use own icon instead start-here-kde; make start button without arrow

KDE · Dec 9, 2017 · e185f09 · e185f09
1 parent 9e0ee60
commit e185f09
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 12 deletions.
diff --git a/48-apps-liquidshell.png b/48-apps-liquidshell.png
diff --git a/AppMenu.cxx b/AppMenu.cxx
@@ -60,7 +60,7 @@ void AppMenu::fill()
   else if ( dirPath == QStandardPaths::writableLocation(QStandardPaths::DesktopLocation) )
     button->setIcon(QIcon::fromTheme("user-desktop"));
   else // fallback
-    button->setIcon(QIcon::fromTheme("start-here"));
+    button->setIcon(QIcon::fromTheme("folder"));
 
   QLayoutItem *child;
   while ( (child = popup->layout()->takeAt(0)) )

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
+include(ECMInstallIcons)
 
 find_package(Qt5 5.6 CONFIG REQUIRED COMPONENTS
     Core
@@ -114,3 +115,8 @@ target_link_libraries(${TARGET}
 
 install(TARGETS ${TARGET} ${INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.${TARGET}.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+ecm_install_icons(ICONS
+                  48-apps-liquidshell.png
+                  DESTINATION ${ICON_INSTALL_DIR}
+                  THEME hicolor)
diff --git a/StartMenu.cxx b/StartMenu.cxx
@@ -33,17 +33,18 @@
 //--------------------------------------------------------------------------------
 
 StartMenu::StartMenu(DesktopPanel *parent)
-  : QPushButton(parent)
+  : QToolButton(parent)
 {
   setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
   setIconSize((parent->getRows() == 1) ? QSize(22, 22) : QSize(48, 48));
 
   connect(parent, &DesktopPanel::rowsChanged,
           [this](int rows) { setIconSize((rows == 1) ? QSize(22, 22) : QSize(48, 48)); });
 
-  setThemeIcon("start-here-kde");
+  setThemeIcon("liquidshell");
 
-  setMenu(new PopupMenu(this));
+  popup = new PopupMenu(this);
+  connect(this, &QToolButton::pressed, this, &StartMenu::showMenu);
 
   fill();
 
@@ -62,14 +63,14 @@ void StartMenu::setThemeIcon(const QString &icon)
 
 void StartMenu::fill()
 {
-  menu()->clear();
+  popup->clear();
 
-  fillFromGroup(menu(), KServiceGroup::root());
+  fillFromGroup(popup, KServiceGroup::root());
 
-  menu()->addSeparator();
+  popup->addSeparator();
 
   // add important actions
-  QAction *action = menu()->addAction(QIcon::fromTheme("system-switch-user"), i18n("Switch User"));
+  QAction *action = popup->addAction(QIcon::fromTheme("system-switch-user"), i18n("Switch User"));
   connect(action, &QAction::triggered,
           []()
           {
@@ -81,11 +82,11 @@ void StartMenu::fill()
   KService::Ptr sysSettings = KService::serviceByDesktopName("systemsettings");
   if ( sysSettings )
   {
-    action = menu()->addAction(QIcon::fromTheme(sysSettings->icon()), sysSettings->name());
+    action = popup->addAction(QIcon::fromTheme(sysSettings->icon()), sysSettings->name());
     connect(action, &QAction::triggered, [this, sysSettings]() { KRun::runApplication(*sysSettings, QList<QUrl>(), this); });
   }
 
-  action = menu()->addAction(QIcon::fromTheme("system-run"), i18n("Run Command..."));
+  action = popup->addAction(QIcon::fromTheme("system-run"), i18n("Run Command..."));
   connect(action, &QAction::triggered,
           []()
           {
@@ -154,3 +155,14 @@ void StartMenu::contextMenuEvent(QContextMenuEvent *event)
 }
 
 //--------------------------------------------------------------------------------
+
+void StartMenu::showMenu()
+{
+  popup->adjustSize();
+  QPoint p = mapToGlobal(QPoint(0, 0));
+  popup->move(p.x(), p.y() - popup->height());
+  popup->exec();
+  setDown(false);
+}
+
+//--------------------------------------------------------------------------------
diff --git a/StartMenu.hxx b/StartMenu.hxx
@@ -20,14 +20,14 @@
 #ifndef _StartMenu_H_
 #define _StartMenu_H_
 
-#include <QPushButton>
+#include <QToolButton>
 #include <QMenu>
 
 #include <KServiceGroup>
 
 #include <DesktopPanel.hxx>
 
-class StartMenu : public QPushButton
+class StartMenu : public QToolButton
 {
   Q_OBJECT
 
@@ -44,12 +44,14 @@ class StartMenu : public QPushButton
 
   private Q_SLOTS:
     void fill();
+    void showMenu();
 
   private:
     void fillFromGroup(QMenu *menu, KServiceGroup::Ptr group);
 
   private:
     QString themeIcon;
+    QMenu *popup;
 };
 
 #endif