Adding upstream version 0.9.0+20151028.

Adding upstream version 0.9.0+20150903.
Adding upstream version 0.9.0+20150830.
2015-10-30 01:25:18 +01:00 · 2015-09-24 23:14:46 +02:00 · 2015-09-02 21:40:04 +02:00 · 2015-08-16 03:05:15 +08:00
68 changed files with 1093 additions and 327 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-build
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)

 project(lxqt-notificationd)

@ -7,6 +7,7 @@ option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" O
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)

 find_package(Qt5Widgets REQUIRED QUIET)
 find_package(Qt5DBus REQUIRED QUIET)
@ -14,11 +15,9 @@ find_package(Qt5LinguistTools REQUIRED QUIET)
 find_package(KF5WindowSystem REQUIRED QUIET)

 find_package(lxqt REQUIRED QUIET)
-find_package(qt5xdg REQUIRED)
-
-include(${LXQT_USE_FILE})
-include(${QTXDG_USE_FILE})

+include(GNUInstallDirs)
+include(LXQtCompilerSettings NO_POLICY_SCOPE)
 include(LXQtTranslate)

 add_subdirectory(src)
--- a/config/CMakeLists.txt
+++ b/config/CMakeLists.txt
@ -1,10 +1,5 @@
 project(lxqt-config-notificationd)

