From 15b92a0f40311562e56705bb25126c3bcdc5ff61 Mon Sep 17 00:00:00 2001 From: Kian-Meng Ang Date: Wed, 13 Apr 2022 05:18:11 +0800 Subject: [PATCH] misc: Fix typos --- ChangeLog.md | 4 ++-- docs/features.md | 4 ++-- docs/rules.md | 4 ++-- docs/usage.md | 2 +- lib/logitech_receiver/diversion.py | 2 +- lib/logitech_receiver/hidpp10.py | 4 ++-- lib/logitech_receiver/hidpp20.py | 2 +- lib/logitech_receiver/settings.py | 4 ++-- lib/logitech_receiver/settings_templates.py | 2 +- lib/logitech_receiver/special_keys.py | 2 +- release.sh | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 7999ef8c..80965853 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -9,7 +9,7 @@ * Remove obsolete upower signals. * Appinfo/metadata fixes including using correct APP_ID. * Fix bugs in solaar config. -* Add full set of mouse buttons in persistent remappable actions seeting. +* Add full set of mouse buttons in persistent remappable actions setting. * Improve rule behaviour under Wayland and when Xtest or X11 not available. * Fix up and document dependencies (evdev, Python, ...). @@ -22,7 +22,7 @@ * Broaden range of HID++ Bluetooth devices * Add setting to divert gestures * Rule editor can edit all rule components -* Configuation via solaar config takes effect in Solaar UI if it is running +* Configuration via solaar config takes effect in Solaar UI if it is running * Add setting to disable Onboard Profiles and decouple from Polling Rate setting * Add setting for PERSISTENT_REMAPPABLE_ACTION, common keyboard and mouse cases only * Split Test rule condition into Test and TestBytes and support in rule editor diff --git a/docs/features.md b/docs/features.md index e2d660bb..72529fb9 100644 --- a/docs/features.md +++ b/docs/features.md @@ -154,7 +154,7 @@ A setting implementation for a feature (for modern devices that use the HID++ 2. needs a feature identifier. A setting implementation needs a reader/writer and a validator. -The reader/writer is resposible for actually writing settings to the device +The reader/writer is responsible for actually writing settings to the device and reading them from the device, writing and reading the byte strings that represent the setting values on the device. For most feature settings the setting implementation can just inherit @@ -162,7 +162,7 @@ the standard feature reader/writer, `FeatureRW`. Options for `FeatureRW` are supplied by the `rw_options` class variable, which is used to provide command numbers for reading and writing as well -as other information needed to identify the parts of the command and reponse +as other information needed to identify the parts of the command and response that hold the setting value and modify the reading and writing procedure. `PointerSpeed` uses the defaults; here is an example of specifying non-default commands for reading and writing: diff --git a/docs/rules.md b/docs/rules.md index 3374de2b..162d3907 100644 --- a/docs/rules.md +++ b/docs/rules.md @@ -68,7 +68,7 @@ evaluating each of their components in order. An Or condition is terminated early if a component evaluates to true or the last evaluated sub-component of a component is an action. A Or condition is true if its last evaluated component evaluates to a true -value. `And` conditions take a sequence of components are evaluted the same +value. `And` conditions take a sequence of components are evaluated the same as rules. `Feature` conditions are if true if the name of the feature of the current @@ -195,7 +195,7 @@ Here is a file with six rules: --- - Key: [M2, pressed] - Set: [198E3EB8, dpi, 3000] -- Execute: [notify-send, Incresed mouse speed] +- Execute: [notify-send, Increased mouse speed] ... --- - Key: [Host Switch Channel 2, pressed] diff --git a/docs/usage.md b/docs/usage.md index 188bd675..a58a800b 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -90,7 +90,7 @@ moving sliders, or selecting from alternatives. ![Solaar-main-window-mouse](Solaar-main-window-mouse.png) -Device setings now have a clickable icon that determines whether the +Device settings now have a clickable icon that determines whether the setting can be changed and whether the setting is ignored. ![Solaar-divert-back](Solaar-main-window-back-divert.png) diff --git a/lib/logitech_receiver/diversion.py b/lib/logitech_receiver/diversion.py index d2bba9b4..85fbf9d1 100644 --- a/lib/logitech_receiver/diversion.py +++ b/lib/logitech_receiver/diversion.py @@ -100,7 +100,7 @@ except Exception: xtest_available = True # Xtest might be available xdisplay = None -Xkbdisplay = None # xkb might be avilable +Xkbdisplay = None # xkb might be available modifier_keycodes = [] XkbUseCoreKbd = 0x100 diff --git a/lib/logitech_receiver/hidpp10.py b/lib/logitech_receiver/hidpp10.py index b4032684..165359e9 100644 --- a/lib/logitech_receiver/hidpp10.py +++ b/lib/logitech_receiver/hidpp10.py @@ -44,8 +44,8 @@ DEVICE_KIND = _NamedInts( trackball=0x08, touchpad=0x09, headset=0x0D, # not from Logitech documentation - remote_control=0x0E, # for compatability with HID++ 2.0 - receiver=0x0F # for compatability with HID++ 2.0 + remote_control=0x0E, # for compatibility with HID++ 2.0 + receiver=0x0F # for compatibility with HID++ 2.0 ) POWER_SWITCH_LOCATION = _NamedInts( diff --git a/lib/logitech_receiver/hidpp20.py b/lib/logitech_receiver/hidpp20.py index fc77e9b1..b85599f9 100644 --- a/lib/logitech_receiver/hidpp20.py +++ b/lib/logitech_receiver/hidpp20.py @@ -475,7 +475,7 @@ class ReprogrammableKeyV4(ReprogrammableKey): self._setCidReporting(flags=flags) def set_rawXY_reporting(self, value: bool): - """If set, the mouse temporarilty reports all its raw XY events while this control is pressed as HID++ events.""" + """If set, the mouse temporarily reports all its raw XY events while this control is pressed as HID++ events.""" flags = {special_keys.MAPPING_FLAG.raw_XY_diverted: value} self._setCidReporting(flags=flags) diff --git a/lib/logitech_receiver/settings.py b/lib/logitech_receiver/settings.py index 44a38f39..9c0a9578 100644 --- a/lib/logitech_receiver/settings.py +++ b/lib/logitech_receiver/settings.py @@ -810,7 +810,7 @@ class BitFieldWithOffsetAndMaskValidator(Validator): # each element of options is an instance of a class # that has an id (which is used as an index in other dictionaries) # and where om_method is a method that returns a byte offset and byte mask - # that says how to access and modify the bit toogle for the option + # that says how to access and modify the bit toggle for the option self.options = options self.om_method = om_method # to retrieve the options efficiently: @@ -1203,7 +1203,7 @@ class MultipleRangeValidator(Validator): return None return [int(item), {**args[1]}] - def commpare(self, args, current): + def compare(self, args, current): _log.warn('compare not implemented for multiple range settings') return False diff --git a/lib/logitech_receiver/settings_templates.py b/lib/logitech_receiver/settings_templates.py index d820de76..25fbad3d 100644 --- a/lib/logitech_receiver/settings_templates.py +++ b/lib/logitech_receiver/settings_templates.py @@ -166,7 +166,7 @@ class RegisterSideScroll(_Setting): validator_options = {'true_value': 0x02, 'mask': 0x02} -# different devices have different sets of permissable dpis, so this should be subclassed +# different devices have different sets of permissible dpis, so this should be subclassed class RegisterDpi(_Setting): name = 'dpi-old' label = _('Sensitivity (DPI - older mice)') diff --git a/lib/logitech_receiver/special_keys.py b/lib/logitech_receiver/special_keys.py index 979de9d0..c503e417 100644 --- a/lib/logitech_receiver/special_keys.py +++ b/lib/logitech_receiver/special_keys.py @@ -17,7 +17,7 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Reprogrammable keys information -# Mostly from Logitech documentation, but with some edits for better Lunix compatability +# Mostly from Logitech documentation, but with some edits for better Lunix compatibility from .common import NamedInts as _NamedInts from .common import UnsortedNamedInts as _UnsortedNamedInts diff --git a/release.sh b/release.sh index cd51dc4f..d6595c02 100755 --- a/release.sh +++ b/release.sh @@ -89,9 +89,9 @@ echo grep '^# '"$version" ChangeLog.md >/dev/null [ $? -ne 0 ] && echo 'Error: Version is not present in the changelog' && exit 1 -# Check for uncomitted changes +# Check for uncommitted changes git diff --quiet HEAD >/dev/null -[ $? -ne 0 ] && echo -e '\nError: Uncomitted changes found' && exit 1 +[ $? -ne 0 ] && echo -e '\nError: Uncommitted changes found' && exit 1 # Check if commit is a version bump git show -s --format=%B HEAD | grep "^release $version">/dev/null