Add Menu Position, Pinned items, recommended items, show description for all apps and runner model grid options

prateekmedia · prateekmedia · commit 3377d35a5574 · 2021-07-05T18:07:27.000+05:30
diff --git a/contents/config/main.xml b/contents/config/main.xml
@@ -78,9 +78,21 @@
       <label>The plugin id's of additional KRunner plugins to use. Only used if useExtraRunners is true.</label>
       <default>shell,bookmarks,baloosearch,locations</default>
     </entry>
-    <entry name="centerMenu" type="Bool">
-      <label>Whether to center the popup Menu.</label>
-      <default>true</default>
+    <entry name="menuPosition" type="Int">
+      <label>The position of the menu: 0 = Center, 1 = Edge, 2 = Auto</label>
+      <default>0</default>
+    </entry>
+    <entry name="favGridModel" type="Int">
+      <label>The model for favorite grid / pinned apps grid: 0 = Favourite apps, 1 = Recent apps, 2 = Recent Documents</label>
+      <default>0</default>
+    </entry>
+    <entry name="recentGridModel" type="Int">
+      <label>The model for recent item grid / recommended grid: 0 = Recent Documents, 1 = Recent apps, 2 = Favourite apps, 3 = None</label>
+      <default>0</default>
+    </entry>
+    <entry name="showDescription" type="Bool">
+      <label>Whether to show the description for app and search items or not.</label>
+      <default>false</default>
     </entry>
     <entry name="alwaysShowSearchBar" type="Bool">
       <label>Whether to always show the search bar on top of the menu or not.</label>
