Skip to content

Commit 451a294

Browse files
C0rn3jC0rn3j
committed
Rename "SC-Controller" to "SC Controller" in all user-facing places, also some grammar and linter fixes
1 parent e6efa6d commit 451a294

File tree

15 files changed

+53
-69
lines changed

15 files changed

+53
-69
lines changed

‎ADDITIONAL-LICENSES‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
All images in images/ directory, profile files in default_profiles/
22
and profile_examples/ and menu files in default_menus/ directories
3-
are licensed under CC0 license - https://creativecommons.org/publicdomain/zero/1.0/
3+
are licensed under the CC0 license - https://creativecommons.org/publicdomain/zero/1.0/
44

55
Images in images/menu-icons subdirectories are licensed as described
6-
in 'LICENSES' files in their respective subdirectories.
6+
in the 'LICENSES' files in their respective subdirectories.
77

8-
lib/jsonencoder.py is licensed under PSFL, https://www.python.org/download/releases/2.7/license/
9-
scripts/gamecontrollerdb.txt is taken from Simple DirectMedia Layer library and licensed under zlib license.
10-
lib/xwrappers.py and lib/vdf.py are part of SC-Controller, licensed under GPL2 as rest of the project.
8+
lib/jsonencoder.py is licensed under the PSFL, https://www.python.org/download/releases/2.7/license/
9+
scripts/gamecontrollerdb.txt is taken from the Simple DirectMedia Layer library and licensed under the zlib license.
10+
lib/xwrappers.py and lib/vdf.py are part of SC Controller, licensed under GPL2 like the rest of the project.
1111

12-
Everything else is licensed under GPL2, as described in 'LICENSE' file.
12+
Everything else is licensed under GPL2, as described in the 'LICENSE' file.

‎docs/menu-file.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
SC-Controller menu file specification
1+
SC Controller menu file specification
22
----------------------------------------
33

4-
Menu file contains json-encoded list with menu items (actions), submenus,
4+
Menu file contains json-encoded list with menu items (actions), submenus,
55
separators and menu generators.
66

77
### Menu Items
8-
8+
99
Every menu item is defined by action, in same way as action would be defined
1010
[in profile file](profile-file.md#Action_definition) with one additional
1111
`id` key. `id` specifies action ID and can be anything, but each menu item
@@ -17,16 +17,16 @@ displayed on screen. If `name` is not specified, title is auto-generated.
1717
Example:
1818

1919
[{
20-
"id": "item1",
21-
"action": "profile('Desktop')",
22-
"name": "Switch to Desktop profile",
20+
"id": "item1",
21+
"action": "profile('Desktop')",
22+
"name": "Switch to Desktop profile",
2323
}, {
24-
"id": "item2",
25-
"action": "turnoff()",
26-
"name": "Turn controller OFF",
24+
"id": "item2",
25+
"action": "turnoff()",
26+
"name": "Turn controller OFF",
2727
}]
2828

29-
specifies menu with two items.
29+
specifies menu with two items.
3030

3131
### Submenus
3232

@@ -41,7 +41,7 @@ that order.
4141
Example:
4242

4343
[{
44-
"submenu": "profiles.menu",
44+
"submenu": "profiles.menu",
4545
"name": "All Profiles"
4646
}]
4747

@@ -63,9 +63,9 @@ Example:
6363
[{
6464
"generator": "profiles"
6565
}, {
66-
"id": "item2",
67-
"action": "turnoff()",
68-
"name": "Turn controller OFF",
66+
"id": "item2",
67+
"action": "turnoff()",
68+
"name": "Turn controller OFF",
6969
}]
7070

7171
specifies menu with list of all profiles, followed by one normal menu item.

‎docs/profile-file.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SC-Controller profile file specification
1+
SC Controller profile file specification
22
----------------------------------------
33

44
Profile file contains json-encoded dictonary with specific keys. Missing keys are substituted with defaults, unknown keys are ignored. See [Desktop.sccprofile](../default_profiles/Desktop.sccprofile) for example.
@@ -57,9 +57,9 @@ levels among which is action executed.
5757
Example:
5858

5959
"trigger_left": {
60-
"action": "button(BTN_LEFT)",
60+
"action": "button(BTN_LEFT)",
6161
"levels": [127, 255]
62-
},
62+
},
6363

6464
Sets action that presses left mouse button, but only if trigger
6565
is roughly half-pressed.
@@ -88,10 +88,10 @@ Example:
8888
"pad_left": {
8989
"ring": {
9090
"inner": { "action": "XY(axis(Axes.ABS_X), raxis(Axes.ABS_Y))" },
91-
"outer": { "action": "XY(axis(Axes.ABS_RX), raxis(Axes.ABS_RY))" },
91+
"outer": { "action": "XY(axis(Axes.ABS_RX), raxis(Axes.ABS_RY))" },
9292
"radius": 0.4
9393
}
94-
},
94+
},
9595

9696
defines inner ring binding controlling left stick and outer ring right stick
9797
of emulated gamepad.
@@ -187,9 +187,9 @@ If set to True, enables OSD for action.
187187
Example:
188188

189189
"X": {
190-
"action": "button(Keys.BTN_EAST)",
190+
"action": "button(Keys.BTN_EAST)",
191191
"osd": true
192-
},
192+
},
193193

194194
enables OSD feedback for X button.
195195

