this is now powerkit

rodlie · Oct 12, 2018 · 59b3f74 · 59b3f74
1 parent 054afc5
commit 59b3f74
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 37 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
   - sudo apt-get update
 
 install:
-  - sudo apt-get install qt4-dev-tools qtbase5-dev libxss-dev qt4-qmake qt5-qmake tree libxrandr-dev libxinerama-dev
+  - sudo apt-get install qt4-dev-tools qtbase5-dev libxss-dev qt4-qmake qt5-qmake tree libxrandr-dev
 
 script:
   - export CWD=`pwd`

diff --git a/CNAME b/CNAME
@@ -1 +1 @@
-powerdwarf.dracolinux.org
+powerkit.dracolinux.org
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-powerdwarf <https://github.com/rodlie/powerdwarf>
+PowerKit <https://github.com/rodlie/powerkit>
 
 Copyright (c) 2018, Ole-André Rodlie <ole.andre.rodlie@gmail.com>
 All rights reserved.

diff --git a/app/app.pro b/app/app.pro
@@ -1,24 +1,23 @@
 #
-# powerdwarf <https://github.com/rodlie/powerdwarf>
+# PowerKit <https://github.com/rodlie/powerkit>
 # Copyright (c) 2018, Ole-André Rodlie <ole.andre.rodlie@gmail.com> All rights reserved.
 #
 # Available under the 3-clause BSD license
 # See the LICENSE file for full details
 #
 
-QT += core gui dbus
+QT += core gui dbus xml
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 
-TARGET = powerdwarf
+TARGET = powerkit
 TEMPLATE = app
 
-SOURCES += main.cpp systray.cpp dialog.cpp
-HEADERS += systray.h dialog.h
-OTHER_FILES += share/man/powerdwarf.1
-LIBS += -L../lib -lPowerDwarf
+SOURCES += main.cpp systray.cpp dialog.cpp common.cpp
+HEADERS += systray.h dialog.h common.h
+LIBS += -L../lib -lPowerKit
 INCLUDEPATH += ../lib
 
-include(../powerdwarf.pri)
+include(../powerkit.pri)
 DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
 DEFINES += APP_VERSION_EXTRA=\"\\\"$${VERSION_EXTRA}\\\"\"
 
@@ -32,7 +31,7 @@ DEFINES += APP_VERSION_EXTRA=\"\\\"$${VERSION_EXTRA}\\\"\"
     }
     !CONFIG(no_man_install) {
         target_man.path = $${MANDIR}/man1
-        target_man.files = share/man/powerdwarf.1
+        target_man.files = share/man/$${TARGET}.1
         INSTALLS += target_man
     }
     !CONFIG(no_desktop_install) {

diff --git a/lib/common.cpp → app/common.cpp b/lib/common.cpp → app/common.cpp
diff --git a/lib/common.h → app/common.h b/lib/common.h → app/common.h
diff --git a/app/share/applications/powerdwarf.desktop → app/share/applications/powerkit.desktop b/app/share/applications/powerdwarf.desktop → app/share/applications/powerkit.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=powerdwarf
+Name=PowerKit
 Comment=Power Manager
 Icon=ac-adapter
-Exec=powerdwarf --config
+Exec=powerkit --config
 Terminal=false
 Type=Application
 Categories=Settings;

diff --git a/app/share/autostart/powerdwarf.desktop → app/share/autostart/powerkit.desktop b/app/share/autostart/powerdwarf.desktop → app/share/autostart/powerkit.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=powerdwarf
+Name=PowerKit
 Comment=Power Manager
 Icon=ac-adapter
-Exec=powerdwarf
+Exec=powerkit
 Terminal=false
 Type=Application
 NotShowIn=GNOME;KDE;MATE;TDE;Unity;XFCE;Cinnamon;

diff --git a/app/share/man/powerdwarf.1 → app/share/man/powerkit.1 b/app/share/man/powerdwarf.1 → app/share/man/powerkit.1
diff --git a/app/systray.cpp b/app/systray.cpp
@@ -814,7 +814,6 @@ void SysTray::handlePrepareForSuspend(bool suspend)
     if (!suspend) { // resume
         tray->showMessage(QString(), QString());
         man->UpdateDevices();
-        resetTimer();
         ss->SimulateUserActivity();
     }
 }

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -1,40 +1,37 @@
 #
-# powerdwarf <https://github.com/rodlie/powerdwarf>
+# PowerKit <https://github.com/rodlie/powerkit>
 # Copyright (c) 2018, Ole-André Rodlie <ole.andre.rodlie@gmail.com> All rights reserved.
 #
 # Available under the 3-clause BSD license
 # See the LICENSE file for full details
 #
 
-QT += dbus gui
-greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+QT += dbus xml
+QT -= gui
 
-TARGET = PowerDwarf
+TARGET = PowerKit
 TEMPLATE = lib
 SOURCES += \
-    common.cpp \
     powermanagement.cpp \
     screensaver.cpp \
     device.cpp \
     screens.cpp \
     powerkit.cpp
 HEADERS += \
-    common.h \
     powermanagement.h \
     screensaver.h \
     def.h \
     device.h \
     screens.h \
     powerkit.h
 
-include(../powerdwarf.pri)
-
+include(../powerkit.pri)
 CONFIG(install_lib) {
     CONFIG -= staticlib
     target.path = $${PREFIX}/lib$${LIBSUFFIX}
     INSTALLS += target
     !CONFIG(no_doc_install) {
-        target_docs.path = $${DOCDIR}/powerdwarf-$${VERSION}$${VERSION_EXTRA}
+        target_docs.path = $${DOCDIR}/powerkit-$${VERSION}$${VERSION_EXTRA}
         target_docs.files = ../LICENSE ../README.md ../ChangeLog
         INSTALLS += target_docs
     }

diff --git a/lib/screens.h b/lib/screens.h
@@ -12,7 +12,7 @@
 #include <QMap>
 #include <QString>
 
-#include "common.h"
+//#include "common.h"
 #include <X11/extensions/Xrandr.h>
 
 class Screens

diff --git a/powerdwarf.pri → powerkit.pri b/powerdwarf.pri → powerkit.pri
@@ -1,13 +1,13 @@
 #
-# powerdwarf <https://github.com/rodlie/powerdwarf>
+# PowerKit <https://github.com/rodlie/powerkit>
 # Copyright (c) 2018, Ole-André Rodlie <ole.andre.rodlie@gmail.com> All rights reserved.
 #
 # Available under the 3-clause BSD license
 # See the LICENSE file for full details
 #
 
 VERSION = 1.0.0
-VERSION_EXTRA = "beta8"
+VERSION_EXTRA = "beta1"
 
 isEmpty(PREFIX) {
     PREFIX = /usr/local
@@ -36,10 +36,4 @@ CONFIG(release, debug|release) {
     CONFIG += staticlib
 }
 
-freebsd {
-    INCLUDEPATH += /usr/local/include
-    LIBS += -lX11 -lXss -lXrandr
-} else {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += x11 xscrnsaver xrandr
-}
+LIBS += -lX11 -lXss -lXrandr
diff --git a/powerdwarf.pro → powerkit.pro b/powerdwarf.pro → powerkit.pro
@@ -1,5 +1,5 @@
 #
-# powerdwarf <https://github.com/rodlie/powerdwarf>
+# PowerKit <https://github.com/rodlie/powerkit>
 # Copyright (c) 2018, Ole-André Rodlie <ole.andre.rodlie@gmail.com> All rights reserved.
 #
 # Available under the 3-clause BSD license