Merge pull request #807 from lonerOrz/feat/custombutton

Enhance custom button

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

@@ -16,7 +16,8 @@ ColumnLayout {
   property string valueIcon: widgetData.icon !== undefined ? widgetData.icon : widgetMetadata.icon
   property bool valueTextStream: widgetData.textStream !== undefined ? widgetData.textStream : widgetMetadata.textStream
   property bool valueParseJson: widgetData.parseJson !== undefined ? widgetData.parseJson : widgetMetadata.parseJson
-  property bool valueHideTextInVerticalBar: widgetData.hideTextInVerticalBar !== undefined ? widgetData.hideTextInVerticalBar : widgetMetadata.hideTextInVerticalBar
+  property int valueMaxTextLengthHorizontal: widgetData?.maxTextLength?.horizontal ?? widgetMetadata?.maxTextLength?.horizontal
+  property int valueMaxTextLengthVertical: widgetData?.maxTextLength?.vertical ?? widgetMetadata?.maxTextLength?.vertical
 
   function saveSettings() {
     var settings = Object.assign({}, widgetData || {});
@@ -27,11 +28,21 @@ ColumnLayout {
     settings.rightClickUpdateText = rightClickUpdateText.checked;
     settings.middleClickExec = middleClickExecInput.text;
     settings.middleClickUpdateText = middleClickUpdateText.checked;
+    settings.wheelMode = separateWheelToggle.internalChecked ? "separate" : "unified";
+    settings.wheelExec = wheelExecInput.text;
+    settings.wheelUpExec = wheelUpExecInput.text;
+    settings.wheelDownExec = wheelDownExecInput.text;
+    settings.wheelUpdateText = wheelUpdateText.checked;
+    settings.wheelUpUpdateText = wheelUpUpdateText.checked;
+    settings.wheelDownUpdateText = wheelDownUpdateText.checked;
     settings.textCommand = textCommandInput.text;
     settings.textCollapse = textCollapseInput.text;
     settings.textStream = valueTextStream;
     settings.parseJson = valueParseJson;
-    settings.hideTextInVerticalBar = valueHideTextInVerticalBar;
+    settings.maxTextLength = {
+      "horizontal": valueMaxTextLengthHorizontal,
+      "vertical": valueMaxTextLengthVertical
+    };
     settings.textIntervalMs = parseInt(textIntervalInput.text || textIntervalInput.placeholderText, 10);
     return settings;
   }
@@ -137,6 +148,104 @@ ColumnLayout {
     }
   }
 
+  // Wheel command settings
+  NToggle {
+    id: separateWheelToggle
+    Layout.fillWidth: true
+    label: I18n.tr("bar.widget-settings.custom-button.wheel-mode-separate.label", "Separate wheel commands")
+    description: I18n.tr("bar.widget-settings.custom-button.wheel-mode-separate.description", "Enable separate commands for wheel up and down")
+    property bool internalChecked: (widgetData?.wheelMode || widgetMetadata?.wheelMode || "unified") === "separate"
+    checked: internalChecked
+    onToggled: checked => {
+      internalChecked = checked
+    }
+  }
+
+  ColumnLayout {
+    Layout.fillWidth: true
+    Layout.preferredWidth: parent.width
+
+    RowLayout {
+      id: unifiedWheelLayout
+      visible: !separateWheelToggle.checked
+      spacing: Style.marginM
+
+      NTextInput {
+        id: wheelExecInput
+        Layout.fillWidth: true
+        label: I18n.tr("bar.widget-settings.custom-button.wheel.label")
+        description: I18n.tr("bar.widget-settings.custom-button.wheel.description")
+        placeholderText: I18n.tr("placeholders.enter-command")
+        text: widgetData?.wheelExec || widgetMetadata?.wheelExec || ""
+      }
+
+      NToggle {
+        id: wheelUpdateText
+        enabled: !valueTextStream
+        Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+        Layout.bottomMargin: Style.marginS
+        onEntered: TooltipService.show(wheelUpdateText, I18n.tr("bar.widget-settings.custom-button.wheel.update-text"), "auto")
+        onExited: TooltipService.hide()
+        checked: widgetData?.wheelUpdateText ?? widgetMetadata?.wheelUpdateText
+        onToggled: isChecked => checked = isChecked
+      }
+    }
+
+    ColumnLayout {
+      id: separatedWheelLayout
+      Layout.fillWidth: true
+      visible: separateWheelToggle.checked
+
+      RowLayout {
+        spacing: Style.marginM
+
+        NTextInput {
+          id: wheelUpExecInput
+          Layout.fillWidth: true
+          label: I18n.tr("bar.widget-settings.custom-button.wheel-up.label")
+          description: I18n.tr("bar.widget-settings.custom-button.wheel-up.description")
+          placeholderText: I18n.tr("placeholders.enter-command")
+          text: widgetData?.wheelUpExec || widgetMetadata?.wheelUpExec || ""
+        }
+
+        NToggle {
+          id: wheelUpUpdateText
+          enabled: !valueTextStream
+          Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+          Layout.bottomMargin: Style.marginS
+          onEntered: TooltipService.show(wheelUpUpdateText, I18n.tr("bar.widget-settings.custom-button.wheel.update-text"), "auto")
+          onExited: TooltipService.hide()
+          checked: (widgetData?.wheelUpUpdateText !== undefined) ? widgetData.wheelUpUpdateText : (widgetMetadata?.wheelUpUpdateText ?? false)
+          onToggled: isChecked => checked = isChecked
+        }
+      }
+
+      RowLayout {
+        spacing: Style.marginM
+
+        NTextInput {
+          id: wheelDownExecInput
+          Layout.fillWidth: true
+          label: I18n.tr("bar.widget-settings.custom-button.wheel-down.label")
+          description: I18n.tr("bar.widget-settings.custom-button.wheel-down.description")
+          placeholderText: I18n.tr("placeholders.enter-command")
+          text: widgetData?.wheelDownExec || widgetMetadata?.wheelDownExec || ""
+        }
+
+        NToggle {
+          id: wheelDownUpdateText
+          enabled: !valueTextStream
+          Layout.alignment: Qt.AlignRight | Qt.AlignBottom
+          Layout.bottomMargin: Style.marginS
+          onEntered: TooltipService.show(wheelDownUpdateText, I18n.tr("bar.widget-settings.custom-button.wheel.update-text"), "auto")
+          onExited: TooltipService.hide()
+          checked: (widgetData?.wheelDownUpdateText !== undefined) ? widgetData.wheelDownUpdateText : (widgetMetadata?.wheelDownUpdateText ?? false)
+          onToggled: isChecked => checked = isChecked
+        }
+      }
+    }
+  }
+
   NDivider {
     Layout.fillWidth: true
   }
@@ -145,11 +254,22 @@ ColumnLayout {
     label: I18n.tr("bar.widget-settings.custom-button.dynamic-text")
   }
 
-  NToggle {
-    label: I18n.tr("bar.widget-settings.custom-button.hide-vertical.label", "Hide text in vertical bar")
-    description: I18n.tr("bar.widget-settings.custom-button.hide-vertical.description", "If enabled, the text from the command output will not be shown when the bar is in a vertical layout (left or right).")
-    checked: valueHideTextInVerticalBar
-    onToggled: checked => valueHideTextInVerticalBar = checked
+  NSpinBox {
+    label: I18n.tr("bar.widget-settings.custom-button.max-text-length-horizontal.label", "Max text length (horizontal)")
+    description: I18n.tr("bar.widget-settings.custom-button.max-text-length-horizontal.description", "Maximum number of characters to show in horizontal bar (0 to hide text)")
+    from: 0
+    to: 100
+    value: valueMaxTextLengthHorizontal
+    onValueChanged: valueMaxTextLengthHorizontal = value
+  }
+
+  NSpinBox {
+    label: I18n.tr("bar.widget-settings.custom-button.max-text-length-vertical.label", "Max text length (vertical)")
+    description: I18n.tr("bar.widget-settings.custom-button.max-text-length-vertical.description", "Maximum number of characters to show in vertical bar (0 to hide text)")
+    from: 0
+    to: 100
+    value: valueMaxTextLengthVertical
+    onValueChanged: valueMaxTextLengthVertical = value
   }
 
   NToggle {