Lubuntu/lxqt-notificationd-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cherry-picking upstream version 0.12.0.

Browse Source
This commit is contained in:
Alf Gaida 2017-12-04 22:38:48 +01:00
parent d8f10636af
commit d52362de8e
41 changed files with 197 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -4,7 +4,7 @@ Upstream Authors:
Copyright:
Copyright (c) 2010-2012 Razor team
Copyright (c) 2012-2016 LXQt team
Copyright (c) 2012-2017 LXQt team
License: LGPL-2.1+
The full text of the licenses can be found in the 'COPYING' file.

32
CHANGELOG
View File

@ -1,7 +1,37 @@
lxqt-notificationd-0.11.1 / 2017-01-01
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.

17
CMakeLists.txt
View File

@ -12,14 +12,24 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
find_package(Qt5DBus REQUIRED)
find_package(Qt5LinguistTools REQUIRED QUIET)
find_package(Qt5LinguistTools REQUIRED)
find_package(Qt5Widgets REQUIRED)
message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
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 **********************************
@ -27,3 +37,6 @@ include(LXQtTranslate)
add_subdirectory(config)
add_subdirectory(src)
## merged from lxqt-common
add_subdirectory(autostart)

17
autostart/CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
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
)

9
autostart/lxqt-notifications.desktop.in Normal file
View File

@ -0,0 +1,9 @@
[Desktop Entry]
Type=Application
Name=Notification Daemon
TryExec=lxqt-notificationd
Exec=lxqt-notificationd
OnlyShowIn=LXQt;
X-LXQt-Module=true
#TRANSLATIONS_DIR=translations

2
autostart/translations/lxqt-notifications_ar.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[ar]=بريمج الإشعارات

2
autostart/translations/lxqt-notifications_cs.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[cs]=Oznamovací démon

2
autostart/translations/lxqt-notifications_cs_CZ.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[cs_CZ]=Oznamovací démon

2
autostart/translations/lxqt-notifications_da.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[da]=Notifikationsbaggrundsprogram

2
autostart/translations/lxqt-notifications_de.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[de]=Benachrichtigungsdaemon

2
autostart/translations/lxqt-notifications_el.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[el]=Υπηρεσία ειδοποιήσεων

2
autostart/translations/lxqt-notifications_eo.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[eo]=Demono de atentigoj

2
autostart/translations/lxqt-notifications_es.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[es]=Demonio de notificaciones

2
autostart/translations/lxqt-notifications_es_VE.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[es_VE]=Demonio de notificaciones

2
autostart/translations/lxqt-notifications_eu.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[eu]=Jakinarazpen-deabrua

2
autostart/translations/lxqt-notifications_fi.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[fi]=Ilmoituspalvelu

2
autostart/translations/lxqt-notifications_fr.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[fr]=Démon de notification

2
autostart/translations/lxqt-notifications_hu.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[hu]=Értesítő szolgáltatás

2
autostart/translations/lxqt-notifications_it_IT.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[it_IT]=Demone delle notifiche

2
autostart/translations/lxqt-notifications_ja.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[ja]=通知デーモン

2
autostart/translations/lxqt-notifications_lt.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[lt]=Pranešimų tarnyba

2
autostart/translations/lxqt-notifications_nl.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[nl]=notificatie Daemon

2
autostart/translations/lxqt-notifications_pl_PL.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[pl_PL]=Daemon Powiadomień

2
autostart/translations/lxqt-notifications_pt.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[pt]=Serviço de notificações

2
autostart/translations/lxqt-notifications_pt_BR.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[pt_BR]=Daemon de notificação

2
autostart/translations/lxqt-notifications_ro_RO.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[ro_RO]=Daemon de notificare

2
autostart/translations/lxqt-notifications_ru.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[ru]=демон Cообщение

2
autostart/translations/lxqt-notifications_ru_RU.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[ru_RU]=Служба уведомлений

2
autostart/translations/lxqt-notifications_sl.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[sl]=Obvestilnik

2
autostart/translations/lxqt-notifications_th_TH.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[th_TH]=ดีมอนการแจ้งเตือน

2
autostart/translations/lxqt-notifications_tr.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[tr]=Bildirim Artsüreci

