RC2-ish:

* added failsafe icons (CONFIG+=bundle_icons)
* simplify icon theme loading
* added new configuration options
* some minor fixes

.travis.yml

@@ -13,14 +13,14 @@ script:
   - export CWD=`pwd`
   - mkdir $CWD/qt5
   - cd $CWD/qt5
-  - qmake -qt=qt5 CONFIG+=release PREFIX=/usr ..
+  - qmake -qt=qt5 CONFIG+=release CONFIG+=install_lib PREFIX=/usr ..
   - make
   - make INSTALL_ROOT=`pwd`/pkg install
   - tree pkg
   - cd $CWD
   - mkdir $CWD/qt4
   - cd $CWD/qt4
-  - qmake -qt=qt4 CONFIG+=release PREFIX=/usr ..
+  - qmake -qt=qt4 CONFIG+=release CONFIG+=bundle_icons PREFIX=/usr ..
   - make
   - make INSTALL_ROOT=`pwd`/pkg install
   - tree pkg

ChangeLog

@@ -1,2 +1,6 @@
+## 1.0.0rc2 - 20181103
+ * Added more configuration options
+ * Added option to bundle failsafe icons
+
 ## 1.0.0rc1 - 20181025
  * first public release

LICENSE

@@ -1,4 +1,3 @@
-PowerKit <https://github.com/rodlie/powerkit>
 
 Copyright (c) 2018, Ole-André Rodlie <[email protected]>
 All rights reserved.

README.md

