From f5176a304893cecf99a8c2ad6bb17633cfc49c27 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 18 Oct 2016 03:09:57 +0200 Subject: [PATCH] Cherry-picking upstream release 0.11.0. * Synced debian foo with experimental * Bumped Standards to 3.9.8, no changes needed * Bumped compat to 10 * Removed --parallel from rules, compat 10 standard * Bumped minimum version debhelper (>= 10) * Bumped minimum version libqtxdg-dev (>= 2.0.0) * Bumped build dependency liblxqt-dev (>= 0.11.0) * Added build dependency libqt5svg5-dev * Added build dependency libqt5xdgiconloader-dev (>= 2.0) * Added Recommends lxqt-notificationd-l10n * Fixed VCS-Fields, use https and plain /git/ * Fixed copyright Format field * Bumped copyright years * Added translation control to rules * Set CMAKE_BUILD_TYPE=RelWithDebInfo * Exported LC_ALL=C.UTF-8, make builds reproducible * Added README.md to docs --- .gitignore | 1 + AUTHORS | 4 +- CHANGELOG | 180 ++++++++++++++++++ README.md | 32 +++- config/CMakeLists.txt | 10 + config/basicsettings.cpp | 2 +- .../translations/lxqt-config-notificationd.ts | 102 ---------- .../lxqt-config-notificationd_ca.desktop | 4 + .../lxqt-config-notificationd_de.ts | 105 ---------- .../lxqt-config-notificationd_el.ts | 105 ---------- .../lxqt-config-notificationd_hr.ts | 150 --------------- .../lxqt-config-notificationd_hu.ts | 130 ------------- .../lxqt-config-notificationd_it.ts | 166 ---------------- .../lxqt-config-notificationd_pt.ts | 165 ---------------- .../lxqt-config-notificationd_ru.ts | 130 ------------- .../lxqt-config-notificationd_ru_RU.desktop | 4 - .../lxqt-config-notificationd_ru_RU.ts | 130 ------------- debian/changelog | 23 +++ debian/compat | 2 +- debian/control | 17 +- debian/copyright | 6 +- debian/docs | 1 + debian/lintian-overrides | 2 +- debian/rules | 13 +- debian/upstream/signing-key.asc | 107 +++++------ debian/watch | 4 +- src/CMakeLists.txt | 10 + src/notification.cpp | 10 +- src/notification.ui | 6 + src/translations/lxqt-notificationd.ts | 17 -- src/translations/lxqt-notificationd_de.ts | 17 -- src/translations/lxqt-notificationd_el.ts | 17 -- src/translations/lxqt-notificationd_hu.ts | 17 -- src/translations/lxqt-notificationd_pt.ts | 17 -- src/translations/lxqt-notificationd_ru.ts | 17 -- src/translations/lxqt-notificationd_ru_RU.ts | 17 -- 36 files changed, 341 insertions(+), 1399 deletions(-) create mode 100644 CHANGELOG delete mode 100644 config/translations/lxqt-config-notificationd.ts create mode 100644 config/translations/lxqt-config-notificationd_ca.desktop delete mode 100644 config/translations/lxqt-config-notificationd_de.ts delete mode 100644 config/translations/lxqt-config-notificationd_el.ts delete mode 100644 config/translations/lxqt-config-notificationd_hr.ts delete mode 100644 config/translations/lxqt-config-notificationd_hu.ts delete mode 100644 config/translations/lxqt-config-notificationd_it.ts delete mode 100644 config/translations/lxqt-config-notificationd_pt.ts delete mode 100644 config/translations/lxqt-config-notificationd_ru.ts delete mode 100644 config/translations/lxqt-config-notificationd_ru_RU.desktop delete mode 100644 config/translations/lxqt-config-notificationd_ru_RU.ts delete mode 100644 src/translations/lxqt-notificationd.ts delete mode 100644 src/translations/lxqt-notificationd_de.ts delete mode 100644 src/translations/lxqt-notificationd_el.ts delete mode 100644 src/translations/lxqt-notificationd_hu.ts delete mode 100644 src/translations/lxqt-notificationd_pt.ts delete mode 100644 src/translations/lxqt-notificationd_ru.ts delete mode 100644 src/translations/lxqt-notificationd_ru_RU.ts diff --git a/.gitignore b/.gitignore index 378eac2..290b958 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build +*/translations/lxqt-notificationd 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/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..d396fda --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,180 @@ + +lxqt-notificationd-0.11.0 / 2016-09-24 +====================================== + + * Update and extend README.md + * Add Catalan translation + * build: Use external translations + * ts-files removal (#50) + * Clean up qDebugs/comments in notification.cpp + * config: Use our specific icon for demo + * Fix used licenses in AUTHORS, lxqt-notificationd is pure LGPL Bump year in AUTHORS + * Italian translation update + * Updated Russian translation Removed ru_RU files + * notification: Default icon + * notification: Fill background + * update lxqt-config-notificationd_hu.ts + * Update lxqt-config-notificationd_it.ts + +0.10.0 / 2015-10-31 +=================== + + * Update translations + * Remove docs/notification-spec-latest.html in favour of an upstream link + * Fix license file + * Switch all connect() calls to the new-style syntax + * Handle clicks on text labels properly (workaround for QTBUG-49025) + * Don't force rich text formatting on app, summary and body labels. + * Fix and improve action buttons. + * lxqt-config-notificationd: Fix Advanced Settings Ui Layout + * OnlyShowIn=LXQt; + * Update Greek (el) translation Remove country variant from language code + * Rename LxQt to LXQt everywhere + * Handles CMake policy CMP0063 + * Use the LXQtCompilerSettings CMake module + * Adds Runtime install COMPONENT + * Coding style changes + * Use GNUInstallDirs + * Use CMAKE_AUTOUIC, drop qt5_wrap_ui() + * Removes unneeded include_directories() entries + * Updated german translation. + * Updated template for new translations. + * Updates the build system to use the Targets infrastructure + * fix building + * Remove trailing whitespaces + * Replace LXDE-Qt with LXQt in documentation/comment + * lxqt_translate_ts: Fixes wrong argument position + * config-nototification_hu.ts modified + *_hu.ts added + * Hungarian translatons + * Update lxqt-config-notificationd_it.desktop + * Create lxqt-config-notificationd_it.ts + * Create lxqt-config-notificationd_hr.ts + * Fix image format for images with 3 channels + * Easier selection of notifications stop + * Fix notifications disappearing on mouse leave + * lxqt-config-notificationd_fr_FR.desktop: french translation update + * notification: set fixed width of text labels for correct sizeHint after setText + * config: more options to configure notification placement (added center ver/hor) + * Fix Russian duplicated entries on .desktop files + * Update lxqt-config-notificationd_it_IT.desktop + * notification: multilined plain text formatting + * Remove KF5/ prefix as done in lxde/liblxqt#36 + * settings: possibility to configure more than 99s shown time + * Unified german translation + * Updated german translation + * Added german translation. + +0.9.0 / 2015-01-06 +================== + + * Portuguese language update + * Fix typos in tests + * - Unify naming for a unique lxqt. No more suffixes + * Add icon to config window + * Use the new LxQt::SingleApplication + * CMakeLists.txt maintenance. + * fix a translation mistake for zh_CN + * Uses the new translations cmake modules + * Update Russian translation + * Display a clearer test notification right after changing the settings + * Notifications must not cover the panel. Fixes lxde/lxde-qt#315. + * Port to KWindowSystem + * Update deprecated dbus annotation + * Use lxqt.org as vendor + * Drop Qt4 support in code + * Clean up CMakeLists.txt and drop Qt 4 support + +0.8.0 / 2014-10-13 +================== + + * Adapt to the translation infrastructure + * Fix xde/lxde-qt #67 - Notifications are shown in the wrong location. + * Make the notification stay on top, fix bug lxde/lxde-qt #6 - Notifications show up under calendar plugin. + * Cleanup for Qt5 ready includes + * Use cmake 2.8.9 by default and use 2.8.11 for qt5. * Simplify qt5 support. + * Initial Qt5 support. + * Use new LXQt header files. + * Swap Spacing and Width + +0.7.0 / 2014-05-07 +================== + + * Update COPYING + +0.6.99 / 2014-04-30 +=================== + + * remove old templates from translations remove icon translations from desktop file translations + * Style fixes to the advanced config + * Update AUTHORS + * Add CPack rules for creating tarball + * Rename main window to Desktop Notifications + * Better wording in desktop files + * fixed: worng (and debug) qlabel color qss; moving bottom-left notification out of screen in some conditions + * Removed CMAKE_SOURCE_DIR usage from CMakeLists.txt files + * Add a dirty hack to workaround repainting issues and fix razor-qt bug 536. See https://github.com/Razor-qt/razor-qt/issues/536 for details. + * Use the correct updated org.freedesktop.Notifications.xml file from razor-resources. + * Fix renaming bugs, replacing lxqt-qt with lxde-qt + * Finish the crazy razor=>lxqt renaming tasks. + * rename razor to lxqt in strings + * Add missing files. + * Rename binaries and replace razor with lxqt. * Use the latest liblxqt and libqtxdg. + * Add COPYING and AUTHORS + * X-RAZOR changed to Razor in desktop files + * fixed #611 Notifications HTML rendering and buttons versus combo-box + * Set foreground colors for dark themes + * Fix CMakeLists.txt for 'Unknown CMake command "razor_translate_ts"' + * Translations updated + * first part of fixes based on Coverity Scan (code static analysis) + * Generate translation files + * Fix components missing translations + * Delete bad en_GB translations + * Update translations + * Translations updated + * Replace

tag with newlines since it's not valid notification markup + * notifications: fix button/combobox displaying for actions (stringlist should be checked divided by 2) + * Translations + * Deleted old translation methods. + * notifications: do not grow height in time (after days of use we were getting higher notification widgets) + * fixed #383 Identical notifications get increasingly large + * New translation infrastructure + * notification, dbus: no need for ReloadSettings anymore because it works out of the box now + * Fix variable (Issue #387) + * Fix for Issue #290 Fails to build on BSD + * fixed #324 Add a notification queue + * Fix for fix for commit 1c31b24 "compiles with qt 4.6.x as well" + * Fix for commit 1c31b24f3b43de5d6fb82f26e41d1a183d0c61e0 "compiles with qt 4.6.x as well" + * compiles with qt 4.6.x as well + * ad #329 - default actions and docs + * part of #329: on-click on notification launces default action or it tries to find appropariate window to raise; xfitman method renamed + one new + * don't display summary if its content equals appLabel + * issue #325: do not display default app icon if there is no icon found for notification + * fixed #327 Focused notifications should not time out + * suggestion for #325 - notifications are much smaller now. And it can be set to use smaller fornt in theme as well + * Add warning if a different notifications daemon is running + * Fix for #308 + * notifications: devel docs + * notifications: settings are synced with config tool (dbus); layouting fixes + * razorqt-notificationd: Fix the placement restore configuration Ui + * Add Hints support + * Add license headers + * notification icon fix + * proper actions handling + * notification widget expands as required + * notif: final fix for signals and slots + * notif. config: do not limit notification to 99px by default + * notiications test app + * port icon code for qt4.6.x + * Fix issue 308 Calling setMinimumSize and setMaximumSize when widget is not shown will do nothing + * slot name fix + * fixed action handling + * Let CMake generate the adaptor + * Add use parts of razor-runner theme for notifications + * Fix .desktop file generation + * notifications: vrious fixes; more options (hardcoded values removed); layouting + * fixes; begin of movabe notifications + * config app for notifications + * xdg notification actions implemented + * notifications: razorapplication used (theming); qtxdg used; spec icon loading implemented + * new notification solution (initial import) diff --git a/README.md b/README.md index ddcd8a6..677cda4 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,33 @@ # lxqt-notificationd -The LXQt Notification daemon +## Overview -## Spec +`lxqt-notificationd` is LXQt's implementation of a daemon according to the [Desktop Notifications Specification](https://developer.gnome.org/notification-spec/). -lxqt-notificationd follows the Desktop Notifications Specification version 1.2. +This specification defines a way to display notifications in pop-up windows on desktops. Notifications like this are e. g. frequently used by chat or mail clients to inform about incoming messages, by media players to indicate the beginning of another track but also by the desktop environment itself to indicate volume changes or similar. -It can be found here: +lxqt-notificationd is comprising binaries `lxqt-notificationd` and `lxqt-config-notificationd`. +`lxqt-notificationd` is running in a daemon-like manner as so-called [LXQt Module](https://github.com/lxde/lxqt-session#lxqt-modules) and doing the actual work. GUI "Desktop Notifications", binary `lxqt-config-notificationd`, is used to customize the notifications. -* https://people.gnome.org/~mccann/docs/notification-spec/notification-spec-latest.html +lxqt-notificationd is implementing version 1.2 of the said specification. + +## Installation + +### Compiling source code + +Runtime dependencies are KWindowSystem, [liblxqt](https://github.com/lxde/liblxqt) and [lxqt-common](https://github.com/lxde/lxqt-common). +Additional build dependencies are CMake and optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. + +Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. + +To build run `make`, to install `make install` which accepts variable `DESTDIR` as usual. + +### Binary packages + +Official binary packages are provided by all major Linux distributions like Arch Linux, Debian (as of Debian stretch only), Fedora and openSUSE. Just use your package manager to search for string `lxqt-notificationd`. + +## Configuration, Usage + +As `lxqt-notificationd` is run as LXQt Module it can be adjusted from section "Basic Settings" in configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#lxqt-session-settings) of [lxqt-session](https://github.com/lxde/lxqt-session). + +Configuration dialogue "Desktop Notifications" (binary `lxqt-config-notificationd`) which is used to customize notifications can be opened from the panel's main menu - Preferences - LXQt Settings - Desktop Notifications and is provided by the [Configuration Center](https://github.com/lxde/lxqt-config#configuration-center) of [lxqt-config](https://github.com/lxde/lxqt-config) as well. 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_ca.desktop b/config/translations/lxqt-config-notificationd_ca.desktop new file mode 100644 index 0000000..d79fcbd --- /dev/null +++ b/config/translations/lxqt-config-notificationd_ca.desktop @@ -0,0 +1,4 @@ +# Translations +Name[ca]=Notificacions de l'escriptori +GenericName[ca]=Ajusts de les notificacions de LXQt +Comment[ca]=Configureu les notificacions de l'escriptori 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/debian/changelog b/debian/changelog index 7cab7f1..6ac0d9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +lxqt-notificationd (0.11.0-2) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.0. + * Synced debian foo with experimental + * Bumped Standards to 3.9.8, no changes needed + * Bumped compat to 10 + * Removed --parallel from rules, compat 10 standard + * Bumped minimum version debhelper (>= 10) + * Bumped minimum version libqtxdg-dev (>= 2.0.0) + * Bumped build dependency liblxqt-dev (>= 0.11.0) + * Added build dependency libqt5svg5-dev + * Added build dependency libqt5xdgiconloader-dev (>= 2.0) + * Added Recommends lxqt-notificationd-l10n + * Fixed VCS-Fields, use https and plain /git/ + * Fixed copyright Format field + * Bumped copyright years + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + * Added README.md to docs + + -- Alf Gaida Tue, 18 Oct 2016 03:02:33 +0200 + lxqt-notificationd (0.10.0-2) unstable; urgency=medium * Remove dbg package in favor of dbgsym. diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 39e8c8c..f8a11b9 100644 --- a/debian/control +++ b/debian/control @@ -5,26 +5,29 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: cmake (>= 3.0.2), - debhelper (>= 9), +Build-Depends: debhelper (>= 10), + cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.11.0), + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libx11-dev, pkg-config, qtbase5-private-dev, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-notificationd.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-notificationd.git/?h=debian/sid +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-notificationd.git -b debian/sid Homepage: https://github.com/lxde/lxqt-notificationd Package: lxqt-notificationd Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-notificationd-l10n Provides: notification-daemon Description: LXQt notification daemon The LXQt notification daemon. diff --git a/debian/copyright b/debian/copyright index 18c7aae..8f15948 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,14 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lxqt-notificationd Source: https://github.com/lxde/lxqt-notificationd Files: * -Copyright: 2012-2015 LXQt team +Copyright: 2012-2016 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/docs b/debian/docs index 62deb04..0b6e0f3 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md diff --git a/debian/lintian-overrides b/debian/lintian-overrides index 393063e..ef5d27e 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,4 +1,4 @@ -# there will not be manpages in a foreseable futore +# there will not be manpages in a foreseable future lxqt-notificationd: binary-without-manpage usr/bin/lxqt-config-notificationd lxqt-notificationd: binary-without-manpage usr/bin/lxqt-notificationd diff --git a/debian/rules b/debian/rules index e8abf41..9dbedc2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,15 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 +# export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh ${@} --buildsystem cmake \ - --parallel + dh ${@} --buildsystem cmake + +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 05cd1df..4936633 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,63 +1,50 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U -WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA -Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ -OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 -7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE -FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb -ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 -+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 -ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 -ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC -iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB -tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC -Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a -SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ -OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb -sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF -UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho -P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu -6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn -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 -=fF8P +mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy +ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E +C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95 +zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1 +d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8 +Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6 +Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L +o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP +6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed +8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC +xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB +tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4 +wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf +41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf +Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr +luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ +L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d +2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq +nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7 +96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t +jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p +qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH +Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW +e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0 +omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94 +sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE +T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp +uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB +vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy +qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx +q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl +TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt +Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX +asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201 +Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA +CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ +zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ +ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06 +d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd +6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK +m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f +3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS +waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL +ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY +WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91 +1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk= +=h7ww -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 632ca69..40154c3 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-notificationd/releases .*/([\d\.]+).tar.gz + https://github.com/lxde/lxqt-notificationd/releases .*/lxqt-notificationd-([\d\.]+).tar.xz 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 - - -