Merge pull request #591 from blackbartblues/feat/keybind-cheatsheet-3.4.0

fix(keybind-cheatsheet): v3.4.0 - settings save bug, i18n structure, code quality

Author: Ly-sec

keybind-cheatsheet/BarWidget.qml

@@ -17,7 +17,7 @@ NIconButton {
   baseSize: Style.getCapsuleHeightForScreen(screen?.name)
   applyUiScale: false
   icon: "keyboard"
-  tooltipText: pluginApi?.tr("keybind-cheatsheet.barwidget.tooltip") || "Keybind Cheatsheet"
+  tooltipText: pluginApi?.tr("barwidget.tooltip")
   tooltipDirection: BarService.getTooltipDirection(screen?.name)
   customRadius: Style.radiusL
 
@@ -36,12 +36,12 @@ NIconButton {
 
     model: [
       {
-        "label": "Open Cheatsheet",
+        "label": pluginApi?.tr("barwidget.open"),
         "action": "open-panel",
         "icon": "keyboard"
       },
       {
-        "label": "Plugin Settings",
+        "label": pluginApi?.tr("barwidget.settings"),
         "action": "plugin-settings",
         "icon": "settings"
       },

keybind-cheatsheet/CHANGELOG.md

@@ -1,16 +1,60 @@
 # Changelog
 
+## [3.4.0] - 2026-04-07
+
+### Bug Fixes
+
+**Settings unreachable from panel button**
+- Fixed critical bug where clicking the settings button (top-right of the keybind panel) blocked all input in the settings window
+- The panel now closes before opening settings, preventing the open panel from intercepting mouse events
+- Reported by Discord users: editing width/height was impossible when settings were opened this way
+
+**Settings not saved when opened from panel**
+- Fixed settings changes being silently discarded when the settings window was opened via the panel button
+- `saveSettings()` was declared on an inner `ColumnLayout` instead of the root `Item`, making it invisible to the Noctalia shell
+- With the previous direct-mutation approach this went unnoticed; after switching to the edit-copy pattern saves now work correctly from all entry points
+
+### Code Quality
+
+**Settings: edit-copy pattern**
+- Replaced direct `pluginSettings` mutation in `onTextChanged` handlers with proper edit-copy properties (`editWindowWidth`, `editWindowHeight`, `editAutoHeight`, `editColumnCount`, `editModKeyVariable`, `editHyprlandConfigPath`, `editNiriConfigPath`)
+- Changes are committed to `pluginSettings` only when the user clicks Save, matching Noctalia plugin conventions
+
+**i18n: corrected structure**
+- Removed `"keybind-cheatsheet"` top-level wrapper from all 20 language JSON files
+- Removed `"keybind-cheatsheet."` prefix from all 50 `tr()` calls across all QML files
+- Structure now matches the Noctalia plugin i18n specification
+
+**Removed dead code**
+- Deleted unused `parseNiriConfig()` function (118 lines) superseded by `parseNiriFileContent()` in v3.1.0
+
+**Shell injection hardening**
+- Glob expansion in config path resolution now passes user-provided patterns as positional shell arguments (`$1`) instead of string-concatenating them into the shell command, preventing potential injection via crafted config path values
+
+**resizeTimer: semantic popup detection**
+- Replaced fragile `toString()` string matching (`"Popup_QMLTYPE"`, `"NPluginSettingsPopup"`) with a semantic check (`typeof obj.modal === "boolean"`) that works with any QML `Popup` subclass
+
+**Named key badge colors**
+- Extracted hardcoded hex colors in `getKeyColor()` into named `readonly property color` constants (`keyColorAlt`, `keyColorXF86`, `keyColorPrint`, `keyColorNumeric`, `keyColorMouse`)
+
+### Manifest
+
+- Added missing `repository` field
+- Added tags: `System`, `Indicator` (alongside existing `Bar`, `Panel`)
+
+---
+
 ## [3.2.2] - 2026-02-08
 
-### 🐛 Bug Fixes
+### Bug Fixes
 
 **Hyprland Parser - No Category Handling**
 - Fixed parser crash when Hyprland config has no category headers (`# 1. Category Name`)
 - Parser now creates default "Keybinds" category for configs without categories
 - Default category name is fully translatable via i18n system
 - Prevents keybind loss for users who don't organize their configs with categories
 
-### 🌍 Translations
+### Translations
 
 **Complete i18n Coverage**
 - Added `default-category` translations for all 19 supported languages
@@ -25,7 +69,7 @@
 - Turkish (tr), Ukrainian (uk-UA), Swedish (sv), Hungarian (hu)
 - Kurdish (ku), Norwegian Nynorsk (nn-NO), Hindi/Nepali (hn)
 
-### 🔧 Code Quality
+### Code Quality
 
 **Memory Leak Prevention**
 - Added recursion limit tracking for parser (`hasCategories` flag)
@@ -36,21 +80,21 @@
 
 ## [3.1.2] - 2026-02-08
 
-### 🌐 Translations
+### Translations
 
 - Added german translations for the `error` keys
 
 ## [3.1.1] - 2026-02-03
 
-### 🚀 Smart Caching
+### Smart Caching
 
 **Compositor Change Detection**
 - Plugin now detects when compositor changes (e.g., switching from Hyprland to Niri)
 - Automatically re-parses config only when compositor differs from cached data
 - Instant panel opening when using same compositor (uses cache)
 - Saves detected compositor in settings for comparison
 
-### 🐛 Bug Fixes
+### Bug Fixes
 
 **Improved Niri Parser**
 - Fixed multiline bind parsing - handles binds that span multiple lines
@@ -63,7 +107,7 @@
 - Each compositor shows specific explanation why it's not supported
 - All error messages are translatable via i18n
 
-### 📝 Documentation
+### Documentation
 
 **README Updates**
 - Fixed IPC command syntax in examples
@@ -74,7 +118,7 @@
 
 ## [3.1.0] - 2026-02-03
 
-### ✨ New Features
+### New Features
 
 **Niri Support**
 - Full Niri compositor support with KDL config parsing
@@ -87,7 +131,7 @@
 - Memory leak prevention with recursion limits
 - Glob pattern support for bulk file imports
 
-### 🔧 Improvements
+### Improvements
 
 **Better Error Handling**
 - Graceful fallback for unsupported compositors
@@ -98,7 +142,7 @@
 
 ## [3.0.0] - 2026-01-30
 
-### 🎉 Initial Release
+### Initial Release
 
 **Core Features**
 - Hyprland keybind parsing

keybind-cheatsheet/Main.qml

@@ -53,20 +53,20 @@ Item {
   function getUnsupportedCompositorMessage(compositor) {
     var messages = {
       "sway": {
-        short: pluginApi?.tr("keybind-cheatsheet.error.sway-not-supported") || "Sway is not yet supported",
-        detail: pluginApi?.tr("keybind-cheatsheet.error.sway-detail") || "Sway support may be added in a future update (similar format to Hyprland)"
+        short: pluginApi?.tr("error.sway-not-supported"),
+        detail: pluginApi?.tr("error.sway-detail")
       },
       "labwc": {
-        short: pluginApi?.tr("keybind-cheatsheet.error.labwc-not-supported") || "LabWC is not supported",
-        detail: pluginApi?.tr("keybind-cheatsheet.error.labwc-detail") || "LabWC uses XML config format which is incompatible with this plugin"
+        short: pluginApi?.tr("error.labwc-not-supported"),
+        detail: pluginApi?.tr("error.labwc-detail")
       },
       "mango": {
-        short: pluginApi?.tr("keybind-cheatsheet.error.mango-not-supported") || "MangoWC is not supported",
-        detail: pluginApi?.tr("keybind-cheatsheet.error.mango-detail") || "MangoWC config format is not compatible with this plugin"
+        short: pluginApi?.tr("error.mango-not-supported"),
+        detail: pluginApi?.tr("error.mango-detail")
       },
       "unknown": {
-        short: pluginApi?.tr("keybind-cheatsheet.error.unknown-compositor") || "Unknown compositor detected",
-        detail: pluginApi?.tr("keybind-cheatsheet.error.unknown-detail") || "This plugin only supports Hyprland and Niri compositors"
+        short: pluginApi?.tr("error.unknown-compositor"),
+        detail: pluginApi?.tr("error.unknown-detail")
       }
     };
 
@@ -144,7 +144,7 @@ Item {
 
       var unsupportedMsg = getUnsupportedCompositorMessage(compositorName);
       saveToDb([{
-        "title": pluginApi?.tr("keybind-cheatsheet.error.unsupported-compositor") || "Unsupported Compositor",
+        "title": pluginApi?.tr("error.unsupported-compositor"),
         "binds": [
           { "keys": compositorName.toUpperCase(), "desc": unsupportedMsg.short },
           { "keys": "INFO", "desc": unsupportedMsg.detail }
@@ -222,7 +222,7 @@ Item {
     // Handle glob patterns
     if (isGlobPattern(nextFile)) {
       niriGlobProcess.expandedFiles = []; // Clear previous results
-      niriGlobProcess.command = ["sh", "-c", "for f in " + nextFile + "; do [ -f \"$f\" ] && echo \"$f\"; done"];
+      niriGlobProcess.command = ["sh", "-c", 'for f in $1; do [ -f "$f" ] && echo "$f"; done', "sh", nextFile];
       niriGlobProcess.running = true;
       return;
     }
@@ -499,7 +499,7 @@ Item {
     // Handle glob patterns
     if (isGlobPattern(nextFile)) {
       hyprGlobProcess.expandedFiles = []; // Clear previous results
-      hyprGlobProcess.command = ["sh", "-c", "for f in " + nextFile + "; do [ -f \"$f\" ] && echo \"$f\"; done"];
+      hyprGlobProcess.command = ["sh", "-c", 'for f in $1; do [ -f "$f" ] && echo "$f"; done', "sh", nextFile];
       hyprGlobProcess.running = true;
       return;
     }
@@ -588,7 +588,6 @@ Item {
     var currentCategory = null;
     var hasCategories = false; // Track if we found any category headers
 
-    // TUTAJ ZMIANA: Pobierz ustawioną zmienną (domyślnie $mod) i zamień na wielkie litery
     var modVar = pluginApi?.pluginSettings?.modKeyVariable || "$mod";
     var modVarUpper = modVar.toUpperCase();
 
@@ -608,7 +607,7 @@ Item {
       else if (line.includes("bind") && line.includes('#"')) {
         // If no categories found yet, create default category
         if (!currentCategory && !hasCategories) {
-          var defaultCategoryName = pluginApi?.tr("keybind-cheatsheet.default-category") || "Keybinds";
+          var defaultCategoryName = pluginApi?.tr("default-category");
           currentCategory = { "title": defaultCategoryName, "binds": [] };
         }
 
@@ -624,7 +623,6 @@ Item {
 
             // Build modifiers list properly
             var mods = [];
-            // TUTAJ ZMIANA: Sprawdzamy czy to ustawiony mod (np. $MAINMOD) albo SUPER
             if (modPart.includes(modVarUpper) || modPart.includes("SUPER")) mods.push("Super");
 
             if (modPart.includes("SHIFT")) mods.push("Shift");
@@ -657,126 +655,6 @@ Item {
     clearParsingData();
   }
 
-  // ========== NIRI PARSER ==========
-  function parseNiriConfig(text) {
-    var lines = text.split('\n');
-    var inBindsBlock = false;
-    var braceDepth = 0;
-    var currentCategory = null;
-
-    var actionCategories = {
-      "spawn": "Applications",
-      "spawn-sh": "Applications",
-      "focus-column": "Column Navigation",
-      "focus-window": "Window Focus",
-      "focus-workspace": "Workspace Navigation",
-      "move-column": "Move Columns",
-      "move-column-to-workspace": "Workspace Management",
-      "move-window": "Move Windows",
-      "move-window-to-workspace": "Workspace Management",
-      "consume-window": "Window Management",
-      "expel-window": "Window Management",
-      "close-window": "Window Management",
-      "fullscreen-window": "Window Management",
-      "maximize-column": "Column Management",
-      "set-column-width": "Column Width",
-      "switch-preset-column-width": "Column Width",
-      "reset-window-height": "Window Size",
-      "screenshot": "Screenshots",
-      "power-off-monitors": "Power",
-      "quit": "System",
-      "toggle-animation": "Animations"
-    };
-
-    var categorizedBinds = {};
-
-    for (var i = 0; i < lines.length; i++) {
-      var line = lines[i].trim();
-
-      // Find binds block
-      if (line.startsWith("binds") && line.includes("{")) {
-        inBindsBlock = true;
-        braceDepth = 1;
-        continue;
-      }
-
-      if (!inBindsBlock) continue;
-
-      // Track brace depth
-      for (var j = 0; j < line.length; j++) {
-        if (line[j] === '{') braceDepth++;
-        else if (line[j] === '}') braceDepth--;
-      }
-
-      if (braceDepth <= 0) {
-        inBindsBlock = false;
-        break;
-      }
-
-      // Category markers: // #"Category Name" - only these create categories
-      if (line.startsWith("//")) {
-        var categoryMatch = line.match(/\/\/\s*#"([^"]+)"/);
-        if (categoryMatch) {
-          currentCategory = categoryMatch[1];
-        }
-        continue;
-      }
-
-      if (line.length === 0) continue;
-
-      // Parse: Mod+Key { action; }
-      var bindMatch = line.match(/^([A-Za-z0-9_+]+)\s*(?:[a-z\-]+=\S+\s*)*\{\s*([^}]+)\s*\}/);
-
-      if (bindMatch) {
-        var keyCombo = bindMatch[1];
-        var action = bindMatch[2].trim().replace(/;$/, '');
-
-        var formattedKeys = formatNiriKeyCombo(keyCombo);
-        var category = currentCategory || getNiriCategory(action, actionCategories);
-
-        if (!categorizedBinds[category]) {
-          categorizedBinds[category] = [];
-        }
-
-        categorizedBinds[category].push({
-          "keys": formattedKeys,
-          "desc": formatNiriAction(action)
-        });
-      }
-    }
-
-    // Convert to array
-    var categoryOrder = [
-      "Noctalia", "Applications", "Window Management", "Column Navigation",
-      "Window Focus", "Workspace Navigation", "Workspace Management",
-      "Move Columns", "Move Windows", "Column Management", "Column Width",
-      "Window Size", "Screenshots", "Power", "System", "Animations"
-    ];
-
-    var categories = [];
-    for (var k = 0; k < categoryOrder.length; k++) {
-      var catName = categoryOrder[k];
-      if (categorizedBinds[catName] && categorizedBinds[catName].length > 0) {
-        categories.push({
-          "title": catName,
-          "binds": categorizedBinds[catName]
-        });
-      }
-    }
-
-    // Add remaining categories
-    for (var cat in categorizedBinds) {
-      if (categoryOrder.indexOf(cat) === -1 && categorizedBinds[cat].length > 0) {
-        categories.push({
-          "title": cat,
-          "binds": categorizedBinds[cat]
-        });
-      }
-    }
-
-    saveToDb(categories);
-  }
-
   function formatSpecialKey(key) {
     var keyMap = {
       // Audio keys (uppercase for Hyprland)