-include_directories (
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
 set(NOTIFICATIONS_CONF_SRC
    advancedsettings.cpp
    basicsettings.cpp
@ -19,8 +14,9 @@ set(NOTIFICATIONS_CONF_UI


 # Translations **********************************
-lxqt_translate_ts(NOTIFICATIONS_CONF_QM SOURCES
+lxqt_translate_ts(NOTIFICATIONS_CONF_QM
    UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS}
+    SOURCES
    ${NOTIFICATIONS_CONF_MOC}
    ${NOTIFICATIONS_CONF_SRC}
    ${NOTIFICATIONS_CONF_UI}
@ -31,11 +27,9 @@ lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
 lxqt_translate_desktop(DESKTOP_FILES SOURCES lxqt-config-notificationd.desktop.in)
 #************************************************

-qt5_wrap_ui(NOTIFICATIONS_CONF_UI_CPP ${NOTIFICATIONS_CONF_UI})

 add_executable(${PROJECT_NAME}
    ${NOTIFICATIONS_CONF_SRC}
-    ${NOTIFICATIONS_CONF_UI_CPP}
    ${NOTIFICATIONS_CONF_QM}
    ${DESKTOP_FILES}
    ${QM_LOADER}
@ -44,8 +38,16 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
    KF5::WindowSystem
    Qt5::Widgets
-    ${LXQT_LIBRARIES}
+    lxqt
 )

-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-install(FILES ${DESKTOP_FILES} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
+install(TARGETS
+    ${PROJECT_NAME}
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)
+install(FILES
+    ${DESKTOP_FILES}
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
+    COMPONENT Runtime
+)
--- a/config/advancedsettings.cpp
+++ b/config/advancedsettings.cpp
@ -31,7 +31,7 @@
 #include "mainwindow.h"


-AdvancedSettings::AdvancedSettings(LxQt::Settings* settings, QWidget *parent):
+AdvancedSettings::AdvancedSettings(LXQt::Settings* settings, QWidget *parent):
    QWidget(parent),
    mSettings(settings)
 {
--- a/config/advancedsettings.h
+++ b/config/advancedsettings.h
@ -37,14 +37,14 @@ class AdvancedSettings : public QWidget, public Ui::AdvancedSettings
    Q_OBJECT

 public:
-    explicit AdvancedSettings(LxQt::Settings* settings, QWidget* parent = 0);
+    explicit AdvancedSettings(LXQt::Settings* settings, QWidget* parent = 0);
    ~AdvancedSettings();

 public slots:
    void restoreSettings();

 private:
-    LxQt::Settings* mSettings;
+    LXQt::Settings* mSettings;

 private slots:
    void save();
--- a/config/advancedsettings.ui
+++ b/config/advancedsettings.ui
@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>340</width>
-    <height>284</height>
+    <width>350</width>
+    <height>301</height>
   </rect>
  </property>
  <layout class="QGridLayout" name="gridLayout_2">
@ -70,6 +70,12 @@
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
       <widget class="QLabel" name="label_3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
        <property name="text">
         <string>Some notifications set their own on-screen duration.</string>
        </property>
@ -92,6 +98,9 @@
          <property name="suffix">
           <string> sec</string>
          </property>
+          <property name="maximum">
+           <number>7200</number>
+          </property>
         </widget>
        </item>
       </layout>
--- a/config/basicsettings.cpp
+++ b/config/basicsettings.cpp
@ -31,7 +31,7 @@
 #include "mainwindow.h"


-BasicSettings::BasicSettings(LxQt::Settings* settings, QWidget *parent) :
+BasicSettings::BasicSettings(LXQt::Settings* settings, QWidget *parent) :
    QWidget(parent),
    mSettings(settings)
 {
@ -39,28 +39,26 @@ BasicSettings::BasicSettings(LxQt::Settings* settings, QWidget *parent) :

    restoreSettings();

-    connect(topLeftButton, SIGNAL(clicked()), this, SLOT(updateNotification()));
-    connect(topRightButton, SIGNAL(clicked()), this, SLOT(updateNotification()));
-    connect(bottomRightButton, SIGNAL(clicked()), this, SLOT(updateNotification()));
-    connect(bottomLeftButton, SIGNAL(clicked()), this, SLOT(updateNotification()));
+    connect(topLeftRB,      SIGNAL(clicked()), this, SLOT(updateNotification()));
+    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()));
+    connect(bottomRightRB,  SIGNAL(clicked()), this, SLOT(updateNotification()));

-    LxQt::Notification serverTest;
+    LXQt::Notification serverTest;
    QString serverName = serverTest.serverInfo().name;
    if (serverName != "lxqt-notificationd")
    {
        if (serverName.isEmpty())
-        {
-            warningLabel->setText(tr(
-                "<b>Warning:</b> No notifications daemon is running.\n"
-                "A fallback will be used."));
-        }
+            warningLabel->setText(tr("<b>Warning:</b> No notifications daemon is running.\n"
+            "A fallback will be used."));
        else
-        {
-            warningLabel->setText(tr(
-                "<b>Warning:</b> A third-party notifications daemon (%1) is running.\n"
-                "These settings won't have any effect on it!"
-                ).arg(serverName));
-        }
+            warningLabel->setText(tr("<b>Warning:</b> A third-party notifications daemon (%1) is running.\n"
+            "These settings won't have any effect on it!").arg(serverName));
    }
 }

@ -70,33 +68,53 @@ BasicSettings::~BasicSettings()

 void BasicSettings::restoreSettings()
 {
-    QString placement = mSettings->value("placement", "bottom-right").toString().toLower();
-    if (placement == "bottom-right")
-        bottomRightButton->setChecked(true);
-    else if (placement == "bottom-left")
-        bottomLeftButton->setChecked(true);
-    else if (placement == "top-right")
-        topRightButton->setChecked(true);
-    else if (placement == "top-left")
-        topLeftButton->setChecked(true);
-    else
-        bottomRightButton->setChecked(true);
+    QString placement = mSettings->value(QStringLiteral("placement"),
+                                         QStringLiteral("bottom-right")).toString().toLower();
+
+    if (QStringLiteral("top-left") == placement)
+        topLeftRB->setChecked(true);
+    else if (QStringLiteral("top-center") == placement)
+        topCenterRB->setChecked(true);
+    else if (QStringLiteral("top-right") == placement)
+        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)
+        bottomLeftRB->setChecked(true);
+    else if (QStringLiteral("bottom-center") == placement)
+        bottomCenterRB->setChecked(true);
+    else if (QStringLiteral("bottom-right") == placement)
+        bottomRightRB->setChecked(true);
 }

 void BasicSettings::updateNotification()
 {
-    if (bottomRightButton->isChecked())
-        mSettings->setValue("placement", "bottom-right");
-    else if (bottomLeftButton->isChecked())
-        mSettings->setValue("placement", "bottom-left");
-    else if (topRightButton->isChecked())
-        mSettings->setValue("placement", "top-right");
-    else if (topLeftButton->isChecked())
-        mSettings->setValue("placement", "top-left");
+    QString align;
+    if (topLeftRB->isChecked())
+        align = QStringLiteral("top-left");
+    else if (topCenterRB->isChecked())
+        align = QStringLiteral("top-center");
+    else if (topRightRB->isChecked())
+        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())
+        align = QStringLiteral("bottom-left");
+    else if (bottomCenterRB->isChecked())
+        align = QStringLiteral("bottom-center");
+    else // if (bottomRightRB->isChecked())
+        align = QStringLiteral("bottom-right");

-    LxQt::Notification::notify(//"lxqt-config-notificationd",
-                              tr("Notification demo"),
-                              tr("This is a test notification.\n"
-                                 "All notifications will now appear here on LXQt."),
-                              "lxqt-logo.png");
+    mSettings->setValue(QStringLiteral("placement"), align);
+    LXQt::Notification::notify(tr("Notification demo ") + align,
+                               tr("This is a test notification.\n All notifications will now appear here on LXQt."),
+                               QStringLiteral("lxqt-logo.png"));
 }
--- a/config/basicsettings.h
+++ b/config/basicsettings.h
@ -37,7 +37,7 @@ class BasicSettings : public QWidget, public Ui::BasicSettings
 {
    Q_OBJECT
 public:
-    explicit BasicSettings(LxQt::Settings* settings, QWidget* parent = 0);
+    explicit BasicSettings(LXQt::Settings* settings, QWidget* parent = 0);
    ~BasicSettings();

 public slots:
@ -47,7 +47,7 @@ private slots:
    void updateNotification();

 private:
-    LxQt::Settings* mSettings;
+    LXQt::Settings* mSettings;
 };

 #endif // BASICSETTINGS_H
--- a/config/basicsettings.ui
+++ b/config/basicsettings.ui
@ -6,12 +6,12 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>244</width>
-    <height>218</height>
+    <width>148</width>
+    <height>179</height>
   </rect>
  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
    <widget class="QLabel" name="label">
     <property name="font">
      <font>
@ -24,44 +24,144 @@
     </property>
    </widget>
   </item>
-   <item row="1" column="0" colspan="2">
+   <item>
    <widget class="QGroupBox" name="groupBox">
     <property name="title">
      <string>Position on screen</string>
     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QRadioButton" name="topLeftButton">
+      <item row="2" column="4">
+       <widget class="QRadioButton" name="bottomRightRB">
        <property name="text">
-         <string>Top/Left</string>
+         <string/>
        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QRadioButton" name="centerRightRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QRadioButton" name="centerCenterRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
       </widget>
      </item>
      <item row="0" column="1">
-       <widget class="QRadioButton" name="topRightButton">
-        <property name="text">
-         <string>Top/Right</string>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="2">
+       <widget class="QRadioButton" name="topCenterRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QRadioButton" name="bottomCenterRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QRadioButton" name="topLeftRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
+       </widget>
+      </item>
+      <item row="0" column="4">
+       <widget class="QRadioButton" name="topRightRB">
+        <property name="text">
+         <string/>
+        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
       </widget>
      </item>
      <item row="1" column="0">
-       <widget class="QRadioButton" name="bottomLeftButton">
+       <widget class="QRadioButton" name="centerLeftRB">
        <property name="text">
-         <string>Bottom/Left</string>
+         <string/>
        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
       </widget>
      </item>
-      <item row="1" column="1">
-       <widget class="QRadioButton" name="bottomRightButton">
+      <item row="2" column="0">
+       <widget class="QRadioButton" name="bottomLeftRB">
        <property name="text">
-         <string>Bottom/Right</string>
+         <string/>
        </property>
+        <attribute name="buttonGroup">
+         <string notr="true">buttonGroup</string>
+        </attribute>
       </widget>
      </item>
+      <item row="0" column="3">
+       <spacer name="horizontalSpacer_2">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
     </layout>
    </widget>
   </item>
-   <item row="3" column="1">
+   <item>
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
@ -74,7 +174,7 @@
     </property>
    </spacer>
   </item>
-   <item row="4" column="0" colspan="2">
+   <item>
    <widget class="QLabel" name="warningLabel">
     <property name="wordWrap">
      <bool>true</bool>
@ -85,4 +185,7 @@
 </widget>
 <resources/>
 <connections/>
+ <buttongroups>
+  <buttongroup name="buttonGroup"/>
+ </buttongroups>
 </ui>
--- a/config/lxqt-config-notificationd.desktop.in
+++ b/config/lxqt-config-notificationd.desktop.in
@ -6,6 +6,6 @@ Comment=Configure desktop notifications
 Exec=lxqt-config-notificationd
 Icon=preferences-desktop-theme
 Categories=Settings;DesktopSettings;Qt;LXQt;
-OnlyShowIn=LXQt;LXDE;
+OnlyShowIn=LXQt;

 #TRANSLATIONS_DIR=translations
--- a/config/main.cpp
+++ b/config/main.cpp
@ -35,7 +35,7 @@

 int main(int argc, char** argv)
 {
-    LxQt::SingleApplication a(argc, argv);
+    LXQt::SingleApplication a(argc, argv);

    MainWindow w;
    w.setWindowIcon(QIcon::fromTheme("preferences-desktop-theme"));
--- a/config/mainwindow.cpp
+++ b/config/mainwindow.cpp
@ -37,7 +37,7 @@


 MainWindow::MainWindow(QWidget *parent) :
-    LxQt::ConfigDialog(tr("Desktop Notifications"), new LxQt::Settings("notifications"), parent)
+    LXQt::ConfigDialog(tr("Desktop Notifications"), new LXQt::Settings("notifications"), parent)
 {
    BasicSettings* basic = new BasicSettings(mSettings, this);
    addPage(basic, tr("Basic Settings"), "preferences-desktop-notification");
--- a/config/mainwindow.h
+++ b/config/mainwindow.h
@ -31,7 +31,7 @@
 #include <LXQt/ConfigDialog>


-class MainWindow : public LxQt::ConfigDialog
+class MainWindow : public LXQt::ConfigDialog
 {
    Q_OBJECT

--- a/config/translations/lxqt-config-notificationd.ts
+++ b/config/translations/lxqt-config-notificationd.ts
@ -1,105 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1">
 <context>
    <name>AdvancedSettings</name>
    <message>
-        <source>Menu Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Notification Duration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>For some the notification&apos;s expiration time is dependent on the notification server&apos;s settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&quot;Server Decides&quot; Time:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> sec</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
+        <location filename="../advancedsettings.ui" line="17"/>
        <source>Sizes</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Notification Spacing:</source>
+        <location filename="../advancedsettings.ui" line="25"/>
+        <source>Width:</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../advancedsettings.ui" line="32"/>
+        <location filename="../advancedsettings.ui" line="56"/>
        <source> px</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Notification Width:</source>
+        <location filename="../advancedsettings.ui" line="49"/>
+        <source>Spacing:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="68"/>
+        <source>Duration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="74"/>
+        <source>Some notifications set their own on-screen duration.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="86"/>
+        <source>Default duration:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="93"/>
+        <source> sec</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
    <name>BasicSettings</name>
    <message>
+        <location filename="../basicsettings.ui" line="23"/>
        <source>Basic Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Display Notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top/Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top/Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom/Left</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom/Right</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Test Notification</source>
+        <location filename="../basicsettings.ui" line="30"/>
+        <source>Position on screen</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../basicsettings.cpp" line="57"/>
        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
 A fallback will be used.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../basicsettings.cpp" line="60"/>
        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
-These settings won&apos;t have an effect on it!</source>
+These settings won&apos;t have any effect on it!</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Notification Summary</source>
+        <location filename="../basicsettings.cpp" line="117"/>
+        <source>Notification demo </source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <source>Notification Body</source>
+        <location filename="../basicsettings.cpp" line="118"/>
+        <source>This is a test notification.
+ All notifications will now appear here on LXQt.</source>
        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
    <name>MainWindow</name>
    <message>
+        <location filename="../mainwindow.cpp" line="40"/>
        <source>Desktop Notifications</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../mainwindow.cpp" line="43"/>
        <source>Basic Settings</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
+        <location filename="../mainwindow.cpp" line="47"/>
        <source>Advanced Settings</source>
        <translation type="unfinished"></translation>
    </message>
--- a/config/translations/lxqt-config-notificationd_cs.desktop
+++ b/config/translations/lxqt-config-notificationd_cs.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[cs]=Nastavení oznamování v LxQtu
-Name[cs]=Nastavení oznamování v LxQtu
-Comment[cs]=Nastavit oznamování na ploše LxQt
+GenericName[cs]=Nastavení oznamování v LXQtu
+Name[cs]=Nastavení oznamování v LXQtu
+Comment[cs]=Nastavit oznamování na ploše LXQt
--- a/config/translations/lxqt-config-notificationd_cs_CZ.desktop
+++ b/config/translations/lxqt-config-notificationd_cs_CZ.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[cs_CZ]=Nastavení oznamování v LxQtu
-Name[cs_CZ]=Nastavení oznamování v LxQtu
-Comment[cs_CZ]=Nastavit oznamování na ploše LxQt
+GenericName[cs_CZ]=Nastavení oznamování v LXQtu
+Name[cs_CZ]=Nastavení oznamování v LXQtu
+Comment[cs_CZ]=Nastavit oznamování na ploše LXQt
--- a/config/translations/lxqt-config-notificationd_da.desktop
+++ b/config/translations/lxqt-config-notificationd_da.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[da]=Notesblok
 Name[da]=Strømstyring
-Comment[da]=Indstil freedesktop meddelelser på LxQt skrivebord
+Comment[da]=Indstil freedesktop meddelelser på LXQt skrivebord
--- a/config/translations/lxqt-config-notificationd_da_DK.desktop
+++ b/config/translations/lxqt-config-notificationd_da_DK.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[da_DK]=LxQt freedesktop Meddelelsesindstillinger
-Name[da_DK]=LxQt freedesktop Meddelelsesindstillinger
-Comment[da_DK]=Indstil freedesktop meddelelser på LxQt skrivebord
+GenericName[da_DK]=LXQt freedesktop Meddelelsesindstillinger
+Name[da_DK]=LXQt freedesktop Meddelelsesindstillinger
+Comment[da_DK]=Indstil freedesktop meddelelser på LXQt skrivebord
--- a/config/translations/lxqt-config-notificationd_de.desktop
+++ b/config/translations/lxqt-config-notificationd_de.desktop
@ -1,3 +1,4 @@
 # Translations
-GenericName[de]=LxQt Konfigurations Center
-Name[de]=LxQt Konfiguration
+Name[de]=Mitteilungen der Arbeitsfläche
+GenericName[de]=LXQt Mitteilungseinstellungen
+Comment[de]=Konfiguration von Benachrichtigungen
--- a/config/translations/lxqt-config-notificationd_de.ts
+++ b/config/translations/lxqt-config-notificationd_de.ts
@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>AdvancedSettings</name>
+    <message>
+        <location filename="../advancedsettings.ui" line="17"/>
+        <source>Sizes</source>
+        <translation>Größen</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="25"/>
+        <source>Width:</source>
+        <translation>Breite:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="32"/>
+        <location filename="../advancedsettings.ui" line="56"/>
+        <source> px</source>
+        <translation> px</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="49"/>
+        <source>Spacing:</source>
+        <translation>Abstand:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="68"/>
+        <source>Duration</source>
+        <translation>Dauer</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="74"/>
+        <source>Some notifications set their own on-screen duration.</source>
+        <translation>Einige Benachrichtigungen setzen ihre eigene Anzeigedauer.</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="86"/>
+        <source>Default duration:</source>
+        <translation>Standarddauer:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="93"/>
+        <source> sec</source>
+        <translation> s</translation>
+    </message>
+</context>
+<context>
+    <name>BasicSettings</name>
+    <message>
+        <location filename="../basicsettings.ui" line="23"/>
+        <source>Basic Settings</source>
+        <translation>Grundeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="30"/>
+        <source>Position on screen</source>
+        <translation>Position auf dem Bildschirm</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="57"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
+A fallback will be used.</source>
+        <translation>&lt;b&gt;Warnung:&lt;/b&gt; Es läuft kein Benachrichtigungsdaemon.
+Ein Ersatz wird verwendet.</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="60"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
+These settings won&apos;t have any effect on it!</source>
+        <translation>&lt;b&gt;Warnung:&lt;/b&gt; Ein anderer Benachrichtigungsdaemon (%1) läuft.
+Diese Einstellungen wirken sich auf ihn nicht aus!</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="117"/>
+        <source>Notification demo </source>
+        <translation>Testbenachrichtigung </translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="118"/>
+        <source>This is a test notification.
+ All notifications will now appear here on LXQt.</source>
+        <translation>Dies ist eine Testbenachrichtigung.
+Alle Benachrichtigungen erscheinen jetzt hier auf LXQt.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.cpp" line="40"/>
+        <source>Desktop Notifications</source>
+        <translation>Arbeitsflächenbenachrichtigungen</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="43"/>
+        <source>Basic Settings</source>
+        <translation>Grundeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="47"/>
+        <source>Advanced Settings</source>
+        <translation>Erweiterte Einstellungen</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-notificationd_de_DE.desktop
+++ b/config/translations/lxqt-config-notificationd_de_DE.desktop
@ -1,4 +0,0 @@
-# Translations
-GenericName[de_DE]=Anwendungsmenü
-Name[de_DE]=LxQt Freedesktop Mitteilungen Konfiguration
-Comment[de_DE]=Freedesktop Mitteilungen für LxQt Desktop konfigurieren
--- a/config/translations/lxqt-config-notificationd_el.desktop
+++ b/config/translations/lxqt-config-notificationd_el.desktop
@ -0,0 +1,4 @@
+# Translations
+Name[el]=Ειδοποιήσεις επιφάνειας εργασίας
+GenericName[el]=Ρυθμίσεις ειδοποιήσεων LXQt
+Comment[el]=Διαμόρφωση των ειδοποιήσεων της επιφάνειας εργασίας LXQt
--- a/config/translations/lxqt-config-notificationd_el.ts
+++ b/config/translations/lxqt-config-notificationd_el.ts
@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
+<context>
+    <name>AdvancedSettings</name>
+    <message>
+        <location filename="../advancedsettings.ui" line="17"/>
+        <source>Sizes</source>
+        <translation>Μεγέθη</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="25"/>
+        <source>Width:</source>
+        <translation>Πλάτος:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="32"/>
+        <location filename="../advancedsettings.ui" line="56"/>
+        <source> px</source>
+        <translation> εικ</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="49"/>
+        <source>Spacing:</source>
+        <translation>Απόσταση:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="68"/>
+        <source>Duration</source>
+        <translation>Διάρκεια</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="74"/>
+        <source>Some notifications set their own on-screen duration.</source>
+        <translation>Μερικές ειδοποιήσεις καθορίζουν τη δική τους διάρκεια εμφάνισης.</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="86"/>
+        <source>Default duration:</source>
+        <translation>Διάρκεια εξ ορισμού:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="93"/>
+        <source> sec</source>
+        <translation> δευτ</translation>
+    </message>
+</context>
+<context>
+    <name>BasicSettings</name>
+    <message>
+        <location filename="../basicsettings.ui" line="23"/>
+        <source>Basic Settings</source>
+        <translation>Βασικές ρυθμίσεις</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="30"/>
+        <source>Position on screen</source>
+        <translation>Θέση στην οθόνη</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="57"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
+A fallback will be used.</source>
+        <translation>&lt;b&gt;Προειδοποίηση:&lt;/b&gt; Δεν εκτελείται κάποιος δαίμονας ειδοποιήσεων
+Θα χρησιμοποιηθεί η ανακατεύθυνση.</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="60"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
+These settings won&apos;t have any effect on it!</source>
+        <translation>&lt;b&gt;Προειδοποίηση:&lt;/b&gt; Εκτελείται ένας δαίμονας ειδοποιήσεων τρίτων (%1).
+Αυτές οι ρυθμίσεις δεν θα έχουν κάποια επίδραση σε αυτόν!</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="117"/>
+        <source>Notification demo </source>
+        <translation>Επίδειξη ειδοποιήσεων </translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="118"/>
+        <source>This is a test notification.
+ All notifications will now appear here on LXQt.</source>
+        <translation>Αυτή είναι μια δοκιμαστική ειδοποίηση.
+ Όλες οι ειδοποιήσεις στο LXQt θα εμφανίζονται εδώ.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.cpp" line="40"/>
+        <source>Desktop Notifications</source>
+        <translation>Ειδοποιήσεις επιφάνειας εργασίας</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="43"/>
+        <source>Basic Settings</source>
+        <translation>Βασικές ρυθμίσεις</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="47"/>
+        <source>Advanced Settings</source>
+        <translation>Προηγμένες ρυθμίσεις</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-notificationd_el_GR.desktop
+++ b/config/translations/lxqt-config-notificationd_el_GR.desktop
@ -1,4 +0,0 @@
-# Translations
-GenericName[el_GR]=Διαμόρφωση ειδοποιήσεων LxQt
-Name[el_GR]=Διαμόρφωση ειδοποιήσεων LxQt
-Comment[el_GR]=Διαμόρφωση ειδοποιήσεων στην επιφάνεια εργασίας LxQt
--- a/config/translations/lxqt-config-notificationd_eo.desktop
+++ b/config/translations/lxqt-config-notificationd_eo.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[eo]=Agordoj de muso por LxQto
-Name[eo]=Agordoj de muso por LxQto
-Comment[eo]=Agordi atentigojn de freedesktop en LxQt-labortablo
+GenericName[eo]=Agordoj de muso por LXQto
+Name[eo]=Agordoj de muso por LXQto
+Comment[eo]=Agordi atentigojn de freedesktop en LXQt-labortablo
--- a/config/translations/lxqt-config-notificationd_es.desktop
+++ b/config/translations/lxqt-config-notificationd_es.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[es]=Administrador de tareas
-Name[es]=Configuración de sesiones LxQt
-Comment[es]=Configure las notificacionde de freedesktop en el escritorio LxQt
+Name[es]=Configuración de sesiones LXQt
+Comment[es]=Configure las notificacionde de freedesktop en el escritorio LXQt
--- a/config/translations/lxqt-config-notificationd_es_VE.desktop
+++ b/config/translations/lxqt-config-notificationd_es_VE.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[es_VE]=Configuracion de notificaciones de Escritorio LxQt
-Name[es_VE]=Configuracion de notificaciones de Escritorio LxQt
-Comment[es_VE]=Configura las notificacones en el Escritoro LxQt
+GenericName[es_VE]=Configuracion de notificaciones de Escritorio LXQt
+Name[es_VE]=Configuracion de notificaciones de Escritorio LXQt
+Comment[es_VE]=Configura las notificacones en el Escritoro LXQt
--- a/config/translations/lxqt-config-notificationd_eu.desktop
+++ b/config/translations/lxqt-config-notificationd_eu.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[eu]=LxQt Freedesktop jakinarazpenen konfigurazioa
-Name[eu]=LxQt Freedesktop jakinarazpenen konfigurazioa
-Comment[eu]=Konfiguratu LxQt mahaigaineko Freedesktop jakinarazpenak
+GenericName[eu]=LXQt Freedesktop jakinarazpenen konfigurazioa
+Name[eu]=LXQt Freedesktop jakinarazpenen konfigurazioa
+Comment[eu]=Konfiguratu LXQt mahaigaineko Freedesktop jakinarazpenak
--- a/config/translations/lxqt-config-notificationd_fi.desktop
+++ b/config/translations/lxqt-config-notificationd_fi.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[fi]=LxQt-työpöydän ilmoitusasetukset
-Name[fi]=LxQt-työpöydän ilmoitusasetukset
-Comment[fi]=Muokkaa LxQt-työpöydän ilmoituksia
+GenericName[fi]=LXQt-työpöydän ilmoitusasetukset
+Name[fi]=LXQt-työpöydän ilmoitusasetukset
+Comment[fi]=Muokkaa LXQt-työpöydän ilmoituksia
--- a/config/translations/lxqt-config-notificationd_fr_FR.desktop
+++ b/config/translations/lxqt-config-notificationd_fr_FR.desktop
@ -1,3 +1,3 @@
 # Translations
-GenericName[fr_FR]=Bloc-notes
-Name[fr_FR]=Paramétreur de session LxQt
+GenericName[fr_FR]=Paramétrage des notifications du bureau
+Name[fr_FR]=Paramétrage notifications
--- a/config/translations/lxqt-config-notificationd_hr.ts
+++ b/config/translations/lxqt-config-notificationd_hr.ts
@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="hr_HR">
+<context>
+    <name>AdvancedSettings</name>
+    <message>
+        <source>Menu Configuration</source>
+        <translation type="unfinished">Konfiguracija izbornika</translation>
+    </message>
+    <message>
+        <source>Notification Duration</source>
+        <translation type="unfinished">Trajanje obavijesti</translation>
+    </message>
+    <message>
+        <source>For some the notification&apos;s expiration time is dependent on the notification server&apos;s settings.</source>
+        <translation type="unfinished">Za neke obavijesti&apos;s vrijeme istjecanja ovisi o postavkama poslužitelja&apos;s obavijesti</translation>
+    </message>
+    <message>
+        <source>&quot;Server Decides&quot; Time:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">sek</translation>
+    </message>
+    <message>
+        <source>Sizes</source>
+        <translation type="unfinished">Veličine</translation>
+    </message>
+    <message>
+        <source>Notification Spacing:</source>
+        <translation type="unfinished">Razmak obavijesti</translation>
+    </message>
+    <message>
+        <source> px</source>
+        <translation type="unfinished"> px</translation>
+    </message>
+    <message>
+        <source>Notification Width:</source>
+        <translation type="unfinished">Širina obavijesti</translation>
+    </message>
+</context>
+<context>
+    <name>BasicSettings</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished">Osnovne postavke</translation>
+    </message>
+    <message>
+        <source>Display Notifications</source>
+        <translation type="unfinished">Prikaži obavijesti</translation>
+    </message>
+    <message>
+        <source>Top/Left</source>
+        <translation type="unfinished">Gore/lijevo</translation>
+    </message>
+    <message>
+        <source>Top/Right</source>
+        <translation type="unfinished">Gore/desno</translation>
+    </message>
+    <message>
+        <source>Bottom/Left</source>
+        <translation type="unfinished">Dolje/lijevo</translation>
+    </message>
+    <message>
+        <source>Bottom/Right</source>
+        <translation type="unfinished">Dolje/desno</translation>
+    </message>
+    <message>
+        <source>Test Notification</source>
+        <translation type="unfinished">Isprobaj obavijesti</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
+A fallback will be used.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
+These settings won&apos;t have an effect on it!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notification Summary</source>
+        <translation type="unfinished">Sažetak obavijesti</translation>
+    </message>
+    <message>
+        <source>Notification Body</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Desktop Notifications</source>
+        <translation type="unfinished">Obavijesti radne površine</translation>
+    </message>
+    <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished">Osnovne postavke</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation type="unfinished">Napredne postavke</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-notificationd_hu.desktop
+++ b/config/translations/lxqt-config-notificationd_hu.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[hu]=Alkalmazásmenü
-Name[hu]=LxQt beállítóközpont
-Comment[hu]=A Freedesktop értesítések beállítása
+GenericName[hu]=Az asztali értesítések beállítása
+Name[hu]=LXQt értesítések beállítása
+Comment[hu]=A felbukkanó értesítések beállítása
--- a/config/translations/lxqt-config-notificationd_hu.ts
+++ b/config/translations/lxqt-config-notificationd_hu.ts
@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="hu_HU">
+<context>
+    <name>AdvancedSettings</name>
+    <message>
+        <location filename="../advancedsettings.ui" line="17"/>
+        <source>Sizes</source>
+        <translation>Méret</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="25"/>
+        <source>Width:</source>
+        <translation>Szélesség:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="32"/>
+        <location filename="../advancedsettings.ui" line="56"/>
+        <source> px</source>
+        <translation> pixel</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="49"/>
+        <source>Spacing:</source>
+        <translation>Térköz:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="68"/>
+        <source>Duration</source>
+        <translation>Tartam</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="74"/>
+        <source>Some notifications set their own on-screen duration.</source>
+        <translation>Egyes értesítések megjelenési ideje</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="86"/>
+        <source>Default duration:</source>
+        <translation>Alapértelmezett tartam:</translation>
+    </message>
+    <message>
+        <location filename="../advancedsettings.ui" line="93"/>
+        <source> sec</source>
+        <translation> mp</translation>
+    </message>
+</context>
+<context>
+    <name>BasicSettings</name>
+    <message>
+        <location filename="../basicsettings.ui" line="23"/>
+        <source>Basic Settings</source>
+        <translation>Alapbeállítások</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="30"/>
+        <source>Position on screen</source>
+        <translation>Hely</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="36"/>
+        <source>Top/Left</source>
+        <translation>Balra fenn</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="43"/>
+        <source>Top/Right</source>
+        <translation>Jobbra fenn</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="50"/>
+        <source>Bottom/Left</source>
+        <translation>Balra lenn</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.ui" line="57"/>
+        <source>Bottom/Right</source>
+        <translation>Jobbra lenn</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="53"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
+A fallback will be used.</source>
+        <translation>&lt;b&gt;Figyelem:&lt;/b&gt; Értesítő démon nem fut.
+A vésztartalék használatos.</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="59"/>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
+These settings won&apos;t have any effect on it!</source>
+        <translation>&lt;b&gt;Figyelem:&lt;/b&gt; A (%1) démont már valaki futtatja.
+Ezek a beállítások arra már hatástalanok!</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="98"/>
+        <source>Notification demo</source>
+        <translation>Értesítési bemutató</translation>
+    </message>
+    <message>
+        <location filename="../basicsettings.cpp" line="99"/>
+        <source>This is a test notification.
+All notifications will now appear here on LXQt.</source>
+        <translation>Az értesítés tesztje
+Minden értesítést megjelenít az LXQt.</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.cpp" line="40"/>
+        <source>Desktop Notifications</source>
+        <translation>Asztali értesítések</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="43"/>
+        <source>Basic Settings</source>
+        <translation>Alapbeállítások</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="47"/>
+        <source>Advanced Settings</source>
+        <translation>Haladó beállítások</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-notificationd_id_ID.desktop
+++ b/config/translations/lxqt-config-notificationd_id_ID.desktop
@ -1,3 +1,3 @@
 # Translations
 GenericName[id_ID]=Hell World
-Name[id_ID]=Konfigurator Desktop LxQt
+Name[id_ID]=Konfigurator Desktop LXQt
--- a/config/translations/lxqt-config-notificationd_it.desktop
+++ b/config/translations/lxqt-config-notificationd_it.desktop
@ -1,3 +1,4 @@
 # Translations
-GenericName[it]=Centro di Configurazione LxQt
-Name[it]=Configura LxQt
+GenericName[it]=Notifiche
+Name[it]=Configura notifiche
+Comment[it]=Configura le notifiche Freedesktop del Desktop LXQt
--- a/config/translations/lxqt-config-notificationd_it.ts
+++ b/config/translations/lxqt-config-notificationd_it.ts
@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it">
+<context>
+    <name>AdvancedSettings</name>
+    <message>
+        <source>Menu Configuration</source>
+        <translation>Configurazione del menu</translation>
+    </message>
+    <message>
+        <source>Notification Duration</source>
+        <translation>Durata delle notifiche</translation>
+    </message>
+    <message>
+        <source>For some the notification&apos;s expiration time is dependent on the notification server&apos;s settings.</source>
+        <translation>Per alcune notifiche il tempo dipende dalle impostazioni del server delle notifiche.</translation>
+    </message>
+    <message>
+        <source>&quot;Server Decides&quot; Time:</source>
+        <translation>Tempo di decisioni del server:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Sizes</source>
+        <translation>Dimensione</translation>
+    </message>
+    <message>
+        <source>Notification Spacing:</source>
+        <translatorcomment>a cosa si riferisce??</translatorcomment>
+        <translation type="unfinished">Spazing:</translation>
+    </message>
+    <message>
+        <source> px</source>
+        <translation></translation>
+    </message>
+    <message>
+        <source>Notification Width:</source>
+        <translation>Larghezza:</translation>
+    </message>
+</context>
+<context>
+    <name>BasicSettings</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Impostazioni base</translation>
+    </message>
+    <message>
+        <source>Display Notifications</source>
+        <translation>Mostra notifiche</translation>
+    </message>
+    <message>
+        <source>Top/Left</source>
+        <translation>Alto a sinistra</translation>
+    </message>
+    <message>
+        <source>Top/Right</source>
+        <translation>Alto a destra</translation>
+    </message>
+    <message>
+        <source>Bottom/Left</source>
+        <translation>Fondo a sinistra</translation>
+    </message>
+    <message>
+        <source>Bottom/Right</source>
+        <translation>Fondo a destra</translation>
+    </message>
+    <message>
+        <source>Test Notification</source>
+        <translation>Notifica di prova</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; No notifications daemon is running.
+A fallback will be used.</source>
+        <translation>&lt;b&gt;Attenzione:&lt;/b&gt; Nessun demone di notifiche è in esecuzione.
+Sarà usato un sistema di riserva.</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; A third-party notifications daemon (%1) is running.
+These settings won&apos;t have an effect on it!</source>
+        <translation>&lt;b&gt;Attenzione:&lt;/b&gt; Un altro demone di notifiche (%1) è in esecuzione.
+Queste impostazioni non avranno effetto su quello!</translation>
+    </message>
+    <message>
+        <source>Notification Summary</source>
+        <translation>Sommario della notifica</translation>
+    </message>
+    <message>
+        <source>Notification Body</source>
+        <translation>Corpo della notifica</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>Desktop Notifications</source>
+        <translation type="unfinished">Notificazioni Desktop</translation>
+    </message>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Impostazioni base</translation>
+    </message>
+    <message>
+        <source>Advanced Settings</source>
+        <translation>Impostazioni avanzate</translation>
+    </message>
+</context>
+</TS>
--- a/config/translations/lxqt-config-notificationd_it_IT.desktop
+++ b/config/translations/lxqt-config-notificationd_it_IT.desktop
@ -1,4 +0,0 @@
-# Translations
-GenericName[it_IT]=Esci
-Name[it_IT]=Esci dal sistema
-Comment[it_IT]=Configura le notifiche freedesktop nel desktop LxQt
--- a/config/translations/lxqt-config-notificationd_ja.desktop
+++ b/config/translations/lxqt-config-notificationd_ja.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[ja]=LxQtフリーデスクトップ通知の設定
-Name[ja]=LxQtフリーデスクトップ通知の設定
-Comment[ja]=LxQtデスクトップでフリーデスクトップ通知を設定
+GenericName[ja]=LXQtフリーデスクトップ通知の設定
+Name[ja]=LXQtフリーデスクトップ通知の設定
+Comment[ja]=LXQtデスクトップでフリーデスクトップ通知を設定
--- 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
+Comment[lt]=Konfigūruoti freedesktop pranešimus LXQt darbalaukyje
--- a/config/translations/lxqt-config-notificationd_nl.desktop
+++ b/config/translations/lxqt-config-notificationd_nl.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[nl]=Notepad
 Name[nl]=Energiebeheer
-Comment[nl]=Configureren freedesktop meldingen in LxQt desktop
+Comment[nl]=Configureren freedesktop meldingen in LXQt desktop
--- a/config/translations/lxqt-config-notificationd_pl.desktop
+++ b/config/translations/lxqt-config-notificationd_pl.desktop
@ -1,3 +1,3 @@
 # Translations
 GenericName[pl]=Menu
-Name[pl]=Panel sterowania LxQt
+Name[pl]=Panel sterowania LXQt
--- 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
+GenericName[pl_PL]=Konfiguracja wyglądu LXQt
+Name[pl_PL]=Konfiguracja wyglądu LXQt
+Comment[pl_PL]=Konfiguruj powiadomienia freedesktop w LXQt
--- a/config/translations/lxqt-config-notificationd_pt_BR.desktop
+++ b/config/translations/lxqt-config-notificationd_pt_BR.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[pt_BR]=Suspender Automaticamente
 Name[pt_BR]=Gerenciamento de energia
-Comment[pt_BR]=Configurar as notificações do freedesktop na área de trabalho do LxQt
+Comment[pt_BR]=Configurar as notificações do freedesktop na área de trabalho do LXQt
--- a/config/translations/lxqt-config-notificationd_ro_RO.desktop
+++ b/config/translations/lxqt-config-notificationd_ro_RO.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[ro_RO]=Părăsește
 Name[ro_RO]=Părăsește sistemul
-Comment[ro_RO]=Configurează notificările freedesktop în desktop-ul LxQt
+Comment[ro_RO]=Configurează notificările freedesktop în desktop-ul LXQt
--- a/config/translations/lxqt-config-notificationd_ru.desktop
+++ b/config/translations/lxqt-config-notificationd_ru.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[ru]=Настройки уведомлений LxQt
+GenericName[ru]=Настройки уведомлений LXQt
 Name[ru]=Уведомления рабочего стола
 Comment[ru]=Настроить уведомления рабочего стола
--- a/config/translations/lxqt-config-notificationd_ru_RU.desktop
+++ b/config/translations/lxqt-config-notificationd_ru_RU.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[ru]=Настройки уведомлений LxQt
-Name[ru]=Уведомления рабочего стола
-Comment[ru]=Настроить уведомления рабочего стола
+GenericName[ru_RU]=Настройки уведомлений LXQt
+Name[ru_RU]=Уведомления рабочего стола
+Comment[ru_RU]=Настроить уведомления рабочего стола
--- a/config/translations/lxqt-config-notificationd_sl.desktop
+++ b/config/translations/lxqt-config-notificationd_sl.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[sl]=Nastavitve obvestil
 Name[sl]=Nastavitve obvestil na namizju
-Comment[sl]=Nastavite obvestila na namizju LxQt
+Comment[sl]=Nastavite obvestila na namizju LXQt
--- a/config/translations/lxqt-config-notificationd_th_TH.desktop
+++ b/config/translations/lxqt-config-notificationd_th_TH.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LxQt Freedesktop
-Name[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LxQt Freedesktop
-Comment[th_TH]=ตั้งค่าการเตือนต่างๆ ของ freedesktop ในเดสก์ท็อป LxQt
+GenericName[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LXQt Freedesktop
+Name[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LXQt Freedesktop
+Comment[th_TH]=ตั้งค่าการเตือนต่างๆ ของ freedesktop ในเดสก์ท็อป LXQt
--- a/config/translations/lxqt-config-notificationd_tr.desktop
+++ b/config/translations/lxqt-config-notificationd_tr.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[tr]=Not Defteri
 Name[tr]=Güç yönetimi
-Comment[tr]=LxQt masaüstünde freedesktop bildirimlerini ayarla
+Comment[tr]=LXQt masaüstünde freedesktop bildirimlerini ayarla
--- a/config/translations/lxqt-config-notificationd_uk.desktop
+++ b/config/translations/lxqt-config-notificationd_uk.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[uk]=Налаштування Freedesktop сповіщень LxQt
-Name[uk]=Налаштування Freedesktop сповіщень LxQt
-Comment[uk]=Налаштувати Freedesktop сповіщення в стільниці LxQt
+GenericName[uk]=Налаштування Freedesktop сповіщень LXQt
+Name[uk]=Налаштування Freedesktop сповіщень LXQt
+Comment[uk]=Налаштувати Freedesktop сповіщення в стільниці LXQt
--- a/config/translations/lxqt-config-notificationd_zh_CN.desktop
+++ b/config/translations/lxqt-config-notificationd_zh_CN.desktop
@ -1,4 +1,4 @@
 # Translations
 GenericName[zh_CN]=qxkb
-Name[zh_CN]=LxQt 通知配置
-Comment[zh_CN]=配置 LxQt 桌面的通知
+Name[zh_CN]=LXQt 通知配置
+Comment[zh_CN]=配置 LXQt 桌面的通知
--- a/config/translations/lxqt-config-notificationd_zh_TW.desktop
+++ b/config/translations/lxqt-config-notificationd_zh_TW.desktop
@ -1,4 +1,4 @@
 # Translations
-GenericName[zh_TW]=LxQt通知設定
-Name[zh_TW]=LxQt通知設定
-Comment[zh_TW]=LxQt桌面上的FreeDesktop通知設定
+GenericName[zh_TW]=LXQt通知設定
+Name[zh_TW]=LXQt通知設定
+Comment[zh_TW]=LXQt桌面上的FreeDesktop通知設定
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -1,8 +1,3 @@
-include_directories(
-    "${CMAKE_CURRENT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_BINARY_DIR}"
-)
-
 set(NOTIFICATIONS_SRC
    main.cpp
    notificationarea.cpp
@ -16,15 +11,15 @@ set(NOTIFICATIONS_UI
    notification.ui
 )

-qt5_wrap_ui(NOTIFICATIONS_UI_CPP ${NOTIFICATIONS_UI})
 qt5_add_dbus_adaptor(NOTIFICATIONS_SRC
    org.freedesktop.Notifications.xml
    notifyd.h Notifyd
 )

 # Translations **********************************
-lxqt_translate_ts(NOTIFICATIONS_QM_FILES SOURCES
+lxqt_translate_ts(NOTIFICATIONS_QM_FILES
    UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS}
+    SOURCES
    ${NOTIFICATIONS_SRC}
    ${NOTIFICATIONS_UI}
    INSTALL_DIR "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}"
@ -35,7 +30,6 @@ lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})

 add_executable(lxqt-notificationd
    ${NOTIFICATIONS_SRC}
-    ${NOTIFICATIONS_UI_CPP}
    ${NOTIFICATIONS_QM_FILES}
    ${QM_LOADER}
 )
@ -43,9 +37,12 @@ add_executable(lxqt-notificationd
 target_link_libraries(lxqt-notificationd
    Qt5::Widgets
    Qt5::DBus
-    ${QTXDG_LIBRARIES}
-    ${LXQT_LIBRARIES}
+    lxqt
    KF5::WindowSystem
 )

-install(TARGETS lxqt-notificationd RUNTIME DESTINATION bin)
+install(TARGETS
+    lxqt-notificationd
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)
--- a/src/main.cpp
+++ b/src/main.cpp
@ -34,7 +34,7 @@
 #include "notifyd.h"


-/*! \mainpage LXDE-Qt notification daemon
+/*! \mainpage LXQt notification daemon
 *
 * Running in user session; implementing standard as described in:
 *    docs/nodification-spec-latest.html
@ -65,7 +65,7 @@
 */
 int main(int argc, char** argv)
 {
-    LxQt::Application a(argc, argv);
+    LXQt::Application a(argc, argv);

    a.setQuitOnLastWindowClosed(false);

@ -74,7 +74,7 @@ int main(int argc, char** argv)
                "NotificationArea {background: transparent;}"
                "NotificationLayout {background: transparent;}"
                   );
-    
+
    Notifyd* daemon = new Notifyd();
    new NotificationsAdaptor(daemon);

@ -84,6 +84,5 @@ int main(int argc, char** argv)
    if (!connection.registerObject("/org/freedesktop/Notifications", daemon))
        qDebug() << "registerObject failed: another object with '/org/freedesktop/Notifications' runs already";

-
    return a.exec();
 }
--- a/src/notification.cpp
+++ b/src/notification.cpp
@ -32,13 +32,16 @@
 #include <QtDBus/QDBusArgument>
 #include <QDebug>
 #include <XdgIcon>
-#include <KF5/KWindowSystem/KWindowSystem>
+#include <KWindowSystem/KWindowSystem>
+#include <QMouseEvent>
+#include <QPushButton>

 #include "notification.h"
 #include "notificationwidgets.h"

 #define ICONSIZE QSize(32, 32)

+
 Notification::Notification(const QString &application,
                           const QString &summary, const QString &body,
                           const QString &icon, int timeout,
@ -46,6 +49,7 @@ Notification::Notification(const QString &application,
                           QWidget *parent)
    : QWidget(parent),
      m_timer(0),
+      m_linkHovered(false),
      m_actionWidget(0)
 {
    setupUi(this);
@ -57,7 +61,14 @@ Notification::Notification(const QString &application,

    setValues(application, summary, body, icon, timeout, actions, hints);

-    connect(closeButton, SIGNAL(clicked()), this, SLOT(closeButton_clicked()));
+    connect(closeButton, &QPushButton::clicked, this, &Notification::closeButton_clicked);
+
+    for (QLabel *label : {bodyLabel, summaryLabel})
+    {
+        connect(label, &QLabel::linkHovered, this, &Notification::linkHovered);
+
+        label->installEventFilter(this);
+    }
 }

 void Notification::setValues(const QString &application,
@ -109,21 +120,27 @@ void Notification::setValues(const QString &application,
        iconLabel->setPixmap(m_pixmap);
        iconLabel->show();
    }
+    //XXX: workaround to properly set text labels widths (for correct sizeHints after setText)
+    adjustSize();

    // application
-	appLabel->setVisible(!application.isEmpty());
+    appLabel->setVisible(!application.isEmpty());
+    appLabel->setFixedWidth(appLabel->width());
    appLabel->setText(application);

    // summary
-    summaryLabel->setVisible(!summary.isEmpty());
+    summaryLabel->setVisible(!summary.isEmpty() && application != summary);
+    summaryLabel->setFixedWidth(summaryLabel->width());
    summaryLabel->setText(summary);

-    if (application == summary)
-        summaryLabel->setVisible(false);
-
    // body
    bodyLabel->setVisible(!body.isEmpty());
-    bodyLabel->setText(body);
+    bodyLabel->setFixedWidth(bodyLabel->width());
+    //https://developer.gnome.org/notification-spec
+    //Body - This is a multi-line body of text. Each line is a paragraph, server implementations are free to word wrap them as they see fit.
+    //XXX: remove all unsupported tags?!? (supported <b>, <i>, <u>, <a>, <img>)
+    QString formatted(body);
+    bodyLabel->setText(formatted.replace('\n', QStringLiteral("<br/>")));

    // Timeout
    // Special values:
@ -139,7 +156,7 @@ void Notification::setValues(const QString &application,
    if (timeout > 0)
    {
        m_timer = new NotificationTimer(this);
-        connect(m_timer, SIGNAL(timeout()), this, SIGNAL(timeout()));
+        connect(m_timer, &NotificationTimer::timeout, this, &Notification::timeout);
        m_timer->start(timeout);
    }

@ -168,8 +185,10 @@ void Notification::setValues(const QString &application,
            m_actionWidget = new NotificationActionsButtonsWidget(actions, this);
        else
            m_actionWidget = new NotificationActionsComboWidget(actions, this);
-        connect(m_actionWidget, SIGNAL(actionTriggered(const QString &)),
-                this, SIGNAL(actionTriggered(const QString &)));
+
+        connect(m_actionWidget, &NotificationActionsWidget::actionTriggered,
+                this, &Notification::actionTriggered);
+
        actionsLayout->addWidget(m_actionWidget);
        m_actionWidget->show();
    }
@ -225,7 +244,14 @@ QPixmap Notification::getPixmapFromHint(const QVariant &argument) const
    arg >> channels;
    arg >> data;
    arg.endStructure();
-    QImage img = QImage((uchar*)data.constData(), width, height, QImage::Format_ARGB32).rgbSwapped();
+
+    bool rgb = !hasAlpha && channels == 3 && bitsPerSample == 8;
+    QImage::Format imageFormat = rgb ? QImage::Format_RGB888 : QImage::Format_ARGB32;
+
+    QImage img = QImage((uchar*)data.constData(), width, height, imageFormat);
+
+    if (!rgb)
+        img = img.rgbSwapped();

    return QPixmap::fromImage(img);
 }
@ -259,6 +285,25 @@ void Notification::leaveEvent(QEvent * event)
        m_timer->resume();
 }

+bool Notification::eventFilter(QObject *obj, QEvent *event)
+{
+    // Catch mouseReleaseEvent on child labels if a link is not currently being hovered.
+    //
+    // This workarounds QTBUG-49025 where clicking on text does not propagate the mouseReleaseEvent
+    // to the parent even though the text is not selectable and no link is being clicked.
+    if (event->type() == QEvent::MouseButtonRelease && !m_linkHovered)
+    {
+        mouseReleaseEvent(static_cast<QMouseEvent*>(event));
+        return true;
+    }
+    return false;
+}
+
+void Notification::linkHovered(QString link)
+{
+    m_linkHovered = !link.isEmpty();
+}
+
 void Notification::mouseReleaseEvent(QMouseEvent * event)
 {
 //    qDebug() << "CLICKED" << event;
@ -310,7 +355,7 @@ void NotificationTimer::pause()
        return;

    stop();
-    m_intervalMsec = m_startTime.msecsTo(QDateTime());
+    m_intervalMsec = m_startTime.msecsTo(QDateTime::currentDateTime());
 }

 void NotificationTimer::resume()
--- a/src/notification.h
+++ b/src/notification.h
@ -86,7 +86,7 @@ protected:
            - if there is one action or at least one default action, this
               default action is triggered on click.
               \see NotificationActionsWidget::hasDefaultAction()
-               \see NotificationActionsWidget::defaultAction() 
+               \see NotificationActionsWidget::defaultAction()
            - it tries to find caller window by
                a) application name. \see XfitMan::getApplicationName()
                b) window title. \see XfitMan::getWindowTitle()
@ -99,6 +99,7 @@ private:
    NotificationTimer *m_timer;

    QPixmap m_pixmap;
+    bool m_linkHovered;

    NotificationActionsWidget *m_actionWidget;

@ -106,9 +107,11 @@ private:
    void paintEvent(QPaintEvent *);
    QPixmap getPixmapFromHint(const QVariant &argument) const;
    QPixmap getPixmapFromString(const QString &str) const;
+    bool eventFilter(QObject *obj, QEvent *event);

 private slots:
    void closeButton_clicked();
+    void linkHovered(QString);
 };


--- a/src/notification.ui
+++ b/src/notification.ui
@ -82,7 +82,7 @@
        <string notr="true">TextLabel</string>
       </property>
       <property name="textFormat">
-        <enum>Qt::RichText</enum>
+        <enum>Qt::PlainText</enum>
       </property>
       <property name="wordWrap">
        <bool>false</bool>
--- a/src/notificationarea.cpp
+++ b/src/notificationarea.cpp
@ -55,10 +55,10 @@ NotificationArea::NotificationArea(QWidget *parent)
    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

-    connect(m_layout, SIGNAL(allNotificationsClosed()), this, SLOT(close()));
-    connect(m_layout, SIGNAL(notificationAvailable()), this, SLOT(show()));
-    connect(m_layout, SIGNAL(heightChanged(int)), this, SLOT(setHeight(int)));
-    connect(qApp->desktop(), SIGNAL(workAreaResized(int)), SLOT(setHeight()));
+    connect(m_layout, &NotificationLayout::allNotificationsClosed, this, &NotificationArea::close);
+    connect(m_layout, &NotificationLayout::notificationAvailable, this, &NotificationArea::show);
+    connect(m_layout, &NotificationLayout::heightChanged, this, &NotificationArea::setHeight);
+    connect(qApp->desktop(), &QDesktopWidget::workAreaResized, this, &NotificationArea::setHeight);
 }

 void NotificationArea::setHeight(int contentHeight)
@ -78,38 +78,44 @@ void NotificationArea::setHeight(int contentHeight)
    // I think it's a bug of Qt.
    QRect workArea = qApp->desktop()->availableGeometry(qApp->desktop()->primaryScreen());

-    int h = workArea.height();
-    int safeHeight = contentHeight > h ? h : contentHeight;
-    int x, y;
+    workArea -= QMargins(m_spacing, m_spacing, m_spacing, m_spacing);
+    QRect notif_rect = workArea.normalized();
+    notif_rect.setWidth(width());
+    if (notif_rect.height() > contentHeight)
+        notif_rect.setHeight(contentHeight);

-    if (m_placement == "bottom-right")
+    // no move needed for "top-left"
+    if ("top-center" == m_placement)
    {
-        x = workArea.right() - width() - m_spacing;
-        y = workArea.bottom() - safeHeight  - m_spacing;
-    }
-    else if (m_placement == "bottom-left")
+        notif_rect.moveCenter(workArea.center());
+        notif_rect.moveTop(workArea.top());
+    } else if ("top-right" == m_placement)
    {
-        x = workArea.x() + m_spacing;
-        y = workArea.bottom() - safeHeight - m_spacing;
-    }
-    else if (m_placement == "top-right")
+        notif_rect.moveRight(workArea.right());
+    } else if ("center-left" == m_placement)
    {
-        x = workArea.right() - width() - m_spacing;
-        y = workArea.y() + m_spacing;
-    }
-    else if (m_placement == "top-left")
+        notif_rect.moveCenter(workArea.center());
+        notif_rect.moveLeft(workArea.left());
+    } else if ("center-center" == m_placement)
    {
-        x = workArea.x() + m_spacing;
-        y = workArea.y() + m_spacing;
-    }
-    else
+        notif_rect.moveCenter(workArea.center());
+    } else if ("center-right" == m_placement)
    {
-        x = workArea.right() - width() - m_spacing;
-        y = workArea.bottom() - safeHeight;
+        notif_rect.moveCenter(workArea.center());
+        notif_rect.moveRight(workArea.right());
+    } else if ("bottom-left" == m_placement)
+    {
+        notif_rect.moveBottom(workArea.bottom());
+    } else if ("bottom-center" == m_placement)
+    {
+        notif_rect.moveCenter(workArea.center());
+        notif_rect.moveBottom(workArea.bottom());
+    } else if ("bottom-right" == m_placement)
+    {
+        notif_rect.moveBottomRight(workArea.bottomRight());
    }

-    move(x, y);
-    resize(width(), safeHeight);
+    setGeometry(notif_rect);
    // always show the latest notification
    ensureVisible(0, contentHeight, 0, 0);
 }
--- a/src/notificationlayout.cpp
+++ b/src/notificationlayout.cpp
@ -41,7 +41,7 @@ NotificationLayout::NotificationLayout(QWidget *parent)
    setPalette(palette);
    // Required to display wallpaper
    setAttribute(Qt::WA_TranslucentBackground);
-    
+
    // Make the window stay on top
    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);