@@ -327,9 +327,9 @@ All keys are optional. Value for each key is [action definition](#Action_definit
327327
Example:
328328

329329
"buttons": {
330-
"A": { "action": "button(Keys.BTN_WEST)", },
331-
"B": { "action": "osd('Hello world!')" },
332-
"BACK": { "action": "button(Keys.KEY_LEFTCTRL) and button(Keys.KEY_A)" },
330+
"A": { "action": "button(Keys.BTN_WEST)", },
331+
"B": { "action": "osd('Hello world!')" },
332+
"BACK": { "action": "button(Keys.KEY_LEFTCTRL) and button(Keys.KEY_A)" },
333333
}
334334

335335

‎glade/creg.glade‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -889,10 +889,10 @@ That means your account lacks permissons needed to read controller exclusively.
889889
<property name="hexpand">True</property>
890890
<property name="label" translatable="yes">&lt;b&gt;DS4 Controller&lt;/b&gt;
891891

892-
SC-Controller supports DS4 controllers automatically
892+
SC Controller supports DS4 controllers automatically
893893
and requires no additional configuration. All you need
894-
is to make sure "DS4 Controller Support" checkbox
895-
is enabled in Settings or here:</property>
894+
is to make sure that the "DS4 Controller Support" checkbox
895+
is enabled in the Settings or here:</property>
896896
<property name="use-markup">True</property>
897897
<property name="wrap">True</property>
898898
<property name="xalign">0</property>

‎glade/global_settings.glade‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,7 +1464,7 @@ or even crash.</property>
14641464
<property name="visible">True</property>
14651465
<property name="can-focus">False</property>
14661466
<property name="margin-left">30</property>
1467-
<property name="label" translatable="yes">If enabled, any connected DualSense controller will be automatically used by SC-Controller</property>
1467+
<property name="label" translatable="yes">If enabled, any connected DualSense controller will be automatically used by SC Controller</property>
14681468
<property name="xalign">0</property>
14691469
<property name="yalign">0</property>
14701470
</object>
@@ -1497,7 +1497,7 @@ or even crash.</property>
14971497
<property name="visible">True</property>
14981498
<property name="can-focus">False</property>
14991499
<property name="margin-left">30</property>
1500-
<property name="label" translatable="yes">If enabled, any connected Dualshock4 controller will be automatically used by SC-Controller</property>
1500+
<property name="label" translatable="yes">If enabled, any connected Dualshock4 controller will be automatically used by SC Controller</property>
15011501
<property name="xalign">0</property>
15021502
<property name="yalign">0</property>
15031503
</object>
@@ -1512,7 +1512,7 @@ or even crash.</property>
15121512
<property name="visible">True</property>
15131513
<property name="can-focus">False</property>
15141514
<property name="margin-left">20</property>
1515-
<property name="label" translatable="yes">Controller listed here are automatically used by SC-Controller whenever they are connected.</property>
1515+
<property name="label" translatable="yes">Controllers listed here are automatically used by SC Controller whenever they are connected.</property>
15161516
<property name="xalign">0</property>
15171517
</object>
15181518
<packing>
@@ -2296,7 +2296,7 @@ grips, triggers, finger positions on both pads and stick angle.</property>
22962296
<object class="GtkLabel" id="label40">
22972297
<property name="visible">True</property>
22982298
<property name="can-focus">False</property>
2299-
<property name="label" translatable="yes">Display message about new version after SC-Controller upgrade</property>
2299+
<property name="label" translatable="yes">Display a message with changelog when SC Controller updates</property>
23002300
<property name="use-underline">True</property>
23012301
<property name="mnemonic-widget">cbShowOSD</property>
23022302
<attributes>

‎glade/import_export.glade‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
<object class="GtkLabel" id="lblBtImport">
203203
<property name="visible">True</property>
204204
<property name="can-focus">False</property>
205-
<property name="label" translatable="yes">_Import SC-Controller Profile</property>
205+
<property name="label" translatable="yes">_Import SC Controller Profile</property>
206206
<property name="use-underline">True</property>
207207
<attributes>
208208
<attribute name="weight" value="bold"/>

‎scc/gui/ae/dpad.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
3-
"""
4-
SC-Controller - Action Editor - "DPAD or Menu"
1+
"""SC Controller - Action Editor - "DPAD or Menu".
52
63
Setups DPAD emulation or menu display
74
"""

‎scc/gui/ae/first_page.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#!/usr/bin/env python3
2-
# -*- coding: utf-8 -*-
3-
"""
4-
SC-Controller - Action Editor - First Page
1+
"""SC Controller - Action Editor - First Page.
52
63
Provides links for quick settings.
74
"""
@@ -13,7 +10,7 @@
1310
from scc.tools import nameof
1411

1512

16-
import os, logging
13+
import logging
1714
log = logging.getLogger("AE.1st")
1815

1916
__all__ = [ 'FirstPage' ]

‎scc/gui/importexport/export.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ def on_btSaveAs_clicked(self, *a):
201201
# Determine format
202202
f = Gtk.FileFilter()
203203
if self._needs_package():
204-
f.set_name("SC-Controller Profile Archive")
204+
f.set_name("SC Controller Profile Archive")
205205
fmt = "sccprofile.tar.gz"
206206
else:
207-
f.set_name("SC-Controller Profile")
207+
f.set_name("SC Controller Profile")
208208
fmt = "sccprofile"
209209
f.add_pattern("*.%s" % (fmt,))
210210

‎scc/gui/importexport/import_sccprofile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class ImportSccprofile(object):
1818
def on_btImportSccprofile_clicked(self, *a):
1919
# Create filters
2020
f1 = Gtk.FileFilter()
21-
f1.set_name("SC-Controller Profile or Archive")
21+
f1.set_name("SC Controller Profile or Archive")
2222
f1.add_pattern("*.sccprofile")
2323
f1.add_pattern("*.sccprofile.tar.gz")
2424

0 commit comments

Comments
 (0)