Merge "Rename popupSettingsStyle to f2PopupStyle"
commit
6a07d7ddd9
|
@ -31,12 +31,12 @@
|
||||||
latin:clobberSettingsKey="true"
|
latin:clobberSettingsKey="true"
|
||||||
>
|
>
|
||||||
<key-style
|
<key-style
|
||||||
latin:styleName="settingsPopupStyle"
|
latin:styleName="f2PopupStyle"
|
||||||
latin:parentStyle="functionalKeyStyle" />
|
latin:parentStyle="functionalKeyStyle" />
|
||||||
</case>
|
</case>
|
||||||
<default>
|
<default>
|
||||||
<key-style
|
<key-style
|
||||||
latin:styleName="settingsPopupStyle"
|
latin:styleName="f2PopupStyle"
|
||||||
latin:keyLabelOption="hasPopupHint"
|
latin:keyLabelOption="hasPopupHint"
|
||||||
latin:popupCharacters="\@icon/5|\@integer/key_settings"
|
latin:popupCharacters="\@icon/5|\@integer/key_settings"
|
||||||
latin:parentStyle="functionalKeyStyle" />
|
latin:parentStyle="functionalKeyStyle" />
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
latin:code="@integer/key_shortcut"
|
latin:code="@integer/key_shortcut"
|
||||||
latin:keyIcon="iconShortcutKey"
|
latin:keyIcon="iconShortcutKey"
|
||||||
latin:keyIconPreview="iconPreviewShortcutKey"
|
latin:keyIconPreview="iconPreviewShortcutKey"
|
||||||
latin:parentStyle="settingsPopupStyle" />
|
latin:parentStyle="f2PopupStyle" />
|
||||||
<key-style
|
<key-style
|
||||||
latin:styleName="settingsKeyStyle"
|
latin:styleName="settingsKeyStyle"
|
||||||
latin:code="@integer/key_settings"
|
latin:code="@integer/key_settings"
|
||||||
|
|
Loading…
Reference in New Issue