2
autostart/translations/lxqt-notifications_uk.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[uk]=Демон сповіщень

2
autostart/translations/lxqt-notifications_zh_CN.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[zh_CN]=通知服务

2
autostart/translations/lxqt-notifications_zh_TW.desktop Normal file
View File

@ -0,0 +1,2 @@
# Translations
Name[zh_TW]=系統通知程序

7
config/basicsettings.cpp
View File

@ -43,7 +43,6 @@ BasicSettings::BasicSettings(LXQt::Settings* settings, QWidget *parent) :
connect(topCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(topRightRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(centerLeftRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(centerCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(centerRightRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(bottomLeftRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
connect(bottomCenterRB, SIGNAL(clicked()), this, SLOT(updateNotification()));
@ -79,8 +78,6 @@ void BasicSettings::restoreSettings()
topRightRB->setChecked(true);
else if (QStringLiteral("center-left") == placement)
centerLeftRB->setChecked(true);
else if (QStringLiteral("center-center") == placement)
centerCenterRB->setChecked(true);
else if (QStringLiteral("center-right") == placement)
centerRightRB->setChecked(true);
else if (QStringLiteral("bottom-left") == placement)
@ -93,7 +90,7 @@ void BasicSettings::restoreSettings()
void BasicSettings::updateNotification()
{
QString align;
QString align;
if (topLeftRB->isChecked())
align = QStringLiteral("top-left");
else if (topCenterRB->isChecked())
@ -102,8 +99,6 @@ void BasicSettings::updateNotification()
align = QStringLiteral("top-right");
else if (centerLeftRB->isChecked())
align = QStringLiteral("center-left");
else if (centerCenterRB->isChecked())
align = QStringLiteral("center-center");
else if (centerRightRB->isChecked())
align = QStringLiteral("center-right");
else if (bottomLeftRB->isChecked())

48
config/basicsettings.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>148</width>
<height>179</height>
<width>398</width>
<height>354</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
@ -56,16 +56,6 @@
</attribute>
</widget>
</item>
<item row="1" column="2">
<widget class="QRadioButton" name="centerCenterRB">
<property name="text">
<string/>
</property>
<attribute name="buttonGroup">
<string notr="true">buttonGroup</string>
</attribute>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
@ -158,6 +148,38 @@
</property>
</spacer>
</item>
<item row="1" column="0">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>90</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="2">
<spacer name="spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>100</width>
<height>90</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
@ -169,7 +191,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>105</width>
<height>51</height>
<height>21</height>
</size>
</property>
</spacer>

12
config/main.cpp
View File

@ -29,6 +29,7 @@
#include <XdgIcon>
#include <LXQt/Settings>
#include <QCommandLineParser>
#include "mainwindow.h"
@ -36,6 +37,17 @@
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"));

6
config/translations/lxqt-config-notificationd_lt.desktop
View File

@ -1,4 +1,4 @@
# Translations
GenericName[lt]=Qlipper
Name[lt]=Energijos naudojimo nustatymai
Comment[lt]=Konfigūruoti freedesktop pranešimus LXQt darbalaukyje
GenericName[lt]=LXQt pranešimų nustatymai
Name[lt]=Darbalaukio pranešimai
Comment[lt]=Konfigūruoti darbalaukio pranešimus

6
config/translations/lxqt-config-notificationd_pl_PL.desktop
View File

@ -1,4 +1,4 @@
# Translations
GenericName[pl_PL]=Konfiguracja wyglądu LXQt
Name[pl_PL]=Konfiguracja wyglądu LXQt
Comment[pl_PL]=Konfiguruj powiadomienia freedesktop w LXQt
Name[pl_PL]=Powiadomienia ekranowe
GenericName[pl_PL]=Ustawienia powiadomień LXQt
Comment[pl_PL]=Konfiguruj powiadomienia ekranowe

12
src/main.cpp
View File

@ -27,6 +27,7 @@
#include <QApplication>
#include <QtDBus/QDBusConnection>
#include <QCommandLineParser>
#include <LXQt/Application>
@ -66,9 +67,18 @@
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;}"

2
src/notifyd.h
View File

@ -109,7 +109,7 @@ signals:
*/
void NotificationClosed(uint in0, uint in1);
// singals for our implementation - internal usage
// 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)