Hello community, here is the log from the commit of package lxqt-globalkeys for openSUSE:Factory checked in at 2017-10-24 22:22:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-globalkeys (Old) and /work/SRC/openSUSE:Factory/.lxqt-globalkeys.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-globalkeys" Tue Oct 24 22:22:56 2017 rev:6 rq:535973 version:0.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-globalkeys/lxqt-globalkeys.changes 2017-03-12 19:59:02.415864899 +0100 +++ /work/SRC/openSUSE:Factory/.lxqt-globalkeys.new/lxqt-globalkeys.changes 2017-10-24 22:23:05.321225084 +0200 @@ -1,0 +2,43 @@ +Mon Oct 23 10:52:06 UTC 2017 - [email protected] + +- Update to 0.12.0: + * Set patch version + * Don't export github templates + * fix deadlock - don't accept keyPress when processing dbus call (#56) + * Added Lithuanian language + * lxqt-config-globalkeys: set Qt::AA_UseHighDpiPixmaps to true + * Added QCommandLineParser and basic cli interface to lxqt-config-globalkeys + * Adeed LXQT_GLOBALKEYS_PATCH_VERSION + * Fixes a FTBFS in superbuild mode (#51) + * Added autostart and xdg to CMakeLists.txt + * changed xdg/CmakeLists.txt + * fixed xdg/CMakeLists.txt renamed config to xdg - merge preparation + * Use const iterators + * globalkeys: Open "empty" browser on activation + * Updated *_da.desktop files and removed *_da_DK.desktop files + * Update AUTHORS + * Open https://duckduckgo.com instead of google.com as default + * Update desktop entries and Replace fr_FR by fr + * lxqt-rc.xml: Change default config install path + * Settings Openbox updated. + * Screenshot (Shift+Print), file manager (ctl+Alt+e) and web browser (Ctl+atl+i) key shortcuts added. + * Default key shortcuts added to lxqt-globalkeysd. + * Update Greek translation (el) Remove country variant from language code + * CMake: Adds Runtime and Devel install COMPONENTs + * Coding style changes + * Adds double quotes to everything that may break + * 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 + * Add session.conf and windowmanagers.conf. + * Support lxqt-session and add necessary xdg autostart desktop entry files. + * Rename dirs and replace razor with lxqt. Install lxqt.conf to /etc/xdg/lxqt and provide theme config. + * Properly set default wallpaper for pcmanfm-qt. Comment out openbox config handling in startlxde-qt since it's not needed. + * Fix file paths, replacing razor with lxqt. * Remove Alt+F2 and Ctrl+Esc from openbox config file to avoid conflicts with lxqt-panel & lxqt-globalkeys. + * Add default configuration files for lxde-qt session. +- Remove post and postun + +------------------------------------------------------------------- Old: ---- lxqt-globalkeys-0.11.1.tar.xz lxqt-globalkeys-0.11.1.tar.xz.asc New: ---- lxqt-globalkeys-0.12.0.tar.xz lxqt-globalkeys-0.12.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-globalkeys.spec ++++++ --- /var/tmp/diff_new_pack.s5HXMP/_old 2017-10-24 22:23:05.837200964 +0200 +++ /var/tmp/diff_new_pack.s5HXMP/_new 2017-10-24 22:23:05.841200777 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxqt-globalkeys # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,19 @@ Name: lxqt-globalkeys -Version: 0.11.1 +Version: 0.12.0 Release: 0 Summary: Global keyboard shortcuts registration License: LGPL-2.1+ Group: System/GUI/LXQt Url: http://www.lxqt.org -Source: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz -Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc +Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: lxqt-build-tools-devel +BuildRequires: lxqt-build-tools-devel >= 0.4.0 BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(lxqt) >= %{version} @@ -81,12 +81,6 @@ %cmake_install %fdupes -s %{buildroot} -%post -%desktop_database_post - -%postun -%desktop_database_postun - %post -n liblxqt-globalkeys0 -p /sbin/ldconfig %postun -n liblxqt-globalkeys0 -p /sbin/ldconfig @@ -98,9 +92,14 @@ %files %defattr(-,root,root) %doc AUTHORS LICENSE +%dir %{_sysconfdir}/xdg/ +%dir %{_sysconfdir}/xdg/autostart/ +%dir %{_sysconfdir}/xdg/lxqt/ %{_bindir}/lxqt-globalkeysd %{_bindir}/lxqt-config-globalkeyshortcuts %{_datadir}/applications/lxqt-config-globalkeyshortcuts.desktop +%{_sysconfdir}/xdg/autostart/lxqt-globalkeyshortcuts.desktop +%config %{_sysconfdir}/xdg/lxqt/globalkeyshortcuts.conf %files devel %defattr (-,root,root) ++++++ lxqt-globalkeys-0.11.1.tar.xz -> lxqt-globalkeys-0.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/AUTHORS new/lxqt-globalkeys-0.12.0/AUTHORS --- old/lxqt-globalkeys-0.11.1/AUTHORS 2017-01-01 23:07:45.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/AUTHORS 2017-10-21 21:16:12.000000000 +0200 @@ -4,7 +4,7 @@ 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/CHANGELOG new/lxqt-globalkeys-0.12.0/CHANGELOG --- old/lxqt-globalkeys-0.11.1/CHANGELOG 2017-01-01 23:07:45.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/CHANGELOG 2017-10-21 21:16:12.000000000 +0200 @@ -1,7 +1,49 @@ -lxqt-globalkeys-0.11.1 / 2017-01-01 +lxqt-globalkeys-0.12.0 / 2017-10-21 =================================== + * Set patch version + * Don't export github templates + * fix deadlock - don't accept keyPress when processing dbus call (#56) + * Added Lithuanian language + * lxqt-config-globalkeys: set Qt::AA_UseHighDpiPixmaps to true + * Added QCommandLineParser and basic cli interface to lxqt-config-globalkeys + * Adeed LXQT_GLOBALKEYS_PATCH_VERSION + * Fixes a FTBFS in superbuild mode (#51) + * Added autostart and xdg to CMakeLists.txt + * changed xdg/CmakeLists.txt + * fixed xdg/CMakeLists.txt renamed config to xdg - merge preparation + * Use const iterators + * globalkeys: Open "empty" browser on activation + * Updated *_da.desktop files and removed *_da_DK.desktop files + * Update AUTHORS + * Open https://duckduckgo.com instead of google.com as default + * Update desktop entries and Replace fr_FR by fr + * lxqt-rc.xml: Change default config install path + * Settings Openbox updated. + * Screenshot (Shift+Print), file manager (ctl+Alt+e) and web browser (Ctl+atl+i) key shortcuts added. + * Default key shortcuts added to lxqt-globalkeysd. + * Update Greek translation (el) Remove country variant from language code + * CMake: Adds Runtime and Devel install COMPONENTs + * Coding style changes + * Adds double quotes to everything that may break + * 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 + * Add session.conf and windowmanagers.conf. + * Support lxqt-session and add necessary xdg autostart desktop entry files. + * Rename dirs and replace razor with lxqt. Install lxqt.conf to /etc/xdg/lxqt and provide theme config. + * Properly set default wallpaper for pcmanfm-qt. Comment out openbox config handling in startlxde-qt since it's not needed. + * Fix file paths, replacing razor with lxqt. * Remove Alt+F2 and Ctrl+Esc from openbox config file to avoid conflicts with lxqt-panel & lxqt-globalkeys. + * Add default configuration files for lxde-qt session. + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * Added *da.desktop * Use the lxqt-build-tools/lxqt_create_portable_headers * Use the new lxqt-build-tools package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/CMakeLists.txt new/lxqt-globalkeys-0.12.0/CMakeLists.txt --- old/lxqt-globalkeys-0.11.1/CMakeLists.txt 2017-01-01 23:07:45.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 @@ -11,7 +11,7 @@ set(CMAKE_BUILD_TYPE Release) endif() -set(LXQTBT_MINIMUM_VERSION "0.1.0") +set(LXQTBT_MINIMUM_VERSION "0.4.0") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -20,11 +20,17 @@ find_package(Qt5Widgets REQUIRED) find_package(Qt5DBus REQUIRED) -find_package(Qt5LinguistTools REQUIRED QUIET) +find_package(Qt5LinguistTools REQUIRED) find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) -find_package(lxqt REQUIRED QUIET) +find_package(lxqt REQUIRED) +# Patch Version +set(LXQT_GLOBALKEYS_PATCH_VERSION 0) + +set(LXQT_GLOBALKEYS_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_GLOBALKEYS_PATCH_VERSION}) +add_definitions("-DLXQT_GLOBALKEYS_VERSION=\"${LXQT_GLOBALKEYS_VERSION}\"") + include(LXQtTranslate) include(LXQtCreatePkgConfigFile) include(LXQtCreatePortableHeaders) @@ -93,3 +99,8 @@ "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config-version.cmake" DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}" ) + +# merged from lxqt-common +add_subdirectory(autostart) +add_subdirectory(xdg) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/CMakeLists.txt new/lxqt-globalkeys-0.12.0/autostart/CMakeLists.txt --- old/lxqt-globalkeys-0.11.1/autostart/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 @@ -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_globlalkeys_autostart_desktop_files ALL DEPENDS ${DESKTOP_FILES}) +#************************************************ + +install(FILES + ${DESKTOP_FILES} + DESTINATION "${LXQT_ETC_XDG_DIR}/autostart" + COMPONENT Runtime +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/lxqt-globalkeyshortcuts.desktop.in new/lxqt-globalkeys-0.12.0/autostart/lxqt-globalkeyshortcuts.desktop.in --- old/lxqt-globalkeys-0.11.1/autostart/lxqt-globalkeyshortcuts.desktop.in 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/lxqt-globalkeyshortcuts.desktop.in 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Name=Global Keyboard Shortcuts +TryExec=lxqt-globalkeysd +Exec=lxqt-globalkeysd +OnlyShowIn=LXQt; +X-LXQt-Module=true + +#TRANSLATIONS_DIR=translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_cs.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_cs.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_cs.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_cs.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[cs]=Celkové klávesové zkratky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_cs_CZ.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_cs_CZ.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_cs_CZ.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_cs_CZ.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[cs_CZ]=Celkové klávesové zkratky diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_da.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_da.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_da.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[da]=Globale tastaturgenveje diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_de.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_de.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_de.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_de.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[de]=Globale Kurzbefehle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_el.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_el.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_el.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_el.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[el]=Καθολικές συντομεύσεις πληκτρολογίου diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_es.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[es]=Atajos Globales del Teclado diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_es_VE.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es_VE.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_es_VE.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es_VE.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[es_VE]=Atajos de teclados de LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_eu.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_eu.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_eu.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_eu.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[eu]=Teklatuko lasterbide orokorrak diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_fi.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_fi.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_fi.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_fi.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[fi]=Yleiset pikanäppäimet diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_fr.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_fr.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_fr.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1 @@ +Name[fr]=Raccourcis clavier globaux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_it_IT.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_it_IT.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_it_IT.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_it_IT.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[it_IT]=Scorciatoie globali della tastiera diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_lt.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_lt.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_lt.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[lt]=Visuotiniai spartieji klavišai diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pl_PL.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pl_PL.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pl_PL.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pl_PL.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[pl_PL]=Globalne Skróty Klawiszowe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pt.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pt.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pt.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[pt]=Teclas de atalho globais diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pt_BR.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pt_BR.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_pt_BR.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_pt_BR.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[pt_BR]=Atalhos Globais Do Teclado diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ro_RO.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ro_RO.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ro_RO.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ro_RO.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[ro_RO]=Taste rapide globale diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ru.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ru.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ru.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ru.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[ru]=Глобальные горячих клавиш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ru_RU.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ru_RU.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_ru_RU.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_ru_RU.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[ru_RU]=Глобальные сочетания клавиш diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_th_TH.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_th_TH.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_th_TH.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_th_TH.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[th_TH]=ปุ่มลัดหลักต่างๆ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_uk.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_uk.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_uk.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_uk.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[uk]=Глобальні клавіатурні скорочення diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_zh_CN.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_zh_CN.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_zh_CN.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[zh_CN]=全局键盘快捷键 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_zh_TW.desktop new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_zh_TW.desktop --- old/lxqt-globalkeys-0.11.1/autostart/translations/lxqt-globalkeyshortcuts_zh_TW.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_zh_TW.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,2 @@ +# Translations +Name[zh_TW]=全域鍵盤快捷鍵 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/config/main.cpp new/lxqt-globalkeys-0.12.0/config/main.cpp --- old/lxqt-globalkeys-0.11.1/config/main.cpp 2017-01-01 23:07:45.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/config/main.cpp 2017-10-21 21:16:12.000000000 +0200 @@ -27,11 +27,23 @@ #include <LXQt/SingleApplication> +#include <QCommandLineParser> #include "main_window.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 Globalkeys ")); + const QString VERINFO = QStringLiteral(LXQT_GLOBALKEYS_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + a.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(a); MainWindow w; a.setActivationWindow(&w); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/config/translations/lxqt-config-globalkeyshortcuts_lt.desktop new/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_lt.desktop --- old/lxqt-globalkeys-0.11.1/config/translations/lxqt-config-globalkeyshortcuts_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_lt.desktop 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,4 @@ +# Translations +Name[lt]=Spartieji klavišai +GenericName[lt]=Sparčiųjų klavišų nustatymai +Comment[lt]=Konfigūruoti LXQt sparčiuosius klavišus diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/daemon/core.cpp new/lxqt-globalkeys-0.12.0/daemon/core.cpp --- old/lxqt-globalkeys-0.11.1/daemon/core.cpp 2017-01-01 23:07:45.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/daemon/core.cpp 2017-10-21 21:16:12.000000000 +0200 @@ -42,6 +42,7 @@ #include <errno.h> #include <string.h> #include <stdio.h> +#include <mutex> #include <stdexcept> @@ -760,8 +761,8 @@ settings.setValue(/* General/ */"AllowGrabBaseKeypad", mAllowGrabBaseKeypad); settings.setValue(/* General/ */"AllowGrabMiscKeypad", mAllowGrabMiscKeypad); - ShortcutAndActionById::const_iterator lastShortcutAndActionById = mShortcutAndActionById.end(); - for (ShortcutAndActionById::const_iterator shortcutAndActionById = mShortcutAndActionById.begin(); shortcutAndActionById != lastShortcutAndActionById; ++shortcutAndActionById) + ShortcutAndActionById::const_iterator lastShortcutAndActionById = mShortcutAndActionById.constEnd(); + for (ShortcutAndActionById::const_iterator shortcutAndActionById = mShortcutAndActionById.constBegin(); shortcutAndActionById != lastShortcutAndActionById; ++shortcutAndActionById) { const BaseAction *action = shortcutAndActionById.value().second; QString section = shortcutAndActionById.value().first + "." + QString::number(shortcutAndActionById.key()); @@ -1146,17 +1147,18 @@ XEvent event; while (mX11EventLoopActive) { - XNextEvent(mDisplay, &event); + XPeekEvent(mDisplay, &event); if (!mX11EventLoopActive) { break; } - switch (event.type) + if (event.type == KeyPress && mDataMutex.tryLock(0)) { - case KeyPress: - { - QMutexLocker lock(&mDataMutex); + std::unique_lock<QMutex> unlocker(mDataMutex, std::adopt_lock); + + // pop event from the x11 queue and process it + XNextEvent(mDisplay, &event); if (mGrabbingShortcut) { @@ -1370,11 +1372,15 @@ } } } - } - break; - default: + } + else + // check for pending pipe requests from other thread { + if (event.type != KeyPress) { + XNextEvent(mDisplay, &event); + } + pollfd fds[1]; fds[0].fd = mX11RequestPipe[STDIN_FILENO]; fds[0].events = POLLIN | POLLERR | POLLHUP; @@ -1644,7 +1650,6 @@ } } } - } } } @@ -2033,8 +2038,8 @@ try { - ShortcutByX11::const_iterator shortcutByX11 = mShortcutByX11.find(X11shortcut); - if (shortcutByX11 != mShortcutByX11.end()) + ShortcutByX11::const_iterator shortcutByX11 = mShortcutByX11.constFind(X11shortcut); + if (shortcutByX11 != mShortcutByX11.constEnd()) { usedShortcut = shortcutByX11.value(); } @@ -2055,8 +2060,8 @@ log(LOG_INFO, "Using shortcut '%s' instead of '%s'", qPrintable(usedShortcut), qPrintable(shortcut)); } - X11ByShortcut::const_iterator x11ByShortcut = mX11ByShortcut.find(usedShortcut); - if (x11ByShortcut == mX11ByShortcut.end()) + X11ByShortcut::const_iterator x11ByShortcut = mX11ByShortcut.constFind(usedShortcut); + if (x11ByShortcut == mX11ByShortcut.constEnd()) { mX11ByShortcut[usedShortcut] = X11shortcut; } @@ -2129,7 +2134,7 @@ QString useShortcut = shortcut; if (shortcut.isEmpty()) { - IdByClientPath::ConstIterator idByClientPath = mIdByClientPath.find(path); + IdByClientPath::ConstIterator idByClientPath = mIdByClientPath.constFind(path); if (idByClientPath != mIdByClientPath.constEnd()) { useShortcut = mShortcutAndActionById[idByClientPath.value()].first;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/xdg/CMakeLists.txt new/lxqt-globalkeys-0.12.0/xdg/CMakeLists.txt --- old/lxqt-globalkeys-0.11.1/xdg/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/xdg/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,6 @@ +# install default config files to /etc/xdg +install(FILES + globalkeyshortcuts.conf + DESTINATION "${LXQT_ETC_XDG_DIR}/lxqt" + COMPONENT Runtime +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.11.1/xdg/globalkeyshortcuts.conf new/lxqt-globalkeys-0.12.0/xdg/globalkeyshortcuts.conf --- old/lxqt-globalkeys-0.11.1/xdg/globalkeyshortcuts.conf 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-globalkeys-0.12.0/xdg/globalkeyshortcuts.conf 2017-10-21 21:16:12.000000000 +0200 @@ -0,0 +1,41 @@ + +[Control%2BAlt%2BT.1] +Comment=QTerminal +Enabled=true +Exec=qterminal + +[Shift%2BControl%2BF6.2] +Comment=\x2600 \x2193 +Enabled=true +Exec=lxqt-config-brightness, -d + +[Shift%2BControl%2BF7.3] +Comment=\x2600 \x2191 +Enabled=true +Exec=lxqt-config-brightness, -i + +[XF86MonBrightnessDown.4] +Comment=\x2600 \x2193 +Enabled=true +Exec=lxqt-config-brightness, -d + +[XF86MonBrightnessUp.5] +Comment=\x2600 \x2191 +Enabled=true +Exec=lxqt-config-brightness, -i + + +[Control%2BAlt%2BE.6] +Comment=Pcmanfm +Enabled=true +Exec=pcmanfm-qt + +[Control%2BAlt%2BI.7] +Comment=Web browser +Enabled=true +Exec=xdg-open, about:blank + +[Print.8] +Comment=screen shot +Enabled=true +Exec=lximage-qt, -s