@ -96,10 +96,10 @@ void NotificationLayout::addNotification(uint id, const QString &application,
            }
        }

-        connect(n, SIGNAL(timeout()), this, SLOT(removeNotificationTimeout()));
-        connect(n, SIGNAL(userCanceled()), this, SLOT(removeNotificationUser()));
-        connect(n, SIGNAL(actionTriggered(QString)),
-                this, SLOT(notificationActionCalled(QString)));
+        connect(n, &Notification::timeout, this, &NotificationLayout::removeNotificationTimeout);
+        connect(n, &Notification::userCanceled, this, &NotificationLayout::removeNotificationUser);
+        connect(n, &Notification::actionTriggered,
+                this, &NotificationLayout::notificationActionCalled);
        m_notifications[id] = n;
        m_layout->addWidget(n);
        n->show();
--- a/src/notificationwidgets.cpp
+++ b/src/notificationwidgets.cpp
@ -39,77 +39,77 @@
 NotificationActionsWidget::NotificationActionsWidget(const QStringList& actions, QWidget *parent)
    : QWidget(parent)
 {
-    for (int i = 0; i < actions.count(); ++i)
+    for (int i = 0; i < actions.count(); i += 2)
    {
-        if (i == actions.count()-1)
+        QString key = actions[i];
+        QString value;
+
+        if (i == actions.count() - 1)
        {
-            qDebug() << "NotificationActionsWidget actions has contains pairs (id, value, id, value...) got odd count:" << actions.count() << "Actions:" << actions;
-            m_actionMap[actions.at(i)] = actions.at(i);
+            value = key;
+            qWarning() << "Odd number of elements in action list. Last action will use key as text (" << key << ")";
+        } else {
+            value = actions[i + 1];
        }
-        else
-        {
-            m_actionMap[actions.at(i)] = actions.at(i+1);
-        }
-        ++i; // move to the next ID
+
+        if (key == "default")
+            m_defaultAction = key;
+
+        m_actions.append({key, value});
    }

-    // if there is only one action let's take it as a default one
-    if (m_actionMap.count() == 1)
-        m_defaultAction = m_actionMap[m_actionMap.keys().at(0)];
-
-    qDebug() << "NotificationActionsWidget processed actions:" << m_actionMap;
+    // if there is only one action let's use it as the default one
+    if (m_actions.count() == 1)
+        m_defaultAction = m_actions[0].first;
 }


 NotificationActionsButtonsWidget::NotificationActionsButtonsWidget(const QStringList& actions, QWidget *parent)
    : NotificationActionsWidget(actions, parent)
 {
-    QHashIterator<QString,QString> it(m_actionMap);
    QHBoxLayout *l = new QHBoxLayout();
    setLayout(l);

    QButtonGroup *group = new QButtonGroup(this);

-    while (it.hasNext())
+    for (auto const & action : m_actions)
    {
-        it.next();
-        QPushButton *b = new QPushButton(it.value(), this);
+        QPushButton *b = new QPushButton(action.second, this);
+        b->setObjectName(action.first);
        l->addWidget(b);
        group->addButton(b);
-        if (it.key() == "default")
-        {
+
+        if (action.first == m_defaultAction)
            b->setFocus(Qt::OtherFocusReason);
-            m_defaultAction = it.key();
-        }
    }
-    connect(group, SIGNAL(buttonClicked(QAbstractButton*)),
-            this, SLOT(actionButtonActivated(QAbstractButton*)));
+    connect(group, static_cast<void (QButtonGroup::*)(QAbstractButton*)>(&QButtonGroup::buttonClicked),
+            this, &NotificationActionsButtonsWidget::actionButtonActivated);
 }

 void NotificationActionsButtonsWidget::actionButtonActivated(QAbstractButton* button)
 {
-    emit actionTriggered(m_actionMap.key(button->text()));
+    emit actionTriggered(button->objectName());
 }


 NotificationActionsComboWidget::NotificationActionsComboWidget(const QStringList& actions, QWidget *parent)
    : NotificationActionsWidget(actions, parent)
 {
-    QHashIterator<QString,QString> it(m_actionMap);
    QHBoxLayout *l = new QHBoxLayout();
    setLayout(l);

    l->addWidget(new QLabel(tr("Actions:"), this));
    m_comboBox = new QComboBox(this);
    int currentIndex = -1;
-    while (it.hasNext())
+
+    for (int i = 0; i < m_actions.count(); ++i)
    {
-        it.next();
-        m_comboBox->addItem(it.value(), it.key());
-        if (it.key() == "default")
+        auto const & action = m_actions[i];
+
+        m_comboBox->addItem(action.second, action.first);
+        if (action.first == m_defaultAction)
        {
-            currentIndex = m_comboBox->count()-1;
-            m_defaultAction = it.key();
+            currentIndex = i;
        }
    }
    l->addWidget(m_comboBox);
@ -119,8 +119,8 @@ NotificationActionsComboWidget::NotificationActionsComboWidget(const QStringList

    QPushButton *b = new QPushButton(tr("OK"), this);
    l->addWidget(b);
-    connect(b, SIGNAL(clicked()),
-            this, SLOT(actionComboBoxActivated()));
+    connect(b, &QPushButton::clicked,
+            this, &NotificationActionsComboWidget::actionComboBoxActivated);
 }

 void NotificationActionsComboWidget::actionComboBoxActivated()
@ -130,5 +130,5 @@ void NotificationActionsComboWidget::actionComboBoxActivated()
    int ix = m_comboBox->currentIndex();
    if (ix == -1)
        return;
-    emit actionTriggered(m_actionMap.key(m_comboBox->itemText(ix)));
+    emit actionTriggered(m_actions[ix].first);
 }
