| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_slider/cr_slider.html
"> |
| 2 <link rel="import" href="chrome://resources/html/cr.html"> | 2 <link rel="import" href="chrome://resources/html/cr.html"> |
| 3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout-classes.html"> |
| 6 <link rel="import" href="/controls/settings_checkbox.html"> | 6 <link rel="import" href="/controls/settings_checkbox.html"> |
| 7 <link rel="import" href="/controls/settings_dropdown_menu.html"> | 7 <link rel="import" href="/controls/settings_dropdown_menu.html"> |
| 8 <link rel="import" href="/i18n_setup.html"> | 8 <link rel="import" href="/i18n_setup.html"> |
| 9 <link rel="import" href="/route.html"> | 9 <link rel="import" href="/route.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 10 <link rel="import" href="/settings_shared_css.html"> |
| 11 | 11 |
| 12 <dom-module id="settings-keyboard"> | 12 <dom-module id="settings-keyboard"> |
| 13 <template> | 13 <template> |
| 14 <style include="settings-shared"></style> | 14 <style include="settings-shared"></style> |
| 15 <div class="settings-box first"> | 15 <div class="settings-box first"> |
| 16 <div class="start">$i18n{keyboardKeySearch}</div> | 16 <div class="start">$i18n{keyboardKeySearch}</div> |
| 17 <settings-dropdown-menu | 17 <settings-dropdown-menu |
| 18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" | 18 pref="{{prefs.settings.language.xkb_remap_search_key_to}}" |
| 19 menu-options="[[keyMapTargetsWithCapsLock_]]"> | 19 menu-options="[[keyMapTargets_]]"> |
| 20 </settings-dropdown-menu> | 20 </settings-dropdown-menu> |
| 21 </div> | 21 </div> |
| 22 <div class="settings-box"> | 22 <div class="settings-box"> |
| 23 <div class="start">$i18n{keyboardKeyCtrl}</div> | 23 <div class="start">$i18n{keyboardKeyCtrl}</div> |
| 24 <settings-dropdown-menu | 24 <settings-dropdown-menu |
| 25 pref="{{prefs.settings.language.xkb_remap_control_key_to}}" | 25 pref="{{prefs.settings.language.xkb_remap_control_key_to}}" |
| 26 menu-options="[[keyMapTargets_]]"> | 26 menu-options="[[keyMapTargets_]]"> |
| 27 </settings-dropdown-menu> | 27 </settings-dropdown-menu> |
| 28 </div> | 28 </div> |
| 29 <div class="settings-box"> | 29 <div class="settings-box"> |
| 30 <div class="start">$i18n{keyboardKeyAlt}</div> | 30 <div class="start">$i18n{keyboardKeyAlt}</div> |
| 31 <settings-dropdown-menu | 31 <settings-dropdown-menu |
| 32 pref="{{prefs.settings.language.xkb_remap_alt_key_to}}" | 32 pref="{{prefs.settings.language.xkb_remap_alt_key_to}}" |
| 33 menu-options="[[keyMapTargets_]]"> | 33 menu-options="[[keyMapTargets_]]"> |
| 34 </settings-dropdown-menu> | 34 </settings-dropdown-menu> |
| 35 </div> | 35 </div> |
| 36 <template is="dom-if" if="[[showCapsLock_]]"> | 36 <template is="dom-if" if="[[showCapsLock_]]"> |
| 37 <div class="settings-box" id="capsLockKey"> | 37 <div class="settings-box" id="capsLockKey"> |
| 38 <div class="start">$i18n{keyboardKeyCapsLock}</div> | 38 <div class="start">$i18n{keyboardKeyCapsLock}</div> |
| 39 <settings-dropdown-menu | 39 <settings-dropdown-menu |
| 40 pref="{{prefs.settings.language.remap_caps_lock_key_to}}" | 40 pref="{{prefs.settings.language.remap_caps_lock_key_to}}" |
| 41 menu-options="[[keyMapTargetsWithCapsLock_]]"> | 41 menu-options="[[keyMapTargets_]]"> |
| 42 </settings-dropdown-menu> | 42 </settings-dropdown-menu> |
| 43 </div> | 43 </div> |
| 44 </template> | 44 </template> |
| 45 <template is="dom-if" if="[[showDiamondKey_]]"> | 45 <template is="dom-if" if="[[showDiamondKey_]]"> |
| 46 <div class="settings-box" id="diamondKey"> | 46 <div class="settings-box" id="diamondKey"> |
| 47 <div class="start">$i18n{keyboardKeyDiamond}</div> | 47 <div class="start">$i18n{keyboardKeyDiamond}</div> |
| 48 <settings-dropdown-menu | 48 <settings-dropdown-menu |
| 49 pref="{{prefs.settings.language.remap_diamond_key_to}}" | 49 pref="{{prefs.settings.language.remap_diamond_key_to}}" |
| 50 menu-options="[[keyMapTargets_]]"> | 50 menu-options="[[keyMapTargets_]]"> |
| 51 </settings-dropdown-menu> | 51 </settings-dropdown-menu> |
| 52 </div> | 52 </div> |
| 53 </template> | 53 </template> |
| 54 <div class="settings-box"> | 54 <div class="settings-box"> |
| 55 <div class="start">$i18n{keyboardKeyEscape}</div> |
| 56 <settings-dropdown-menu |
| 57 pref="{{prefs.settings.language.remap_escape_key_to}}" |
| 58 menu-options="[[keyMapTargets_]]"> |
| 59 </settings-dropdown-menu> |
| 60 </div> |
| 61 <div class="settings-box"> |
| 62 <div class="start">$i18n{keyboardKeyBackspace}</div> |
| 63 <settings-dropdown-menu |
| 64 pref="{{prefs.settings.language.remap_backspace_key_to}}" |
| 65 menu-options="[[keyMapTargets_]]"> |
| 66 </settings-dropdown-menu> |
| 67 </div> |
| 68 <div class="settings-box"> |
| 55 <settings-checkbox | 69 <settings-checkbox |
| 56 pref="{{prefs.settings.language.send_function_keys}}" | 70 pref="{{prefs.settings.language.send_function_keys}}" |
| 57 label="$i18n{keyboardSendFunctionKeys}" | 71 label="$i18n{keyboardSendFunctionKeys}" |
| 58 sub-label="$i18n{keyboardSendFunctionKeysDescription}"> | 72 sub-label="$i18n{keyboardSendFunctionKeysDescription}"> |
| 59 </settings-checkbox> | 73 </settings-checkbox> |
| 60 </div> | 74 </div> |
| 61 <div class="settings-box"> | 75 <div class="settings-box"> |
| 62 <settings-checkbox | 76 <settings-checkbox |
| 63 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}" | 77 pref="{{prefs.settings.language.xkb_auto_repeat_enabled_r2}}" |
| 64 label="$i18n{keyboardEnableAutoRepeat}"> | 78 label="$i18n{keyboardEnableAutoRepeat}"> |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 <div id="keyboardOverlay" class="settings-box" | 110 <div id="keyboardOverlay" class="settings-box" |
| 97 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> | 111 on-tap="onShowKeyboardShortcutsOverlayTap_" actionable> |
| 98 $i18n{showKeyboardShortcutsOverlay} | 112 $i18n{showKeyboardShortcutsOverlay} |
| 99 </div> | 113 </div> |
| 100 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> | 114 <div class="settings-box" on-tap="onShowLanguageInputTap_" actionable> |
| 101 $i18n{keyboardShowLanguageAndInput} | 115 $i18n{keyboardShowLanguageAndInput} |
| 102 </div> | 116 </div> |
| 103 </template> | 117 </template> |
| 104 <script src="keyboard.js"></script> | 118 <script src="keyboard.js"></script> |
| 105 </dom-module> | 119 </dom-module> |
| OLD | NEW |