From d52362de8e4cc0ee30484507e5e00271b2bb8169 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 4 Dec 2017 22:38:48 +0100 Subject: [PATCH] Cherry-picking upstream version 0.12.0. --- AUTHORS | 2 +- CHANGELOG | 32 ++++++++++++- CMakeLists.txt | 17 ++++++- autostart/CMakeLists.txt | 17 +++++++ autostart/lxqt-notifications.desktop.in | 9 ++++ .../lxqt-notifications_ar.desktop | 2 + .../lxqt-notifications_cs.desktop | 2 + .../lxqt-notifications_cs_CZ.desktop | 2 + .../lxqt-notifications_da.desktop | 2 + .../lxqt-notifications_de.desktop | 2 + .../lxqt-notifications_el.desktop | 2 + .../lxqt-notifications_eo.desktop | 2 + .../lxqt-notifications_es.desktop | 2 + .../lxqt-notifications_es_VE.desktop | 2 + .../lxqt-notifications_eu.desktop | 2 + .../lxqt-notifications_fi.desktop | 2 + .../lxqt-notifications_fr.desktop | 2 + .../lxqt-notifications_hu.desktop | 2 + .../lxqt-notifications_it_IT.desktop | 2 + .../lxqt-notifications_ja.desktop | 2 + .../lxqt-notifications_lt.desktop | 2 + .../lxqt-notifications_nl.desktop | 2 + .../lxqt-notifications_pl_PL.desktop | 2 + .../lxqt-notifications_pt.desktop | 2 + .../lxqt-notifications_pt_BR.desktop | 2 + .../lxqt-notifications_ro_RO.desktop | 2 + .../lxqt-notifications_ru.desktop | 2 + .../lxqt-notifications_ru_RU.desktop | 2 + .../lxqt-notifications_sl.desktop | 2 + .../lxqt-notifications_th_TH.desktop | 2 + .../lxqt-notifications_tr.desktop | 2 + .../lxqt-notifications_uk.desktop | 2 + .../lxqt-notifications_zh_CN.desktop | 2 + .../lxqt-notifications_zh_TW.desktop | 2 + config/basicsettings.cpp | 7 +-- config/basicsettings.ui | 48 ++++++++++++++----- config/main.cpp | 12 +++++ .../lxqt-config-notificationd_lt.desktop | 6 +-- .../lxqt-config-notificationd_pl_PL.desktop | 6 +-- src/main.cpp | 12 ++++- src/notifyd.h | 2 +- 41 files changed, 197 insertions(+), 31 deletions(-) create mode 100644 autostart/CMakeLists.txt create mode 100644 autostart/lxqt-notifications.desktop.in create mode 100644 autostart/translations/lxqt-notifications_ar.desktop create mode 100644 autostart/translations/lxqt-notifications_cs.desktop create mode 100644 autostart/translations/lxqt-notifications_cs_CZ.desktop create mode 100644 autostart/translations/lxqt-notifications_da.desktop create mode 100644 autostart/translations/lxqt-notifications_de.desktop create mode 100644 autostart/translations/lxqt-notifications_el.desktop create mode 100644 autostart/translations/lxqt-notifications_eo.desktop create mode 100644 autostart/translations/lxqt-notifications_es.desktop create mode 100644 autostart/translations/lxqt-notifications_es_VE.desktop create mode 100644 autostart/translations/lxqt-notifications_eu.desktop create mode 100644 autostart/translations/lxqt-notifications_fi.desktop create mode 100644 autostart/translations/lxqt-notifications_fr.desktop create mode 100644 autostart/translations/lxqt-notifications_hu.desktop create mode 100644 autostart/translations/lxqt-notifications_it_IT.desktop create mode 100644 autostart/translations/lxqt-notifications_ja.desktop create mode 100644 autostart/translations/lxqt-notifications_lt.desktop create mode 100644 autostart/translations/lxqt-notifications_nl.desktop create mode 100644 autostart/translations/lxqt-notifications_pl_PL.desktop create mode 100644 autostart/translations/lxqt-notifications_pt.desktop create mode 100644 autostart/translations/lxqt-notifications_pt_BR.desktop create mode 100644 autostart/translations/lxqt-notifications_ro_RO.desktop create mode 100644 autostart/translations/lxqt-notifications_ru.desktop create mode 100644 autostart/translations/lxqt-notifications_ru_RU.desktop create mode 100644 autostart/translations/lxqt-notifications_sl.desktop create mode 100644 autostart/translations/lxqt-notifications_th_TH.desktop create mode 100644 autostart/translations/lxqt-notifications_tr.desktop create mode 100644 autostart/translations/lxqt-notifications_uk.desktop create mode 100644 autostart/translations/lxqt-notifications_zh_CN.desktop create mode 100644 autostart/translations/lxqt-notifications_zh_TW.desktop diff --git a/AUTHORS b/AUTHORS index a66be6d..abb6e1f 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: 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 --git a/CHANGELOG b/CHANGELOG index 52e9afc..0aef0e7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 --git a/CMakeLists.txt b/CMakeLists.txt index c79e8c3..07666af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,14 +12,24 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) 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 @@ include(LXQtTranslate) add_subdirectory(config) add_subdirectory(src) + +## merged from lxqt-common +add_subdirectory(autostart) diff --git a/autostart/CMakeLists.txt b/autostart/CMakeLists.txt new file mode 100644 index 0000000..540204c --- /dev/null +++ b/autostart/CMakeLists.txt @@ -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 --git a/autostart/lxqt-notifications.desktop.in b/autostart/lxqt-notifications.desktop.in new file mode 100644 index 0000000..526c85d --- /dev/null +++ b/autostart/lxqt-notifications.desktop.in @@ -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 --git a/autostart/translations/lxqt-notifications_ar.desktop b/autostart/translations/lxqt-notifications_ar.desktop new file mode 100644 index 0000000..94fda71 --- /dev/null +++ b/autostart/translations/lxqt-notifications_ar.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ar]=بريمج الإشعارات diff --git a/autostart/translations/lxqt-notifications_cs.desktop b/autostart/translations/lxqt-notifications_cs.desktop new file mode 100644 index 0000000..dbfc200 --- /dev/null +++ b/autostart/translations/lxqt-notifications_cs.desktop @@ -0,0 +1,2 @@ +# Translations +Name[cs]=Oznamovací démon diff --git a/autostart/translations/lxqt-notifications_cs_CZ.desktop b/autostart/translations/lxqt-notifications_cs_CZ.desktop new file mode 100644 index 0000000..d0d09ba --- /dev/null +++ b/autostart/translations/lxqt-notifications_cs_CZ.desktop @@ -0,0 +1,2 @@ +# Translations +Name[cs_CZ]=Oznamovací démon diff --git a/autostart/translations/lxqt-notifications_da.desktop b/autostart/translations/lxqt-notifications_da.desktop new file mode 100644 index 0000000..220815a --- /dev/null +++ b/autostart/translations/lxqt-notifications_da.desktop @@ -0,0 +1,2 @@ +# Translations +Name[da]=Notifikationsbaggrundsprogram diff --git a/autostart/translations/lxqt-notifications_de.desktop b/autostart/translations/lxqt-notifications_de.desktop new file mode 100644 index 0000000..aaf455a --- /dev/null +++ b/autostart/translations/lxqt-notifications_de.desktop @@ -0,0 +1,2 @@ +# Translations +Name[de]=Benachrichtigungsdaemon diff --git a/autostart/translations/lxqt-notifications_el.desktop b/autostart/translations/lxqt-notifications_el.desktop new file mode 100644 index 0000000..fac7a42 --- /dev/null +++ b/autostart/translations/lxqt-notifications_el.desktop @@ -0,0 +1,2 @@ +# Translations +Name[el]=Υπηρεσία ειδοποιήσεων diff --git a/autostart/translations/lxqt-notifications_eo.desktop b/autostart/translations/lxqt-notifications_eo.desktop new file mode 100644 index 0000000..a107c79 --- /dev/null +++ b/autostart/translations/lxqt-notifications_eo.desktop @@ -0,0 +1,2 @@ +# Translations +Name[eo]=Demono de atentigoj diff --git a/autostart/translations/lxqt-notifications_es.desktop b/autostart/translations/lxqt-notifications_es.desktop new file mode 100644 index 0000000..8c530f9 --- /dev/null +++ b/autostart/translations/lxqt-notifications_es.desktop @@ -0,0 +1,2 @@ +# Translations +Name[es]=Demonio de notificaciones diff --git a/autostart/translations/lxqt-notifications_es_VE.desktop b/autostart/translations/lxqt-notifications_es_VE.desktop new file mode 100644 index 0000000..fe338c0 --- /dev/null +++ b/autostart/translations/lxqt-notifications_es_VE.desktop @@ -0,0 +1,2 @@ +# Translations +Name[es_VE]=Demonio de notificaciones diff --git a/autostart/translations/lxqt-notifications_eu.desktop b/autostart/translations/lxqt-notifications_eu.desktop new file mode 100644 index 0000000..07feb4b --- /dev/null +++ b/autostart/translations/lxqt-notifications_eu.desktop @@ -0,0 +1,2 @@ +# Translations +Name[eu]=Jakinarazpen-deabrua diff --git a/autostart/translations/lxqt-notifications_fi.desktop b/autostart/translations/lxqt-notifications_fi.desktop new file mode 100644 index 0000000..850073f --- /dev/null +++ b/autostart/translations/lxqt-notifications_fi.desktop @@ -0,0 +1,2 @@ +# Translations +Name[fi]=Ilmoituspalvelu diff --git a/autostart/translations/lxqt-notifications_fr.desktop b/autostart/translations/lxqt-notifications_fr.desktop new file mode 100644 index 0000000..0c67a93 --- /dev/null +++ b/autostart/translations/lxqt-notifications_fr.desktop @@ -0,0 +1,2 @@ +# Translations +Name[fr]=Démon de notification diff --git a/autostart/translations/lxqt-notifications_hu.desktop b/autostart/translations/lxqt-notifications_hu.desktop new file mode 100644 index 0000000..24bedc6 --- /dev/null +++ b/autostart/translations/lxqt-notifications_hu.desktop @@ -0,0 +1,2 @@ +# Translations +Name[hu]=Értesítő szolgáltatás diff --git a/autostart/translations/lxqt-notifications_it_IT.desktop b/autostart/translations/lxqt-notifications_it_IT.desktop new file mode 100644 index 0000000..3630595 --- /dev/null +++ b/autostart/translations/lxqt-notifications_it_IT.desktop @@ -0,0 +1,2 @@ +# Translations +Name[it_IT]=Demone delle notifiche diff --git a/autostart/translations/lxqt-notifications_ja.desktop b/autostart/translations/lxqt-notifications_ja.desktop new file mode 100644 index 0000000..713c937 --- /dev/null +++ b/autostart/translations/lxqt-notifications_ja.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ja]=通知デーモン diff --git a/autostart/translations/lxqt-notifications_lt.desktop b/autostart/translations/lxqt-notifications_lt.desktop new file mode 100644 index 0000000..6cee138 --- /dev/null +++ b/autostart/translations/lxqt-notifications_lt.desktop @@ -0,0 +1,2 @@ +# Translations +Name[lt]=Pranešimų tarnyba diff --git a/autostart/translations/lxqt-notifications_nl.desktop b/autostart/translations/lxqt-notifications_nl.desktop new file mode 100644 index 0000000..d30048e --- /dev/null +++ b/autostart/translations/lxqt-notifications_nl.desktop @@ -0,0 +1,2 @@ +# Translations +Name[nl]=notificatie Daemon diff --git a/autostart/translations/lxqt-notifications_pl_PL.desktop b/autostart/translations/lxqt-notifications_pl_PL.desktop new file mode 100644 index 0000000..0618018 --- /dev/null +++ b/autostart/translations/lxqt-notifications_pl_PL.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pl_PL]=Daemon Powiadomień diff --git a/autostart/translations/lxqt-notifications_pt.desktop b/autostart/translations/lxqt-notifications_pt.desktop new file mode 100644 index 0000000..4a752f0 --- /dev/null +++ b/autostart/translations/lxqt-notifications_pt.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pt]=Serviço de notificações diff --git a/autostart/translations/lxqt-notifications_pt_BR.desktop b/autostart/translations/lxqt-notifications_pt_BR.desktop new file mode 100644 index 0000000..c5489dd --- /dev/null +++ b/autostart/translations/lxqt-notifications_pt_BR.desktop @@ -0,0 +1,2 @@ +# Translations +Name[pt_BR]=Daemon de notificação diff --git a/autostart/translations/lxqt-notifications_ro_RO.desktop b/autostart/translations/lxqt-notifications_ro_RO.desktop new file mode 100644 index 0000000..3595a63 --- /dev/null +++ b/autostart/translations/lxqt-notifications_ro_RO.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ro_RO]=Daemon de notificare diff --git a/autostart/translations/lxqt-notifications_ru.desktop b/autostart/translations/lxqt-notifications_ru.desktop new file mode 100644 index 0000000..74400fc --- /dev/null +++ b/autostart/translations/lxqt-notifications_ru.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ru]=демон Cообщение diff --git a/autostart/translations/lxqt-notifications_ru_RU.desktop b/autostart/translations/lxqt-notifications_ru_RU.desktop new file mode 100644 index 0000000..0d5ae8a --- /dev/null +++ b/autostart/translations/lxqt-notifications_ru_RU.desktop @@ -0,0 +1,2 @@ +# Translations +Name[ru_RU]=Служба уведомлений diff --git a/autostart/translations/lxqt-notifications_sl.desktop b/autostart/translations/lxqt-notifications_sl.desktop new file mode 100644 index 0000000..eee7519 --- /dev/null +++ b/autostart/translations/lxqt-notifications_sl.desktop @@ -0,0 +1,2 @@ +# Translations +Name[sl]=Obvestilnik diff --git a/autostart/translations/lxqt-notifications_th_TH.desktop b/autostart/translations/lxqt-notifications_th_TH.desktop new file mode 100644 index 0000000..d776fde --- /dev/null +++ b/autostart/translations/lxqt-notifications_th_TH.desktop @@ -0,0 +1,2 @@ +# Translations +Name[th_TH]=ดีมอนการแจ้งเตือน diff --git a/autostart/translations/lxqt-notifications_tr.desktop b/autostart/translations/lxqt-notifications_tr.desktop new file mode 100644 index 0000000..3007942 --- /dev/null +++ b/autostart/translations/lxqt-notifications_tr.desktop @@ -0,0 +1,2 @@ +# Translations +Name[tr]=Bildirim Artsüreci diff --git a/autostart/translations/lxqt-notifications_uk.desktop b/autostart/translations/lxqt-notifications_uk.desktop new file mode 100644 index 0000000..3eff111 --- /dev/null +++ b/autostart/translations/lxqt-notifications_uk.desktop @@ -0,0 +1,2 @@ +# Translations +Name[uk]=Демон сповіщень diff --git a/autostart/translations/lxqt-notifications_zh_CN.desktop b/autostart/translations/lxqt-notifications_zh_CN.desktop new file mode 100644 index 0000000..e6d86b6 --- /dev/null +++ b/autostart/translations/lxqt-notifications_zh_CN.desktop @@ -0,0 +1,2 @@ +# Translations +Name[zh_CN]=通知服务 diff --git a/autostart/translations/lxqt-notifications_zh_TW.desktop b/autostart/translations/lxqt-notifications_zh_TW.desktop new file mode 100644 index 0000000..fce6aba --- /dev/null +++ b/autostart/translations/lxqt-notifications_zh_TW.desktop @@ -0,0 +1,2 @@ +# Translations +Name[zh_TW]=系統通知程序 diff --git a/config/basicsettings.cpp b/config/basicsettings.cpp index 35f3e21..e8aa9f8 100644 --- a/config/basicsettings.cpp +++ b/config/basicsettings.cpp @@ -43,7 +43,6 @@ BasicSettings::BasicSettings(LXQt::Settings* settings, QWidget *parent) : 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 @@ void BasicSettings::restoreSettings() 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::restoreSettings() void BasicSettings::updateNotification() { - QString align; + QString align; if (topLeftRB->isChecked()) align = QStringLiteral("top-left"); else if (topCenterRB->isChecked()) @@ -102,8 +99,6 @@ void BasicSettings::updateNotification() 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 --git a/config/basicsettings.ui b/config/basicsettings.ui index c7bccb3..7681b1d 100644 --- a/config/basicsettings.ui +++ b/config/basicsettings.ui @@ -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 --git a/config/main.cpp b/config/main.cpp index 06c7550..6dddae0 100644 --- a/config/main.cpp +++ b/config/main.cpp @@ -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 --git a/config/translations/lxqt-config-notificationd_lt.desktop b/config/translations/lxqt-config-notificationd_lt.desktop index d2d072e..6bcc15b 100644 --- a/config/translations/lxqt-config-notificationd_lt.desktop +++ b/config/translations/lxqt-config-notificationd_lt.desktop @@ -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 --git a/config/translations/lxqt-config-notificationd_pl_PL.desktop b/config/translations/lxqt-config-notificationd_pl_PL.desktop index d6a8abe..a29bab0 100644 --- a/config/translations/lxqt-config-notificationd_pl_PL.desktop +++ b/config/translations/lxqt-config-notificationd_pl_PL.desktop @@ -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 --git a/src/main.cpp b/src/main.cpp index 642e101..fc49d10 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 --git a/src/notifyd.h b/src/notifyd.h index 6ffeac5..2c6ef73 100644 --- a/src/notifyd.h +++ b/src/notifyd.h @@ -109,7 +109,7 @@ signals: */ 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)