--- a/src/notificationwidgets.h
+++ b/src/notificationwidgets.h
@ -65,7 +65,7 @@ signals:

 protected:
    QString m_defaultAction;
-    QHash<QString,QString> m_actionMap;
+    QList<QPair<QString/*action key*/, QString/*action value*/>> m_actions;
 };

 class NotificationActionsButtonsWidget : public NotificationActionsWidget
--- a/src/notifyd.cpp
+++ b/src/notifyd.cpp
@ -40,21 +40,21 @@ Notifyd::Notifyd(QObject* parent)
      mId(0)
 {
    m_area = new NotificationArea();
-    m_settings = new LxQt::Settings("notifications");
+    m_settings = new LXQt::Settings("notifications");
    reloadSettings();

-    connect(this, SIGNAL(notificationAdded(uint,QString,QString,QString,QString,int,QStringList,QVariantMap)),
-            m_area->layout(), SLOT(addNotification(uint,QString,QString,QString,QString,int,QStringList,QVariantMap)));
-    connect(this, SIGNAL(notificationClosed(uint, uint)),
-            m_area->layout(), SLOT(removeNotification(uint, uint)));
+    connect(this, &Notifyd::notificationAdded,
+            m_area->layout(), &NotificationLayout::addNotification);
+    connect(this, &Notifyd::notificationClosed,
+            m_area->layout(), &NotificationLayout::removeNotification);
    // feedback for original caller
-    connect(m_area->layout(), SIGNAL(notificationClosed(uint,uint)),
-            this, SIGNAL(NotificationClosed(uint,uint)));
-    connect(m_area->layout(), SIGNAL(actionInvoked(uint, QString)),
-            this, SIGNAL(ActionInvoked(uint,QString)));
+    connect(m_area->layout(), &NotificationLayout::notificationClosed,
+            this, &Notifyd::NotificationClosed);
+    connect(m_area->layout(), &NotificationLayout::actionInvoked,
+            this, &Notifyd::ActionInvoked);

-    connect(m_settings, SIGNAL(settingsChanged()),
-            this, SLOT(reloadSettings()));
+    connect(m_settings, &LXQt::Settings::settingsChanged,
+            this, &Notifyd::reloadSettings);

 }

