Merge pull request #31 from matthewvogt/remove-mnotification

Remove mnotification
sailfishos · Mar 19, 2015 · 05c1344 · 05c1344
2 parents be3f447 + 8f7313d
commit 05c1344
Show file tree

Hide file tree

Showing 13 changed files with 115 additions and 156 deletions.
diff --git a/data/data.pro b/data/data.pro
@@ -0,0 +1,6 @@
+TEMPLATE = aux
+
+notification_categories.path  = /usr/share/lipstick/notificationcategories
+notification_categories.files = notificationcategories/*.conf
+
+INSTALLS += notification_categories
diff --git a/data/notificationcategories/x-nemo.transfer.complete.conf b/data/notificationcategories/x-nemo.transfer.complete.conf
@@ -0,0 +1,2 @@
+appIcon=icon-lock-transfer
+urgency=1
diff --git a/data/notificationcategories/x-nemo.transfer.conf b/data/notificationcategories/x-nemo.transfer.conf
@@ -0,0 +1,3 @@
+appIcon=icon-lock-transfer
+transient=true
+urgency=1
diff --git a/data/notificationcategories/x-nemo.transfer.error.conf b/data/notificationcategories/x-nemo.transfer.error.conf
@@ -0,0 +1,2 @@
+appIcon=icon-lock-transfer
+urgency=2
diff --git a/doc/doc.pri b/doc/doc.pri
@@ -1,14 +1,10 @@
-equals(QT_MAJOR_VERSION, 4): QDOC = qdoc3
-equals(QT_MAJOR_VERSION, 5): QDOC = qdoc
+QDOC = qdoc
 QHELPGENERATOR = qhelpgenerator
-equals(QT_MAJOR_VERSION, 4): QDOCCONF = doc/config/transfer-engine-project.qdocconf
-equals(QT_MAJOR_VERSION, 5): QDOCCONF = transfer-engine-project.qdocconf
+QDOCCONF = transfer-engine-project.qdocconf
 QHELPFILE = doc/html/transferengine.qhp
 QCHFILE = doc/html/transferengine.qch
 
-equals(QT_MAJOR_VERSION, 4): docs.commands = ($$QDOC $$QDOCCONF) && \
-                ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE)
-equals(QT_MAJOR_VERSION, 5): docs.commands = (cd doc/config; $$QDOC $$QDOCCONF; cd ../..) && \
+docs.commands = (cd doc/config; $$QDOC $$QDOCCONF; cd ../..) && \
                 ($$QHELPGENERATOR $$QHELPFILE -o $$QCHFILE)
 
 QMAKE_EXTRA_TARGETS += docs

diff --git a/lib/lib.pro b/lib/lib.pro
@@ -1,12 +1,10 @@
 TEMPLATE = lib
-equals(QT_MAJOR_VERSION, 4): TARGET = nemotransferengine
-equals(QT_MAJOR_VERSION, 5): TARGET = nemotransferengine-qt5
+TARGET = nemotransferengine-qt5
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG += shared link_pkgconfig
 QT += dbus
-equals(QT_MAJOR_VERSION, 4): PKGCONFIG += quillmetadata
-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += quillmetadata-qt5
+PKGCONFIG += quillmetadata-qt5
 
 system(qdbusxml2cpp -v -c TransferEngineInterface -p transferengineinterface.h:transferengineinterface.cpp -i metatypedeclarations.h ../dbus/org.nemo.transferengine.xml)
 
@@ -38,22 +36,18 @@ HEADERS += \
 SOURCES += \
    transferengineinterface.cpp
 
-equals(QT_MAJOR_VERSION, 4): OTHER_FILES += nemotransfernegine.pc nemotransferengine-plugin.prf
-equals(QT_MAJOR_VERSION, 5): OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
+OTHER_FILES += nemotransfernegine-qt5.pc nemotransferengine-plugin-qt5.prf
 
 headers.files = $$HEADERS
-equals(QT_MAJOR_VERSION, 4): headers.path = /usr/include/TransferEngine
-equals(QT_MAJOR_VERSION, 5): headers.path = /usr/include/TransferEngine-qt5
+headers.path = /usr/include/TransferEngine-qt5
 
 target.path = /usr/lib
 
 pkgconfigpc.path = /usr/lib/pkgconfig/
-equals(QT_MAJOR_VERSION, 4): pkgconfigpc.files = nemotransferengine.pc
-equals(QT_MAJOR_VERSION, 5): pkgconfigpc.files = nemotransferengine-qt5.pc
+pkgconfigpc.files = nemotransferengine-qt5.pc
 
 prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
-equals(QT_MAJOR_VERSION, 4): prf.files = nemotransferengine-plugin.prf
-equals(QT_MAJOR_VERSION, 5): prf.files = nemotransferengine-plugin-qt5.prf
+prf.files = nemotransferengine-plugin-qt5.prf
 
 
 INSTALLS += target headers prf pkgconfigpc
diff --git a/rpm/transfer-engine-qt5.spec b/rpm/transfer-engine-qt5.spec
@@ -14,8 +14,8 @@ BuildRequires: pkgconfig(Qt5Qml)
 BuildRequires: pkgconfig(Qt5Quick)
 BuildRequires: pkgconfig(accounts-qt5)
 BuildRequires: desktop-file-utils
-BuildRequires: pkgconfig(mlite5)
 BuildRequires: pkgconfig(quillmetadata-qt5)
+BuildRequires: pkgconfig(nemonotifications-qt5) >= 1.0.4
 BuildRequires: qt5-qttools-linguist
 BuildRequires: qt5-qttools-qthelp-devel
 BuildRequires: qt5-plugin-platform-minimal
@@ -35,7 +35,7 @@ Obsoletes: nemo-transferengine <= 0.0.19
 %{_bindir}/nemo-transfer-engine
 %{_datadir}/dbus-1/services/org.nemo.transferengine.service
 %{_datadir}/translations/nemo-transfer-engine_eng_en.qm
-
+%{_datadir}/lipstick/notificationcategories/*
 
 %package -n libnemotransferengine-qt5
 Summary: Transfer engine library.

diff --git a/src/main.cpp b/src/main.cpp
@@ -43,6 +43,8 @@ Q_DECL_EXPORT int main(int argc, char *argv[])
     translator.load(QLocale(), "nemo-transfer-engine", "-", translationPath);
     app.installTranslator(&translator);
 
+    //% "Transfers"
+    app.setApplicationName(qtTrId("transferengine-ap-transfers"));
 
     TransferEngine engine;
     return app.exec();

diff --git a/src/src.pro b/src/src.pro
@@ -11,15 +11,13 @@ packagesExist(qt5-boostable) {
   warning("qt5-boostable not available; startup times will be slower")
 }
 
-equals(QT_MAJOR_VERSION, 4): LIBS += -L../lib -lnemotransferengine
-equals(QT_MAJOR_VERSION, 5): LIBS += -L../lib -lnemotransferengine-qt5
+LIBS += -L../lib -lnemotransferengine-qt5
 
 # generate adaptor code
 system(qdbusxml2cpp -c TransferEngineAdaptor -a transferengineadaptor.h:transferengineadaptor.cpp -i metatypedeclarations.h ../dbus/org.nemo.transferengine.xml)
 
 CONFIG += link_pkgconfig
-equals(QT_MAJOR_VERSION, 4): PKGCONFIG += mlite accounts-qt
-equals(QT_MAJOR_VERSION, 5): PKGCONFIG += mlite5 accounts-qt5
+PKGCONFIG += accounts-qt5 nemonotifications-qt5
 
 # translations
 TS_FILE = $$OUT_PWD/nemo-transfer-engine.ts