From 85490cfbe45abad22101c786896115384bc0376b Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Tue, 22 May 2018 21:45:38 -0500 Subject: [PATCH] Remove pristine-tar files. --- AUTHORS | 10 - CHANGELOG | 219 --------- CMakeLists.txt | 42 -- LICENSE | 458 ------------------ README.md | 33 -- autostart/CMakeLists.txt | 17 - autostart/lxqt-notifications.desktop.in | 9 - .../lxqt-notifications_ar.desktop | 2 - .../lxqt-notifications_cs.desktop | 2 - .../lxqt-notifications_cs_CZ.desktop | 2 - .../lxqt-notifications_da.desktop | 2 - .../lxqt-notifications_de.desktop | 2 - .../lxqt-notifications_el.desktop | 2 - .../lxqt-notifications_eo.desktop | 2 - .../lxqt-notifications_es.desktop | 2 - .../lxqt-notifications_es_VE.desktop | 2 - .../lxqt-notifications_eu.desktop | 2 - .../lxqt-notifications_fi.desktop | 2 - .../lxqt-notifications_fr.desktop | 2 - .../lxqt-notifications_hu.desktop | 2 - .../lxqt-notifications_it_IT.desktop | 2 - .../lxqt-notifications_ja.desktop | 2 - .../lxqt-notifications_lt.desktop | 2 - .../lxqt-notifications_nl.desktop | 2 - .../lxqt-notifications_pl_PL.desktop | 2 - .../lxqt-notifications_pt.desktop | 2 - .../lxqt-notifications_pt_BR.desktop | 2 - .../lxqt-notifications_ro_RO.desktop | 2 - .../lxqt-notifications_ru.desktop | 2 - .../lxqt-notifications_ru_RU.desktop | 2 - .../lxqt-notifications_sl.desktop | 2 - .../lxqt-notifications_th_TH.desktop | 2 - .../lxqt-notifications_tr.desktop | 2 - .../lxqt-notifications_uk.desktop | 2 - .../lxqt-notifications_zh_CN.desktop | 2 - .../lxqt-notifications_zh_TW.desktop | 2 - config/CMakeLists.txt | 63 --- config/advancedsettings.cpp | 66 --- config/advancedsettings.h | 54 --- config/advancedsettings.ui | 128 ----- config/basicsettings.cpp | 115 ----- config/basicsettings.h | 53 -- config/basicsettings.ui | 213 -------- config/lxqt-config-notificationd.desktop.in | 11 - config/main.cpp | 58 --- config/mainwindow.cpp | 54 --- config/mainwindow.h | 44 -- .../lxqt-config-notificationd_ar.desktop | 4 - .../lxqt-config-notificationd_ca.desktop | 4 - .../lxqt-config-notificationd_cs.desktop | 4 - .../lxqt-config-notificationd_cs_CZ.desktop | 4 - .../lxqt-config-notificationd_da.desktop | 3 - .../lxqt-config-notificationd_de.desktop | 4 - .../lxqt-config-notificationd_el.desktop | 4 - .../lxqt-config-notificationd_eo.desktop | 4 - .../lxqt-config-notificationd_es.desktop | 4 - .../lxqt-config-notificationd_es_VE.desktop | 4 - .../lxqt-config-notificationd_eu.desktop | 4 - .../lxqt-config-notificationd_fi.desktop | 4 - .../lxqt-config-notificationd_fr.desktop | 4 - .../lxqt-config-notificationd_hu.desktop | 4 - .../lxqt-config-notificationd_id_ID.desktop | 3 - .../lxqt-config-notificationd_it.desktop | 4 - .../lxqt-config-notificationd_ja.desktop | 4 - .../lxqt-config-notificationd_lt.desktop | 4 - .../lxqt-config-notificationd_nl.desktop | 4 - .../lxqt-config-notificationd_pl.desktop | 3 - .../lxqt-config-notificationd_pl_PL.desktop | 4 - .../lxqt-config-notificationd_pt.desktop | 4 - .../lxqt-config-notificationd_pt_BR.desktop | 4 - .../lxqt-config-notificationd_ro_RO.desktop | 4 - .../lxqt-config-notificationd_ru.desktop | 4 - .../lxqt-config-notificationd_sl.desktop | 4 - ...lxqt-config-notificationd_sr@latin.desktop | 3 - .../lxqt-config-notificationd_th_TH.desktop | 4 - .../lxqt-config-notificationd_tr.desktop | 4 - .../lxqt-config-notificationd_uk.desktop | 4 - .../lxqt-config-notificationd_zh_CN.desktop | 4 - .../lxqt-config-notificationd_zh_TW.desktop | 4 - src/CMakeLists.txt | 58 --- src/main.cpp | 98 ---- src/notification.cpp | 361 -------------- src/notification.h | 137 ------ src/notification.ui | 169 ------- src/notificationarea.cpp | 134 ----- src/notificationarea.h | 70 --- src/notificationlayout.cpp | 200 -------- src/notificationlayout.h | 104 ---- src/notificationwidgets.cpp | 134 ----- src/notificationwidgets.h | 102 ---- src/notifyd.cpp | 148 ------ src/notifyd.h | 138 ------ src/org.freedesktop.Notifications.xml | 69 --- test/NotifyTest.pro | 20 - test/lxqt-notification-test-multiples.sh | 12 - test/lxqt-notification-test.sh | 15 - test/main.cpp | 35 -- test/mainwindow.cpp | 73 --- test/mainwindow.h | 53 -- test/mainwindow.ui | 76 --- 100 files changed, 4035 deletions(-) delete mode 100644 AUTHORS delete mode 100644 CHANGELOG delete mode 100644 CMakeLists.txt delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 autostart/CMakeLists.txt delete mode 100644 autostart/lxqt-notifications.desktop.in delete mode 100644 autostart/translations/lxqt-notifications_ar.desktop delete mode 100644 autostart/translations/lxqt-notifications_cs.desktop delete mode 100644 autostart/translations/lxqt-notifications_cs_CZ.desktop delete mode 100644 autostart/translations/lxqt-notifications_da.desktop delete mode 100644 autostart/translations/lxqt-notifications_de.desktop delete mode 100644 autostart/translations/lxqt-notifications_el.desktop delete mode 100644 autostart/translations/lxqt-notifications_eo.desktop delete mode 100644 autostart/translations/lxqt-notifications_es.desktop delete mode 100644 autostart/translations/lxqt-notifications_es_VE.desktop delete mode 100644 autostart/translations/lxqt-notifications_eu.desktop delete mode 100644 autostart/translations/lxqt-notifications_fi.desktop delete mode 100644 autostart/translations/lxqt-notifications_fr.desktop delete mode 100644 autostart/translations/lxqt-notifications_hu.desktop delete mode 100644 autostart/translations/lxqt-notifications_it_IT.desktop delete mode 100644 autostart/translations/lxqt-notifications_ja.desktop delete mode 100644 autostart/translations/lxqt-notifications_lt.desktop delete mode 100644 autostart/translations/lxqt-notifications_nl.desktop delete mode 100644 autostart/translations/lxqt-notifications_pl_PL.desktop delete mode 100644 autostart/translations/lxqt-notifications_pt.desktop delete mode 100644 autostart/translations/lxqt-notifications_pt_BR.desktop delete mode 100644 autostart/translations/lxqt-notifications_ro_RO.desktop delete mode 100644 autostart/translations/lxqt-notifications_ru.desktop delete mode 100644 autostart/translations/lxqt-notifications_ru_RU.desktop delete mode 100644 autostart/translations/lxqt-notifications_sl.desktop delete mode 100644 autostart/translations/lxqt-notifications_th_TH.desktop delete mode 100644 autostart/translations/lxqt-notifications_tr.desktop delete mode 100644 autostart/translations/lxqt-notifications_uk.desktop delete mode 100644 autostart/translations/lxqt-notifications_zh_CN.desktop delete mode 100644 autostart/translations/lxqt-notifications_zh_TW.desktop delete mode 100644 config/CMakeLists.txt delete mode 100644 config/advancedsettings.cpp delete mode 100644 config/advancedsettings.h delete mode 100644 config/advancedsettings.ui delete mode 100644 config/basicsettings.cpp delete mode 100644 config/basicsettings.h delete mode 100644 config/basicsettings.ui delete mode 100644 config/lxqt-config-notificationd.desktop.in delete mode 100644 config/main.cpp delete mode 100644 config/mainwindow.cpp delete mode 100644 config/mainwindow.h delete mode 100644 config/translations/lxqt-config-notificationd_ar.desktop delete mode 100644 config/translations/lxqt-config-notificationd_ca.desktop delete mode 100644 config/translations/lxqt-config-notificationd_cs.desktop delete mode 100644 config/translations/lxqt-config-notificationd_cs_CZ.desktop delete mode 100644 config/translations/lxqt-config-notificationd_da.desktop delete mode 100644 config/translations/lxqt-config-notificationd_de.desktop delete mode 100644 config/translations/lxqt-config-notificationd_el.desktop delete mode 100644 config/translations/lxqt-config-notificationd_eo.desktop delete mode 100644 config/translations/lxqt-config-notificationd_es.desktop delete mode 100644 config/translations/lxqt-config-notificationd_es_VE.desktop delete mode 100644 config/translations/lxqt-config-notificationd_eu.desktop delete mode 100644 config/translations/lxqt-config-notificationd_fi.desktop delete mode 100644 config/translations/lxqt-config-notificationd_fr.desktop delete mode 100644 config/translations/lxqt-config-notificationd_hu.desktop delete mode 100644 config/translations/lxqt-config-notificationd_id_ID.desktop delete mode 100644 config/translations/lxqt-config-notificationd_it.desktop delete mode 100644 config/translations/lxqt-config-notificationd_ja.desktop delete mode 100644 config/translations/lxqt-config-notificationd_lt.desktop delete mode 100644 config/translations/lxqt-config-notificationd_nl.desktop delete mode 100644 config/translations/lxqt-config-notificationd_pl.desktop delete mode 100644 config/translations/lxqt-config-notificationd_pl_PL.desktop delete mode 100644 config/translations/lxqt-config-notificationd_pt.desktop delete mode 100644 config/translations/lxqt-config-notificationd_pt_BR.desktop delete mode 100644 config/translations/lxqt-config-notificationd_ro_RO.desktop delete mode 100644 config/translations/lxqt-config-notificationd_ru.desktop delete mode 100644 config/translations/lxqt-config-notificationd_sl.desktop delete mode 100644 config/translations/lxqt-config-notificationd_sr@latin.desktop delete mode 100644 config/translations/lxqt-config-notificationd_th_TH.desktop delete mode 100644 config/translations/lxqt-config-notificationd_tr.desktop delete mode 100644 config/translations/lxqt-config-notificationd_uk.desktop delete mode 100644 config/translations/lxqt-config-notificationd_zh_CN.desktop delete mode 100644 config/translations/lxqt-config-notificationd_zh_TW.desktop delete mode 100644 src/CMakeLists.txt delete mode 100644 src/main.cpp delete mode 100644 src/notification.cpp delete mode 100644 src/notification.h delete mode 100644 src/notification.ui delete mode 100644 src/notificationarea.cpp delete mode 100644 src/notificationarea.h delete mode 100644 src/notificationlayout.cpp delete mode 100644 src/notificationlayout.h delete mode 100644 src/notificationwidgets.cpp delete mode 100644 src/notificationwidgets.h delete mode 100644 src/notifyd.cpp delete mode 100644 src/notifyd.h delete mode 100644 src/org.freedesktop.Notifications.xml delete mode 100644 test/NotifyTest.pro delete mode 100755 test/lxqt-notification-test-multiples.sh delete mode 100755 test/lxqt-notification-test.sh delete mode 100644 test/main.cpp delete mode 100644 test/mainwindow.cpp delete mode 100644 test/mainwindow.h delete mode 100644 test/mainwindow.ui diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index abb6e1f..0000000 --- a/AUTHORS +++ /dev/null @@ -1,10 +0,0 @@ -Upstream Authors: - LXQt team: http://lxqt.org - Razor team: http://razor-qt.org - -Copyright: - Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2017 LXQt team - -License: LGPL-2.1+ -The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 0aef0e7..0000000 --- a/CHANGELOG +++ /dev/null @@ -1,219 +0,0 @@ - -lxqt-notificationd-0.12.0 / 2017-10-21 -====================================== - - * Set patch version - * Don't export github templates - * Improvement for notification settings, see https://github.com/lxde/lxqt/issues/744#issuecomment-138601402 - * Updated Lithuanian language - * Drops Qt5Core_VERSION_STRING - * lxqt-config-notificationd: set Qt::AA_UseHighDpiPixmaps to true - * Add a basic cli to lxqt-config-notificationd Add a basic cli to lxqt-notificationd - * Added default CMAKE_BUILD_TYPE and LXQT_NOTIFICATION_PATCH_VERSION - * Create lxqt-config-notificationd_pl_PL.desktop - * Fixes a FTBFS in superbuild mode - * Added merged autostart to CMakeLists.txt - * Updated *_da.desktop files and removed *_da_DK.desktop files - * Update desktop entries and Replace fr_FR by fr - * Update Greek translation (el) Remove country variant from language code - * CMake: Adds Runtime and Devel install COMPONENTs - * Coding style changes - * Updates the build system to use the Targets infrastructure - * Drops hardcoded /etc/xdg paths - * Updated german translation, replaced Qt4 by Qt in all xsession/translations - * Updates translations infrastructure - * Update the required minimum cmake version - * remove dead template lines switch OnlyShowIn from Razor -> LXQt stringchanges LxQt -> LXQt - * Support lxqt-session and add necessary xdg autostart desktop entry files. - * Fix a typo: singals -> signals - * Bump year - -0.11.1 / 2017-01-01 -=================== - - * Release 0.11.1: Update changelog - * Updated da translation. Removed da_DK - * Update and rename French .desktop file - * Make CMakeList.txt more uniform. - * Remove cpack (#53) - -0.11.0 / 2016-09-24 -=================== - - * Release 0.11.0: Add changelog - * 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/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index 07666af..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - -project(lxqt-notificationd) - -include(GNUInstallDirs) - -set(CMAKE_AUTOMOC ON) -set(CMAKE_AUTOUIC ON) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) - -find_package(Qt5DBus REQUIRED) -find_package(Qt5LinguistTools REQUIRED) -find_package(Qt5Widgets REQUIRED) -message(STATUS "Building with Qt${Qt5Core_VERSION}") - -find_package(KF5WindowSystem REQUIRED) - -find_package(lxqt REQUIRED) - -if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) -endif() - -# Patch Version -set(LXQT_NOTIFICATIOND_PATCH_VERSION 0) - -set(LXQT_NOTIFICATIOND_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_NOTIFICATIOND_PATCH_VERSION}) -add_definitions("-DLXQT_NOTIFICATIOND_VERSION=\"${LXQT_NOTIFICATIOND_VERSION}\"") - -include(LXQtCompilerSettings NO_POLICY_SCOPE) - -# Translations ********************************** -include(LXQtTranslate) - -add_subdirectory(config) -add_subdirectory(src) - -## merged from lxqt-common -add_subdirectory(autostart) diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 20fb9c7..0000000 --- a/LICENSE +++ /dev/null @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md deleted file mode 100644 index 677cda4..0000000 --- a/README.md +++ /dev/null @@ -1,33 +0,0 @@ -# lxqt-notificationd - -## Overview - -`lxqt-notificationd` is LXQt's implementation of a daemon according to the [Desktop Notifications Specification](https://developer.gnome.org/notification-spec/). - -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. - -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. - -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/autostart/CMakeLists.txt b/autostart/CMakeLists.txt deleted file mode 100644 index 540204c..0000000 --- a/autostart/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) - -file(GLOB DESKTOP_FILES_IN *.desktop.in) - -# Translations ********************************** -lxqt_translate_desktop(DESKTOP_FILES - SOURCES - ${DESKTOP_FILES_IN} -) -add_custom_target(lxqt_notificationd_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES}) -#************************************************ - -install(FILES - ${DESKTOP_FILES} - DESTINATION "${LXQT_ETC_XDG_DIR}/autostart" - COMPONENT Runtime -) diff --git a/autostart/lxqt-notifications.desktop.in b/autostart/lxqt-notifications.desktop.in deleted file mode 100644 index 526c85d..0000000 --- a/autostart/lxqt-notifications.desktop.in +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Notification Daemon -TryExec=lxqt-notificationd -Exec=lxqt-notificationd -OnlyShowIn=LXQt; -X-LXQt-Module=true - -#TRANSLATIONS_DIR=translations diff --git a/autostart/translations/lxqt-notifications_ar.desktop b/autostart/translations/lxqt-notifications_ar.desktop deleted file mode 100644 index 94fda71..0000000 --- a/autostart/translations/lxqt-notifications_ar.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[ar]=بريمج الإشعارات diff --git a/autostart/translations/lxqt-notifications_cs.desktop b/autostart/translations/lxqt-notifications_cs.desktop deleted file mode 100644 index dbfc200..0000000 --- a/autostart/translations/lxqt-notifications_cs.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[cs]=Oznamovací démon diff --git a/autostart/translations/lxqt-notifications_cs_CZ.desktop b/autostart/translations/lxqt-notifications_cs_CZ.desktop deleted file mode 100644 index d0d09ba..0000000 --- a/autostart/translations/lxqt-notifications_cs_CZ.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[cs_CZ]=Oznamovací démon diff --git a/autostart/translations/lxqt-notifications_da.desktop b/autostart/translations/lxqt-notifications_da.desktop deleted file mode 100644 index 220815a..0000000 --- a/autostart/translations/lxqt-notifications_da.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[da]=Notifikationsbaggrundsprogram diff --git a/autostart/translations/lxqt-notifications_de.desktop b/autostart/translations/lxqt-notifications_de.desktop deleted file mode 100644 index aaf455a..0000000 --- a/autostart/translations/lxqt-notifications_de.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[de]=Benachrichtigungsdaemon diff --git a/autostart/translations/lxqt-notifications_el.desktop b/autostart/translations/lxqt-notifications_el.desktop deleted file mode 100644 index fac7a42..0000000 --- a/autostart/translations/lxqt-notifications_el.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[el]=Υπηρεσία ειδοποιήσεων diff --git a/autostart/translations/lxqt-notifications_eo.desktop b/autostart/translations/lxqt-notifications_eo.desktop deleted file mode 100644 index a107c79..0000000 --- a/autostart/translations/lxqt-notifications_eo.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[eo]=Demono de atentigoj diff --git a/autostart/translations/lxqt-notifications_es.desktop b/autostart/translations/lxqt-notifications_es.desktop deleted file mode 100644 index 8c530f9..0000000 --- a/autostart/translations/lxqt-notifications_es.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[es]=Demonio de notificaciones diff --git a/autostart/translations/lxqt-notifications_es_VE.desktop b/autostart/translations/lxqt-notifications_es_VE.desktop deleted file mode 100644 index fe338c0..0000000 --- a/autostart/translations/lxqt-notifications_es_VE.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[es_VE]=Demonio de notificaciones diff --git a/autostart/translations/lxqt-notifications_eu.desktop b/autostart/translations/lxqt-notifications_eu.desktop deleted file mode 100644 index 07feb4b..0000000 --- a/autostart/translations/lxqt-notifications_eu.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[eu]=Jakinarazpen-deabrua diff --git a/autostart/translations/lxqt-notifications_fi.desktop b/autostart/translations/lxqt-notifications_fi.desktop deleted file mode 100644 index 850073f..0000000 --- a/autostart/translations/lxqt-notifications_fi.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[fi]=Ilmoituspalvelu diff --git a/autostart/translations/lxqt-notifications_fr.desktop b/autostart/translations/lxqt-notifications_fr.desktop deleted file mode 100644 index 0c67a93..0000000 --- a/autostart/translations/lxqt-notifications_fr.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[fr]=Démon de notification diff --git a/autostart/translations/lxqt-notifications_hu.desktop b/autostart/translations/lxqt-notifications_hu.desktop deleted file mode 100644 index 24bedc6..0000000 --- a/autostart/translations/lxqt-notifications_hu.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[hu]=Értesítő szolgáltatás diff --git a/autostart/translations/lxqt-notifications_it_IT.desktop b/autostart/translations/lxqt-notifications_it_IT.desktop deleted file mode 100644 index 3630595..0000000 --- a/autostart/translations/lxqt-notifications_it_IT.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[it_IT]=Demone delle notifiche diff --git a/autostart/translations/lxqt-notifications_ja.desktop b/autostart/translations/lxqt-notifications_ja.desktop deleted file mode 100644 index 713c937..0000000 --- a/autostart/translations/lxqt-notifications_ja.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[ja]=通知デーモン diff --git a/autostart/translations/lxqt-notifications_lt.desktop b/autostart/translations/lxqt-notifications_lt.desktop deleted file mode 100644 index 6cee138..0000000 --- a/autostart/translations/lxqt-notifications_lt.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[lt]=Pranešimų tarnyba diff --git a/autostart/translations/lxqt-notifications_nl.desktop b/autostart/translations/lxqt-notifications_nl.desktop deleted file mode 100644 index d30048e..0000000 --- a/autostart/translations/lxqt-notifications_nl.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[nl]=notificatie Daemon diff --git a/autostart/translations/lxqt-notifications_pl_PL.desktop b/autostart/translations/lxqt-notifications_pl_PL.desktop deleted file mode 100644 index 0618018..0000000 --- a/autostart/translations/lxqt-notifications_pl_PL.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[pl_PL]=Daemon Powiadomień diff --git a/autostart/translations/lxqt-notifications_pt.desktop b/autostart/translations/lxqt-notifications_pt.desktop deleted file mode 100644 index 4a752f0..0000000 --- a/autostart/translations/lxqt-notifications_pt.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[pt]=Serviço de notificações diff --git a/autostart/translations/lxqt-notifications_pt_BR.desktop b/autostart/translations/lxqt-notifications_pt_BR.desktop deleted file mode 100644 index c5489dd..0000000 --- a/autostart/translations/lxqt-notifications_pt_BR.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[pt_BR]=Daemon de notificação diff --git a/autostart/translations/lxqt-notifications_ro_RO.desktop b/autostart/translations/lxqt-notifications_ro_RO.desktop deleted file mode 100644 index 3595a63..0000000 --- a/autostart/translations/lxqt-notifications_ro_RO.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[ro_RO]=Daemon de notificare diff --git a/autostart/translations/lxqt-notifications_ru.desktop b/autostart/translations/lxqt-notifications_ru.desktop deleted file mode 100644 index 74400fc..0000000 --- a/autostart/translations/lxqt-notifications_ru.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[ru]=демон Cообщение diff --git a/autostart/translations/lxqt-notifications_ru_RU.desktop b/autostart/translations/lxqt-notifications_ru_RU.desktop deleted file mode 100644 index 0d5ae8a..0000000 --- a/autostart/translations/lxqt-notifications_ru_RU.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[ru_RU]=Служба уведомлений diff --git a/autostart/translations/lxqt-notifications_sl.desktop b/autostart/translations/lxqt-notifications_sl.desktop deleted file mode 100644 index eee7519..0000000 --- a/autostart/translations/lxqt-notifications_sl.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[sl]=Obvestilnik diff --git a/autostart/translations/lxqt-notifications_th_TH.desktop b/autostart/translations/lxqt-notifications_th_TH.desktop deleted file mode 100644 index d776fde..0000000 --- a/autostart/translations/lxqt-notifications_th_TH.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[th_TH]=ดีมอนการแจ้งเตือน diff --git a/autostart/translations/lxqt-notifications_tr.desktop b/autostart/translations/lxqt-notifications_tr.desktop deleted file mode 100644 index 3007942..0000000 --- a/autostart/translations/lxqt-notifications_tr.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[tr]=Bildirim Artsüreci diff --git a/autostart/translations/lxqt-notifications_uk.desktop b/autostart/translations/lxqt-notifications_uk.desktop deleted file mode 100644 index 3eff111..0000000 --- a/autostart/translations/lxqt-notifications_uk.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[uk]=Демон сповіщень diff --git a/autostart/translations/lxqt-notifications_zh_CN.desktop b/autostart/translations/lxqt-notifications_zh_CN.desktop deleted file mode 100644 index e6d86b6..0000000 --- a/autostart/translations/lxqt-notifications_zh_CN.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[zh_CN]=通知服务 diff --git a/autostart/translations/lxqt-notifications_zh_TW.desktop b/autostart/translations/lxqt-notifications_zh_TW.desktop deleted file mode 100644 index fce6aba..0000000 --- a/autostart/translations/lxqt-notifications_zh_TW.desktop +++ /dev/null @@ -1,2 +0,0 @@ -# Translations -Name[zh_TW]=系統通知程序 diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt deleted file mode 100644 index 1fe1512..0000000 --- a/config/CMakeLists.txt +++ /dev/null @@ -1,63 +0,0 @@ -project(lxqt-config-notificationd) - -set(NOTIFICATIONS_CONF_SRC - advancedsettings.cpp - basicsettings.cpp - mainwindow.cpp - main.cpp -) - -set(NOTIFICATIONS_CONF_UI - advancedsettings.ui - basicsettings.ui -) - - -# Translations ********************************** -lxqt_translate_ts(NOTIFICATIONS_CONF_QM - UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS} - SOURCES - ${NOTIFICATIONS_CONF_MOC} - ${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}) -lxqt_translate_desktop(DESKTOP_FILES SOURCES lxqt-config-notificationd.desktop.in) -#************************************************ - - -add_executable(${PROJECT_NAME} - ${NOTIFICATIONS_CONF_SRC} - ${NOTIFICATIONS_CONF_QM} - ${DESKTOP_FILES} - ${QM_LOADER} -) - -target_link_libraries(${PROJECT_NAME} - KF5::WindowSystem - Qt5::Widgets - lxqt -) - -install(TARGETS - ${PROJECT_NAME} - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT Runtime -) -install(FILES - ${DESKTOP_FILES} - DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" - COMPONENT Runtime -) diff --git a/config/advancedsettings.cpp b/config/advancedsettings.cpp deleted file mode 100644 index c5816f3..0000000 --- a/config/advancedsettings.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include - -#include "advancedsettings.h" -#include "mainwindow.h" - - -AdvancedSettings::AdvancedSettings(LXQt::Settings* settings, QWidget *parent): - QWidget(parent), - mSettings(settings) -{ - setupUi(this); - restoreSettings(); - - connect(serverDecidesBox, SIGNAL(valueChanged(int)), this, SLOT(save())); - connect(spacingBox, SIGNAL(valueChanged(int)), this, SLOT(save())); - connect(widthBox, SIGNAL(valueChanged(int)), this, SLOT(save())); -} - -AdvancedSettings::~AdvancedSettings() -{ -} - -void AdvancedSettings::restoreSettings() -{ - int serverDecides = mSettings->value("server_decides", 10).toInt(); - if (serverDecides <= 0) - serverDecides = 10; - serverDecidesBox->setValue(serverDecides); - - spacingBox->setValue(mSettings->value("spacing", 6).toInt()); - widthBox->setValue(mSettings->value("width", 300).toInt()); -} - -void AdvancedSettings::save() -{ - mSettings->setValue("server_decides", serverDecidesBox->value()); - mSettings->setValue("spacing", spacingBox->value()); - mSettings->setValue("width", widthBox->value()); -} diff --git a/config/advancedsettings.h b/config/advancedsettings.h deleted file mode 100644 index 05d6d71..0000000 --- a/config/advancedsettings.h +++ /dev/null @@ -1,54 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef ADVANCEDSETTINGS_H -#define ADVANCEDSETTINGS_H - -#include -#include -#include "ui_advancedsettings.h" - -class AdvancedSettings : public QWidget, public Ui::AdvancedSettings -{ - Q_OBJECT - -public: - explicit AdvancedSettings(LXQt::Settings* settings, QWidget* parent = 0); - ~AdvancedSettings(); - -public slots: - void restoreSettings(); - -private: - LXQt::Settings* mSettings; - -private slots: - void save(); - -}; - -#endif // MENUCONFIG_H diff --git a/config/advancedsettings.ui b/config/advancedsettings.ui deleted file mode 100644 index 84ec3f8..0000000 --- a/config/advancedsettings.ui +++ /dev/null @@ -1,128 +0,0 @@ - - - AdvancedSettings - - - - 0 - 0 - 350 - 301 - - - - - - - Sizes - - - - - - - - Width: - - - - - - - px - - - 10 - - - 2000 - - - - - - - - - - - Spacing: - - - - - - - px - - - - - - - - - - - - Duration - - - - - - - 0 - 0 - - - - Some notifications set their own on-screen duration. - - - true - - - - - - - - - Default duration: - - - - - - - sec - - - 7200 - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - diff --git a/config/basicsettings.cpp b/config/basicsettings.cpp deleted file mode 100644 index e8aa9f8..0000000 --- a/config/basicsettings.cpp +++ /dev/null @@ -1,115 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include - -#include "basicsettings.h" -#include "mainwindow.h" - - -BasicSettings::BasicSettings(LXQt::Settings* settings, QWidget *parent) : - QWidget(parent), - mSettings(settings) -{ - setupUi(this); - - restoreSettings(); - - 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(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; - QString serverName = serverTest.serverInfo().name; - if (serverName != "lxqt-notificationd") - { - if (serverName.isEmpty()) - warningLabel->setText(tr("Warning: No notifications daemon is running.\n" - "A fallback will be used.")); - else - warningLabel->setText(tr("Warning: A third-party notifications daemon (%1) is running.\n" - "These settings won't have any effect on it!").arg(serverName)); - } -} - -BasicSettings::~BasicSettings() -{ -} - -void BasicSettings::restoreSettings() -{ - 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-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() -{ - 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 (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"); - - 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")); -} diff --git a/config/basicsettings.h b/config/basicsettings.h deleted file mode 100644 index cd0ba77..0000000 --- a/config/basicsettings.h +++ /dev/null @@ -1,53 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef BASICSETTINGS_H -#define BASICSETTINGS_H - -#include -#include -#include "ui_basicsettings.h" - - -class BasicSettings : public QWidget, public Ui::BasicSettings -{ - Q_OBJECT -public: - explicit BasicSettings(LXQt::Settings* settings, QWidget* parent = 0); - ~BasicSettings(); - -public slots: - void restoreSettings(); - -private slots: - void updateNotification(); - -private: - LXQt::Settings* mSettings; -}; - -#endif // BASICSETTINGS_H diff --git a/config/basicsettings.ui b/config/basicsettings.ui deleted file mode 100644 index 7681b1d..0000000 --- a/config/basicsettings.ui +++ /dev/null @@ -1,213 +0,0 @@ - - - BasicSettings - - - - 0 - 0 - 398 - 354 - - - - - - - - 75 - true - - - - Basic Settings - - - - - - - Position on screen - - - Qt::AlignCenter - - - - - - - - - true - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - - - - buttonGroup - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 40 - 20 - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 100 - 90 - - - - - - - - Qt::Vertical - - - QSizePolicy::Minimum - - - - 100 - 90 - - - - - - - - - - - Qt::Vertical - - - - 105 - 21 - - - - - - - - true - - - - - - - - - - - diff --git a/config/lxqt-config-notificationd.desktop.in b/config/lxqt-config-notificationd.desktop.in deleted file mode 100644 index abf3fd6..0000000 --- a/config/lxqt-config-notificationd.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Desktop Notifications -GenericName=LXQt Notification Settings -Comment=Configure desktop notifications -Exec=lxqt-config-notificationd -Icon=preferences-desktop-theme -Categories=Settings;DesktopSettings;Qt;LXQt; -OnlyShowIn=LXQt; - -#TRANSLATIONS_DIR=translations diff --git a/config/main.cpp b/config/main.cpp deleted file mode 100644 index 6dddae0..0000000 --- a/config/main.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include - -#include -#include -#include - -#include "mainwindow.h" - - -int main(int argc, char** argv) -{ - LXQt::SingleApplication a(argc, argv); - a.setAttribute(Qt::AA_UseHighDpiPixmaps, true); - - QCommandLineParser parser; - parser.setApplicationDescription(QStringLiteral("LXQt Config Notificationd")); - const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION - "\nliblxqt " LXQT_VERSION - "\nQt " QT_VERSION_STR); - a.setApplicationVersion(VERINFO); - parser.addVersionOption(); - parser.addHelpOption(); - parser.process(a); - - MainWindow w; - w.setWindowIcon(QIcon::fromTheme("preferences-desktop-theme")); - a.setActivationWindow(&w); - w.show(); - - return a.exec(); -} diff --git a/config/mainwindow.cpp b/config/mainwindow.cpp deleted file mode 100644 index 316aa23..0000000 --- a/config/mainwindow.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include -#include -#include - -#include "mainwindow.h" -#include "basicsettings.h" -#include "advancedsettings.h" - - -MainWindow::MainWindow(QWidget *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"); - connect(this, SIGNAL(reset()), basic, SLOT(restoreSettings())); - - AdvancedSettings* menu = new AdvancedSettings(mSettings, this); - addPage(menu, tr("Advanced Settings"), "preferences-desktop-notification-bell"); - connect(this, SIGNAL(reset()), menu, SLOT(restoreSettings())); -} - -MainWindow::~MainWindow() -{ - delete mSettings; -} diff --git a/config/mainwindow.h b/config/mainwindow.h deleted file mode 100644 index d189729..0000000 --- a/config/mainwindow.h +++ /dev/null @@ -1,44 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2010-2011 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - - -class MainWindow : public LXQt::ConfigDialog -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget* parent = 0); - ~MainWindow(); - -}; - -#endif diff --git a/config/translations/lxqt-config-notificationd_ar.desktop b/config/translations/lxqt-config-notificationd_ar.desktop deleted file mode 100644 index 9427452..0000000 --- a/config/translations/lxqt-config-notificationd_ar.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[ar]=قائمة التطبيقات -Name[ar]=أداة تهيئة جلسة ريزر -Comment[ar]=إعداد إشعارات سطح المكتب المفتوح في سطح مكتب ريزر diff --git a/config/translations/lxqt-config-notificationd_ca.desktop b/config/translations/lxqt-config-notificationd_ca.desktop deleted file mode 100644 index d79fcbd..0000000 --- a/config/translations/lxqt-config-notificationd_ca.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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_cs.desktop b/config/translations/lxqt-config-notificationd_cs.desktop deleted file mode 100644 index 15dd687..0000000 --- a/config/translations/lxqt-config-notificationd_cs.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[cs]=Nastavení oznamování v LXQtu -Name[cs]=Nastavení oznamování v LXQtu -Comment[cs]=Nastavit oznamování na ploše LXQt diff --git a/config/translations/lxqt-config-notificationd_cs_CZ.desktop b/config/translations/lxqt-config-notificationd_cs_CZ.desktop deleted file mode 100644 index c3a4c9d..0000000 --- a/config/translations/lxqt-config-notificationd_cs_CZ.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/config/translations/lxqt-config-notificationd_da.desktop b/config/translations/lxqt-config-notificationd_da.desktop deleted file mode 100644 index ba11c84..0000000 --- a/config/translations/lxqt-config-notificationd_da.desktop +++ /dev/null @@ -1,3 +0,0 @@ -Name[da]=Skrivebordsnotifikationer -GenericName[da]=LXQt-notifikationsindstillinger -Comment[da]=Konfigurér skrivebordsnotifikationer diff --git a/config/translations/lxqt-config-notificationd_de.desktop b/config/translations/lxqt-config-notificationd_de.desktop deleted file mode 100644 index b96da31..0000000 --- a/config/translations/lxqt-config-notificationd_de.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[de]=Mitteilungen der Arbeitsfläche -GenericName[de]=LXQt Mitteilungseinstellungen -Comment[de]=Konfiguration von Benachrichtigungen \ No newline at end of file diff --git a/config/translations/lxqt-config-notificationd_el.desktop b/config/translations/lxqt-config-notificationd_el.desktop deleted file mode 100644 index e43bf0e..0000000 --- a/config/translations/lxqt-config-notificationd_el.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[el]=Ειδοποιήσεις επιφάνειας εργασίας -GenericName[el]=Ρυθμίσεις ειδοποιήσεων LXQt -Comment[el]=Διαμόρφωση των ειδοποιήσεων της επιφάνειας εργασίας LXQt diff --git a/config/translations/lxqt-config-notificationd_eo.desktop b/config/translations/lxqt-config-notificationd_eo.desktop deleted file mode 100644 index 0d806cf..0000000 --- a/config/translations/lxqt-config-notificationd_eo.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[eo]=Agordoj de muso por LXQto -Name[eo]=Agordoj de muso por LXQto -Comment[eo]=Agordi atentigojn de freedesktop en LXQt-labortablo diff --git a/config/translations/lxqt-config-notificationd_es.desktop b/config/translations/lxqt-config-notificationd_es.desktop deleted file mode 100644 index a1f148c..0000000 --- a/config/translations/lxqt-config-notificationd_es.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[es]=Administrador de tareas -Name[es]=Configuración de sesiones LXQt -Comment[es]=Configure las notificacionde de freedesktop en el escritorio LXQt diff --git a/config/translations/lxqt-config-notificationd_es_VE.desktop b/config/translations/lxqt-config-notificationd_es_VE.desktop deleted file mode 100644 index e3a7711..0000000 --- a/config/translations/lxqt-config-notificationd_es_VE.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/config/translations/lxqt-config-notificationd_eu.desktop b/config/translations/lxqt-config-notificationd_eu.desktop deleted file mode 100644 index 128a94c..0000000 --- a/config/translations/lxqt-config-notificationd_eu.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[eu]=LXQt Freedesktop jakinarazpenen konfigurazioa -Name[eu]=LXQt Freedesktop jakinarazpenen konfigurazioa -Comment[eu]=Konfiguratu LXQt mahaigaineko Freedesktop jakinarazpenak diff --git a/config/translations/lxqt-config-notificationd_fi.desktop b/config/translations/lxqt-config-notificationd_fi.desktop deleted file mode 100644 index c2df16c..0000000 --- a/config/translations/lxqt-config-notificationd_fi.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/config/translations/lxqt-config-notificationd_fr.desktop b/config/translations/lxqt-config-notificationd_fr.desktop deleted file mode 100644 index 645db1c..0000000 --- a/config/translations/lxqt-config-notificationd_fr.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[fr]=Paramétrage des notifications -GenericName[fr]=Paramétrage des notifications du bureau LXQt -Comment[fr]=Paramétrage des notifications du bureau LXQt diff --git a/config/translations/lxqt-config-notificationd_hu.desktop b/config/translations/lxqt-config-notificationd_hu.desktop deleted file mode 100644 index c29f436..0000000 --- a/config/translations/lxqt-config-notificationd_hu.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -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 diff --git a/config/translations/lxqt-config-notificationd_id_ID.desktop b/config/translations/lxqt-config-notificationd_id_ID.desktop deleted file mode 100644 index 8e95feb..0000000 --- a/config/translations/lxqt-config-notificationd_id_ID.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[id_ID]=Hell World -Name[id_ID]=Konfigurator Desktop LXQt diff --git a/config/translations/lxqt-config-notificationd_it.desktop b/config/translations/lxqt-config-notificationd_it.desktop deleted file mode 100644 index c37a37e..0000000 --- a/config/translations/lxqt-config-notificationd_it.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[it]=Notifiche -Name[it]=Configura notifiche -Comment[it]=Configura le notifiche Freedesktop del Desktop LXQt diff --git a/config/translations/lxqt-config-notificationd_ja.desktop b/config/translations/lxqt-config-notificationd_ja.desktop deleted file mode 100644 index 49a5d43..0000000 --- a/config/translations/lxqt-config-notificationd_ja.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[ja]=LXQtフリーデスクトップ通知の設定 -Name[ja]=LXQtフリーデスクトップ通知の設定 -Comment[ja]=LXQtデスクトップでフリーデスクトップ通知を設定 diff --git a/config/translations/lxqt-config-notificationd_lt.desktop b/config/translations/lxqt-config-notificationd_lt.desktop deleted file mode 100644 index 6bcc15b..0000000 --- a/config/translations/lxqt-config-notificationd_lt.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[lt]=LXQt pranešimų nustatymai -Name[lt]=Darbalaukio pranešimai -Comment[lt]=Konfigūruoti darbalaukio pranešimus diff --git a/config/translations/lxqt-config-notificationd_nl.desktop b/config/translations/lxqt-config-notificationd_nl.desktop deleted file mode 100644 index d8669ce..0000000 --- a/config/translations/lxqt-config-notificationd_nl.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[nl]=Notepad -Name[nl]=Energiebeheer -Comment[nl]=Configureren freedesktop meldingen in LXQt desktop diff --git a/config/translations/lxqt-config-notificationd_pl.desktop b/config/translations/lxqt-config-notificationd_pl.desktop deleted file mode 100644 index b25a590..0000000 --- a/config/translations/lxqt-config-notificationd_pl.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[pl]=Menu -Name[pl]=Panel sterowania LXQt diff --git a/config/translations/lxqt-config-notificationd_pl_PL.desktop b/config/translations/lxqt-config-notificationd_pl_PL.desktop deleted file mode 100644 index a29bab0..0000000 --- a/config/translations/lxqt-config-notificationd_pl_PL.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[pl_PL]=Powiadomienia ekranowe -GenericName[pl_PL]=Ustawienia powiadomień LXQt -Comment[pl_PL]=Konfiguruj powiadomienia ekranowe diff --git a/config/translations/lxqt-config-notificationd_pt.desktop b/config/translations/lxqt-config-notificationd_pt.desktop deleted file mode 100644 index 73cb693..0000000 --- a/config/translations/lxqt-config-notificationd_pt.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[pt]=Notificações do ambiente de trabalho -GenericName[pt]=Definições das notificações do LXQt -Comment[pt]=Configurar notificações do sistema diff --git a/config/translations/lxqt-config-notificationd_pt_BR.desktop b/config/translations/lxqt-config-notificationd_pt_BR.desktop deleted file mode 100644 index 0dc5256..0000000 --- a/config/translations/lxqt-config-notificationd_pt_BR.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/config/translations/lxqt-config-notificationd_ro_RO.desktop b/config/translations/lxqt-config-notificationd_ro_RO.desktop deleted file mode 100644 index 56eb190..0000000 --- a/config/translations/lxqt-config-notificationd_ro_RO.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# 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 diff --git a/config/translations/lxqt-config-notificationd_ru.desktop b/config/translations/lxqt-config-notificationd_ru.desktop deleted file mode 100644 index 33ca789..0000000 --- a/config/translations/lxqt-config-notificationd_ru.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[ru]=Настройки уведомлений LXQt -Name[ru]=Уведомления рабочего стола -Comment[ru]=Настроить уведомления рабочего стола \ No newline at end of file diff --git a/config/translations/lxqt-config-notificationd_sl.desktop b/config/translations/lxqt-config-notificationd_sl.desktop deleted file mode 100644 index 170a0cd..0000000 --- a/config/translations/lxqt-config-notificationd_sl.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[sl]=Nastavitve obvestil -Name[sl]=Nastavitve obvestil na namizju -Comment[sl]=Nastavite obvestila na namizju LXQt diff --git a/config/translations/lxqt-config-notificationd_sr@latin.desktop b/config/translations/lxqt-config-notificationd_sr@latin.desktop deleted file mode 100644 index 0b2584b..0000000 --- a/config/translations/lxqt-config-notificationd_sr@latin.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -GenericName[sr@latin]=Automatsko suspendovanje -Name[sr@latin]=Upravljanje napajanjem diff --git a/config/translations/lxqt-config-notificationd_th_TH.desktop b/config/translations/lxqt-config-notificationd_th_TH.desktop deleted file mode 100644 index ff870c6..0000000 --- a/config/translations/lxqt-config-notificationd_th_TH.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LXQt Freedesktop -Name[th_TH]=การตั้งค่าการเตือนต่างๆ ของ LXQt Freedesktop -Comment[th_TH]=ตั้งค่าการเตือนต่างๆ ของ freedesktop ในเดสก์ท็อป LXQt diff --git a/config/translations/lxqt-config-notificationd_tr.desktop b/config/translations/lxqt-config-notificationd_tr.desktop deleted file mode 100644 index aab1b35..0000000 --- a/config/translations/lxqt-config-notificationd_tr.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[tr]=Not Defteri -Name[tr]=Güç yönetimi -Comment[tr]=LXQt masaüstünde freedesktop bildirimlerini ayarla diff --git a/config/translations/lxqt-config-notificationd_uk.desktop b/config/translations/lxqt-config-notificationd_uk.desktop deleted file mode 100644 index b433fa2..0000000 --- a/config/translations/lxqt-config-notificationd_uk.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[uk]=Налаштування Freedesktop сповіщень LXQt -Name[uk]=Налаштування Freedesktop сповіщень LXQt -Comment[uk]=Налаштувати Freedesktop сповіщення в стільниці LXQt diff --git a/config/translations/lxqt-config-notificationd_zh_CN.desktop b/config/translations/lxqt-config-notificationd_zh_CN.desktop deleted file mode 100644 index 07c92c6..0000000 --- a/config/translations/lxqt-config-notificationd_zh_CN.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[zh_CN]=qxkb -Name[zh_CN]=LXQt 通知配置 -Comment[zh_CN]=配置 LXQt 桌面的通知 diff --git a/config/translations/lxqt-config-notificationd_zh_TW.desktop b/config/translations/lxqt-config-notificationd_zh_TW.desktop deleted file mode 100644 index ccdcea0..0000000 --- a/config/translations/lxqt-config-notificationd_zh_TW.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -GenericName[zh_TW]=LXQt通知設定 -Name[zh_TW]=LXQt通知設定 -Comment[zh_TW]=LXQt桌面上的FreeDesktop通知設定 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt deleted file mode 100644 index ca5c771..0000000 --- a/src/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -set(NOTIFICATIONS_SRC - main.cpp - notificationarea.cpp - notification.cpp - notificationlayout.cpp - notificationwidgets.cpp - notifyd.cpp -) - -set(NOTIFICATIONS_UI - notification.ui -) - -qt5_add_dbus_adaptor(NOTIFICATIONS_SRC - org.freedesktop.Notifications.xml - notifyd.h Notifyd -) - -# Translations ********************************** -lxqt_translate_ts(NOTIFICATIONS_QM_FILES - UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS} - SOURCES - ${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}) -#************************************************ - -add_executable(lxqt-notificationd - ${NOTIFICATIONS_SRC} - ${NOTIFICATIONS_QM_FILES} - ${QM_LOADER} -) - -target_link_libraries(lxqt-notificationd - Qt5::Widgets - Qt5::DBus - lxqt - KF5::WindowSystem -) - -install(TARGETS - lxqt-notificationd - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" - COMPONENT Runtime -) diff --git a/src/main.cpp b/src/main.cpp deleted file mode 100644 index fc49d10..0000000 --- a/src/main.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include - -#include - -#include "notificationsadaptor.h" -#include "notifyd.h" - - -/*! \mainpage LXQt notification daemon - * - * Running in user session; implementing standard as described in: - * docs/nodification-spec-latest.html - * - * Implementation notes: - * - * Class \c Notifyd implements the main "server" part, a DBUS - * interface. Displaying of notifications is handled by these - * classes: - * - * - \c NotificationArea: a QScrollArea object with transparency. - * It ensures tha no action is unreachable (user can scroll - * over notifications) - * - \c NotificationLayout: a \c NotificationArea's main widget, - * (QWidget instance) holding instances of \c Notification. - * Layouting (in real QLayout) is done here. - * - \c Notification: a QWidget with one notification. Icon, texts, - * user interaction, etc. is handled in it. - * - * \c Notification can be extended with widgets located in files - * notificationwidgets.*. Currently there is only one extension: - * - * - \c NotificationActionsWidget holding user interface for - * interactive actions (buttons or combobox). - * - * Other extensions for e.g. "x-cannonical-*" can be implemented too. - * - */ -int main(int argc, char** argv) -{ - LXQt::Application a(argc, argv); - a.setQuitOnLastWindowClosed(false); - - QCommandLineParser parser; - parser.setApplicationDescription(QStringLiteral("LXQt Notification Daemon")); - const QString VERINFO = QStringLiteral(LXQT_NOTIFICATIOND_VERSION - "\nliblxqt " LXQT_VERSION - "\nQt " QT_VERSION_STR); - a.setApplicationVersion(VERINFO); - parser.addVersionOption(); - parser.addHelpOption(); - parser.process(a); - - // Ensure the helper widgets are hidden - a.setStyleSheet(a.styleSheet() + - "NotificationArea {background: transparent;}" - "NotificationLayout {background: transparent;}" - ); - - Notifyd* daemon = new Notifyd(); - new NotificationsAdaptor(daemon); - - QDBusConnection connection = QDBusConnection::sessionBus(); - if (!connection.registerService("org.freedesktop.Notifications")) - qDebug() << "registerService failed: another service with 'org.freedesktop.Notifications' runs already"; - if (!connection.registerObject("/org/freedesktop/Notifications", daemon)) - qDebug() << "registerObject failed: another object with '/org/freedesktop/Notifications' runs already"; - - return a.exec(); -} diff --git a/src/notification.cpp b/src/notification.cpp deleted file mode 100644 index 4e1553d..0000000 --- a/src/notification.cpp +++ /dev/null @@ -1,361 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#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, - const QStringList& actions, const QVariantMap& hints, - QWidget *parent) - : QWidget(parent), - m_timer(0), - m_linkHovered(false), - m_actionWidget(0) -{ - setupUi(this); - setObjectName("Notification"); - setMouseTracking(true); - - setMaximumWidth(parent->width()); - setMinimumWidth(parent->width()); - - setValues(application, summary, body, icon, timeout, actions, hints); - - 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, - const QString &summary, const QString &body, - const QString &icon, int timeout, - const QStringList& actions, const QVariantMap& hints) -{ - // Basic properties ********************* - - // Notifications spec set real order here: - // An implementation which only displays one image or icon must - // choose which one to display using the following order: - // - "image-data" - // - "image-path" - // - app_icon parameter - // - for compatibility reason, "icon_data" - if (!hints["image_data"].isNull()) - { - m_pixmap = getPixmapFromHint(hints["image_data"]); - } - else if (!hints["image_path"].isNull()) - { - m_pixmap = getPixmapFromString(hints["image_path"].toString()); - } - else if (!icon.isEmpty()) - { - m_pixmap = getPixmapFromString(icon); - } - else if (!hints["icon_data"].isNull()) - { - m_pixmap = getPixmapFromHint(hints["icon_data"]); - } - // issue #325: Do not display icon if it's not found... - if (m_pixmap.isNull()) - { - iconLabel->hide(); - } - else - { - if (m_pixmap.size().width() > ICONSIZE.width() - || m_pixmap.size().height() > ICONSIZE.height()) - { - m_pixmap = m_pixmap.scaled(ICONSIZE, Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - 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->setFixedWidth(appLabel->width()); - appLabel->setText(application); - - // summary - summaryLabel->setVisible(!summary.isEmpty() && application != summary); - summaryLabel->setFixedWidth(summaryLabel->width()); - summaryLabel->setText(summary); - - // body - bodyLabel->setVisible(!body.isEmpty()); - 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 , , , , ) - QString formatted(body); - bodyLabel->setText(formatted.replace('\n', QStringLiteral("
"))); - - // Timeout - // Special values: - // < 0: server decides timeout - // 0: infifite - if (m_timer) - { - m_timer->stop(); - m_timer->deleteLater(); - } - - // -1 for server decides is handled in notifyd to save QSettings instance - if (timeout > 0) - { - m_timer = new NotificationTimer(this); - connect(m_timer, &NotificationTimer::timeout, this, &Notification::timeout); - m_timer->start(timeout); - } - - // Categories ********************* - if (!hints["category"].isNull()) - { - // TODO/FIXME: Categories - how to handle it? - } - - // Urgency Levels ********************* - // Type Description - // 0 Low - // 1 Normal - // 2 Critical - if (!hints["urgency"].isNull()) - { - // TODO/FIXME: Urgencies - how to handle it? - } - - // Actions - if (actions.count() && m_actionWidget == 0) - { - if (actions.count()/2 < 4) - m_actionWidget = new NotificationActionsButtonsWidget(actions, this); - else - m_actionWidget = new NotificationActionsComboWidget(actions, this); - - connect(m_actionWidget, &NotificationActionsWidget::actionTriggered, - this, &Notification::actionTriggered); - - actionsLayout->addWidget(m_actionWidget); - m_actionWidget->show(); - } - - adjustSize(); - // ensure layout expansion - setMinimumHeight(qMax(rect().height(), childrenRect().height())); -} - -QString Notification::application() const -{ - return appLabel->text(); -} - -QString Notification::summary() const -{ - return summaryLabel->text(); -} - -QString Notification::body() const -{ - return bodyLabel->text(); -} - -void Notification::closeButton_clicked() -{ - if (m_timer) - m_timer->stop(); - emit userCanceled(); -} - -void Notification::paintEvent(QPaintEvent *) -{ - QStyleOption opt; - opt.init(this); - QPainter p(this); - style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this); -} - -QPixmap Notification::getPixmapFromHint(const QVariant &argument) const -{ - int width, height, rowstride, bitsPerSample, channels; - bool hasAlpha; - QByteArray data; - - const QDBusArgument arg = argument.value(); - arg.beginStructure(); - arg >> width; - arg >> height; - arg >> rowstride; - arg >> hasAlpha; - arg >> bitsPerSample; - arg >> channels; - arg >> data; - arg.endStructure(); - - 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); -} - -QPixmap Notification::getPixmapFromString(const QString &str) const -{ - QUrl url(str); - if (url.isValid() && QFile::exists(url.toLocalFile())) - { -// qDebug() << " getPixmapFromString by URL" << url; - return QPixmap(url.toLocalFile()); - } - else - { -// qDebug() << " getPixmapFromString by XdgIcon theme" << str << ICONSIZE << XdgIcon::themeName(); -// qDebug() << " " << XdgIcon::fromTheme(str) << "isnull:" << XdgIcon::fromTheme(str).isNull(); - // They say: do not display an icon if it;s not found - see #325 - return XdgIcon::fromTheme(str/*, XdgIcon::defaultApplicationIcon()*/).pixmap(ICONSIZE); - } -} - -void Notification::enterEvent(QEvent * event) -{ - if (m_timer) - m_timer->pause(); -} - -void Notification::leaveEvent(QEvent * event) -{ - if (m_timer) - 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(event)); - return true; - } - return false; -} - -void Notification::linkHovered(QString link) -{ - m_linkHovered = !link.isEmpty(); -} - -void Notification::mouseReleaseEvent(QMouseEvent * event) -{ -// qDebug() << "CLICKED" << event; - QString appName; - QString windowTitle; - - if (m_actionWidget && m_actionWidget->hasDefaultAction()) - { - emit actionTriggered(m_actionWidget->defaultAction()); - return; - } - - foreach (WId i, KWindowSystem::stackingOrder()) - { - KWindowInfo info = KWindowInfo(i, NET::WMName | NET::WMVisibleName); - appName = info.name(); - windowTitle = info.visibleName(); - // qDebug() << " " << i << "APPNAME" << appName << "TITLE" << windowTitle; - if (appName.isEmpty()) - { - QWidget::mouseReleaseEvent(event); - return; - } - if (appName == appLabel->text() || windowTitle == appLabel->text()) - { - KWindowSystem::raiseWindow(i); - closeButton_clicked(); - return; - } - } -} - -NotificationTimer::NotificationTimer(QObject *parent) - : QTimer(parent), - m_intervalMsec(-1) -{ -} - -void NotificationTimer::start(int msec) -{ - m_startTime = QDateTime::currentDateTime(); - m_intervalMsec = msec; - QTimer::start(msec); -} - -void NotificationTimer::pause() -{ - if (!isActive()) - return; - - stop(); - m_intervalMsec = m_startTime.msecsTo(QDateTime::currentDateTime()); -} - -void NotificationTimer::resume() -{ - if (isActive()) - return; - - start(m_intervalMsec); -} diff --git a/src/notification.h b/src/notification.h deleted file mode 100644 index 525da95..0000000 --- a/src/notification.h +++ /dev/null @@ -1,137 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef NOTIFICATION_H -#define NOTIFICATION_H - -#include -#include -#include -#include -#include "ui_notification.h" - - -class NotificationActionsWidget; -class NotificationTimer; - - -/*! Implementation of one notification. - * - * Notification on-click behavior is defined in mouseReleaseEvent() - */ -class Notification : public QWidget, public Ui::Notification -{ - Q_OBJECT -public: - /*! Construct a notification. - * Parameters are described in \c Notifyd::Notify() - */ - explicit Notification(const QString &application, - const QString &summary, const QString &body, - const QString &icon, int timeout, - const QStringList& actions, const QVariantMap& hints, - QWidget *parent = 0); - - /*! Set new values (update) for existing notification. - * Parameters are described in \c Notifyd::Notify() - */ - void setValues(const QString &application, - const QString &summary, const QString &body, - const QString &icon, int timeout, - const QStringList& actions, const QVariantMap& hints); - - QString application() const; - QString summary() const; - QString body() const; - -signals: - //! the server set timeout passed. Notification should close itself. - void timeout(); - //! User clicked the "close" button - void userCanceled(); - /*! User selected some of actions provided - * \param actionKey an action key - */ - void actionTriggered(const QString &actionKey); - -protected: - void enterEvent(QEvent * event); - void leaveEvent(QEvent * event); - /*! Define on-click behavior in the notification area. - Currently it implements: - - if there is one action or at least one default action, this - default action is triggered on click. - \see NotificationActionsWidget::hasDefaultAction() - \see NotificationActionsWidget::defaultAction() - - it tries to find caller window by - a) application name. \see XfitMan::getApplicationName() - b) window title. \see XfitMan::getWindowTitle() - if it can be found the window is raised and the notification is closed - - leave notification as-is. - */ - void mouseReleaseEvent(QMouseEvent * event); - -private: - NotificationTimer *m_timer; - - QPixmap m_pixmap; - bool m_linkHovered; - - NotificationActionsWidget *m_actionWidget; - - // mandatory for stylesheets - 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 timer with pause/resume functionality - * - */ -class NotificationTimer : public QTimer -{ - Q_OBJECT -public: - NotificationTimer(QObject *parent=0); - -public slots: - void start(int msec); - void pause(); - void resume(); - -private: - QDateTime m_startTime; - qint64 m_intervalMsec; -}; - -#endif // NOTIFICATION_H diff --git a/src/notification.ui b/src/notification.ui deleted file mode 100644 index 30f18d6..0000000 --- a/src/notification.ui +++ /dev/null @@ -1,169 +0,0 @@ - - - Notification - - - - 0 - 0 - 209 - 77 - - - - true - - - - 9 - - - 11 - - - - - 4 - - - 2 - - - - - - 0 - 0 - - - - - 32 - 32 - - - - - 32 - 32 - - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - 6 - - - - - - 75 - true - - - - TextLabel - - - Qt::PlainText - - - false - - - - - - - TextLabel - - - Qt::RichText - - - true - - - - - - - - 0 - 0 - - - - TextLabel - - - Qt::RichText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - - - - - - x - - - - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - diff --git a/src/notificationarea.cpp b/src/notificationarea.cpp deleted file mode 100644 index ad38d46..0000000 --- a/src/notificationarea.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include -#include "notificationarea.h" - - -NotificationArea::NotificationArea(QWidget *parent) - : QScrollArea(parent), - m_spacing(-1) -{ - setObjectName("NotificationArea"); - - setWindowFlags(Qt::X11BypassWindowManagerHint - | Qt::FramelessWindowHint - | Qt::WindowStaysOnTopHint); - // Hack to ensure the fully transparent QGraphicsView background - QPalette palette; - palette.setBrush(QPalette::Base, Qt::NoBrush); - setPalette(palette); - // Required to display wallpaper - setAttribute(Qt::WA_TranslucentBackground); - // no border at all finally - setFrameShape(QFrame::NoFrame); - - m_layout = new NotificationLayout(this); - setWidget(m_layout); - - setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - - 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) -{ - if (contentHeight == 0) - { - resize(width(), 0); - hide(); - return; - } - - if (contentHeight == -1) - contentHeight = height(); - - // FIXME: Qt does not seem to update QDesktopWidget::primaryScreen(). - // After we change the primary screen with xrandr, Qt still returns the same value. - // I think it's a bug of Qt. - QRect workArea = qApp->desktop()->availableGeometry(qApp->desktop()->primaryScreen()); - - 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); - - // no move needed for "top-left" - if ("top-center" == m_placement) - { - notif_rect.moveCenter(workArea.center()); - notif_rect.moveTop(workArea.top()); - } else if ("top-right" == m_placement) - { - notif_rect.moveRight(workArea.right()); - } else if ("center-left" == m_placement) - { - notif_rect.moveCenter(workArea.center()); - notif_rect.moveLeft(workArea.left()); - } else if ("center-center" == m_placement) - { - notif_rect.moveCenter(workArea.center()); - } else if ("center-right" == m_placement) - { - 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()); - } - - setGeometry(notif_rect); - // always show the latest notification - ensureVisible(0, contentHeight, 0, 0); -} - -void NotificationArea::setSettings(const QString &placement, int width, int spacing) -{ - m_placement = placement; - - setMaximumWidth(width); - setMinimumWidth(width); - - m_spacing = spacing; - m_layout->setSizes(m_spacing, width); - - this->setHeight(widget()->height()); -} diff --git a/src/notificationarea.h b/src/notificationarea.h deleted file mode 100644 index 8912939..0000000 --- a/src/notificationarea.h +++ /dev/null @@ -1,70 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef NOTIFICATIONAREA_H -#define NOTIFICATIONAREA_H - -#include -#include "notificationlayout.h" - - -/*! Top level widget. Scroll area is used to ensure access - * of all \c Notification instances (scrollable with mouse). - */ -class NotificationArea : public QScrollArea -{ - Q_OBJECT -public: - - explicit NotificationArea(QWidget *parent = 0); - - /*! An access to \c NotificationLayout to connect signals and slots in \c Notifyd - */ - NotificationLayout* layout() { return m_layout; } - - /*! Set new settings value from \c Notifyd. There are only one settings - * used - in \c Notifyd. - * \param placement a string name for notification location "top-level" etc. - * \param width set with of notifications - * \param spacing a spacing in the \NotificationLayout - */ - void setSettings(const QString &placement, int width, int spacing); - -private: - NotificationLayout *m_layout; - - QString m_placement; - int m_spacing; - -private slots: - /*! Recalculate widget size and visibility. Slot is called from \c Notificationlayout - * on demand (notification appear or is closed). - */ - void setHeight(int contentHeight = -1); -}; - -#endif // NOTIFICATIONAREA_H diff --git a/src/notificationlayout.cpp b/src/notificationlayout.cpp deleted file mode 100644 index a6e421a..0000000 --- a/src/notificationlayout.cpp +++ /dev/null @@ -1,200 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "notificationlayout.h" -#include -#include - - -NotificationLayout::NotificationLayout(QWidget *parent) - : QWidget(parent) -{ - setObjectName("NotificationLayout"); - - // Hack to ensure the fully transparent background - QPalette palette; - palette.setBrush(QPalette::Base, Qt::NoBrush); - setPalette(palette); - // Required to display wallpaper - setAttribute(Qt::WA_TranslucentBackground); - - // Make the window stay on top - setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); - - m_layout = new QVBoxLayout(this); - m_layout->setMargin(0); - setLayout(m_layout); -} - -void NotificationLayout::setSizes(int space, int width) -{ - m_layout->setSpacing(space); - setMaximumWidth(width); - setMinimumWidth(width); - - QHashIterator it(m_notifications); - while (it.hasNext()) - { - it.next(); - it.value()->setMinimumWidth(width); - it.value()->setMaximumWidth(width); - } -} - -void NotificationLayout::addNotification(uint id, const QString &application, - const QString &summary, const QString &body, - const QString &icon, int timeout, - const QStringList& actions, const QVariantMap& hints) -{ -// qDebug() << "NotificationLayout::addNotification" << id << application << summary << body << icon << timeout; - if (m_notifications.contains(id)) - { - // TODO/FIXME: it can be deleted by timer in this block. Locking? - Notification *n = m_notifications[id]; - n->setValues(application, summary, body, icon, timeout, actions, hints); - } - else - { - Notification *n = new Notification(application, summary, body, icon, timeout, actions, hints, this); - - // NOTE: it's hard to use == operator for Notification* in QList... - QHashIterator it(m_notifications); - while (it.hasNext()) - { - it.next(); - if (it.value()->application() == application - && it.value()->summary() == summary - && it.value()->body() == body) - { - qDebug() << "Notification app" << application << "summary" << summary << "is already registered but this request is not an update. Broken app?"; - delete n; - return; - } - } - - 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(); - } - - checkHeight(); - emit notificationAvailable(); - - // NOTE by pcman: - // This dirty hack is used to workaround a weird and annoying repainting bug caused by Qt. - // See https://github.com/Razor-qt/razor-qt/issues/536 - // razot-qt bug #536 - Notifications do not repaint under certain conditions - // When we create the first notification and are about to show the widget, force repaint() here. - // FIXME: there should be better ways to do this, or it should be fixed in Qt instead. - if(m_notifications.count() == 1) - repaint(); -} - -void NotificationLayout::removeNotificationTimeout() -{ - Notification *n = qobject_cast(sender()); - if (!n) - { - qDebug() << "Oooook! TIMEOUT Expecting instance of notification, got:" << sender(); - return; - } - - removeNotification(m_notifications.key(n), 1); -} - -void NotificationLayout::removeNotificationUser() -{ - Notification *n = qobject_cast(sender()); - if (!n) - { - qDebug() << "Oooook! USERCANCEL Expecting instance of notification, got:" << sender(); - return; - } - - removeNotification(m_notifications.key(n), 2); -} - -void NotificationLayout::removeNotification(uint key, uint reason) -{ - Notification *n = m_notifications.take(key); - if (!n) - { - qDebug() << "Oooook! Expecting instance of notification, got:" << key; - return; - } - - int ix = m_layout->indexOf(n); - if (ix == -1) - { - qDebug() << "Qooook! Widget not in layout. Impossible!" << n; - return; - } - - delete m_layout->takeAt(ix); - n->deleteLater(); - emit notificationClosed(key, reason); - - if (m_notifications.count() == 0) - emit allNotificationsClosed(); - - checkHeight(); -} - -void NotificationLayout::notificationActionCalled(const QString &actionKey) -{ - Notification *n = qobject_cast(sender()); - if (!n) - { - qDebug() << "Oooook! USERACTION Expecting instance of notification, got:" << sender(); - return; - } - - emit actionInvoked(m_notifications.key(n), actionKey); -} - -void NotificationLayout::checkHeight() -{ - int h = 0; - QHashIterator it(m_notifications); - while (it.hasNext()) - { - it.next(); - // *2 is mandatory here to prevent cropping of widgets - // with enforced small height - h += it.value()->height() + m_layout->spacing() * 2; - } - - setMinimumSize(width(), h); - setMaximumSize(width(), h); - - emit heightChanged(h); -} - diff --git a/src/notificationlayout.h b/src/notificationlayout.h deleted file mode 100644 index 0f4c577..0000000 --- a/src/notificationlayout.h +++ /dev/null @@ -1,104 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef NotificationLayout_H -#define NotificationLayout_H - -#include "notification.h" - - -class NotificationLayout : public QWidget -{ - Q_OBJECT -public: - explicit NotificationLayout(QWidget *parent); - - /*! Set various properties for self and child \c Notification instances. - * \param space a layout spacing - * \param width new width for notifications - */ - void setSizes(int space, int width); - -signals: - //! All \c Notification instances are closed - void allNotificationsClosed(); - //! At least one \c Notification instance is available and needs to be shown - void notificationAvailable(); - //! Height of this widget changed so parent's \c NotificationArea needs to change its size too. - void heightChanged(int); - - /*! Promote the internal change of notification closing into the \c Notifyd - * \param id an notification ID (obtained from \c Notify) - * \param reason a reason for closing code. See specification for more info. - */ - void notificationClosed(uint id, uint reason); - - /*! Inform the external application that user chose one of provided action via the \c Notifyd - * \param in0 a notification ID (obtained from \c Notify) - * \param in1 a selected action key from the (key - display value) pair - */ - void actionInvoked(uint id, const QString &actionKey); - -public slots: - /*! Add new notification - * See \c Notifyd::Notify() for params meanings. - */ - void addNotification(uint id, const QString &application, - const QString &summary, const QString &body, - const QString &icon, int timeout, - const QStringList& actions, const QVariantMap& hints); - - /*! Notification id should be removed because of reason - */ - void removeNotification(uint id, uint reason); - -private: - QHash m_notifications; - QVBoxLayout *m_layout; - - /*! Calculate required height based on height of each \c Notification - * in the m_notifications map. - * Also heightChanged() is emitted here. - */ - void checkHeight(); - -private slots: - /*! \c Notification's timer timeouted, so closing the notifiaction - */ - void removeNotificationTimeout(); - - /*! \c User cancelled the notifiation manually - */ - void removeNotificationUser(); - - /*! User clicked on one of actions (if provioded). - * \param actionKey an action's key (not the display value) - */ - void notificationActionCalled(const QString &actionKey); -}; - -#endif // NotificationLayout_H diff --git a/src/notificationwidgets.cpp b/src/notificationwidgets.cpp deleted file mode 100644 index d61e72c..0000000 --- a/src/notificationwidgets.cpp +++ /dev/null @@ -1,134 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include -#include -#include - -#include "notificationwidgets.h" - -#include - - -NotificationActionsWidget::NotificationActionsWidget(const QStringList& actions, QWidget *parent) - : QWidget(parent) -{ - for (int i = 0; i < actions.count(); i += 2) - { - QString key = actions[i]; - QString value; - - if (i == actions.count() - 1) - { - value = key; - qWarning() << "Odd number of elements in action list. Last action will use key as text (" << key << ")"; - } else { - value = actions[i + 1]; - } - - if (key == "default") - m_defaultAction = key; - - m_actions.append({key, value}); - } - - // 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) -{ - QHBoxLayout *l = new QHBoxLayout(); - setLayout(l); - - QButtonGroup *group = new QButtonGroup(this); - - for (auto const & action : m_actions) - { - QPushButton *b = new QPushButton(action.second, this); - b->setObjectName(action.first); - l->addWidget(b); - group->addButton(b); - - if (action.first == m_defaultAction) - b->setFocus(Qt::OtherFocusReason); - } - connect(group, static_cast(&QButtonGroup::buttonClicked), - this, &NotificationActionsButtonsWidget::actionButtonActivated); -} - -void NotificationActionsButtonsWidget::actionButtonActivated(QAbstractButton* button) -{ - emit actionTriggered(button->objectName()); -} - - -NotificationActionsComboWidget::NotificationActionsComboWidget(const QStringList& actions, QWidget *parent) - : NotificationActionsWidget(actions, parent) -{ - QHBoxLayout *l = new QHBoxLayout(); - setLayout(l); - - l->addWidget(new QLabel(tr("Actions:"), this)); - m_comboBox = new QComboBox(this); - int currentIndex = -1; - - for (int i = 0; i < m_actions.count(); ++i) - { - auto const & action = m_actions[i]; - - m_comboBox->addItem(action.second, action.first); - if (action.first == m_defaultAction) - { - currentIndex = i; - } - } - l->addWidget(m_comboBox); - - if (currentIndex != -1) - m_comboBox->setCurrentIndex(currentIndex); - - QPushButton *b = new QPushButton(tr("OK"), this); - l->addWidget(b); - connect(b, &QPushButton::clicked, - this, &NotificationActionsComboWidget::actionComboBoxActivated); -} - -void NotificationActionsComboWidget::actionComboBoxActivated() -{ - if (!m_comboBox) - return; - int ix = m_comboBox->currentIndex(); - if (ix == -1) - return; - emit actionTriggered(m_actions[ix].first); -} diff --git a/src/notificationwidgets.h b/src/notificationwidgets.h deleted file mode 100644 index 6a4119f..0000000 --- a/src/notificationwidgets.h +++ /dev/null @@ -1,102 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef NOTIFICATIONWIDGETS_H -#define NOTIFICATIONWIDGETS_H - -#include -#include -#include - -class QComboBox; - - -/*! A helper widgets for actions handling. - * See specification for information what actions are. - * - * Let's be a little bit tricky here. Let's allow only few - * buttons in the layout. We will use a combobox if there - * are more actions. I think it's more user friendly. - * - * If there are only few actions the layout with buttons is used. - * If there are more actions the combo box with confirm button is created. - */ -class NotificationActionsWidget : public QWidget -{ - Q_OBJECT - -public: - NotificationActionsWidget(const QStringList& actions, QWidget *parent); - - //! Notification holds exactly one action or at least one action is marked as "default" - bool hasDefaultAction() { return !m_defaultAction.isEmpty(); } - //! The key for default action - QString defaultAction() { return m_defaultAction; } - -signals: - /*! User clicks/chose an actio - * \param actionKey a key of selected action - */ - void actionTriggered(const QString &actionKey); - -protected: - QString m_defaultAction; - QList> m_actions; -}; - -class NotificationActionsButtonsWidget : public NotificationActionsWidget -{ - Q_OBJECT - -public: - /*! Create new widget. - * \param actions a list of actions in form: (key1, display1, key2, display2, ..., keyN, displayN) - */ - NotificationActionsButtonsWidget(const QStringList& actions, QWidget *parent); -private slots: - void actionButtonActivated(QAbstractButton* button); -}; - -class NotificationActionsComboWidget : public NotificationActionsWidget -{ - Q_OBJECT - -public: - /*! Create new widget. - * \param actions a list of actions in form: (key1, display1, key2, display2, ..., keyN, displayN) - */ - NotificationActionsComboWidget(const QStringList& actions, QWidget *parent); - -private: - QComboBox *m_comboBox; - -private slots: - void actionComboBoxActivated(); -}; - - -#endif diff --git a/src/notifyd.cpp b/src/notifyd.cpp deleted file mode 100644 index 0728451..0000000 --- a/src/notifyd.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXQt - a lightweight, Qt based, desktop toolset - * http://lxqt.org - * - * Copyright: 2012 Razor team - * Authors: - * Alec Moskvin - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "notifyd.h" - -#include - - -/* - * Implementation of class Notifyd - */ - -Notifyd::Notifyd(QObject* parent) - : QObject(parent), - mId(0) -{ - m_area = new NotificationArea(); - m_settings = new LXQt::Settings("notifications"); - reloadSettings(); - - 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(), &NotificationLayout::notificationClosed, - this, &Notifyd::NotificationClosed); - connect(m_area->layout(), &NotificationLayout::actionInvoked, - this, &Notifyd::ActionInvoked); - - connect(m_settings, &LXQt::Settings::settingsChanged, - this, &Notifyd::reloadSettings); - -} - -Notifyd::~Notifyd() -{ - m_area->deleteLater(); -} - -void Notifyd::CloseNotification(uint id) -{ - emit notificationClosed(id, 3); -} - -QStringList Notifyd::GetCapabilities() -{ - QStringList caps; - caps - << "actions" - // << "action-icons" - << "body" - << "body-hyperlinks" - << "body-images" - << "body-markup" - // << "icon-multi" - // << "icon-static" - << "persistence" - // << "sound" - ; - return caps; -} - -QString Notifyd::GetServerInformation(QString& vendor, - QString& version, - QString& spec_version) -{ - spec_version = QString("1.2"); - version = QString(LXQT_VERSION); - vendor = QString("lxqt.org"); - return QString("lxqt-notificationd"); -} - -uint Notifyd::Notify(const QString& app_name, - uint replaces_id, - const QString& app_icon, - const QString& summary, - const QString& body, - const QStringList& actions, - const QVariantMap& hints, - int expire_timeout - ) -{ - uint ret; - if (replaces_id == 0) - { - mId++; - ret = mId; - } - else - ret = replaces_id; -#if 0 - qDebug() << QString("Notify(\n" - " app_name = %1\n" - " replaces_id = %2\n" - " app_icon = %3\n" - " summary = %4\n" - " body = %5\n" - ).arg(app_name, QString::number(replaces_id), app_icon, summary, body) - << " actions =" << actions << endl - << " hints =" << hints << endl - << QString(" expire_timeout = %1\n) => %2").arg(QString::number(expire_timeout), QString::number(mId)); -#endif - - // handling the "server decides" timeout - if (expire_timeout == -1) { - expire_timeout = m_serverTimeout; - expire_timeout *= 1000; - } - - emit notificationAdded(ret, app_name, summary, body, app_icon, expire_timeout, actions, hints); - - return ret; -} - -void Notifyd::reloadSettings() -{ - m_serverTimeout = m_settings->value("server_decides", 10).toInt(); - m_area->setSettings( - m_settings->value("placement", "bottom-right").toString().toLower(), - m_settings->value("width", 300).toInt(), - m_settings->value("spacing", 6).toInt()); -} diff --git a/src/notifyd.h b/src/notifyd.h deleted file mode 100644 index 2c6ef73..0000000 --- a/src/notifyd.h +++ /dev/null @@ -1,138 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright: 2012 Razor team - * Authors: - * Alec Moskvin - * Petr Vanek - * - * This program or library is free software; you can redistribute it - * and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef NOTIFYD_H -#define NOTIFYD_H - -#include -#include -#include -#include - -#include "notificationarea.h" -#include - -/* - * Class for interface org.freedesktop.Notifications - */ -class Notifyd: public QObject -{ - Q_OBJECT - -public: - explicit Notifyd(QObject* parent = 0); - virtual ~Notifyd(); - -public slots: - - /*! External application requested to close one notification - * \param id an id obtained by previous \c Notify() call - */ - void CloseNotification(uint id); - - /*! List supported features as required by specification - * \retval QStringList with features. - */ - QStringList GetCapabilities(); - - /*! Provide a server/deamon info about version etc. - * \param vendor outbound string. It's filled with lxde-qt credits - * \param version outbound string. lxde-qt DE version is used (from CMakeLists.txt) - * \param spec_version outbound string. Currently used specification version. - * \retval QString daemon binary name - */ - QString GetServerInformation(QString& vendor, QString& version, QString& spec_version); - - /*! Daemon is requested to display the notification. - * \retval uint an unique notification ID. It should be used for tracking action feedback. - * \param app_name name of the calling application - * \param replaces_id if it's provided (!= 0) the already posted notification is "replaced" - * or updated with new content. - * \param app_icon an icon to show. See specification for more info. - * \param summary an overview text - * \param body a notification body - * \param actions User selectable action list. See specification for more info. - * \param hints Notification hints. See specification for more info. - * \param expire_timeout how long should be this notification displayed (-1 = server decides; 0 forever; >0timeout in milliseconds) - */ - uint Notify(const QString& app_name, - uint replaces_id, - const QString& app_icon, - const QString& summary, - const QString& body, - const QStringList& actions, - const QVariantMap& hints, - int expire_timeout); - -signals: - // signals for DBUS API specs - going outside - - /*! Inform the external application that user chose one of provided action - * \param in0 a notification ID (obtained from \c Notify) - * \param in1 a selected action key from the (key - display value) pair - */ - void ActionInvoked(uint in0, const QString& in1); - /*! Inform the external application that notification has been closed. - * \param in0 a notification ID (obtained from \c Notify) - * \param in1 a closing reason. See specification for more info. - * - * - 1 - The notification expired. - 2 - The notification was dismissed by the user. - 3 - The notification was closed by a call to CloseNotification. - 4 - Undefined/reserved reasons. - */ - void NotificationClosed(uint in0, uint in1); - - // signals for our implementation - internal usage - - /*! Promote the external request for notification closing into the display engine. - * \param id an notification ID (obtained from \c Notify) - * \param reason a reason for closing code. See specification for more info. - */ - void notificationClosed(uint id, uint reason); - - /*! Promote the external request for notification displaying into the engine. - * Parameters are the same as in \c Notify() slot. - */ - void notificationAdded(uint id, const QString &application, const QString &title, - const QString &description, const QString &icon, - int timeout, const QStringList& actions, const QVariantMap& hints); - -private: - uint mId; - NotificationArea *m_area; - int m_serverTimeout; - - LXQt::Settings *m_settings; - -private slots: - void reloadSettings(); -}; - -#endif // NOTIFYD_H diff --git a/src/org.freedesktop.Notifications.xml b/src/org.freedesktop.Notifications.xml deleted file mode 100644 index 5cf538e..0000000 --- a/src/org.freedesktop.Notifications.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/NotifyTest.pro b/test/NotifyTest.pro deleted file mode 100644 index 9a5b8a3..0000000 --- a/test/NotifyTest.pro +++ /dev/null @@ -1,20 +0,0 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2012-06-05T22:26:57 -# -#------------------------------------------------- - -QT += core gui dbus - -TARGET = NotifyTest -TEMPLATE = app -INCLUDEPATH += ../../libraries/ - -SOURCES += main.cpp \ - mainwindow.cpp - -HEADERS += mainwindow.h - -FORMS += mainwindow.ui - -LIBS += -llxqt diff --git a/test/lxqt-notification-test-multiples.sh b/test/lxqt-notification-test-multiples.sh deleted file mode 100755 index 66711fb..0000000 --- a/test/lxqt-notification-test-multiples.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# -# required: notify-send app installed (part of libnotify, or libnotify-tools) -# - - -# basic notifications -notify-send -u low -t 3000 --icon="document-open" "simple notification" "expires in 3s. No action there" & -notify-send -u normal -t 4000 --icon="document-close" "simple notification" "expires in 4s. No action there" & -notify-send -u low -t 3000 --icon="document-open" "simple notification" "expires in 3s. No action there" & -notify-send -u low -t 3000 --icon="document-open" "simple notification" "expires in 3s. No action there" & - diff --git a/test/lxqt-notification-test.sh b/test/lxqt-notification-test.sh deleted file mode 100755 index d260938..0000000 --- a/test/lxqt-notification-test.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# required: notify-send app installed (part of libnotify, or libnotify-tools) -# - - -# basic notifications -notify-send -u low -t 3000 --icon="document-open" "simple notification" "expires in 3s. No action there" & -notify-send -u normal -t 4000 --icon="document-close" "simple notification" "expires in 4s. No action there" & -notify-send -u critical -t 5000 --icon="application-exit" "simple notification" "expires in 5s. No action there" & -notify-send -u normal -t -1 --icon="go-next" "simple notification" "expires when server decies. No action there" & -notify-send -u normal -t 0 --icon="go-up" "simple notification" "never expires. No action there" & - -notify-send -u low -t 3000 --icon="document-open" "simple notification with a very long text inside it" "expires in 3s. No action there. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras vel leo quam. Morbi sit amet lorem vel dui commodo porttitor nec ut libero. Maecenas risus mauris, faucibus id tempus eu, auctor id purus. Vestibulum eget sapien non sem fermentum fermentum id sed turpis. Morbi pretium sem at turpis faucibus facilisis vel lacinia ante. Quisque a turpis lectus, quis posuere magna. Etiam magna velit, sagittis sed tincidunt et, adipiscing rutrum est. Aliquam aliquam aliquet tortor non varius. Quisque sollicitudin, ligula ac pulvinar laoreet, lacus metus sagittis nulla, ac sodales felis diam sed urna. In hac habitasse platea dictumst. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas." & - diff --git a/test/main.cpp b/test/main.cpp deleted file mode 100644 index 950cf04..0000000 --- a/test/main.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright (C) 2012 Alec Moskvin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include -#include -#include "mainwindow.h" - -int main(int argc, char *argv[]) -{ - QApplication a(argc, argv); - MainWindow w; - w.show(); - return a.exec(); -} diff --git a/test/mainwindow.cpp b/test/mainwindow.cpp deleted file mode 100644 index e29df18..0000000 --- a/test/mainwindow.cpp +++ /dev/null @@ -1,73 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright (C) 2012 Alec Moskvin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#include "mainwindow.h" -#include "ui_mainwindow.h" -#include -#include - -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent), - ui(new Ui::MainWindow) -{ - ui->setupUi(this); - connect(ui->pushButton, SIGNAL(clicked()), SLOT(createNotification())); - LXQtNotification::notify("1"); - LXQtNotification::notify("2"); - LXQtNotification::notify("3"); -} - -void MainWindow::createNotification() -{ - 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); - n->setIcon("preferences-desktop-launch-feedback"); - n->update(); -} - -void MainWindow::clickEvent(int button) -{ - LXQtNotification* n = qobject_cast(sender()); - if (n) - { - if (button == 0) - { - n->setBody("Hello!"); - } - else - { - n->setBody("Closing..."); - n->setTimeout(1000); - } - n->update(); - } -} - -MainWindow::~MainWindow() -{ - delete ui; - qDeleteAll(nlist); -} diff --git a/test/mainwindow.h b/test/mainwindow.h deleted file mode 100644 index de0bacd..0000000 --- a/test/mainwindow.h +++ /dev/null @@ -1,53 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER - * (c)LGPL2+ - * - * LXDE-Qt - a lightweight, Qt based, desktop toolset - * http://razor-qt.org - * - * Copyright (C) 2012 Alec Moskvin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef MAINWINDOW_H -#define MAINWINDOW_H - -#include - -class LXQtNotification; - -namespace Ui { -class MainWindow; -} - -class MainWindow : public QMainWindow -{ - Q_OBJECT - -public: - explicit MainWindow(QWidget* parent = 0); - ~MainWindow(); - -public slots: - void createNotification(); - void clickEvent(int button); - -private: - Ui::MainWindow* ui; - QList nlist; -}; - -#endif // MAINWINDOW_H diff --git a/test/mainwindow.ui b/test/mainwindow.ui deleted file mode 100644 index 1f573d7..0000000 --- a/test/mainwindow.ui +++ /dev/null @@ -1,76 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 400 - 300 - - - - MainWindow - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - PushButton - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 0 - 0 - 400 - 23 - - - - - - TopToolBarArea - - - false - - - - - - - -