Commit 6656ba58 authored by Alf Gaida's avatar Alf Gaida

Cherry-picking new upstream version 0.13.0.

* Bumped build dependency liblxqt0-dev to >= 0.13.0~
parent c6a06b80
debian/*.debhelper
debian/*.log
debian/*.substvars
debian/debhelper-build-stamp
debian/files
debian/lxqt-notificationd/
Upstream Authors:
LXQt team: http://lxqt.org
LXQt team: https://lxqt.org
Razor team: http://razor-qt.org
Copyright:
......
lxqt-notificationd-0.12.0 / 2017-10-21
lxqt-notificationd-0.13.0 / 2018-05-21
======================================
* Spanish translation update
* Include QStyle and QStyleOption to fix compilation with Qt5.11
* CMake: Prevent in-source builds
* notificationlayout: Remove the "on top" hint
* fix razor-qt -> lxqt and http -> https
* Fix mentions of LXDE
* Fix typo
* Fix spanish translation
* Update Simplified Chinese desktop entry
* Update Traditional Chinese translation
* Drop Qt foreach
* cmake: Handle CMP0071
* Change icon to preferences-desktop-notification
0.12.0 / 2017-10-21
===================
* Release 0.12.0: Update changelog
* Set patch version
* Don't export github templates
* Improvement for notification settings, see https://github.com/lxde/lxqt/issues/744#issuecomment-138601402
......
......@@ -28,8 +28,12 @@ endif()
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}\"")
add_definitions(
"-DLXQT_NOTIFICATIOND_VERSION=\"${LXQT_NOTIFICATIOND_VERSION}\""
"-DQT_NO_FOREACH"
)
include(LXQtPreventInSourceBuilds)
include(LXQtCompilerSettings NO_POLICY_SCOPE)
# Translations **********************************
......
......@@ -2,32 +2,56 @@
## Overview
`lxqt-notificationd` is LXQt's implementation of a daemon according to the [Desktop Notifications Specification](https://developer.gnome.org/notification-spec/).
`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.
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 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/lxqt/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.
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.
Runtime dependencies are KWindowSystem, [liblxqt](https://github.com/lxqt/liblxqt)
and [lxqt-common](https://github.com/lxqt/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/lxqt/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.
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.
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`.
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).
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/lxqt/lxqt-session#lxqt-session-settings)
of [lxqt-session](https://github.com/lxqt/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.
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/lxqt/lxqt-config#configuration-center)
of [lxqt-config](https://github.com/lxqt/lxqt-config) as well.
# Translations
Name[es]=Demonio de notificaciones
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
......@@ -4,7 +4,7 @@ Name=Desktop Notifications
GenericName=LXQt Notification Settings
Comment=Configure desktop notifications
Exec=lxqt-config-notificationd
Icon=preferences-desktop-theme
Icon=preferences-desktop-notification
Categories=Settings;DesktopSettings;Qt;LXQt;
OnlyShowIn=LXQt;
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2010-2011 Razor team
* Authors:
......
# Translations
GenericName[es]=Administrador de tareas
Name[es]=Configuración de sesiones LXQt
Comment[es]=Configure las notificacionde de freedesktop en el escritorio LXQt
Name[es]=Notificaciones del escritorio
GenericName[es]=Configuración de las notificaciones de LXQt
Comment[es]=Configurar las notificaciones del escritorio
# Translations
GenericName[es_VE]=Configuracion de notificaciones de Escritorio LXQt
Name[es_VE]=Configuracion de notificaciones de Escritorio LXQt
GenericName[es_VE]=Configuración de notificaciones de Escritorio LXQt
Name[es_VE]=Configuración de notificaciones de Escritorio LXQt
Comment[es_VE]=Configura las notificacones en el Escritoro LXQt
# Translations
GenericName[zh_CN]=qxkb
Name[zh_CN]=LXQt 通知配置
Comment[zh_CN]=配置 LXQt 桌面的通知
GenericName[zh_CN]=LXQt 通知配置
Name[zh_CN]=桌面通知
Comment[zh_CN]=配置桌面通知
# Translations
GenericName[zh_TW]=LXQt通知設定
Name[zh_TW]=LXQt通知設定
Comment[zh_TW]=LXQt桌面上的FreeDesktop通知設定
GenericName[zh_TW]=LXQt 通知設定
Name[zh_TW]=桌面通知
Comment[zh_TW]=設定桌面通知
/*.debhelper
/*.log
/*.substvars
/debhelper-build-stamp
/files
/lxqt-notificationd/
lxqt-notificationd (0.13.0-1) unstable; urgency=medium
* Cherry-picking new upstream version 0.13.0.
* Bumped build dependency liblxqt0-dev to >= 0.13.0~
-- Alf Gaida <agaida@siduction.org> Thu, 24 May 2018 21:45:09 +0200
lxqt-notificationd (0.12.0-4) unstable; urgency=medium
* Bumped compat to 11
......
......@@ -7,7 +7,7 @@ Section: x11
Priority: optional
Build-Depends: debhelper (>= 11~),
libkf5windowsystem-dev,
liblxqt0-dev (>= 0.12.0),
liblxqt0-dev (>= 0.13.0~),
libqt5svg5-dev,
libqt5x11extras5-dev,
libx11-dev,
......
......@@ -11,11 +11,14 @@ set(NOTIFICATIONS_UI
notification.ui
)
qt5_add_dbus_adaptor(NOTIFICATIONS_SRC
qt5_add_dbus_adaptor(NOTIFICATIONS_DBUS_SRC
org.freedesktop.Notifications.xml
notifyd.h Notifyd
)
set_property(SOURCE ${NOTIFICATIONS_DBUS_SRC} PROPERTY SKIP_AUTOGEN ON)
list(APPEND NOTIFICATIONS_SRC "${NOTIFICATIONS_DBUS_SRC}")
# Translations **********************************
lxqt_translate_ts(NOTIFICATIONS_QM_FILES
UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS}
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......@@ -35,6 +35,8 @@
#include <KWindowSystem/KWindowSystem>
#include <QMouseEvent>
#include <QPushButton>
#include <QStyle>
#include <QStyleOption>
#include "notification.h"
#include "notificationwidgets.h"
......@@ -310,7 +312,7 @@ void Notification::mouseReleaseEvent(QMouseEvent * event)
return;
}
foreach (WId i, KWindowSystem::stackingOrder())
for (WId i : KWindowSystem::stackingOrder())
{
KWindowInfo info = KWindowInfo(i, NET::WMName | NET::WMVisibleName);
appName = info.name();
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......@@ -42,9 +42,6 @@ NotificationLayout::NotificationLayout(QWidget *parent)
// 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);
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
......@@ -2,7 +2,7 @@
* (c)LGPL2+
*
* LXQt - a lightweight, Qt based, desktop toolset
* http://lxqt.org
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright: 2012 Razor team
* Authors:
......@@ -61,8 +61,8 @@ public slots:
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 vendor outbound string. It's filled with lxqt credits
* \param version outbound string. lxqt DE version is used (from CMakeLists.txt)
* \param spec_version outbound string. Currently used specification version.
* \retval QString daemon binary name
*/
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright (C) 2012 Alec Moskvin <alecm@gmx.com>
*
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright (C) 2012 Alec Moskvin <alecm@gmx.com>
*
......
/* BEGIN_COMMON_COPYRIGHT_HEADER
* (c)LGPL2+
*
* LXDE-Qt - a lightweight, Qt based, desktop toolset
* http://razor-qt.org
* LXQt - a lightweight, Qt based, desktop toolset
* https://lxqt.org
*
* Copyright (C) 2012 Alec Moskvin <alecm@gmx.com>
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment