Skip to content

Commit

Permalink
Merge branch 'settings-page-labels' of https://github.com/aiannacc/Go…
Browse files Browse the repository at this point in the history 
…ko-Salvager into beta
  • Loading branch information
@aiannacc
aiannacc committed Apr 24, 2014
2 parents de30a4b + 1c800c1 commit 7ee4140
Showing 1 changed file with 49 additions and 27 deletions.
76 changes: 49 additions & 27 deletions src/ext/settingsDialog.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,43 +43,51 @@
$('#settingsTabs-game')
.append($('<div>').text('In-game sidebar'))
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_sidebar')
.attr('ng-model', 'so.sidebar')
.addClass('indented'))
.append('Show sidebar (VPs, log, chat)<br>')
.append('<label for="settings_sidebar">Show sidebar (VPs, log, chat)</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_sidebar_chat')
.attr('ng-model', 'so.sidebar_chat')
.addClass('indented'))
.append('Replace Goko chat window<br>')
.append($('<input type="checkbox" ng-model="so.flash_chat" class="indented">'))
.append('Visual chat alert<br>')
.append($('<input type="checkbox" ng-model="so.chat_noise" class="indented">'))
.append('Audio chat alert<br>')
.append('<label for="settings_sidebar_chat">Replace Goko chat window</label><br />')
.append($('<input type="checkbox" ng-model="so.flash_chat" id="settings_flash_chat" class="indented">'))
.append('<label for="settings_flash_chat">Visual chat alert</label><br />')
.append($('<input type="checkbox" ng-model="so.chat_noise" id="settings_chat_noise" class="indented">'))
.append('<label for="settings_chat_noise">Audio chat alert</label><br />')
.append($('<div>').text('VP Counter'))
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_vp_request')
.attr('ng-model', 'so.vp_request')
.addClass('indented'))
.append('Always request (#vpon)<br>')
.append('<label for="settings_vp_request">Always request (#vpon)</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_vp_refuse')
.attr('ng-model', 'so.vp_refuse')
.addClass('indented'))
.append('Always refuse (#vpoff)<br>')
.append('<label for="settings_vp_refuse">Always refuse (#vpoff)</label><br />')
.append('Animation Speed:<br>')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_speed_tweak_uniform')
.attr('ng-model', 'so.speed_tweak_uniform')
.attr('ng-change', 'updateSpeeds()')
.addClass('indented'))
.append('More consistent speeds<br>')
.append('<label for="settings_speed_tweak_uniform">More consistent speeds</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_speed_tweak_faster')
.attr('ng-model', 'so.speed_tweak_faster')
.attr('ng-change', 'updateSpeeds()')
.attr('ng-disabled', '!so.speed_tweak_uniform')
.addClass('indented'))
.append('Speed up "normal" and "fast" modes<br>')
.append('<label for="settings_speed_tweak_faster">Speed up "normal" and "fast" modes</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_always_stack')
.attr('ng-model', 'so.always_stack'))
.append('Stack duplicate cards<br>')
.append('<label for="settings_always_stack">Stack duplicate cards</label><br />')
.append('Greeting Message')
.append($('<input>').attr('type', 'text')
.attr('id', 'greeting')
.attr('ng-model', 'so.greeting'));

// Define the dialog sections: blacklist settings
Expand Down Expand Up @@ -157,18 +165,20 @@
$('#settingsTabs-lobby')
.append($('<div>').text('Notifications:'))
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_audio_notifications')
.attr('ng-model', 'so.audio_notifications')
.addClass('indented'))
.append('Sounds<br>')
.append('<label for="settings_audio_notifications">Sounds</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_popup_notifications')
.attr('ng-model', 'so.popup_notifications')
.addClass('indented'))
.append('Traditional popups<br>')
.append('<label for="settings_popup_notifications">Traditional popups</label><br />')
.append($('<input>').attr('id', 'desktopnotificationcheckbox')
.attr('type', 'checkbox')
.attr('ng-model', 'so.desktop_notifications')
.addClass('indented'))
.append('HTML5 Notifications (recommended)<br>')
.append('<label for="desktopnotificationcheckbox">HTML5 Notifications (recommended)</label><br />')

.append($('<div>').text('Lobby Ratings:'))
.append($('<span>').addClass('indented')
Expand All @@ -178,62 +188,74 @@
's.name as s.text for s in sortkeys')))
.append($('<br>'))
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_proranks')
.attr('ng-model', 'so.proranks')
.addClass('indented'))
.append('Display Pro ratings instead of Casual<br>')
.append('<label for="settings_proranks">Display Pro ratings instead of Casual</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_isoranks')
.attr('ng-model', 'so.isoranks')
.addClass('indented'))
.append('Also display Isotropish ratings<br>')
.append('<label for="settings_isoranks">Also display Isotropish ratings</label><br />')

.append($('<div>').text('Autokick:'))
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_autokick_by_rating')
.attr('ng-model', 'so.autokick_by_rating')
.addClass('indented'))
.append('By Goko Pro rating<br>')

.append('<label for="settings_autokick_by_rating">By Goko Pro rating</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_autokick_by_level')
.attr('ng-model', 'so.autokick_by_level')
.addClass('indented'))
.append('By TrueSkill (Isotropish) level<br>')
.append('<label for="settings_autokick_by_level">By TrueSkill (Isotropish) level</label><br />')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_autokick_by_forname')
.attr('ng-model', 'so.autokick_by_forname')
.addClass('indented'))
.append('By player name<br>')
.append('<label for="settings_autokick_by_forname">By player name</label><br />')

.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_explain_kicks')
.attr('ng-model', 'so.explain_kicks')
.addClass('indented'))
.append('Explain kicks in chat<br>')
.append('<label for="settings_explain_kicks">Explain kicks in chat</label><br />')


.append($('<div>').text('Quick game:'))
.append('&nbsp;&nbsp;&nbsp;&nbsp;Name:')
.append($('<input>').attr('type', 'name')
.attr('id', 'quick_game_name')
.attr('ng-model', 'so.quick_game_name')
.addClass('indented'))
.append('<br>')
.append('&nbsp;&nbsp;&nbsp;&nbsp;Type (pro/casual/unrated):')
.append($('<input>').attr('type', 'name')
.attr('id', 'quick_game_type')
.attr('ng-model', 'so.quick_game_type')
.addClass('indented'))
.append('<br>')
.append('&nbsp;&nbsp;&nbsp;&nbsp;# of players (2/3/4/5/6):')
.append($('<input>').attr('type', 'name')
.attr('id', 'quick_game_players')
.attr('ng-model', 'so.quick_game_players')
.addClass('indented'))
.append('<br>')
.append($('<input>').attr('type', 'checkbox')
.attr('id', 'settings_quick_game_automatch')
.attr('ng-model', 'so.quick_game_automatch')
.addClass('indented'))
.append('Use Automatch<br>');
.append('<label for="settings_quick_game_automatch">Use Automatch</label><br />');

// Define the dialog sections: miscellaneous settings
$('#settingsTabs-misc')
.append($('<input type="checkbox" ng-model="so.generator">'))
.append('Kingdom Generator<br>')
.append($('<input type="checkbox" ng-model="so.autozap">'))
.append('Adventure Mode Auto-Zap<br>')
.append($('<input type="checkbox" ng-model="so.debug_mode">'))
.append('Extra logging (for error reports)<br>');
.append($('<input type="checkbox" id="settings_generator" ng-model="so.generator">'))
.append('<label for="settings_generator">Kingdom Generator</label><br />')
.append($('<input type="checkbox" id="settings_autozap" ng-model="so.autozap">'))
.append('<label for="settings_autozap">Adventure Mode Auto-Zap</label><br />')
.append($('<input type="checkbox" id="settings_debug_mode" ng-model="so.debug_mode">'))
.append('<label for="settings_debug_mode">Extra logging (for error reports)</label><br />');

// Verify blacklist when opening Blacklist tab. Save on close.
$('#settingsTabs').on("tabsactivate", function (event, ui) {
Expand Down

0 comments on commit 7ee4140

Please sign in to comment.