diff -Nru lxqt-notificationd-0.11.1/AUTHORS lxqt-notificationd-0.12.0/AUTHORS
--- lxqt-notificationd-0.11.1/AUTHORS 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/AUTHORS 2017-10-21 19:18:28.000000000 +0000
@@ -4,7 +4,7 @@
Copyright:
Copyright (c) 2010-2012 Razor team
- Copyright (c) 2012-2016 LXQt team
+ Copyright (c) 2012-2017 LXQt team
License: LGPL-2.1+
The full text of the licenses can be found in the 'COPYING' file.
diff -Nru lxqt-notificationd-0.11.1/autostart/CMakeLists.txt lxqt-notificationd-0.12.0/autostart/CMakeLists.txt
--- lxqt-notificationd-0.11.1/autostart/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/CMakeLists.txt 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
+
+file(GLOB DESKTOP_FILES_IN *.desktop.in)
+
+# Translations **********************************
+lxqt_translate_desktop(DESKTOP_FILES
+ SOURCES
+ ${DESKTOP_FILES_IN}
+)
+add_custom_target(lxqt_notificationd_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES})
+#************************************************
+
+install(FILES
+ ${DESKTOP_FILES}
+ DESTINATION "${LXQT_ETC_XDG_DIR}/autostart"
+ COMPONENT Runtime
+)
diff -Nru lxqt-notificationd-0.11.1/autostart/lxqt-notifications.desktop.in lxqt-notificationd-0.12.0/autostart/lxqt-notifications.desktop.in
--- lxqt-notificationd-0.11.1/autostart/lxqt-notifications.desktop.in 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/lxqt-notifications.desktop.in 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Notification Daemon
+TryExec=lxqt-notificationd
+Exec=lxqt-notificationd
+OnlyShowIn=LXQt;
+X-LXQt-Module=true
+
+#TRANSLATIONS_DIR=translations
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ar.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ar.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ar.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ar.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[ar]=بريمج الإشعارات
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_cs_CZ.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_cs_CZ.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_cs_CZ.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_cs_CZ.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[cs_CZ]=Oznamovací démon
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_cs.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_cs.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_cs.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_cs.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[cs]=Oznamovací démon
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_da.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_da.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_da.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_da.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[da]=Notifikationsbaggrundsprogram
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_de.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_de.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_de.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_de.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[de]=Benachrichtigungsdaemon
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_el.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_el.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_el.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_el.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[el]=Υπηρεσία ειδοποιήσεων
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_eo.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_eo.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_eo.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_eo.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[eo]=Demono de atentigoj
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_es.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_es.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_es.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_es.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[es]=Demonio de notificaciones
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_es_VE.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_es_VE.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_es_VE.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_es_VE.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[es_VE]=Demonio de notificaciones
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_eu.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_eu.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_eu.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_eu.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[eu]=Jakinarazpen-deabrua
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_fi.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_fi.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_fi.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_fi.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[fi]=Ilmoituspalvelu
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_fr.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_fr.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_fr.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_fr.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[fr]=Démon de notification
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_hu.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_hu.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_hu.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_hu.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[hu]=Értesítő szolgáltatás
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_it_IT.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_it_IT.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_it_IT.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_it_IT.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[it_IT]=Demone delle notifiche
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ja.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ja.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ja.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ja.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[ja]=通知デーモン
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_lt.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_lt.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_lt.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_lt.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[lt]=Pranešimų tarnyba
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_nl.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_nl.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_nl.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_nl.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[nl]=notificatie Daemon
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pl_PL.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pl_PL.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pl_PL.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pl_PL.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[pl_PL]=Daemon Powiadomień
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pt_BR.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pt_BR.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pt_BR.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pt_BR.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[pt_BR]=Daemon de notificação
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pt.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pt.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_pt.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_pt.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[pt]=Serviço de notificações
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ro_RO.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ro_RO.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ro_RO.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ro_RO.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[ro_RO]=Daemon de notificare
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ru.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ru.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ru.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ru.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[ru]=демон Cообщение
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ru_RU.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ru_RU.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_ru_RU.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_ru_RU.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[ru_RU]=Служба уведомлений
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_sl.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_sl.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_sl.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_sl.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[sl]=Obvestilnik
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_th_TH.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_th_TH.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_th_TH.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_th_TH.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[th_TH]=ดีมอนการแจ้งเตือน
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_tr.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_tr.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_tr.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_tr.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[tr]=Bildirim Artsüreci
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_uk.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_uk.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_uk.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_uk.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[uk]=Демон сповіщень
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_zh_CN.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_zh_CN.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_zh_CN.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_zh_CN.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[zh_CN]=通知服务
diff -Nru lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_zh_TW.desktop lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_zh_TW.desktop
--- lxqt-notificationd-0.11.1/autostart/translations/lxqt-notifications_zh_TW.desktop 1970-01-01 00:00:00.000000000 +0000
+++ lxqt-notificationd-0.12.0/autostart/translations/lxqt-notifications_zh_TW.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -0,0 +1,2 @@
+# Translations
+Name[zh_TW]=系統通知程序
diff -Nru lxqt-notificationd-0.11.1/CHANGELOG lxqt-notificationd-0.12.0/CHANGELOG
--- lxqt-notificationd-0.11.1/CHANGELOG 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/CHANGELOG 2017-10-21 19:18:28.000000000 +0000
@@ -1,7 +1,37 @@
-lxqt-notificationd-0.11.1 / 2017-01-01
+lxqt-notificationd-0.12.0 / 2017-10-21
======================================
+ * Set patch version
+ * Don't export github templates
+ * Improvement for notification settings, see https://github.com/lxde/lxqt/issues/744#issuecomment-138601402
+ * Updated Lithuanian language
+ * Drops Qt5Core_VERSION_STRING
+ * lxqt-config-notificationd: set Qt::AA_UseHighDpiPixmaps to true
+ * Add a basic cli to lxqt-config-notificationd Add a basic cli to lxqt-notificationd
+ * Added default CMAKE_BUILD_TYPE and LXQT_NOTIFICATION_PATCH_VERSION
+ * Create lxqt-config-notificationd_pl_PL.desktop
+ * Fixes a FTBFS in superbuild mode
+ * Added merged autostart to CMakeLists.txt
+ * Updated *_da.desktop files and removed *_da_DK.desktop files
+ * Update desktop entries and Replace fr_FR by fr
+ * Update Greek translation (el) Remove country variant from language code
+ * CMake: Adds Runtime and Devel install COMPONENTs
+ * Coding style changes
+ * Updates the build system to use the Targets infrastructure
+ * Drops hardcoded /etc/xdg paths
+ * Updated german translation, replaced Qt4 by Qt in all xsession/translations
+ * Updates translations infrastructure
+ * Update the required minimum cmake version
+ * remove dead template lines switch OnlyShowIn from Razor -> LXQt stringchanges LxQt -> LXQt
+ * Support lxqt-session and add necessary xdg autostart desktop entry files.
+ * Fix a typo: singals -> signals
+ * Bump year
+
+0.11.1 / 2017-01-01
+===================
+
+ * Release 0.11.1: Update changelog
* Updated da translation. Removed da_DK
* Update and rename French .desktop file
* Make CMakeList.txt more uniform.
diff -Nru lxqt-notificationd-0.11.1/CMakeLists.txt lxqt-notificationd-0.12.0/CMakeLists.txt
--- lxqt-notificationd-0.11.1/CMakeLists.txt 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/CMakeLists.txt 2017-10-21 19:18:28.000000000 +0000
@@ -12,14 +12,24 @@
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
find_package(Qt5DBus REQUIRED)
-find_package(Qt5LinguistTools REQUIRED QUIET)
+find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5Widgets REQUIRED)
-message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+message(STATUS "Building with Qt${Qt5Core_VERSION}")
find_package(KF5WindowSystem REQUIRED)
find_package(lxqt REQUIRED)
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE Release)
+endif()
+
+# Patch Version
+set(LXQT_NOTIFICATIOND_PATCH_VERSION 0)
+
+set(LXQT_NOTIFICATIOND_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_NOTIFICATIOND_PATCH_VERSION})
+add_definitions("-DLXQT_NOTIFICATIOND_VERSION=\"${LXQT_NOTIFICATIOND_VERSION}\"")
+
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# Translations **********************************
@@ -27,3 +37,6 @@
add_subdirectory(config)
add_subdirectory(src)
+
+## merged from lxqt-common
+add_subdirectory(autostart)
diff -Nru lxqt-notificationd-0.11.1/config/basicsettings.cpp lxqt-notificationd-0.12.0/config/basicsettings.cpp
--- lxqt-notificationd-0.11.1/config/basicsettings.cpp 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/config/basicsettings.cpp 2017-10-21 19:18:28.000000000 +0000
@@ -43,7 +43,6 @@
connect(topCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(topRightRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(centerLeftRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
- connect(centerCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(centerRightRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(bottomLeftRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(bottomCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
@@ -79,8 +78,6 @@
topRightRB->setChecked(true);
else if (QStringLiteral("center-left") == placement)
centerLeftRB->setChecked(true);
- else if (QStringLiteral("center-center") == placement)
- centerCenterRB->setChecked(true);
else if (QStringLiteral("center-right") == placement)
centerRightRB->setChecked(true);
else if (QStringLiteral("bottom-left") == placement)
@@ -93,7 +90,7 @@
void BasicSettings::updateNotification()
{
- QString align;
+ QString align;
if (topLeftRB->isChecked())
align = QStringLiteral("top-left");
else if (topCenterRB->isChecked())
@@ -102,8 +99,6 @@
align = QStringLiteral("top-right");
else if (centerLeftRB->isChecked())
align = QStringLiteral("center-left");
- else if (centerCenterRB->isChecked())
- align = QStringLiteral("center-center");
else if (centerRightRB->isChecked())
align = QStringLiteral("center-right");
else if (bottomLeftRB->isChecked())
diff -Nru lxqt-notificationd-0.11.1/config/basicsettings.ui lxqt-notificationd-0.12.0/config/basicsettings.ui
--- lxqt-notificationd-0.11.1/config/basicsettings.ui 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/config/basicsettings.ui 2017-10-21 19:18:28.000000000 +0000
@@ -6,8 +6,8 @@
0
0
- 148
- 179
+ 398
+ 354
@@ -56,16 +56,6 @@
- -
-
-
-
-
-
- buttonGroup
-
-
-
-
@@ -158,6 +148,38 @@
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 100
+ 90
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+ QSizePolicy::Minimum
+
+
+
+ 100
+ 90
+
+
+
+
@@ -169,7 +191,7 @@
105
- 51
+ 21
diff -Nru lxqt-notificationd-0.11.1/config/main.cpp lxqt-notificationd-0.12.0/config/main.cpp
--- lxqt-notificationd-0.11.1/config/main.cpp 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/config/main.cpp 2017-10-21 19:18:28.000000000 +0000
@@ -29,6 +29,7 @@
#include
#include
+#include
#include "mainwindow.h"
@@ -36,6 +37,17 @@
int main(int argc, char** argv)
{
LXQt::SingleApplication a(argc, argv);
+ a.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+
+ QCommandLineParser parser;
+ parser.setApplicationDescription(QStringLiteral("LXQt Config Notificationd"));
+ const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION
+ "\nliblxqt " LXQT_VERSION
+ "\nQt " QT_VERSION_STR);
+ a.setApplicationVersion(VERINFO);
+ parser.addVersionOption();
+ parser.addHelpOption();
+ parser.process(a);
MainWindow w;
w.setWindowIcon(QIcon::fromTheme("preferences-desktop-theme"));
diff -Nru lxqt-notificationd-0.11.1/config/translations/lxqt-config-notificationd_lt.desktop lxqt-notificationd-0.12.0/config/translations/lxqt-config-notificationd_lt.desktop
--- lxqt-notificationd-0.11.1/config/translations/lxqt-config-notificationd_lt.desktop 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/config/translations/lxqt-config-notificationd_lt.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -1,4 +1,4 @@
# Translations
-GenericName[lt]=Qlipper
-Name[lt]=Energijos naudojimo nustatymai
-Comment[lt]=Konfigūruoti freedesktop pranešimus LXQt darbalaukyje
+GenericName[lt]=LXQt pranešimų nustatymai
+Name[lt]=Darbalaukio pranešimai
+Comment[lt]=Konfigūruoti darbalaukio pranešimus
diff -Nru lxqt-notificationd-0.11.1/config/translations/lxqt-config-notificationd_pl_PL.desktop lxqt-notificationd-0.12.0/config/translations/lxqt-config-notificationd_pl_PL.desktop
--- lxqt-notificationd-0.11.1/config/translations/lxqt-config-notificationd_pl_PL.desktop 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/config/translations/lxqt-config-notificationd_pl_PL.desktop 2017-10-21 19:18:28.000000000 +0000
@@ -1,4 +1,4 @@
# Translations
-GenericName[pl_PL]=Konfiguracja wyglądu LXQt
-Name[pl_PL]=Konfiguracja wyglądu LXQt
-Comment[pl_PL]=Konfiguruj powiadomienia freedesktop w LXQt
+Name[pl_PL]=Powiadomienia ekranowe
+GenericName[pl_PL]=Ustawienia powiadomień LXQt
+Comment[pl_PL]=Konfiguruj powiadomienia ekranowe
diff -Nru lxqt-notificationd-0.11.1/debian/changelog lxqt-notificationd-0.12.0/debian/changelog
--- lxqt-notificationd-0.11.1/debian/changelog 2017-11-03 22:18:19.000000000 +0000
+++ lxqt-notificationd-0.12.0/debian/changelog 2017-10-24 16:24:23.000000000 +0000
@@ -1,8 +1,11 @@
-lxqt-notificationd (0.11.1-2build1) bionic; urgency=medium
+lxqt-notificationd (0.12.0-1) experimental; urgency=medium
- * No-change rebuild against qtbase5-private-dev.
+ * Cherry-picking upstream release 0.11.0.
+ * Bumped Standards to 4.1.1 - no changes needed
+ * Bumped liblxqt dependency to >= 0.12.0
+ * Added Breaks/Replaces for lxqt-common << 0.12.0
- -- Simon Quigley Fri, 03 Nov 2017 17:18:19 -0500
+ -- Alf Gaida Tue, 24 Oct 2017 18:24:23 +0200
lxqt-notificationd (0.11.1-2) unstable; urgency=medium
diff -Nru lxqt-notificationd-0.11.1/debian/control lxqt-notificationd-0.12.0/debian/control
--- lxqt-notificationd-0.11.1/debian/control 2017-06-30 18:56:57.000000000 +0000
+++ lxqt-notificationd-0.12.0/debian/control 2017-10-24 16:09:18.000000000 +0000
@@ -7,14 +7,14 @@
Priority: optional
Build-Depends: debhelper (>= 10),
libkf5windowsystem-dev,
- liblxqt0-dev (>= 0.11.1),
+ liblxqt0-dev (>= 0.12.0),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
qtbase5-private-dev
-Standards-Version: 4.0.0
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/sid
-Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/sid
+Standards-Version: 4.1.1
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/experimental
+Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/experimental
Homepage: https://github.com/lxde/lxqt-notificationd
Package: lxqt-notificationd
@@ -23,6 +23,8 @@
${shlibs:Depends}
Recommends: lxqt-notificationd-l10n,
lxqt-qtplugin
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
Provides: notification-daemon
Description: LXQt notification daemon
The LXQt notification daemon.
diff -Nru lxqt-notificationd-0.11.1/debian/gbp.conf lxqt-notificationd-0.12.0/debian/gbp.conf
--- lxqt-notificationd-0.11.1/debian/gbp.conf 2017-01-02 12:39:45.000000000 +0000
+++ lxqt-notificationd-0.12.0/debian/gbp.conf 2017-10-24 16:09:34.000000000 +0000
@@ -1,5 +1,5 @@
[DEFAULT]
-debian-branch = debian/sid
+debian-branch = debian/experimental
upstream-branch = upstream/latest
pristine-tar = True
diff -Nru lxqt-notificationd-0.11.1/src/main.cpp lxqt-notificationd-0.12.0/src/main.cpp
--- lxqt-notificationd-0.11.1/src/main.cpp 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/src/main.cpp 2017-10-21 19:18:28.000000000 +0000
@@ -27,6 +27,7 @@
#include
#include
+#include
#include
@@ -66,9 +67,18 @@
int main(int argc, char** argv)
{
LXQt::Application a(argc, argv);
-
a.setQuitOnLastWindowClosed(false);
+ QCommandLineParser parser;
+ parser.setApplicationDescription(QStringLiteral("LXQt Notification Daemon"));
+ const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION
+ "\nliblxqt " LXQT_VERSION
+ "\nQt " QT_VERSION_STR);
+ a.setApplicationVersion(VERINFO);
+ parser.addVersionOption();
+ parser.addHelpOption();
+ parser.process(a);
+
// Ensure the helper widgets are hidden
a.setStyleSheet(a.styleSheet() +
"NotificationArea {background: transparent;}"
diff -Nru lxqt-notificationd-0.11.1/src/notifyd.h lxqt-notificationd-0.12.0/src/notifyd.h
--- lxqt-notificationd-0.11.1/src/notifyd.h 2017-01-01 22:12:42.000000000 +0000
+++ lxqt-notificationd-0.12.0/src/notifyd.h 2017-10-21 19:18:28.000000000 +0000
@@ -109,7 +109,7 @@
*/
void NotificationClosed(uint in0, uint in1);
- // singals for our implementation - internal usage
+ // signals for our implementation - internal usage
/*! Promote the external request for notification closing into the display engine.
* \param id an notification ID (obtained from \c Notify)