Added ability to modify grid size

HimDek · Sep 18, 2022 · aeda61e · aeda61e
1 parent dd8a098
commit aeda61e
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 150 deletions.
diff --git a/contents/config/main.xml b/contents/config/main.xml
@@ -17,8 +17,16 @@
             <label>List of system action favorites.</label>
             <default>suspend,hibernate,reboot,shutdown</default>
         </entry>
+        <entry name="gridColumns" type="Int">
+            <label>Number of cloumns in the grid</label>
+            <default>4</default>
+        </entry>
+        <entry name="gridRows" type="Int">
+            <label>Number of rows in the grid</label>
+            <default>4</default>
+        </entry>
         <entry name="primaryActions" type="Int">
-            <label>Which actions should be displayed in the footer: 0 = Power, 1 = Session, 2 = Custom, 3 = Power and session</label>
+            <label>Which actions should be displayed in the header: 0 = Power, 1 = Session, 2 = Custom, 3 = Power and session</label>
             <default>0</default>
         </entry>
         <entry name="favoritesPortedToKAstats" type="Bool">
@@ -39,7 +47,7 @@
         </entry>
         <entry name="alphaSort" type="Bool">
             <label>Whether to sort menu contents alphabetically or use manual/system sort order.</label>
-            <default>false</default>
+            <default>true</default>
         </entry>
         <entry name="pin" type="Bool">
             <label>Whether the popup should remain open when another window is activated</label>

diff --git a/contents/ui/ApplicationsPage.qml b/contents/ui/ApplicationsPage.qml
@@ -45,7 +45,7 @@ BasePage {
                 mainContentView: true
                 focus: true
                 model: plasmoid.rootItem.rootModel.favoritesModel
-                preferredHeight: sideBar.implicitHeight
+                preferredHeight: root.implicitHeight
             }
         }
 
@@ -56,7 +56,7 @@ BasePage {
                 objectName: "favoritesGridView"
                 focus: true
                 model: plasmoid.rootItem.rootModel.favoritesModel
-                preferredHeight: sideBar.implicitHeight
+                preferredHeight: root.implicitHeight
             }
         }
 
@@ -69,7 +69,7 @@ BasePage {
                 model: stackView.appsModel
                 section.property: model && model.description == "KICKER_ALL_MODEL" ? "display" : ""
                 section.criteria: ViewSection.FirstCharacter
-                preferredHeight: sideBar.implicitHeight
+                preferredHeight: root.implicitHeight
             }
         }
 
@@ -79,7 +79,7 @@ BasePage {
                 id: applicationsGridView
                 objectName: "applicationsGridView"
                 model: stackView.appsModel
-                preferredHeight: sideBar.implicitHeight
+                preferredHeight: root.implicitHeight
             }
         }
 

