diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 378eac2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -build diff --git a/AUTHORS b/AUTHORS index 190d298..a66be6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2014 LXQt team + Copyright (c) 2012-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 4b35bb9..1fe1512 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -21,6 +21,16 @@ lxqt_translate_ts(NOTIFICATIONS_CONF_QM ${NOTIFICATIONS_CONF_SRC} ${NOTIFICATIONS_CONF_UI} INSTALL_DIR "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-notificationd/${PROJECT_NAME}" ) lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME}) diff --git a/config/basicsettings.cpp b/config/basicsettings.cpp index 162fd36..35f3e21 100644 --- a/config/basicsettings.cpp +++ b/config/basicsettings.cpp @@ -116,5 +116,5 @@ void BasicSettings::updateNotification() 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")); + QStringLiteral("lxqt")); } diff --git a/config/translations/lxqt-config-notificationd.ts b/config/translations/lxqt-config-notificationd.ts deleted file mode 100644 index b8a565d..0000000 --- a/config/translations/lxqt-config-notificationd.ts +++ /dev/null @@ -1,102 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - - - - - Width: - - - - - - px - - - - - Spacing: - - - - - Duration - - - - - Some notifications set their own on-screen duration. - - - - - Default duration: - - - - - sec - - - - - BasicSettings - - - Basic Settings - - - - - Position on screen - - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - - MainWindow - - - Desktop Notifications - - - - - Basic Settings - - - - - Advanced Settings - - - - diff --git a/config/translations/lxqt-config-notificationd_de.ts b/config/translations/lxqt-config-notificationd_de.ts deleted file mode 100644 index bf2007b..0000000 --- a/config/translations/lxqt-config-notificationd_de.ts +++ /dev/null @@ -1,105 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - Größen - - - - Width: - Breite: - - - - - px - px - - - - Spacing: - Abstand: - - - - Duration - Dauer - - - - Some notifications set their own on-screen duration. - Einige Benachrichtigungen setzen ihre eigene Anzeigedauer. - - - - Default duration: - Standarddauer: - - - - sec - s - - - - BasicSettings - - - Basic Settings - Grundeinstellungen - - - - Position on screen - Position auf dem Bildschirm - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Warnung:</b> Es läuft kein Benachrichtigungsdaemon. -Ein Ersatz wird verwendet. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - <b>Warnung:</b> Ein anderer Benachrichtigungsdaemon (%1) läuft. -Diese Einstellungen wirken sich auf ihn nicht aus! - - - - Notification demo - Testbenachrichtigung - - - - This is a test notification. - All notifications will now appear here on LXQt. - Dies ist eine Testbenachrichtigung. -Alle Benachrichtigungen erscheinen jetzt hier auf LXQt. - - - - MainWindow - - - Desktop Notifications - Arbeitsflächenbenachrichtigungen - - - - Basic Settings - Grundeinstellungen - - - - Advanced Settings - Erweiterte Einstellungen - - - diff --git a/config/translations/lxqt-config-notificationd_el.ts b/config/translations/lxqt-config-notificationd_el.ts deleted file mode 100644 index ee52b23..0000000 --- a/config/translations/lxqt-config-notificationd_el.ts +++ /dev/null @@ -1,105 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - Μεγέθη - - - - Width: - Πλάτος: - - - - - px - εικ - - - - Spacing: - Απόσταση: - - - - Duration - Διάρκεια - - - - Some notifications set their own on-screen duration. - Μερικές ειδοποιήσεις καθορίζουν τη δική τους διάρκεια εμφάνισης. - - - - Default duration: - Διάρκεια εξ ορισμού: - - - - sec - δευτ - - - - BasicSettings - - - Basic Settings - Βασικές ρυθμίσεις - - - - Position on screen - Θέση στην οθόνη - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Προειδοποίηση:</b> Δεν εκτελείται κάποιος δαίμονας ειδοποιήσεων -Θα χρησιμοποιηθεί η ανακατεύθυνση. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - <b>Προειδοποίηση:</b> Εκτελείται ένας δαίμονας ειδοποιήσεων τρίτων (%1). -Αυτές οι ρυθμίσεις δεν θα έχουν κάποια επίδραση σε αυτόν! - - - - Notification demo - Επίδειξη ειδοποιήσεων - - - - This is a test notification. - All notifications will now appear here on LXQt. - Αυτή είναι μια δοκιμαστική ειδοποίηση. - Όλες οι ειδοποιήσεις στο LXQt θα εμφανίζονται εδώ. - - - - MainWindow - - - Desktop Notifications - Ειδοποιήσεις επιφάνειας εργασίας - - - - Basic Settings - Βασικές ρυθμίσεις - - - - Advanced Settings - Προηγμένες ρυθμίσεις - - - diff --git a/config/translations/lxqt-config-notificationd_hr.ts b/config/translations/lxqt-config-notificationd_hr.ts deleted file mode 100644 index 3ea72b9..0000000 --- a/config/translations/lxqt-config-notificationd_hr.ts +++ /dev/null @@ -1,150 +0,0 @@ - - - - - AdvancedSettings - - Menu Configuration - Konfiguracija izbornika - - - Notification Duration - Trajanje obavijesti - - - For some the notification's expiration time is dependent on the notification server's settings. - Za neke obavijesti's vrijeme istjecanja ovisi o postavkama poslužitelja's obavijesti - - - - Width: - - - - - Spacing: - - - - - Duration - - - - - Some notifications set their own on-screen duration. - - - - - Default duration: - - - - - sec - sek - - - - Sizes - Veličine - - - Notification Spacing: - Razmak obavijesti - - - - - px - px - - - Notification Width: - Širina obavijesti - - - - BasicSettings - - - Basic Settings - Osnovne postavke - - - - Position on screen - - - - Display Notifications - Prikaži obavijesti - - - Top/Left - Gore/lijevo - - - Top/Right - Gore/desno - - - Bottom/Left - Dolje/lijevo - - - Bottom/Right - Dolje/desno - - - Test Notification - Isprobaj obavijesti - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - Notification Summary - Sažetak obavijesti - - - - MainWindow - - - Desktop Notifications - Obavijesti radne površine - - - - Basic Settings - Osnovne postavke - - - - Advanced Settings - Napredne postavke - - - diff --git a/config/translations/lxqt-config-notificationd_hu.ts b/config/translations/lxqt-config-notificationd_hu.ts deleted file mode 100644 index 353401b..0000000 --- a/config/translations/lxqt-config-notificationd_hu.ts +++ /dev/null @@ -1,130 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - Méret - - - - Width: - Szélesség: - - - - - px - pixel - - - - Spacing: - Térköz: - - - - Duration - Tartam - - - - Some notifications set their own on-screen duration. - Egyes értesítések megjelenési ideje - - - - Default duration: - Alapértelmezett tartam: - - - - sec - mp - - - - BasicSettings - - - Basic Settings - Alapbeállítások - - - - Position on screen - Hely - - - Top/Left - Balra fenn - - - Top/Right - Jobbra fenn - - - Bottom/Left - Balra lenn - - - Bottom/Right - Jobbra lenn - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Figyelem:</b> Értesítő démon nem fut. -A vésztartalék használatos. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - <b>Figyelem:</b> A (%1) démont már valaki futtatja. -Ezek a beállítások arra már hatástalanok! - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - Notification demo - Értesítési bemutató - - - This is a test notification. -All notifications will now appear here on LXQt. - Az értesítés tesztje -Minden értesítést megjelenít az LXQt. - - - - MainWindow - - - Desktop Notifications - Asztali értesítések - - - - Basic Settings - Alapbeállítások - - - - Advanced Settings - Haladó beállítások - - - diff --git a/config/translations/lxqt-config-notificationd_it.ts b/config/translations/lxqt-config-notificationd_it.ts deleted file mode 100644 index 98f87b8..0000000 --- a/config/translations/lxqt-config-notificationd_it.ts +++ /dev/null @@ -1,166 +0,0 @@ - - - - - AdvancedSettings - - Menu Configuration - Configurazione del menu - - - Notification Duration - Durata delle notifiche - - - For some the notification's expiration time is dependent on the notification server's settings. - Per alcune notifiche il tempo dipende dalle impostazioni del server delle notifiche. - - - "Server Decides" Time: - Tempo di decisioni del server: - - - - Width: - - - - - Spacing: - - - - - Duration - - - - - Some notifications set their own on-screen duration. - - - - - Default duration: - - - - - sec - sec - - - - Sizes - Dimensione - - - Notification Spacing: - a cosa si riferisce?? - Spazing: - - - - - px - - - - Notification Width: - Larghezza: - - - - BasicSettings - - - Basic Settings - Impostazioni base - - - - Position on screen - - - - Display Notifications - Mostra notifiche - - - Top/Left - Alto a sinistra - - - Top/Right - Alto a destra - - - Bottom/Left - Fondo a sinistra - - - Bottom/Right - Fondo a destra - - - Test Notification - Notifica di prova - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Attenzione:</b> Nessun demone di notifiche è in esecuzione. -Sarà usato un sistema di riserva. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have an effect on it! - <b>Attenzione:</b> Un altro demone di notifiche (%1) è in esecuzione. -Queste impostazioni non avranno effetto su quello! - - - Notification Summary - Sommario della notifica - - - Notification Body - Corpo della notifica - - - - MainWindow - - - Desktop Notifications - Notificazioni Desktop - - - - Basic Settings - Impostazioni base - - - - Advanced Settings - Impostazioni avanzate - - - diff --git a/config/translations/lxqt-config-notificationd_pt.ts b/config/translations/lxqt-config-notificationd_pt.ts deleted file mode 100644 index 2a0530d..0000000 --- a/config/translations/lxqt-config-notificationd_pt.ts +++ /dev/null @@ -1,165 +0,0 @@ - - - - - AdvancedSettings - - Menu Configuration - Configuração do menu - - - Notification Duration - Duração da notificação - - - For some the notification's expiration time is dependent on the notification server's settings. - Para algumas notificações, o tempo limite depende das definições das notificações do servidor. - - - "Server Decides" Time: - Tempo para "Decisão do servidor": - - - - Width: - - - - - Spacing: - - - - - Duration - - - - - Some notifications set their own on-screen duration. - - - - - Default duration: - - - - - sec - seg - - - - Sizes - Tamanhos - - - Notification Spacing: - Espaçamento da notificação: - - - - - px - px - - - Notification Width: - Largura da notificaçao: - - - - BasicSettings - - - Basic Settings - Definições básicas - - - - Position on screen - - - - Display Notifications - Mostrar notificações - - - Top/Left - Cima/Esquerda - - - Top/Right - Cima/Direita - - - Bottom/Left - Baixo/Esquerda - - - Bottom/Right - Baixo/Direita - - - Test Notification - Testar notificação - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Aviso:</b> o serviço de notificaçoes não está em execução. -Será utilizada uma solução alternativa. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have an effect on it! - <b>Aviso:</b> já está a ser executado um serviço de notificações (%1). -Estas definições não produzirão qualquer efeito! - - - Notification Summary - Resumo da notificação - - - Notification Body - Corpo da notificação - - - - MainWindow - - - Desktop Notifications - Notificações do ambiente de trabalho - - - - Basic Settings - Definições básicas - - - - Advanced Settings - Definições avançadas - - - diff --git a/config/translations/lxqt-config-notificationd_ru.ts b/config/translations/lxqt-config-notificationd_ru.ts deleted file mode 100644 index 1a7aca2..0000000 --- a/config/translations/lxqt-config-notificationd_ru.ts +++ /dev/null @@ -1,130 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - Размеры - - - - Width: - Ширина: - - - - - px - пикс - - - - Spacing: - Расстояние: - - - - Duration - Длительность - - - - Some notifications set their own on-screen duration. - Некоторые уведомления сами устанавливают свою длительность на экране. - - - - Default duration: - Длительность по умолчанию: - - - - sec - сек - - - - BasicSettings - - - Basic Settings - Основные настройки - - - - Position on screen - Расположение на экране - - - Top/Left - Вверху слева - - - Top/Right - Вверху справа - - - Bottom/Left - Внизу слева - - - Bottom/Right - Внизу справа - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Внимание:</b> Демон уведомлений не запущен. -Будет использован резервный вариант. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - <b>Внимание:</b> Демон уведомлений третьей сторон (%1) запущен. -Эти настройки не будут иметь никакого эффекта для него! - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - Notification demo - Демонстрация уведомления - - - This is a test notification. -All notifications will now appear here on LXQt. - Это тестовое уведомление. -Все уведомления на LXQt будут появляться здесь. - - - - MainWindow - - - Desktop Notifications - Системные уведомления - - - - Basic Settings - Основные настройки - - - - Advanced Settings - Расширенные настройки - - - diff --git a/config/translations/lxqt-config-notificationd_ru_RU.desktop b/config/translations/lxqt-config-notificationd_ru_RU.desktop deleted file mode 100644 index bf21405..0000000 --- a/config/translations/lxqt-config-notificationd_ru_RU.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[ru_RU]=Настройки уведомлений LXQt -Name[ru_RU]=Уведомления рабочего стола -Comment[ru_RU]=Настроить уведомления рабочего стола diff --git a/config/translations/lxqt-config-notificationd_ru_RU.ts b/config/translations/lxqt-config-notificationd_ru_RU.ts deleted file mode 100644 index cf9e127..0000000 --- a/config/translations/lxqt-config-notificationd_ru_RU.ts +++ /dev/null @@ -1,130 +0,0 @@ - - - - - AdvancedSettings - - - Sizes - Размеры - - - - Width: - Ширина: - - - - - px - пикс - - - - Spacing: - Расстояние: - - - - Duration - Длительность - - - - Some notifications set their own on-screen duration. - Некоторые уведомления сами устанавливают свою длительность на экране. - - - - Default duration: - Длительность по умолчанию: - - - - sec - сек - - - - BasicSettings - - - Basic Settings - Основные настройки - - - - Position on screen - Расположение на экране - - - Top/Left - Вверху слева - - - Top/Right - Вверху справа - - - Bottom/Left - Внизу слева - - - Bottom/Right - Внизу справа - - - - <b>Warning:</b> No notifications daemon is running. -A fallback will be used. - <b>Внимание:</b> Демон уведомлений не запущен. -Будет использован резервный вариант. - - - - <b>Warning:</b> A third-party notifications daemon (%1) is running. -These settings won't have any effect on it! - <b>Внимание:</b> Демон уведомлений третьей сторон (%1) запущен. -Эти настройки не будут иметь никакого эффекта для него! - - - - Notification demo - - - - - This is a test notification. - All notifications will now appear here on LXQt. - - - - Notification demo - Демонстрация уведомления - - - This is a test notification. -All notifications will now appear here on LXQt. - Это тестовое уведомление. -Все уведомления на LXQt будут появляться здесь. - - - - MainWindow - - - Desktop Notifications - Системные уведомления - - - - Basic Settings - Основные настройки - - - - Advanced Settings - Расширенные настройки - - - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4ec25a1..ca5c771 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,6 +23,16 @@ lxqt_translate_ts(NOTIFICATIONS_QM_FILES ${NOTIFICATIONS_SRC} ${NOTIFICATIONS_UI} INSTALL_DIR "${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME}" + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-notificationd/${PROJECT_NAME}" ) lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME}) diff --git a/src/notification.cpp b/src/notification.cpp index 94a750e..4e1553d 100644 --- a/src/notification.cpp +++ b/src/notification.cpp @@ -88,22 +88,18 @@ void Notification::setValues(const QString &application, if (!hints["image_data"].isNull()) { m_pixmap = getPixmapFromHint(hints["image_data"]); -// qDebug() << application << "from image_data" << m_pixmap.isNull(); } else if (!hints["image_path"].isNull()) { m_pixmap = getPixmapFromString(hints["image_path"].toString()); -// qDebug() << application << "from image_path" << m_pixmap.isNull(); } else if (!icon.isEmpty()) { m_pixmap = getPixmapFromString(icon); -// qDebug() << application << "from icon" << icon << m_pixmap.isNull(); } else if (!hints["icon_data"].isNull()) { m_pixmap = getPixmapFromHint(hints["icon_data"]); -// qDebug() << application << "from icon_data" << m_pixmap.isNull(); } // issue #325: Do not display icon if it's not found... if (m_pixmap.isNull()) @@ -161,10 +157,9 @@ void Notification::setValues(const QString &application, } // Categories ********************* - // TODO/FIXME: Categories - how to handle it? if (!hints["category"].isNull()) { - qDebug() << "Notification" << application << "category" << hints["category"]; + // TODO/FIXME: Categories - how to handle it? } // Urgency Levels ********************* @@ -172,10 +167,9 @@ void Notification::setValues(const QString &application, // 0 Low // 1 Normal // 2 Critical - // TODO/FIXME: Urgencies - how to handle it? if (!hints["urgency"].isNull()) { - qDebug() << "Notification" << application << "urgency" << hints["urgency"]; + // TODO/FIXME: Urgencies - how to handle it? } // Actions diff --git a/src/notification.ui b/src/notification.ui index adec9fe..30f18d6 100644 --- a/src/notification.ui +++ b/src/notification.ui @@ -10,6 +10,9 @@ 77 + + true + 9 @@ -136,6 +139,9 @@ x + + + true diff --git a/src/translations/lxqt-notificationd.ts b/src/translations/lxqt-notificationd.ts deleted file mode 100644 index 4a8c633..0000000 --- a/src/translations/lxqt-notificationd.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - - - - - OK - - - - diff --git a/src/translations/lxqt-notificationd_de.ts b/src/translations/lxqt-notificationd_de.ts deleted file mode 100644 index 801bf0e..0000000 --- a/src/translations/lxqt-notificationd_de.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Aktionen: - - - - OK - OK - - - diff --git a/src/translations/lxqt-notificationd_el.ts b/src/translations/lxqt-notificationd_el.ts deleted file mode 100644 index 9aed81f..0000000 --- a/src/translations/lxqt-notificationd_el.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Ενέργειες: - - - - OK - Εντάξει - - - diff --git a/src/translations/lxqt-notificationd_hu.ts b/src/translations/lxqt-notificationd_hu.ts deleted file mode 100644 index cc5df05..0000000 --- a/src/translations/lxqt-notificationd_hu.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Akciók: - - - - OK - - - - diff --git a/src/translations/lxqt-notificationd_pt.ts b/src/translations/lxqt-notificationd_pt.ts deleted file mode 100644 index 89b322a..0000000 --- a/src/translations/lxqt-notificationd_pt.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Ações: - - - - OK - OK - - - diff --git a/src/translations/lxqt-notificationd_ru.ts b/src/translations/lxqt-notificationd_ru.ts deleted file mode 100644 index 0834093..0000000 --- a/src/translations/lxqt-notificationd_ru.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Действия: - - - - OK - OK - - - diff --git a/src/translations/lxqt-notificationd_ru_RU.ts b/src/translations/lxqt-notificationd_ru_RU.ts deleted file mode 100644 index 541c5a7..0000000 --- a/src/translations/lxqt-notificationd_ru_RU.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - - - NotificationActionsComboWidget - - - Actions: - Действия: - - - - OK - OK - - -