--- a/src/notifyd.h
+++ b/src/notifyd.h
@ -129,7 +129,7 @@ private:
    NotificationArea *m_area;
    int m_serverTimeout;

-    LxQt::Settings *m_settings;
+    LXQt::Settings *m_settings;

 private slots:
    void reloadSettings();
--- a/src/translations/lxqt-notificationd_de.ts
+++ b/src/translations/lxqt-notificationd_de.ts
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
+<context>
+    <name>NotificationActionsComboWidget</name>
+    <message>
+        <source>Actions:</source>
+        <translation>Aktionen:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+</context>
+</TS>
--- a/src/translations/lxqt-notificationd_el.ts
+++ b/src/translations/lxqt-notificationd_el.ts
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
+<context>
+    <name>NotificationActionsComboWidget</name>
+    <message>
+        <source>Actions:</source>
+        <translation>Ενέργειες:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation>Εντάξει</translation>
+    </message>
+</context>
+</TS>
--- a/src/translations/lxqt-notificationd_hu.ts
+++ b/src/translations/lxqt-notificationd_hu.ts
@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="hu">
+<context>
+    <name>NotificationActionsComboWidget</name>
+    <message>
+        <source>Actions:</source>
+        <translation>Akciók:</translation>
+    </message>
+    <message>
+        <source>OK</source>
+        <translation></translation>
+    </message>
+</context>
+</TS>
--- a/test/mainwindow.cpp
+++ b/test/mainwindow.cpp
@ -33,14 +33,14 @@ MainWindow::MainWindow(QWidget *parent) :
 {
    ui->setupUi(this);
    connect(ui->pushButton, SIGNAL(clicked()), SLOT(createNotification()));
-    LxQtNotification::notify("1");
-    LxQtNotification::notify("2");
-    LxQtNotification::notify("3");
+    LXQtNotification::notify("1");
+    LXQtNotification::notify("2");
+    LXQtNotification::notify("3");
 }

 void MainWindow::createNotification()
 {
-    LxQtNotification* n = new LxQtNotification("Notification!");
+    LXQtNotification* n = new LXQtNotification("Notification!");
    nlist.append(n);
    connect(n, SIGNAL(actionActivated(int)), this, SLOT(clickEvent(int)));
    n->setActions(QStringList() << "Hi" << "Bye" << "foo" << "bar" << "lorem" << "ipsum", 1);
@ -50,7 +50,7 @@ void MainWindow::createNotification()

 void MainWindow::clickEvent(int button)
 {
-    LxQtNotification* n = qobject_cast<LxQtNotification*>(sender());
+    LXQtNotification* n = qobject_cast<LXQtNotification*>(sender());
    if (n)
    {
        if (button == 0)
--- a/test/mainwindow.h
+++ b/test/mainwindow.h
@ -27,7 +27,7 @@

 #include <QMainWindow>

-class LxQtNotification;
+class LXQtNotification;

 namespace Ui {
 class MainWindow;
@ -36,7 +36,7 @@ class MainWindow;
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
-    
+
 public:
    explicit MainWindow(QWidget* parent = 0);
    ~MainWindow();
@ -47,7 +47,7 @@ public slots:

 private:
    Ui::MainWindow* ui;
-    QList<LxQtNotification*> nlist;
+    QList<LXQtNotification*> nlist;
 };

 #endif // MAINWINDOW_H
Author	SHA1	Message	Date
Alf Gaida	2e7cc6bbed	Adding upstream version 0.9.0+20151028.	2015-10-30 01:25:18 +01:00
Alf Gaida	ed9ce054e2	Adding upstream version 0.9.0+20150903.	2015-09-24 23:14:46 +02:00
Alf Gaida	6a60f296c0	Adding upstream version 0.9.0+20150830.	2015-09-02 21:40:04 +02:00
Andrew Lee (李健秋)	3e7083d4cb	Adding upstream version 0.9.0+20150807. Signed-off-by: Andrew Lee (李健秋) <ajqlee@debian.org>	2015-08-16 03:05:15 +08:00