diff --git a/contents/ui/BasePage.qml b/contents/ui/BasePage.qml
@@ -42,7 +42,7 @@ FocusScope {
     property alias implicitSideBarHeight: sideBarLoader.implicitHeight
 
     implicitWidth: root.preferredSideBarWidth + contentAreaLoader.implicitWidth
-    implicitHeight: root.preferredSideBarHeight
+    implicitHeight: Math.max(root.preferredSideBarHeight, KickoffSingleton.gridCellSize * plasmoid.configuration.gridRows)
 
     Kicker.TriangleMouseFilter {
         id: sideBarFilter

diff --git a/contents/ui/ConfigGeneral.qml b/contents/ui/ConfigGeneral.qml
@@ -9,7 +9,6 @@
 import QtQuick 2.15
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.5
-
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.kquickcontrolsaddons 2.0 as KQuickAddons
 import org.kde.kirigami 2.5 as Kirigami
@@ -22,6 +21,8 @@ ColumnLayout {
     property alias cfg_alphaSort: alphaSort.checked
     property var cfg_systemFavorites: String(plasmoid.configuration.systemFavorites)
     property int cfg_primaryActions: plasmoid.configuration.primaryActions
+    property alias cfg_gridColumns: gridColumns.value
+    property alias cfg_gridRows: gridRows.value
 
     Kirigami.FormLayout {
         Button {
@@ -93,6 +94,42 @@ ColumnLayout {
             Kirigami.FormData.isSection: true
         }
 
+        SpinBox {
+            id: gridColumns
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 1
+            Kirigami.FormData.label: i18n("Colums in grid:")
+            from: 4
+            to: 8
+            stepSize: 1
+            editable: false
+            textFromValue: function(value) {
+                return value;
+            }
+            valueFromText: function(text) {
+                return parseInt(text);
+            }
+        }
+
+        SpinBox {
+            id: gridRows
+            Layout.minimumWidth: Kirigami.Units.gridUnit * 1
+            Kirigami.FormData.label: i18n("Minimum rows in grid:")
+            from: 4
+            to: 8
+            stepSize: 1
+            editable: false
+            textFromValue: function(value) {
+                return value;
+            }
+            valueFromText: function(text) {
+                return parseInt(text);
+            }
+        }
+
+        Item {
+            Kirigami.FormData.isSection: true
+        }
+
         RadioButton {
             id: showFavoritesInGrid
             Kirigami.FormData.label: i18n("Show favorites:")

diff --git a/contents/ui/Kickoff.qml b/contents/ui/Kickoff.qml
@@ -110,10 +110,10 @@ Item {
     //BEGIN Metrics
     readonly property PlasmaCore.FrameSvgItem backgroundMetrics: PlasmaCore.FrameSvgItem {
         // Inset defaults to a negative value when not set by margin hints
-        readonly property real leftPadding: margins.left - Math.max(inset.left, 0)
-        readonly property real rightPadding: margins.right - Math.max(inset.right, 0)
-        readonly property real topPadding: margins.top - Math.max(inset.top, 0)
-        readonly property real bottomPadding: margins.bottom - Math.max(inset.bottom, 0)
+        readonly property real leftPadding: margins.left - inset.left
+        readonly property real rightPadding: margins.right - inset.right
+        readonly property real topPadding: margins.top - inset.top
+        readonly property real bottomPadding: margins.bottom - inset.bottom
         readonly property real spacing: leftPadding
         visible: false
         imagePath: plasmoid.formFactor === PlasmaCore.Types.Planar ? "widgets/background" : "dialogs/background"

diff --git a/contents/ui/KickoffGridView.qml b/contents/ui/KickoffGridView.qml
@@ -76,7 +76,7 @@ EmptyPage {
 
         Accessible.description: i18n("Grid with %1 rows, %2 columns", rows, columns) // can't use i18np here
 
-        implicitWidth: verticalScrollBar.visible ? (view.cellWidth * 4  + verticalScrollBar.width) : view.cellWidth * 4
+        implicitWidth: verticalScrollBar.visible ? (view.cellWidth * plasmoid.configuration.gridColumns + verticalScrollBar.width) : view.cellWidth * plasmoid.configuration.gridColumns
         implicitHeight: preferredHeight
 
         cellHeight: KickoffSingleton.gridCellSize

diff --git a/contents/ui/KickoffListView.qml b/contents/ui/KickoffListView.qml
@@ -58,7 +58,7 @@ EmptyPage {
 
         Accessible.role: Accessible.List
 
-        implicitWidth: mainContentView ? KickoffSingleton.gridCellSize * 4 : (preferredWidth ? preferredWidth : contentWidth)
+        implicitWidth: mainContentView ? KickoffSingleton.gridCellSize * plasmoid.configuration.gridColumns : (preferredWidth ? preferredWidth : contentWidth)
         implicitHeight: mainContentView ? preferredHeight : contentHeight
 
         currentIndex: count > 0 ? 0 : -1

diff --git a/metadata.desktop b/metadata.desktop
@@ -13,7 +13,7 @@ X-Plasma-RequiredExtensions=LaunchApp
 
 X-KDE-PluginInfo-Author=various
 X-KDE-PluginInfo-Name=org.kde.plasma.simplekickoff
-X-KDE-PluginInfo-Version=2.3
+X-KDE-PluginInfo-Version=2.4
 X-KDE-PluginInfo-Category=Application Launchers
 X-KDE-PluginInfo-License=GPL-2.0+
 X-KDE-PluginInfo-EnabledByDefault=true
diff --git a/metadata.json b/metadata.json