refactor: ui actions; fix type hinting for gtk

dynobo · Apr 15, 2024 · c679627 · c679627
1 parent 060c9b8
commit c679627
Show file tree

Hide file tree

Showing 6 changed files with 306 additions and 188 deletions.
diff --git a/keyhint/__main__.py b/keyhint/__main__.py
@@ -1,4 +1,5 @@
 """Package entry for keyhint."""
+
 from keyhint import app
 
 if __name__ == "__main__":

diff --git a/keyhint/app.py b/keyhint/app.py
@@ -5,15 +5,13 @@
 
 import logging
 import sys
-from collections.abc import Mapping
-from typing import Any
 
 import gi
 
 gi.require_version("Gtk", "4.0")
 gi.require_version("Adw", "1")
 
-from gi.repository import Adw, Gio, GLib, Gtk  # noqa: E402
+from gi.repository import Adw, Gio, GLib  # noqa: E402
 
 from keyhint.window import KeyhintWindow  # noqa: E402
 
@@ -36,10 +34,12 @@ class Application(Adw.Application):
 
     def __init__(self, *args, **kwargs) -> None:  # noqa: ANN002, ANN003
         """Initialize application with command line options."""
-        super().__init__(
-            *args,
+        kwargs.update(
             application_id="eu.dynobo.keyhint",
             flags=Gio.ApplicationFlags.HANDLES_COMMAND_LINE,
+        )
+        super().__init__(
+            *args,
             **kwargs,
         )
         self.options: dict = {}
@@ -67,7 +67,7 @@ def do_activate(self, *_, **__) -> None:  # noqa: ANN002, ANN003
         window.set_application(self)
         window.present()
 
-    def do_command_line(self, cli: Gtk, **__: Mapping[Any, Any]) -> int:
+    def do_command_line(self, cli: Gio.ApplicationCommandLine) -> int:
         """Store command line options in class attribute for later usage."""
         self.options = cli.get_options_dict().end().unpack()
 

diff --git a/keyhint/config/cli.toml b/keyhint/config/cli.toml
@@ -36,6 +36,7 @@ eza = "ls clone with coloring"
 duf = "Basic disk usage"
 ncdu = "Recursive disk usage analyzer"
 s-tui = "Stress test and monitor"
+btm = "System resources dashboard"
 
 [section.Navigating]
 pwd = "Print working dir"

diff --git a/keyhint/resources/headerbar.ui b/keyhint/resources/headerbar.ui
@@ -215,41 +215,37 @@
     </property>
   </object>
 
-  <template class="headerbar_box" parent="GtkBox">
-    <child>
-      <object class="AdwHeaderBar" id="headerbar">
-        <property name="hexpand">true</property>
-        <child type="start">
-          <object class="GtkDropDown" id="sheet_dropdown">
-            <property name="can-focus">True</property>
-            <property name="tooltip-text" translatable="yes">Switch cheatsheet</property>
-            <property name="model">
-              <object class="GtkStringList">
-                <items />
-              </object>
-            </property>
-          </object>
-        </child>
-        <child type="title">
-          <object class="GtkSearchEntry" id="search_entry">
-            <property name="placeholder-text" translatable="true">Ctrl+F to filter...</property>
-            <property name="width-request">400</property>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkMenuButton">
-            <property name="icon-name">open-menu-symbolic</property>
-            <property name="tooltip-text" translatable="true">Main Menu</property>
-            <property name="popover">popover_menu</property>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkToggleButton" id="fullscreen_button">
-            <property name="icon-name">view-fullscreen-symbolic</property>
-            <property name="tooltip-text">Toggle fullscreen (F11)</property>
-            <property name="action-name">win.fullscreen</property>
-          </object>
-        </child>
+  <template class="headerbar" parent="GtkHeaderBar">
+    <property name="hexpand">true</property>
+    <child type="start">
+      <object class="GtkDropDown" id="sheet_dropdown">
+        <property name="can-focus">True</property>
+        <property name="tooltip-text" translatable="yes">Switch cheatsheet</property>
+        <property name="model">
+          <object class="GtkStringList">
+            <items />
+          </object>
+        </property>
+      </object>
+    </child>
+    <child type="title">
+      <object class="GtkSearchEntry" id="search_entry">
+        <property name="placeholder-text" translatable="true">Ctrl+F to filter...</property>
+        <property name="width-request">400</property>
+      </object>
+    </child>
+    <child type="end">
+      <object class="GtkMenuButton">
+        <property name="icon-name">open-menu-symbolic</property>
+        <property name="tooltip-text" translatable="true">Main Menu</property>
+        <property name="popover">popover_menu</property>
+      </object>
+    </child>
+    <child type="end">
+      <object class="GtkToggleButton" id="fullscreen_button">
+        <property name="icon-name">view-fullscreen-symbolic</property>
+        <property name="tooltip-text">Toggle fullscreen (F11)</property>
+        <property name="action-name">win.fullscreen</property>
       </object>
     </child>
   </template>