@@ -106,16 +106,13 @@ powerkit requires the following dependencies to work:
  * [ConsoleKit](https://www.freedesktop.org/wiki/Software/ConsoleKit/) (or logind)
  * [UPower](https://upower.freedesktop.org/) 0.9.23(+)
  * [XScreenSaver](https://www.jwz.org/xscreensaver/)
- * [adwaita-icon-theme](https://github.com/GNOME/adwaita-icon-theme) (or similar)
+ * [adwaita-icon-theme](https://github.com/GNOME/adwaita-icon-theme) (if built without ``CONFIG+=bundle_icons``)
 
 ### Icons
 
-powerkit does not bundle any icons, so you will need a compatible theme installed. powerkit will use the existing icon theme from your running DE/WM or fallback to a known theme:
+powerkit will use the existing icon theme from the running DE/WM, else check the GTK settings then fallback to Adwaita if no theme was found. So you should have (a proper version) of Adwaita installed or enable ``CONFIG+=bundle_icons`` when building powerkit.
 
- * Adwaita
- * Gnome
- * Oxygen
- * Tango (not recommended)
+You can override the icon theme in the `~/.config/powerkit/powerkit.conf` file, see ``icon_theme=<theme_name>``.
 
 ## Build
 
@@ -137,6 +134,7 @@ First make sure you have the required dependencies installed, then review the bu
  * **``CONFIG+=install_lib``**: Build and install shared library.
     * **``CONFIG+=no_include_install``**: Do not install include files.
     * **``CONFIG+=no_pkgconfig_install``**: Do not install pkgconfig file.
+ * **``CONFIG+=bundle_icons``**: Bundle a set of fallback icons (Adwaita), this will add 200k to the binary size.
 
 ### Build application
 

app/app.pro

@@ -14,19 +14,26 @@ TEMPLATE = app
 
 SOURCES += main.cpp systray.cpp dialog.cpp common.cpp
 HEADERS += systray.h dialog.h common.h
+
 LIBS += -L../lib -lPowerKit
 INCLUDEPATH += ../lib
 
 include(../powerkit.pri)
 DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 DEFINES += APP_VERSION_EXTRA=\"\\\"$${VERSION_EXTRA}\\\"\"
 
+CONFIG(bundle_icons) {
+    RESOURCES += icons.qrc
+    DEFINES += BUNDLE_ICONS
+}
 !CONFIG(no_app_install) {
     target.path = $${PREFIX}/bin
     INSTALLS += target
     !CONFIG(no_doc_install) {
         target_docs.path = $${DOCDIR}/$${TARGET}-$${VERSION}$${VERSION_EXTRA}
         target_docs.files = ../LICENSE ../README.md ../ChangeLog
+        CONFIG(bundle_icons): target_docs.files += icons/Adwaita/LICENSE.Adwaita
+        exists(../ChangeLog.git): target_docs.files += ../ChangeLog.git
         INSTALLS += target_docs
     }
     !CONFIG(no_man_install) {

app/common.cpp

@@ -96,59 +96,43 @@ void Common::setIconTheme()
     QStringList iconsPath = QIcon::themeSearchPaths();
     QString iconsHomeLocal = QString("%1/.local/share/icons").arg(QDir::homePath());
     QString iconsHome = QString("%1/.icons").arg(QDir::homePath());
-    if (QFile::exists(iconsHomeLocal) && !iconsPath.contains(iconsHomeLocal)) { iconsPath.prepend(iconsHomeLocal); }
-    if (QFile::exists(iconsHome) && !iconsPath.contains(iconsHome)) { iconsPath.prepend(iconsHome); }
+    if (QFile::exists(iconsHomeLocal) &&
+        !iconsPath.contains(iconsHomeLocal)) { iconsPath.prepend(iconsHomeLocal); }
+    if (QFile::exists(iconsHome) &&
+        !iconsPath.contains(iconsHome)) { iconsPath.prepend(iconsHome); }
     iconsPath << QString("%1/../share/icons").arg(qApp->applicationDirPath());
     QIcon::setThemeSearchPaths(iconsPath);
     qDebug() << "using icon theme search path" << QIcon::themeSearchPaths();
 
     QString theme = QIcon::themeName();
     if (theme.isEmpty() || theme == "hicolor") { // try to load saved theme
-        qDebug() << "checking for icon theme in settings";
-        theme = loadPowerSettings("icon_theme").toString();
+        theme = loadPowerSettings(CONF_ICON_THEME).toString();
     }
     if(theme.isEmpty() || theme == "hicolor") { // Nope, then scan for first available
         // gtk
         if(QFile::exists(QDir::homePath() + "/" + ".gtkrc-2.0")) {
-            qDebug() << "checking for icon theme in gtkrc-2.0";
             QSettings gtkFile(QDir::homePath() + "/.gtkrc-2.0", QSettings::IniFormat);
             theme = gtkFile.value("gtk-icon-theme-name").toString().remove("\"");
         } else {
-            qDebug() << "checking for icon theme in gtk-3.0";
             QSettings gtkFile(QDir::homePath() + "/.config/gtk-3.0/settings.ini", QSettings::IniFormat);
             theme = gtkFile.value("gtk-fallback-icon-theme").toString().remove("\"");
         }
         // fallback
-        if(theme.isNull()) {
-            qDebug() << "checking for icon theme in static fallback";
-            QStringList themes;
-            themes << QString("%1/../share/icons/Humanity").arg(qApp->applicationFilePath());
-            themes << "/usr/share/icons/Humanity" << "/usr/local/share/icons/Humanity";
-            themes << QString("%1/../share/icons/Adwaita").arg(qApp->applicationFilePath());
-            themes << "/usr/share/icons/Adwaita" << "/usr/local/share/icons/Adwaita";
-            themes << QString("%1/../share/icons/gnome").arg(qApp->applicationFilePath());
-            themes << "/usr/share/icons/gnome" << "/usr/local/share/icons/gnome";
-            themes << QString("%1/../share/icons/oxygen").arg(qApp->applicationFilePath());
-            themes << "/usr/share/icons/oxygen" << "/usr/local/share/icons/oxygen";
-            themes << QString("%1/../share/icons/hicolor").arg(qApp->applicationFilePath());
-            themes << QString("%1/../share/icons/Tango").arg(qApp->applicationFilePath());
-            themes << "/usr/share/icons/Tango" << "/usr/local/share/icons/Tango";
-            themes << "/usr/share/icons/hicolor" << "/usr/local/share/icons/hicolor";
-            for (int i=0;i<themes.size();++i) {
-                if (QFile::exists(themes.at(i))) {
-                    theme = QString(themes.at(i)).split("/").takeLast();
-                    break;
-                }
-            }
-        }
-        if (theme != "hicolor" && !theme.isEmpty()) {
-            qDebug() << "save icon theme for later use";
-            savePowerSettings("icon_theme", theme);
-        } else {
-            qDebug() << "No icons available!";
-        }
+        if(theme.isNull()) { theme = DEFAULT_THEME; }
+        if (!theme.isEmpty()) { savePowerSettings(CONF_ICON_THEME, theme); }
     }
+    qDebug() << "Using icon theme" << theme;
     QIcon::setThemeName(theme);
+#ifdef BUNDLE_ICONS
+    if (theme != DEFAULT_THEME) { // validate theme
+        QIcon testTheme = QIcon::fromTheme(DEFAULT_AC_ICON);
+        if (testTheme.isNull()) {
+            qDebug() << "icon theme is broken, use failsafe!";
+            QIcon::setThemeName(DEFAULT_THEME);
+            savePowerSettings(CONF_ICON_THEME, DEFAULT_THEME);
+        }
+    }
+#endif
 }
 
 QString Common::confFile()

app/dialog.cpp

@@ -1430,15 +1430,15 @@ void Dialog::getInhibitors()
         QTreeWidgetItem *item = new QTreeWidgetItem(inhibitorTree);
         item->setText(0, inhibitor);
         item->setFlags(Qt::ItemIsEnabled);
-        item->setIcon(0, QIcon::fromTheme("application-x-executable"));
+        item->setIcon(0, QIcon::fromTheme(DEFAULT_TRAY_ICON));
     }
     for (int i=0;i<pmList.size();++i) {
         QString inhibitor = pmList.at(i);
         if (inhibitor.isEmpty()) { continue; }
         QTreeWidgetItem *item = new QTreeWidgetItem(inhibitorTree);
         item->setText(0, inhibitor);
         item->setFlags(Qt::ItemIsEnabled);
-        item->setIcon(0, QIcon::fromTheme("application-x-executable"));
+        item->setIcon(0, QIcon::fromTheme(DEFAULT_TRAY_ICON));
     }
 }
 
@@ -1479,6 +1479,13 @@ void Dialog::showAboutDialog()
                   .arg(tr("file for full details."))
                   .arg(tr("Available on"))
                   .arg(tr("and")));
+#ifdef BUNDLE_ICONS
+    about.setDetailedText(tr("Includes icons from the GNOME project <http://www.gnome.org>.\n\n"
+                             "This work is licenced under the Creative Commons Attribution-Share Alike 3.0 "
+                             "United States License.\n\nTo view a copy of this licence, visit "
+                             "http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative "
+                             "Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA."));
+#endif
     about.exec();
 }
 

app/icons.qrc

@@ -0,0 +1,140 @@
+<RCC>
+    <qresource prefix="/">
+        <file>icons/Adwaita/16x16/actions/system-hibernate.png</file>
+        <file>icons/Adwaita/16x16/actions/system-lock-screen.png</file>
+        <file>icons/Adwaita/16x16/actions/system-log-out.png</file>
+        <file>icons/Adwaita/16x16/actions/system-shutdown.png</file>
+        <file>icons/Adwaita/16x16/actions/system-suspend.png</file>
+        <file>icons/Adwaita/16x16/categories/preferences-other.png</file>
+        <file>icons/Adwaita/16x16/devices/ac-adapter.png</file>
+        <file>icons/Adwaita/16x16/devices/battery.png</file>
+        <file>icons/Adwaita/16x16/devices/input-keyboard.png</file>
+        <file>icons/Adwaita/16x16/devices/input-mouse.png</file>
+        <file>icons/Adwaita/16x16/devices/video-display.png</file>
+        <file>icons/Adwaita/16x16/emblems/emblem-unreadable.png</file>
+        <file>icons/Adwaita/16x16/status/battery-caution-charging.png</file>
+        <file>icons/Adwaita/16x16/status/battery-caution.png</file>
+        <file>icons/Adwaita/16x16/status/battery-empty.png</file>
+        <file>icons/Adwaita/16x16/status/battery-full-charged.png</file>
+        <file>icons/Adwaita/16x16/status/battery-full-charging.png</file>
+        <file>icons/Adwaita/16x16/status/battery-full.png</file>
+        <file>icons/Adwaita/16x16/status/battery-good-charging.png</file>
+        <file>icons/Adwaita/16x16/status/battery-good.png</file>
+        <file>icons/Adwaita/16x16/status/battery-low-charging.png</file>
+        <file>icons/Adwaita/16x16/status/battery-low.png</file>
+        <file>icons/Adwaita/16x16/status/battery-missing.png</file>
+        <file>icons/Adwaita/16x16/status/dialog-information.png</file>
+        <file>icons/Adwaita/16x16/status/dialog-question.png</file>
+        <file>icons/Adwaita/16x16/status/user-available.png</file>
+        <file>icons/Adwaita/16x16/status/weather-clear.png</file>
+        <file>icons/Adwaita/22x22/actions/system-hibernate.png</file>
+        <file>icons/Adwaita/22x22/actions/system-lock-screen.png</file>
+        <file>icons/Adwaita/22x22/actions/system-log-out.png</file>
+        <file>icons/Adwaita/22x22/actions/system-shutdown.png</file>
+        <file>icons/Adwaita/22x22/actions/system-suspend.png</file>
+        <file>icons/Adwaita/22x22/categories/preferences-other.png</file>
+        <file>icons/Adwaita/22x22/devices/ac-adapter.png</file>
+        <file>icons/Adwaita/22x22/devices/battery.png</file>
+        <file>icons/Adwaita/22x22/devices/input-keyboard.png</file>
+        <file>icons/Adwaita/22x22/devices/input-mouse.png</file>
+        <file>icons/Adwaita/22x22/devices/video-display.png</file>
+        <file>icons/Adwaita/22x22/emblems/emblem-unreadable.png</file>
+        <file>icons/Adwaita/22x22/status/battery-caution-charging.png</file>
+        <file>icons/Adwaita/22x22/status/battery-caution.png</file>
+        <file>icons/Adwaita/22x22/status/battery-empty.png</file>
+        <file>icons/Adwaita/22x22/status/battery-full-charged.png</file>
+        <file>icons/Adwaita/22x22/status/battery-full-charging.png</file>
+        <file>icons/Adwaita/22x22/status/battery-full.png</file>
+        <file>icons/Adwaita/22x22/status/battery-good-charging.png</file>
+        <file>icons/Adwaita/22x22/status/battery-good.png</file>
+        <file>icons/Adwaita/22x22/status/battery-low-charging.png</file>
+        <file>icons/Adwaita/22x22/status/battery-low.png</file>
+        <file>icons/Adwaita/22x22/status/battery-missing.png</file>
+        <file>icons/Adwaita/22x22/status/dialog-information.png</file>
+        <file>icons/Adwaita/22x22/status/dialog-question.png</file>
+        <file>icons/Adwaita/22x22/status/user-available.png</file>
+        <file>icons/Adwaita/22x22/status/weather-clear.png</file>
+        <file>icons/Adwaita/24x24/actions/system-hibernate.png</file>
+        <file>icons/Adwaita/24x24/actions/system-lock-screen.png</file>
+        <file>icons/Adwaita/24x24/actions/system-log-out.png</file>
+        <file>icons/Adwaita/24x24/actions/system-shutdown.png</file>
+        <file>icons/Adwaita/24x24/actions/system-suspend.png</file>
+        <file>icons/Adwaita/24x24/categories/preferences-other.png</file>
+        <file>icons/Adwaita/24x24/devices/ac-adapter.png</file>
+        <file>icons/Adwaita/24x24/devices/battery.png</file>
+        <file>icons/Adwaita/24x24/devices/input-keyboard.png</file>
+        <file>icons/Adwaita/24x24/devices/input-mouse.png</file>
+        <file>icons/Adwaita/24x24/devices/video-display.png</file>
+        <file>icons/Adwaita/24x24/emblems/emblem-unreadable.png</file>
+        <file>icons/Adwaita/24x24/status/battery-caution-charging.png</file>
+        <file>icons/Adwaita/24x24/status/battery-caution.png</file>
+        <file>icons/Adwaita/24x24/status/battery-empty.png</file>
+        <file>icons/Adwaita/24x24/status/battery-full-charged.png</file>
+        <file>icons/Adwaita/24x24/status/battery-full-charging.png</file>
+        <file>icons/Adwaita/24x24/status/battery-full.png</file>
+        <file>icons/Adwaita/24x24/status/battery-good-charging.png</file>
+        <file>icons/Adwaita/24x24/status/battery-good.png</file>
+        <file>icons/Adwaita/24x24/status/battery-low-charging.png</file>
+        <file>icons/Adwaita/24x24/status/battery-low.png</file>
+        <file>icons/Adwaita/24x24/status/battery-missing.png</file>
+        <file>icons/Adwaita/24x24/status/dialog-information.png</file>
+        <file>icons/Adwaita/24x24/status/dialog-question.png</file>
+        <file>icons/Adwaita/24x24/status/user-available.png</file>
+        <file>icons/Adwaita/24x24/status/weather-clear.png</file>
+        <file>icons/Adwaita/32x32/actions/system-hibernate.png</file>
+        <file>icons/Adwaita/32x32/actions/system-lock-screen.png</file>
+        <file>icons/Adwaita/32x32/actions/system-log-out.png</file>
+        <file>icons/Adwaita/32x32/actions/system-shutdown.png</file>
+        <file>icons/Adwaita/32x32/actions/system-suspend.png</file>
+        <file>icons/Adwaita/32x32/categories/preferences-other.png</file>
+        <file>icons/Adwaita/32x32/devices/ac-adapter.png</file>
+        <file>icons/Adwaita/32x32/devices/battery.png</file>
+        <file>icons/Adwaita/32x32/devices/input-keyboard.png</file>
+        <file>icons/Adwaita/32x32/devices/input-mouse.png</file>
+        <file>icons/Adwaita/32x32/devices/video-display.png</file>
+        <file>icons/Adwaita/32x32/emblems/emblem-unreadable.png</file>
+        <file>icons/Adwaita/32x32/status/battery-caution-charging.png</file>
+        <file>icons/Adwaita/32x32/status/battery-caution.png</file>
+        <file>icons/Adwaita/32x32/status/battery-empty.png</file>
+        <file>icons/Adwaita/32x32/status/battery-full-charged.png</file>
+        <file>icons/Adwaita/32x32/status/battery-full-charging.png</file>
+        <file>icons/Adwaita/32x32/status/battery-full.png</file>
+        <file>icons/Adwaita/32x32/status/battery-good-charging.png</file>
+        <file>icons/Adwaita/32x32/status/battery-good.png</file>
+        <file>icons/Adwaita/32x32/status/battery-low-charging.png</file>
+        <file>icons/Adwaita/32x32/status/battery-low.png</file>
+        <file>icons/Adwaita/32x32/status/battery-missing.png</file>
+        <file>icons/Adwaita/32x32/status/dialog-information.png</file>
+        <file>icons/Adwaita/32x32/status/dialog-question.png</file>
+        <file>icons/Adwaita/32x32/status/user-available.png</file>
+        <file>icons/Adwaita/32x32/status/weather-clear.png</file>
+        <file>icons/Adwaita/48x48/actions/system-hibernate.png</file>
+        <file>icons/Adwaita/48x48/actions/system-lock-screen.png</file>
+        <file>icons/Adwaita/48x48/actions/system-log-out.png</file>
+        <file>icons/Adwaita/48x48/actions/system-shutdown.png</file>
+        <file>icons/Adwaita/48x48/actions/system-suspend.png</file>
+        <file>icons/Adwaita/48x48/categories/preferences-other.png</file>
+        <file>icons/Adwaita/48x48/devices/ac-adapter.png</file>
+        <file>icons/Adwaita/48x48/devices/battery.png</file>
+        <file>icons/Adwaita/48x48/devices/input-keyboard.png</file>
+        <file>icons/Adwaita/48x48/devices/input-mouse.png</file>
+        <file>icons/Adwaita/48x48/devices/video-display.png</file>
+        <file>icons/Adwaita/48x48/emblems/emblem-unreadable.png</file>
+        <file>icons/Adwaita/48x48/status/battery-caution-charging.png</file>
+        <file>icons/Adwaita/48x48/status/battery-caution.png</file>
+        <file>icons/Adwaita/48x48/status/battery-empty.png</file>
+        <file>icons/Adwaita/48x48/status/battery-full-charged.png</file>
+        <file>icons/Adwaita/48x48/status/battery-full-charging.png</file>
+        <file>icons/Adwaita/48x48/status/battery-full.png</file>
+        <file>icons/Adwaita/48x48/status/battery-good-charging.png</file>
+        <file>icons/Adwaita/48x48/status/battery-good.png</file>
+        <file>icons/Adwaita/48x48/status/battery-low-charging.png</file>
+        <file>icons/Adwaita/48x48/status/battery-low.png</file>
+        <file>icons/Adwaita/48x48/status/battery-missing.png</file>
+        <file>icons/Adwaita/48x48/status/dialog-information.png</file>
+        <file>icons/Adwaita/48x48/status/dialog-question.png</file>
+        <file>icons/Adwaita/48x48/status/user-available.png</file>
+        <file>icons/Adwaita/48x48/status/weather-clear.png</file>
+        <file>icons/Adwaita/index.theme</file>
+    </qresource>
+</RCC>

app/icons/Adwaita/LICENSE.Adwaita

@@ -0,0 +1,7 @@
+This work is licenced under the Creative Commons Attribution-Share Alike 3.0
+United States License. To view a copy of this licence, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+When attributing the artwork, using "GNOME Project" is enough. 
+Please link to http://www.gnome.org where available.

app/icons/Adwaita/README.md

@@ -0,0 +1 @@
+Stripped-down version for use with powerkit.