diff --git a/.travis.yml b/.travis.yml index ce257ed..938db1e 100644 --- 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 index 9bea0c2..e485c8f 100644 --- a/CNAME +++ b/CNAME @@ -1 +1 @@ -powerdwarf.dracolinux.org \ No newline at end of file +powerkit.dracolinux.org diff --git a/LICENSE b/LICENSE index 3e4cb1d..4ac1353 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -powerdwarf +PowerKit Copyright (c) 2018, Ole-André Rodlie All rights reserved. diff --git a/app/app.pro b/app/app.pro index 0a69f1d..3aa8b4a 100644 --- a/app/app.pro +++ b/app/app.pro @@ -1,24 +1,23 @@ # -# powerdwarf +# PowerKit # Copyright (c) 2018, Ole-André Rodlie 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 b/app/common.cpp similarity index 100% rename from lib/common.cpp rename to app/common.cpp diff --git a/lib/common.h b/app/common.h similarity index 100% rename from lib/common.h rename to app/common.h diff --git a/app/share/applications/powerdwarf.desktop b/app/share/applications/powerkit.desktop similarity index 81% rename from app/share/applications/powerdwarf.desktop rename to app/share/applications/powerkit.desktop index a6b2035..16dd48d 100644 --- a/app/share/applications/powerdwarf.desktop +++ b/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 b/app/share/autostart/powerkit.desktop similarity index 82% rename from app/share/autostart/powerdwarf.desktop rename to app/share/autostart/powerkit.desktop index aee423c..f5607e1 100644 --- a/app/share/autostart/powerdwarf.desktop +++ b/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 b/app/share/man/powerkit.1 similarity index 100% rename from app/share/man/powerdwarf.1 rename to app/share/man/powerkit.1 diff --git a/app/systray.cpp b/app/systray.cpp index 45412f1..a4172c2 100644 --- 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 index 83e65d2..e1935ca 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -1,25 +1,23 @@ # -# powerdwarf +# PowerKit # Copyright (c) 2018, Ole-André Rodlie 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 \ @@ -27,14 +25,13 @@ HEADERS += \ 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 index d895734..622821a 100644 --- a/lib/screens.h +++ b/lib/screens.h @@ -12,7 +12,7 @@ #include #include -#include "common.h" +//#include "common.h" #include class Screens diff --git a/powerdwarf.pri b/powerkit.pri similarity index 73% rename from powerdwarf.pri rename to powerkit.pri index c6b6519..bd62288 100644 --- a/powerdwarf.pri +++ b/powerkit.pri @@ -1,5 +1,5 @@ # -# powerdwarf +# PowerKit # Copyright (c) 2018, Ole-André Rodlie All rights reserved. # # Available under the 3-clause BSD license @@ -7,7 +7,7 @@ # 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 b/powerkit.pro similarity index 83% rename from powerdwarf.pro rename to powerkit.pro index 618f6da..8723fd2 100644 --- a/powerdwarf.pro +++ b/powerkit.pro @@ -1,5 +1,5 @@ # -# powerdwarf +# PowerKit # Copyright (c) 2018, Ole-André Rodlie All rights reserved. # # Available under the 3-clause BSD license