diff --git a/contents/ui/ConfigGeneral.qml b/contents/ui/ConfigGeneral.qml
@@ -51,10 +51,13 @@ Kirigami.FormLayout {
     property alias cfg_showRecentContacts: showRecentContacts.checked
 
     property alias cfg_useExtraRunners: useExtraRunners.checked
-    property alias cfg_centerMenu: centerMenu.checked
+    property alias cfg_menuPosition: menuPosition.currentIndex
+    property alias cfg_favGridModel: favGridModel.currentIndex
+    property alias cfg_recentGridModel: recentGridModel.currentIndex
     property alias cfg_reduceIconSizeFooter: reduceIconSizeFooter.checked
     property alias cfg_gridAllowTwoLines: gridAllowTwoLines.checked
     property alias cfg_defaultAllApps: defaultAllApps.checked
+    property alias cfg_showDescription: showDescription.checked
     
     property alias cfg_downIconsDocuments: downIconsDocuments.checked
     property alias cfg_downIconsDownloads: downIconsDownloads.checked
@@ -169,17 +172,45 @@ Kirigami.FormLayout {
         Kirigami.FormData.isSection: true
     }
 
+    ComboBox {
+        id: menuPosition
 
-    CheckBox {
-        id: centerMenu
+        Kirigami.FormData.label: i18n("Menu Position:")
 
-        Kirigami.FormData.label: i18n("Panel Properties:")
+        model: [i18n("Center"), i18n("On Edge"), i18n("Auto")]
+    }
+
+    Item {
+        Kirigami.FormData.isSection: true
+    }
+
+    ComboBox {
+        id: favGridModel
+
+        Kirigami.FormData.label: i18n("Pinned items:")
+
+        model: [i18n("Favourite apps"), i18n("Recent apps"), i18n("Recent Documents")]
+    }
+    
+    Item {
+        Kirigami.FormData.isSection: true
+    }
 
-        text: i18n("Center menu")
+    ComboBox {
+        id: recentGridModel
+
+        Kirigami.FormData.label: i18n("Recommended items:")
+
+        model: [i18n("Recent Documents"), i18n("Recent apps"), i18n("Favourite apps"), i18n("None")]
+    }
+    
+    Item {
+        Kirigami.FormData.isSection: true
     }
 
     CheckBox {
         id: defaultAllApps
+        Kirigami.FormData.label: i18n("Panel Properties:")
         text: i18n("Show All Apps By Default")
     }
 
@@ -193,6 +224,11 @@ Kirigami.FormLayout {
         text: i18n("Allow label to have two lines (Pinned)")
     }
 
+    CheckBox {
+        id: showDescription
+        text: i18n("Show Description for all apps and search items")
+    }
+
     Item {
         Kirigami.FormData.isSection: true
     }
diff --git a/contents/ui/ItemMultiGridView.qml b/contents/ui/ItemMultiGridView.qml
@@ -41,6 +41,7 @@ PlasmaExtras.ScrollArea {
     signal keyNavDown()
 
     property bool grabFocus: false
+    property bool showDescriptions: false
     property int iconSize: units.iconSizes.medium
 
     property alias model: repeater.model
@@ -134,7 +135,8 @@ PlasmaExtras.ScrollArea {
                         top: gridViewLabel.bottom
                         topMargin: units.smallSpacing
                     }
-
+                    showDescriptions: itemMultiGrid.showDescriptions
+                    increaseLeftSpacings: true
                     //TODO >
                     dragEnabled: false
                     dropEnabled: false
diff --git a/contents/ui/MainColumnItem.qml b/contents/ui/MainColumnItem.qml
@@ -63,7 +63,9 @@ Item {
     signal  newTextQuery(string text)
     property real mainColumnHeight: tileSide * 3
     property real favoritesColumnHeight: (units.iconSizes.medium + units.smallSpacing * 2) * 4
-
+    property var pinnedModel: plasmoid.configuration.favGridModel == 0 ? globalFavorites : plasmoid.configuration.favGridModel == 1 ? rootModel.modelForRow(0) : rootModel.modelForRow(1)
+    property var recommendedModel: plasmoid.configuration.recentGridModel == 0 ? rootModel.modelForRow(1) : plasmoid.configuration.recentGridModel == 1 ? rootModel.modelForRow(0) : globalFavorites
+    
     function reset() {
         if (showRecents) resetPinned.start();
         searchField.clear()
@@ -137,8 +139,8 @@ Item {
             if (done) {
                 return;
             }
-            globalFavoritesGrid.model = globalFavorites
-            documentsFavoritesGrid.model = rootModel.modelForRow(1);
+            globalFavoritesGrid.model = pinnedModel
+            documentsFavoritesGrid.model = recommendedModel
             allAppsGrid.model = rootModel.modelForRow(2);
             done = true;
             mainColumn.visible = true
@@ -292,7 +294,7 @@ Item {
             bottom: searching ? parent.bottom : showAllApps ? footer.top : undefined
             bottomMargin: showAllApps ? 5 : 0
         }
-        height: searching || showAllApps ? parent.height : mainColumnHeight
+        height: searching || showAllApps || plasmoid.configuration.recentGridModel == 3 ? parent.height : mainColumnHeight
         property Item visibleGrid: globalFavoritesGrid
         function tryActivate(row, col) {
             if (visibleGrid) {
@@ -302,9 +304,9 @@ Item {
 
         ItemGridView {
             id: globalFavoritesGrid
-            model: globalFavorites
+            model: pinnedModel
             width: parent.width
-            height: tileSide * 3
+            height: plasmoid.configuration.recentGridModel == 3 ? parent.height : tileSide * 3
             cellWidth: tileSide
             cellHeight: tileSide
             square: true
@@ -332,6 +334,7 @@ Item {
             width: parent.width
             model: rootModel.modelForRow(2)
             opacity: showAllApps && !searching ? 1.0 : 0.0
+            showDescriptions: plasmoid.configuration.showDescription
             anchors {
                 leftMargin: units.largeSpacing * 1.6;
             }
@@ -349,6 +352,7 @@ Item {
             enabled: (opacity == 1.0) ? 1 : 0
             width: parent.width
             model: runnerModel
+            showDescriptions: plasmoid.configuration.showDescription
             opacity: searching ? 1.0 : 0.0
             onOpacityChanged: {
                 if (opacity == 1.0) {
@@ -409,6 +413,7 @@ Item {
         anchors.bottom: parent.bottom
         anchors.leftMargin: units.largeSpacing * 3
         anchors.rightMargin: units.largeSpacing
+        visible: plasmoid.configuration.recentGridModel != 3
 
         property int iconSize: 22
 
@@ -471,7 +476,7 @@ Item {
                 left: parent.left
             }
             x: -units.smallSpacing
-            visible: !searching && !showAllApps && !showRecents
+            visible: documentsFavoritesGrid.model.count > 6 && !searching && !showAllApps && !showRecents
         }
 
         ItemGridView {
@@ -492,7 +497,7 @@ Item {
             cellWidth: parent.width * 0.4
             cellHeight: units.iconSizes.medium + units.smallSpacing * 5
             iconSize: units.iconSizes.medium
-            model: rootModel.modelForRow(1);
+            model: recommendedModel
             usesPlasmaTheme: false
 
             onKeyNavUp: {
diff --git a/contents/ui/MenuRepresentation.qml b/contents/ui/MenuRepresentation.qml
@@ -85,35 +85,37 @@ PlasmaCore.Dialog {
         // Fall back to bottom-left of screen area when the applet is on the desktop or floating.
         var x = offset;
         var y = screen.height - height - offset;
-        var horizMidPoint; z
-        var vertMidPoint;
-        var appletTopLeft;
-        if (plasmoid.configuration.centerMenu) {
-            horizMidPoint = screen.x + (screen.width / 2);
-            vertMidPoint = screen.y + (screen.height / 2);
-            x = horizMidPoint - width / 2;
-            //y = vertMidPoint - height / 2;
-            y = plasmoid.location === PlasmaCore.Types.TopEdge ? parent.height + panelSvg.margins.bottom + offset + 6 :  screen.height - height - offset - panelSvg.margins.top - 6;
+        var horizMidPoint = screen.x + (screen.width / 2);
+        var vertMidPoint = screen.y + (screen.height / 2);
+        var appletTopLeft = parent.mapToGlobal(0, 0);
+        var appletBottomLeft = parent.mapToGlobal(0, parent.height);
+        if (plasmoid.configuration.menuPosition == 0) {
+            x = plasmoid.location === PlasmaCore.Types.LeftEdge ? parent.width + panelSvg.margins.right + offset + 6 : plasmoid.location === PlasmaCore.Types.RightEdge ? appletTopLeft.x - panelSvg.margins.left - offset - width - 6 : horizMidPoint - width / 2;
+            y = plasmoid.location === PlasmaCore.Types.TopEdge ? parent.height + panelSvg.margins.bottom + offset + 6 : plasmoid.location === PlasmaCore.Types.BottomEdge ? screen.height - height - offset - panelSvg.margins.top - 6 : vertMidPoint - height / 2;
         } else if (plasmoid.location === PlasmaCore.Types.BottomEdge) {
-            horizMidPoint = screen.x + (screen.width / 2);
-            appletTopLeft = parent.mapToGlobal(0, 0);
-            x = (appletTopLeft.x < horizMidPoint) ? screen.x + offset + 6 : (screen.x + screen.width) - width - offset - 6;
+            if (plasmoid.configuration.menuPosition == 1)
+                x = (appletTopLeft.x < horizMidPoint) ? screen.x + offset + 6 : (screen.x + screen.width) - width - offset - 6;
+            else
+                x = appletTopLeft.x - width / 2
             y = screen.height - height - offset - panelSvg.margins.top - 6;
         } else if (plasmoid.location === PlasmaCore.Types.TopEdge) {
-            horizMidPoint = screen.x + (screen.width / 2);
-            var appletBottomLeft = parent.mapToGlobal(0, parent.height);
-            x = (appletBottomLeft.x < horizMidPoint) ? screen.x + offset + 6 : (screen.x + screen.width) - width - offset - 6;
+            if (plasmoid.configuration.menuPosition == 1)
+                x = (appletBottomLeft.x < horizMidPoint) ? screen.x + offset + 6 : (screen.x + screen.width) - width - offset - 6;
+            else
+                x = appletBottomLeft.x - width / 2
             y = parent.height + panelSvg.margins.bottom + offset + 6;
         } else if (plasmoid.location === PlasmaCore.Types.LeftEdge) {
-            vertMidPoint = screen.y + (screen.height / 2);
-            appletTopLeft = parent.mapToGlobal(0, 0);
             x = parent.width + panelSvg.margins.right + offset + 6;
-            y = (appletTopLeft.y < vertMidPoint) ? screen.y + offset + 6 : (screen.y + screen.height) - height - offset - 6;
+            if (plasmoid.configuration.menuPosition == 1)
+                y = (appletTopLeft.y < vertMidPoint) ? screen.y + offset + 6 : (screen.y + screen.height) - height - offset - 6;
+            else
+                y = appletTopLeft.y - height / 2
         } else if (plasmoid.location === PlasmaCore.Types.RightEdge) {
-            vertMidPoint = screen.y + (screen.height / 2);
-            appletTopLeft = parent.mapToGlobal(0, 0);
             x = appletTopLeft.x - panelSvg.margins.left - offset - width - 6;
-            y = (appletTopLeft.y < vertMidPoint) ? screen.y + offset + 6 : (screen.y + screen.height) - height - offset - 6;
+            if (plasmoid.configuration.menuPosition == 1)
+                y = (appletTopLeft.y < vertMidPoint) ? screen.y + offset + 6 : (screen.y + screen.height) - height - offset - 6;
+            else
+                y = appletTopLeft.y - height / 2
         }
 
         return Qt.point(x, y);
