UI 3

README.md

@@ -17,8 +17,6 @@
 #### Known Issues (Beta Branch)
 
  * Mapping relative axis to relative axis (mouse to mouse) is not possible
- * Mapping relative axis to absolute axis (mouse to gamepad) is not possible
- * Mapping absolute axis to absolute axis (gamepad to gamepad) is not possible
 
 ## Installation
 

bin/input-remapper-gtk

@@ -74,7 +74,7 @@ if __name__ == '__main__':
     logger.debug('Using locale directory: {}'.format(LOCALE_DIR))
 
     # import input-remapper stuff after setting the log verbosity
-    from inputremapper.gui.message_broker import MessageBroker, MessageType
+    from inputremapper.gui.messages.message_broker import MessageBroker, MessageType
     from inputremapper.configs.system_mapping import system_mapping
     from inputremapper.gui.data_manager import DataManager
     from inputremapper.gui.user_interface import UserInterface

data/style.css

@@ -1,63 +1,16 @@
-row {
-    padding: 0;
-}
-
 .status_bar frame {
     /* the status bar is ugly in elementary os otherwise */
     border: 0px;
 }
 
-/* adds a bottom border for themes that don't add one in primary-toolbar
-classes. Interestingly, those that do add a border ignore this separator,
-which is perfect. */
-.top_separator {
-    border: 0px; /* fixes light pixels on each end in arc-dark */
-}
-
-.table-header, .row-box {
-    padding: 2px;
-}
-
-.changed {
-    background: @selected_bg_color;
-}
-
-list entry {
-    border-radius: 4px;
-    border: 0px;
-    box-shadow: none;
-}
-
-list.basic-editor button:not(:focus) {
-    border-color: transparent;
-    background: transparent;
-    box-shadow: none;
-}
-
-list button {
-    border-color: transparent;
-}
-
-.invalid_input {
-    background-color: #ea9697;
-}
-
 .transparent {
     background: transparent;
 }
 
-.code-editor-text-view > * {
-    border-radius: 2px;
-}
-
 .copyright {
     font-size: 7pt;
 }
 
-.editor-key-list label {
-    padding: 11px;
-}
-
 .autocompletion label {
     padding: 11px;
 }
@@ -67,19 +20,19 @@ list button {
     box-shadow: none;
 }
 
