Fixed GUI/OS texts by leaving only OS

Signed-off-by: AlexDygma <alex@dygma.com>
Dygmalab · May 18, 2023 · 1eed90e · 1eed90e
1 parent d990369
commit 1eed90e
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/COPYING b/COPYING
@@ -659,7 +659,7 @@ notice like this when it starts in an interactive mode:
 
 The hypothetical commands `show w' and `show c' should show the appropriate
 parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
+might be different; for a OS interface, you would use an "about box".
 
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.

diff --git a/src/api/keymap/db/dualuse.js b/src/api/keymap/db/dualuse.js
@@ -54,14 +54,14 @@ const DualUseModifierTables = [
   withModifiers(NumpadTable, "Alt /", "ALT/", 49681),
   withModifiers(MiscellaneousTable, "Alt /", "ALT/", 49681),
 
-  withModifiers(LetterTable, "Gui /", "GUI/", 49937),
-  withModifiers(DigitTable, "Gui /", "GUI/", 49937),
-  withModifiers(PunctuationTable, "Gui /", "GUI/", 49937),
-  withModifiers(SpacingTable, "Gui /", "GUI/", 49937),
-  withModifiers(NavigationTable, "Gui /", "GUI/", 49937),
-  withModifiers(FunctionKeyTable, "Gui /", "GUI/", 49937),
-  withModifiers(NumpadTable, "Gui /", "GUI/", 49937),
-  withModifiers(MiscellaneousTable, "Gui /", "GUI/", 49937),
+  withModifiers(LetterTable, "Os /", "OS/", 49937),
+  withModifiers(DigitTable, "Os /", "OS/", 49937),
+  withModifiers(PunctuationTable, "Os /", "OS/", 49937),
+  withModifiers(SpacingTable, "Os /", "OS/", 49937),
+  withModifiers(NavigationTable, "Os /", "OS/", 49937),
+  withModifiers(FunctionKeyTable, "Os /", "OS/", 49937),
+  withModifiers(NumpadTable, "Os /", "OS/", 49937),
+  withModifiers(MiscellaneousTable, "Os /", "OS/", 49937),
 
   withModifiers(LetterTable, "AltGr /", "ALTGR/", 50705),
   withModifiers(DigitTable, "AltGr /", "ALTGR/", 50705),

diff --git a/src/api/keymap/languages/french/french.js b/src/api/keymap/languages/french/french.js
@@ -575,7 +575,7 @@ const frenchAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+", 7936
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/api/keymap/languages/german/german.js b/src/api/keymap/languages/german/german.js
@@ -451,7 +451,7 @@ const germanAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+", 7936
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/api/keymap/languages/japanese/japanese.js b/src/api/keymap/languages/japanese/japanese.js
@@ -1079,7 +1079,7 @@ const japaneseAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+", 79
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/api/keymap/languages/nordic/nordic.js b/src/api/keymap/languages/nordic/nordic.js
@@ -417,7 +417,7 @@ const nordicAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+", 7936
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/api/keymap/languages/spanish/spanish.js b/src/api/keymap/languages/spanish/spanish.js
@@ -448,7 +448,7 @@ const spanishAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+", 793
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/api/keymap/languages/swissGerman/swissGerman.js b/src/api/keymap/languages/swissGerman/swissGerman.js
@@ -483,7 +483,7 @@ const swissGermanAllModTable = withModifiers(table, "Hyper + AltGr +", "H+AGr+",
 const DualUseCtrlTable = withModifiers(table, "Control /", "CTRL/", 49169);
 const DualUseShiftTable = withModifiers(table, "Shift /", "SHIFT/", 49425);
 const DualUseAltTable = withModifiers(table, "Alt /", "ALT/", 49681);
-const DualUseGuiTable = withModifiers(table, "Gui /", "GUI/", 49937);
+const DualUseGuiTable = withModifiers(table, "Os /", "OS/", 49937);
 const DualUseAltGrTable = withModifiers(table, "AltGr /", "ALTGR/", 50705);
 const DualUseLayer1Tables = withModifiers(table, "Layer #1 /", "L#1/", 51218);
 const DualUseLayer2Tables = withModifiers(table, "Layer #2 /", "L#2/", 51474);

diff --git a/src/renderer/component/ListModifiers/ListModifiers.js b/src/renderer/component/ListModifiers/ListModifiers.js
@@ -160,7 +160,7 @@ class ListModifiers extends Component {
           ) : (
             ""
           )}
-          {this.parseModifs(keyCode).includes(4) == true ? <div className="label labelModifier labelOs">O.S.</div> : ""}
+          {this.parseModifs(keyCode).includes(4) == true ? <div className="label labelModifier labelOs">OS</div> : ""}
 
           {/* this is for a Control */}
           {/* {this.parseModifs(keyCode).includes(1) == true ? <div>Control</div> : "Nope"} */}

diff --git a/src/renderer/modules/KeyPickerKeyboard/DualFunctionPicker.js b/src/renderer/modules/KeyPickerKeyboard/DualFunctionPicker.js
@@ -82,7 +82,7 @@ class DualFunctionPicker extends Component {
       { name: "Dual Control ", nameStd: "Ctrl", keynum: 49169 },
       { name: "Dual Shift   ", nameStd: "Shift", keynum: 49425 },
       { name: "Dual Alt     ", nameStd: "Alt", keynum: 49681 },
-      { name: "Dual Gui/OS  ", nameStd: "O.S.", keynum: 49937 },
+      { name: "Dual OS  ", nameStd: "OS", keynum: 49937 },
       { name: "Dual Alt Gr  ", nameStd: "Alt Gr.", keynum: 50705 }
     ];
     this.layerKey = [

diff --git a/src/renderer/modules/KeyPickerKeyboard/ModPicker.js b/src/renderer/modules/KeyPickerKeyboard/ModPicker.js
@@ -184,7 +184,7 @@ class ModPicker extends Component {
 
             <ButtonConfig
               selected={modifs.includes(4)}
-              buttonText="O.S."
+              buttonText="OS"
               className="modbutton"
               onClick={e => this.SelectModif(4)}
               disabled={this.setModifierVisibility()}

diff --git a/src/renderer/modules/Macros/KeyMacro.js b/src/renderer/modules/Macros/KeyMacro.js
@@ -281,7 +281,7 @@ class KeyMacro extends Component {
                                         />
                                       </Dropdown.Item>
                                     );
-                                  case "LEFT GUI":
+                                  case "LEFT OS":
                                     return (
                                       <Dropdown.Item eventKey={id} key={`item-${id}`} className="unstyled">
                                         <ButtonConfig
@@ -292,7 +292,7 @@ class KeyMacro extends Component {
                                         />
                                       </Dropdown.Item>
                                     );
-                                  case "RIGHT GUI":
+                                  case "RIGHT OS":
                                     return (
                                       <Dropdown.Item eventKey={id} key={`item-${id}`} className="unstyled">
                                         <ButtonConfig

diff --git a/src/renderer/modules/Macros/MacroCreator.js b/src/renderer/modules/Macros/MacroCreator.js
@@ -199,8 +199,8 @@ class MacroCreator extends Component {
       { name: "RIGHT CTRL", keyCode: 228, color: "#f5e4e4" },
       { name: "LEFT ALT", keyCode: 226, color: "#faf8e1" },
       { name: "RIGHT ALT", keyCode: 230, color: "#f2e7f5" },
-      { name: "LEFT GUI", keyCode: 227, color: "#e6f0e4" },
-      { name: "RIGHT GUI", keyCode: 231, color: "#e6f0e4" }
+      { name: "LEFT OS", keyCode: 227, color: "#e6f0e4" },
+      { name: "RIGHT OS", keyCode: 231, color: "#e6f0e4" }
     ];
     this.actionTypes = [
       {

diff --git a/src/renderer/modules/Macros/TimelineEditor.js b/src/renderer/modules/Macros/TimelineEditor.js
@@ -69,8 +69,8 @@ class TimelineEditor extends Component {
       { name: "RIGHT CTRL", keyCode: 228, color: "#f5e4e4" },
       { name: "LEFT ALT", keyCode: 226, color: "#faf8e1" },
       { name: "RIGHT ALT", keyCode: 230, color: "#f2e7f5" },
-      { name: "LEFT GUI", keyCode: 227, color: "#e6f0e4" },
-      { name: "RIGHT GUI", keyCode: 231, color: "#e6f0e4" }
+      { name: "LEFT OS", keyCode: 227, color: "#e6f0e4" },
+      { name: "RIGHT OS", keyCode: 231, color: "#e6f0e4" }
     ];
     this.actionTypes = [
       {

diff --git a/src/renderer/modules/Macros/TimelineEditorMacroTable.js b/src/renderer/modules/Macros/TimelineEditorMacroTable.js
@@ -95,8 +95,8 @@ class TimelineEditorMacroTable extends Component {
       { name: "RIGHT CTRL", keyCode: 228, color: "#f5e4e4" },
       { name: "LEFT ALT", keyCode: 226, color: "#faf8e1" },
       { name: "RIGHT ALT", keyCode: 230, color: "#f2e7f5" },
-      { name: "LEFT GUI", keyCode: 227, color: "#e6f0e4" },
-      { name: "RIGHT GUI", keyCode: 231, color: "#e6f0e4" }
+      { name: "LEFT OS", keyCode: 227, color: "#e6f0e4" },
+      { name: "RIGHT OS", keyCode: 231, color: "#e6f0e4" }
     ];
     this.actionTypes = [
       {