KeyboardLayout: add setting to hide icon

Assets/Translations/de.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Wählen Sie, wie dieser Wert angezeigt werden soll.",
           "label": "Anzeigemodus"
+        },
+        "show-icon": {
+          "description": "Das Tastaturlayout-Symbol anzeigen.",
+          "label": "Symbol anzeigen"
         }
       },
       "lock-keys": {

Assets/Translations/en.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Choose how you'd like this value to appear.",
           "label": "Display mode"
+        },
+        "show-icon": {
+          "description": "Display the keyboard layout icon.",
+          "label": "Show icon"
         }
       },
       "lock-keys": {

Assets/Translations/es.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Elige cómo te gustaría que apareciera este valor.",
           "label": "Modo de visualización"
+        },
+        "show-icon": {
+          "description": "Mostrar el icono de la distribución del teclado.",
+          "label": "Mostrar icono"
         }
       },
       "lock-keys": {

Assets/Translations/fr.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Choisissez comment vous souhaitez que cette valeur apparaisse.",
           "label": "Mode d'affichage"
+        },
+        "show-icon": {
+          "description": "Afficher l'icône de disposition du clavier.",
+          "label": "Afficher l'icône"
         }
       },
       "lock-keys": {

Assets/Translations/hu.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Válassza ki, hogyan jelenjen meg ez az érték.",
           "label": "Megjelenítési mód"
+        },
+        "show-icon": {
+          "description": "Billentse a billentyűzetkiosztás ikont.",
+          "label": "Ikon megjelenítése"
         }
       },
       "lock-keys": {

Assets/Translations/ja.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "値の表示方法を選択します。",
           "label": "表示モード"
+        },
+        "show-icon": {
+          "description": "キーボードレイアウトのアイコンを表示します。",
+          "label": "アイコンを表示 (Aikona o hyōji)"
         }
       },
       "lock-keys": {

Assets/Translations/ku.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "ka tu dixwaz ev nirx çawa xuya bibe hilbijêre.",
           "label": "Awaya nîşandanê"
+        },
+        "show-icon": {
+          "description": "Nîşana şêweya klavyeyê nîşan bide.",
+          "label": "Nîşanê nîşan bide"
         }
       },
       "lock-keys": {

Assets/Translations/nl.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Kies hoe je wilt dat deze waarde wordt weergegeven.",
           "label": "Weergavemodus"
+        },
+        "show-icon": {
+          "description": "Toon het toetsenbordindeling-icoon.",
+          "label": "Icoon weergeven"
         }
       },
       "lock-keys": {

Assets/Translations/pl.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Wybierz sposób wyświetlania tej wartości.",
           "label": "Tryb wyświetlania"
+        },
+        "show-icon": {
+          "description": "Wyświetl ikonę układu klawiatury.",
+          "label": "Pokaż ikonę"
         }
       },
       "lock-keys": {

Assets/Translations/pt.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Escolha como você gostaria que este valor aparecesse.",
           "label": "Modo de exibição"
+        },
+        "show-icon": {
+          "description": "Exibir o ícone do layout do teclado.",
+          "label": "Mostrar ícone"
         }
       },
       "lock-keys": {

Assets/Translations/ru.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Выберите, как это значение должно отображаться.",
           "label": "Режим отображения"
+        },
+        "show-icon": {
+          "description": "Отображать значок раскладки клавиатуры.",
+          "label": "Показать значок"
         }
       },
       "lock-keys": {

Assets/Translations/tr.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Bu değerin nasıl görünmesini istediğinizi seçin.",
           "label": "Görüntüleme modu"
+        },
+        "show-icon": {
+          "description": "Klavye düzeni simgesini görüntüle.",
+          "label": "Simgeyi göster"
         }
       },
       "lock-keys": {

Assets/Translations/uk-UA.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "Виберіть, як ви хочете, щоб це значення відображалося.",
           "label": "Режим відображення"
+        },
+        "show-icon": {
+          "description": "Показувати піктограму розкладки клавіатури.",
+          "label": "Показати значок"
         }
       },
       "lock-keys": {

Assets/Translations/zh-CN.json

@@ -224,6 +224,10 @@
         "display-mode": {
           "description": "选择您希望此值显示的方式。",
           "label": "显示模式"
+        },
+        "show-icon": {
+          "description": "显示键盘布局图标。",
+          "label": "显示图标"
         }
       },
       "lock-keys": {

Modules/Bar/Widgets/KeyboardLayout.qml

@@ -33,6 +33,7 @@ Item {
   }
 
   readonly property string displayMode: (widgetSettings.displayMode !== undefined) ? widgetSettings.displayMode : widgetMetadata.displayMode
+  readonly property bool showIcon: (widgetSettings.showIcon !== undefined) ? widgetSettings.showIcon : widgetMetadata.showIcon
 
   // Use the shared service for keyboard layout
   property string currentLayout: KeyboardLayoutService.currentLayout
@@ -70,14 +71,15 @@ Item {
     screen: root.screen
     density: Settings.data.bar.density
     oppositeDirection: BarService.getPillDirection(root)
-    icon: "keyboard"
+    icon: root.showIcon ? "keyboard" : ""
     autoHide: false // Important to be false so we can hover as long as we want
     text: currentLayout.toUpperCase()
     tooltipText: I18n.tr("tooltips.keyboard-layout", {
                            "layout": currentLayout.toUpperCase()
                          })
-    forceOpen: root.displayMode === "forceOpen"
-    forceClose: root.displayMode === "alwaysHide"
+    // When icon is disabled, always show the layout text
+    forceOpen: !root.showIcon || root.displayMode === "forceOpen"
+    forceClose: root.showIcon && root.displayMode === "alwaysHide"
     onClicked: {}
     onRightClicked: {
       var popupMenuWindow = PanelService.getPopupMenuWindow(screen);

Modules/Panels/Settings/Bar/WidgetSettings/KeyboardLayoutSettings.qml

@@ -14,14 +14,17 @@ ColumnLayout {
 
   // Local state
   property string valueDisplayMode: widgetData.displayMode !== undefined ? widgetData.displayMode : widgetMetadata.displayMode
+  property bool valueShowIcon: widgetData.showIcon !== undefined ? widgetData.showIcon : widgetMetadata.showIcon
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {});
     settings.displayMode = valueDisplayMode;
+    settings.showIcon = valueShowIcon;
     return settings;
   }
 
   NComboBox {
+    visible: valueShowIcon // Hide display mode setting when icon is disabled
     label: I18n.tr("bar.widget-settings.keyboard-layout.display-mode.label")
     description: I18n.tr("bar.widget-settings.keyboard-layout.display-mode.description")
     minimumWidth: 134
@@ -42,4 +45,11 @@ ColumnLayout {
     currentKey: valueDisplayMode
     onSelected: key => valueDisplayMode = key
   }
+
+  NToggle {
+    label: I18n.tr("bar.widget-settings.keyboard-layout.show-icon.label")
+    description: I18n.tr("bar.widget-settings.keyboard-layout.show-icon.description")
+    checked: valueShowIcon
+    onToggled: checked => valueShowIcon = checked
+  }
 }

Services/UI/BarWidgetRegistry.qml

@@ -141,7 +141,8 @@ Singleton {
                                     }
                                   },
                                   "KeyboardLayout": {
-                                    "displayMode": "onhover"
+                                    "displayMode": "onhover",
+                                    "showIcon": true
                                   },
                                   "LockKeys": {
                                     "showCapsLock": true,