-.no-border {
-    border: 0px;
-    box-shadow: none;
-}
-
-.code-editor-text-view.multiline {
-  /* extra space between text editor and line numbers */
-  padding-left: 18px;
-}
-
-.no-v-padding{
+.no-v-padding {
     padding-top: 0;
     padding-bottom: 0;
 }
 
-/* @theme_bg_color, @theme_fg_color */
+.transformation-draw-area {
+    border: 1px solid @borders;
+    border-radius: 6px;
+    background: @theme_base_color;
+}
+
+/*
+@theme_bg_color
+@theme_selected_bg_color
+@theme_base_color
+*/

inputremapper/configs/mapping.py

@@ -40,18 +40,22 @@
 from inputremapper.configs.system_mapping import system_mapping, DISABLE_NAME
 from inputremapper.event_combination import EventCombination
 from inputremapper.exceptions import MacroParsingError
-from inputremapper.gui.message_broker import MessageType
+from inputremapper.gui.messages.message_types import MessageType
+from inputremapper.gui.gettext import _
 from inputremapper.injection.macros.parse import is_this_a_macro, parse
 from inputremapper.input_event import EventActions
 
 # TODO: remove pydantic VERSION check as soon as we no longer support
-#  Ubuntu 20.04 and with it the ainchant pydantic 1.2
+#  Ubuntu 20.04 and with it the ancient pydantic 1.2
 
 needs_workaround = pkg_resources.parse_version(
     str(VERSION)
 ) < pkg_resources.parse_version("1.7.1")
 
 
+EMPTY_MAPPING_NAME = _("Empty Mapping")
+
+
 class KnownUinput(str, enum.Enum):
     keyboard = "keyboard"
     mouse = "mouse"
@@ -69,7 +73,7 @@ class Cfg(BaseConfig):
     validate_assignment = True
     use_enum_values = True
     underscore_attrs_are_private = True
-    json_encoders = {EventCombination: lambda v: v.json_str()}
+    json_encoders = {EventCombination: lambda v: v.json_key()}
 
 
 class ImmutableCfg(Cfg):
@@ -180,6 +184,23 @@ def copy(self: MappingModel, *args, **kwargs) -> MappingModel:
             object.__setattr__(copy, "_combination_changed", self._combination_changed)
             return copy
 
+    def format_name(self) -> str:
+        """Get the custom-name or a readable representation of the combination."""
+        if self.name:
+            return self.name
+
+        if (
+            self.event_combination == EventCombination.empty_combination()
+            or self.event_combination is None
+        ):
+            return EMPTY_MAPPING_NAME
+
+        return self.event_combination.beautify()
+
+    def has_input_defined(self) -> bool:
+        """Whether this mapping defines an event-input."""
+        return self.event_combination != EventCombination.empty_combination()
+
     def is_axis_mapping(self) -> bool:
         """whether this mapping specifies an output axis"""
         return self.output_type == EV_ABS or self.output_type == EV_REL
@@ -266,7 +287,7 @@ def validate_symbol(cls, symbol):
         if system_mapping.get(symbol) is not None:
             return symbol
         raise ValueError(
-            f"the output_symbol '{symbol}' is not a macro and not a valid keycode-name"
+            f'the output_symbol "{symbol}" is not a macro and not a valid keycode-name'
         )
 
     @validator("event_combination")

inputremapper/configs/migrations.py

@@ -268,7 +268,7 @@ def _convert_to_individual_mappings():
         if "mapping" in old_preset.keys():
             for combination, symbol_target in old_preset["mapping"].items():
                 logger.info(
-                    f"migrating from '{combination}: {symbol_target}' to mapping dict"
+                    f'migrating from "{combination}: {symbol_target}" to mapping dict'
                 )
                 try:
                     combination = EventCombination.from_string(combination)

inputremapper/configs/preset.py

@@ -209,7 +209,7 @@ def save(self) -> None:
                 del d["event_combination"]
             except KeyError:
                 pass
-            json_ready[combination.json_str()] = d
+            json_ready[combination.json_key()] = d
 
             saved_mappings[combination] = mapping.copy()
             saved_mappings[combination].remove_combination_changed_callback()

inputremapper/event_combination.py

@@ -145,8 +145,9 @@ def get_permutations(self):
 
         return permutations
 
-    def json_str(self) -> str:
-        return "+".join([event.json_str() for event in self])
+    def json_key(self) -> str:
+        """Get a representation of the input that works as key in a json object."""
+        return "+".join([event.json_key() for event in self])
 
     def beautify(self) -> str:
         """Get a human readable string representation."""

inputremapper/gui/autocompletion.py

@@ -30,8 +30,9 @@
 
 from inputremapper.configs.mapping import MappingData
 from inputremapper.configs.system_mapping import system_mapping
-from inputremapper.gui.components import CodeEditor
-from inputremapper.gui.message_broker import MessageBroker, MessageType, UInputsData
+from inputremapper.gui.components.editor import CodeEditor
+from inputremapper.gui.messages.message_broker import MessageBroker, MessageType
+from inputremapper.gui.messages.message_classes import UInputsData
 from inputremapper.gui.utils import debounce
 from inputremapper.injection.macros.parse import (
     FUNCTIONS,
@@ -293,19 +294,43 @@ def _scroll_to_row(self, row):
         # to write code is possible), so here is a custom solution.
         row_height = row.get_allocation().height
 
+        list_box_height = self.list_box.get_allocated_height()
+
         if row:
-            y_offset = row.translate_coordinates(self.list_box, 0, 0)[1]
+            # get coordinate relative to the list_box,
+            # measured from the top of the selected row to the top of the list_box
+            row_y_position = row.translate_coordinates(self.list_box, 0, 0)[1]
+
+            # Depending on the theme, the y_offset will be > 0, even though it
+            # is the uppermost element, due to margins/paddings.
+            if row_y_position < row_height:
+                row_y_position = 0
+
+            # if the selected row sits lower than the second to last row,
+            # then scroll all the way down. otherwise it will only scroll down
+            # to the bottom edge of the selected-row, which might not actually be the
+            # bottom of the list-box due to paddings.
+            if row_y_position > list_box_height - row_height * 1.5:
+                # using a value that is too high doesn't hurt here.
+                row_y_position = list_box_height
+
+            # the visible height of the scrolled_window. not the content.
             height = self.scrolled_window.get_max_content_height()
+
             current_y_scroll = self.scrolled_window.get_vadjustment().get_value()
 
             vadjustment = self.scrolled_window.get_vadjustment()
 
-            if y_offset > current_y_scroll + (height - row_height):
-                vadjustment.set_value(y_offset - (height - row_height))
+            # for the selected row to still be visible, its y_offset has to be
+            # at height - row_height. If the y_offset is higher than that, then
+            # the autocompletion needs to scroll down to make it visible again.
+            if row_y_position > current_y_scroll + (height - row_height):
+                value = row_y_position - (height - row_height)
+                vadjustment.set_value(value)
 
-            if y_offset < current_y_scroll:
-                # scroll up because the element is not visible anymore
-                vadjustment.set_value(y_offset)
+            if row_y_position < current_y_scroll:
+                # the selected element is not visiable, so we need to scroll up.
+                vadjustment.set_value(row_y_position)
 
     def _get_text_iter_at_cursor(self):
         """Get Gtk.TextIter at the current text cursor location."""
@@ -341,7 +366,7 @@ def update(self, *_):
         cursor.y += 12
 
         if self.code_editor.gui.get_show_line_numbers():
-            cursor.x += 25
+            cursor.x += 48
 
         self.set_pointing_to(cursor)