Hello community, here is the log from the commit of package lxqt-globalkeys for openSUSE:Factory checked in at 2018-06-29 22:30:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-globalkeys (Old) and /work/SRC/openSUSE:Factory/.lxqt-globalkeys.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-globalkeys" Fri Jun 29 22:30:50 2018 rev:7 rq:618048 version:0.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-globalkeys/lxqt-globalkeys.changes 2017-10-24 22:23:05.321225084 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-globalkeys.new/lxqt-globalkeys.changes 2018-06-29 22:31:32.938248843 +0200 @@ -1,0 +2,9 @@ +Tue May 22 14:59:20 UTC 2018 - mvet...@suse.com + +- Update to 0.13.0: + * Triggering shortcuts with meta keys + * Register meta keys for shortcuts + * Daemon triggers on KeyRelease + * Avoid polluting the the x11 shortcut map. + +------------------------------------------------------------------- Old: ---- lxqt-globalkeys-0.12.0.tar.xz lxqt-globalkeys-0.12.0.tar.xz.asc New: ---- lxqt-globalkeys-0.13.0.tar.xz lxqt-globalkeys-0.13.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-globalkeys.spec ++++++ --- /var/tmp/diff_new_pack.YHIoPA/_old 2018-06-29 22:31:33.366248516 +0200 +++ /var/tmp/diff_new_pack.YHIoPA/_new 2018-06-29 22:31:33.366248516 +0200 @@ -1,7 +1,7 @@ # # spec file for package lxqt-globalkeys # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,27 +17,27 @@ Name: lxqt-globalkeys -Version: 0.12.0 +Version: 0.13.0 Release: 0 Summary: Global keyboard shortcuts registration -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/GUI/LXQt -Url: http://www.lxqt.org +URL: http://www.lxqt.org 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 >= 0.4.0 +BuildRequires: lxqt-build-tools-devel >= 0.5.0 +BuildRequires: pkgconfig BuildRequires: cmake(KF5WindowSystem) BuildRequires: pkgconfig(Qt5UiTools) BuildRequires: pkgconfig(lxqt) >= %{version} -Requires(pre): desktop-file-utils Requires(post): desktop-file-utils +Requires(pre): desktop-file-utils Obsoletes: lxqt-globalkeys-qt5 < %{version} Provides: lxqt-globalkeys-qt5 = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Daemon and library for global keyboard shortcuts registration @@ -82,16 +82,13 @@ %fdupes -s %{buildroot} %post -n liblxqt-globalkeys0 -p /sbin/ldconfig - %postun -n liblxqt-globalkeys0 -p /sbin/ldconfig - %post -n liblxqt-globalkeys-ui0 -p /sbin/ldconfig - %postun -n liblxqt-globalkeys-ui0 -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS LICENSE +%license LICENSE +%doc AUTHORS %dir %{_sysconfdir}/xdg/ %dir %{_sysconfdir}/xdg/autostart/ %dir %{_sysconfdir}/xdg/lxqt/ @@ -102,7 +99,6 @@ %config %{_sysconfdir}/xdg/lxqt/globalkeyshortcuts.conf %files devel -%defattr (-,root,root) %{_includedir}/%{name} %{_includedir}/lxqt-globalkeys-ui %{_libdir}/pkgconfig/*.pc @@ -114,11 +110,9 @@ %{_datadir}/cmake/lxqt-globalkeys-ui/* %files -n liblxqt-globalkeys0 -%defattr(-,root,root) %{_libdir}/liblxqt-globalkeys.so.* %files -n liblxqt-globalkeys-ui0 -%defattr(-,root,root) %{_libdir}/liblxqt-globalkeys-ui.so.* %changelog ++++++ lxqt-globalkeys-0.12.0.tar.xz -> lxqt-globalkeys-0.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/AUTHORS new/lxqt-globalkeys-0.13.0/AUTHORS --- old/lxqt-globalkeys-0.12.0/AUTHORS 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/AUTHORS 2018-05-21 20:21:00.000000000 +0200 @@ -1,5 +1,5 @@ Upstream Authors: - LXQt team: http://lxqt.org + LXQt team: https://lxqt.org Razor team: http://razor-qt.org Copyright: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/CHANGELOG new/lxqt-globalkeys-0.13.0/CHANGELOG --- old/lxqt-globalkeys-0.12.0/CHANGELOG 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/CHANGELOG 2018-05-21 20:21:00.000000000 +0200 @@ -1,7 +1,28 @@ -lxqt-globalkeys-0.12.0 / 2017-10-21 +lxqt-globalkeys-0.13.0 / 2018-05-21 =================================== + * Update lxqt-config-globalkeyshortcuts_es.desktop + * Spanish translation update + * Add shortcut for lockscreen + * CMake: Prevent in-source builds + * fixed razor-qt -> lxqt and http -> https + * Fixed some LXDE mentions + * Update zh_CN translation + * Triggering shortcuts with meta keys + * Register meta keys for shortcuts + * Daemon triggers on KeyRelease + * free the storage returned by XGetKeyboardMapping + * Drop Qt foreach. + * Avoid polluting the the x11 shortcut map. + * Handle CMake CMP0024 + * cmake: Handle CMP0071 + * Fixes wrong radio buttons when changing shortcuts + +0.12.0 / 2017-10-21 +=================== + + * Release 0.12.0: Update changelog * Set patch version * Don't export github templates * fix deadlock - don't accept keyPress when processing dbus call (#56) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/CMakeLists.txt new/lxqt-globalkeys-0.13.0/CMakeLists.txt --- old/lxqt-globalkeys-0.12.0/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/CMakeLists.txt 2018-05-21 20:21:00.000000000 +0200 @@ -11,7 +11,7 @@ set(CMAKE_BUILD_TYPE Release) endif() -set(LXQTBT_MINIMUM_VERSION "0.4.0") +set(LXQTBT_MINIMUM_VERSION "0.5.0") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -31,6 +31,7 @@ set(LXQT_GLOBALKEYS_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_GLOBALKEYS_PATCH_VERSION}) add_definitions("-DLXQT_GLOBALKEYS_VERSION=\"${LXQT_GLOBALKEYS_VERSION}\"") +include(LXQtPreventInSourceBuilds) include(LXQtTranslate) include(LXQtCreatePkgConfigFile) include(LXQtCreatePortableHeaders) @@ -39,6 +40,8 @@ include(GNUInstallDirs) # Standard directories for installation include(CMakePackageConfigHelpers) +add_definitions(-DQT_NO_FOREACH) + set(LXQT_GLOBALKEYS_LIBRARY_NAME lxqt-globalkeys) set(LXQT_GLOBALKEYS_UI_LIBRARY_NAME lxqt-globalkeys-ui) set(LXQT_INSTALL_CMAKE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/README.md new/lxqt-globalkeys-0.13.0/README.md --- old/lxqt-globalkeys-0.12.0/README.md 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/README.md 2018-05-21 20:21:00.000000000 +0200 @@ -2,36 +2,64 @@ ## Overview -This repository is providing tools to set global keyboard shortcuts in LXQt sessions, that is shortcuts which apply to the LXQt session as a whole and are not limited to distinct applications. - -The core components are two binaries `lxqt-globalkeysd` and `lxqt-config-globalkeyshortcuts`. -`lxqt-globalkeysd` 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 `lxqt-config-globalkeyshortcuts` is used to customize the shortcut settings. +This repository is providing tools to set global keyboard shortcuts in LXQt +sessions, that is shortcuts which apply to the LXQt session as a whole and are +not limited to distinct applications. + +The core components are two binaries `lxqt-globalkeysd` and +`lxqt-config-globalkeyshortcuts`. `lxqt-globalkeysd` 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 `lxqt-config-globalkeyshortcuts` is used to +customize the shortcut settings. ## Installation ### Compiling source code -The only runtime dependencies is [liblxqt](https://github.com/lxde/liblxqt). -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, depending on the way library paths are dealt with on 64bit systems variables like `CMAKE_INSTALL_LIBDIR` may have to be set as well. +The only runtime dependencies is [liblxqt](https://github.com/lxqt/liblxqt). +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, depending on the way library +paths are dealt with on 64bit systems variables like `CMAKE_INSTALL_LIBDIR` may +have to be set as well. -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-globalkeys`. +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-globalkeys`. ## Configuration, Usage ### Caveat lxqt-globalkeys vs. window managers -Window managers can assign shortcuts as well and their scope may overlap with the one of lxqt-globalkeys in LXQt sessions. -This was e. g. affecting elderly configuration files `rc.xml` of Openbox which were assigning `Ctrl+Alt+D` to toggling the display of the desktop which lxqt-globalkeys tries to do as well. This resulted in a warning message "Global shortcut C+A+d+ cannot be registered", see https://github.com/lxde/lxqt/issues/1032. -As depicted in this issue [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd) will show a warning when conflicts like this come up and users can thus decide whether they want to have the shortcut in question handled by the respective window manager or lxqt-globalkeys. +Window managers can assign shortcuts as well and their scope may overlap with +the one of lxqt-globalkeys in LXQt sessions. This was e. g. affecting elderly +configuration files `rc.xml` of Openbox which were assigning `Ctrl+Alt+D` to +toggling the display of the desktop which lxqt-globalkeys tries to do as well. +This resulted in a warning message "Global shortcut C+A+d+ cannot be registered", +see https://github.com/lxqt/lxqt/issues/1032. As depicted in this issue +[lxqt-notificationd](https://github.com/lxqt/lxqt-notificationd) will show a +warning when conflicts like this come up and users can thus decide whether they +want to have the shortcut in question handled by the respective window manager +or lxqt-globalkeys. ### lxqt-globalkeys -Daemon-like `lxqt-globalkeysd` can be adjusted from section "Basic Settings" in configuration dialogue [LXQt Session Settings](https://github.com/lxde/lxqt-session#overview) of [lxqt-session](https://github.com/lxde/lxqt-session). - -Configuration dialogue "Global Actions Manager" (binary `lxqt-config-globalkeyshortcuts`) which is used to customize shortcuts can be opened from the panel's main menu - Preferences - LXQt Settings - Shortcut Keys 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. +Daemon-like `lxqt-globalkeysd` can be adjusted from section "Basic Settings" in +configuration dialogue [LXQt Session Settings](https://github.com/lxqt/lxqt-session#overview) +of [lxqt-session](https://github.com/lxqt/lxqt-session). + +Configuration dialogue "Global Actions Manager" (binary `lxqt-config-globalkeyshortcuts`) +which is used to customize shortcuts can be opened from the panel's main menu - +Preferences - LXQt Settings - Shortcut Keys 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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop new/lxqt-globalkeys-0.13.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop --- old/lxqt-globalkeys-0.12.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/autostart/translations/lxqt-globalkeyshortcuts_es.desktop 2018-05-21 20:21:00.000000000 +0200 @@ -1,2 +1 @@ -# Translations -Name[es]=Atajos Globales del Teclado +Name[es]=Atajos globales de teclado diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/CMakeLists.txt new/lxqt-globalkeys-0.13.0/client/CMakeLists.txt --- old/lxqt-globalkeys-0.12.0/client/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/CMakeLists.txt 2018-05-21 20:21:00.000000000 +0200 @@ -129,6 +129,12 @@ qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" ${DBUS_INTERFACE_BASENAME}) endforeach() +set_property(SOURCE + ${${PROJECT_NAME}_DBUS_INTERFACE_FILES} + ${${PROJECT_NAME}_DBUS_ADAPTOR_FILES} + PROPERTY SKIP_AUTOGEN ON +) + qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES}) set(${PROJECT_NAME}_GENERATED_FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/action.cpp new/lxqt-globalkeys-0.13.0/client/action.cpp --- old/lxqt-globalkeys-0.12.0/client/action.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/action.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/action.h new/lxqt-globalkeys-0.13.0/client/action.h --- old/lxqt-globalkeys-0.12.0/client/action.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/action.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/action_p.h new/lxqt-globalkeys-0.13.0/client/action_p.h --- old/lxqt-globalkeys-0.12.0/client/action_p.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/action_p.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/client.cpp new/lxqt-globalkeys-0.13.0/client/client.cpp --- old/lxqt-globalkeys-0.12.0/client/client.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/client.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/client.h new/lxqt-globalkeys-0.13.0/client/client.h --- old/lxqt-globalkeys-0.12.0/client/client.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/client.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/client_adaptor.cpp new/lxqt-globalkeys-0.13.0/client/client_adaptor.cpp --- old/lxqt-globalkeys-0.12.0/client/client_adaptor.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/client_adaptor.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/client_adaptor.h new/lxqt-globalkeys-0.13.0/client/client_adaptor.h --- old/lxqt-globalkeys-0.12.0/client/client_adaptor.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/client_adaptor.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/client_p.h new/lxqt-globalkeys-0.13.0/client/client_p.h --- old/lxqt-globalkeys-0.12.0/client/client_p.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/client_p.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/client/lxqt-globalkeys.h new/lxqt-globalkeys-0.13.0/client/lxqt-globalkeys.h --- old/lxqt-globalkeys-0.12.0/client/lxqt-globalkeys.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/client/lxqt-globalkeys.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/cmake/lxqt_globalkeys-config.cmake.in new/lxqt-globalkeys-0.13.0/cmake/lxqt_globalkeys-config.cmake.in --- old/lxqt-globalkeys-0.12.0/cmake/lxqt_globalkeys-config.cmake.in 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/cmake/lxqt_globalkeys-config.cmake.in 2018-05-21 20:21:00.000000000 +0200 @@ -10,6 +10,10 @@ @PACKAGE_INIT@ +if (CMAKE_VERSION VERSION_LESS 3.0.2) + message(FATAL_ERROR \"@PROJECT_NAME@ requires at least CMake version 3.0.2\") +endif() + include(CMakeFindDependencyMacro) set(LXQT_GLOBALKEYS_MAJOR_VERSION @LXQT_MAJOR_VERSION@) @@ -20,7 +24,9 @@ find_dependency(Qt5Widgets) find_dependency(Qt5DBus) -if (CMAKE_VERSION VERSION_GREATER 2.8.12) - cmake_policy(SET CMP0024 OLD) +if (NOT TARGET @LXQT_GLOBALKEYS_LIBRARY_NAME@) + if (POLICY CMP0024) + cmake_policy(SET CMP0024 NEW) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/@LXQT_GLOBALKEYS_LIBRARY_NAME@-targets.cmake") endif() -include("${CMAKE_CURRENT_LIST_DIR}/lxqt-globalkeys-targets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/cmake/lxqt_globalkeys_ui-config.cmake.in new/lxqt-globalkeys-0.13.0/cmake/lxqt_globalkeys_ui-config.cmake.in --- old/lxqt-globalkeys-0.12.0/cmake/lxqt_globalkeys_ui-config.cmake.in 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/cmake/lxqt_globalkeys_ui-config.cmake.in 2018-05-21 20:21:00.000000000 +0200 @@ -10,6 +10,10 @@ @PACKAGE_INIT@ +if (CMAKE_VERSION VERSION_LESS 3.0.2) + message(FATAL_ERROR \"@PROJECT_NAME@ requires at least CMake version 3.0.2\") +endif() + include(CMakeFindDependencyMacro) set(LXQT_GLOBALKEYS_UI_MAJOR_VERSION @LXQT_MAJOR_VERSION@) @@ -19,9 +23,11 @@ find_dependency(Qt5Widgets) find_dependency(Qt5DBus) -find_dependency(lxqt-globalkeys) +find_dependency(@LXQT_GLOBALKEYS_LIBRARY_NAME@) -if (CMAKE_VERSION VERSION_GREATER 2.8.12) - cmake_policy(SET CMP0024 OLD) +if (NOT TARGET @LXQT_GLOBALKEYS_UI_LIBRARY_NAME@) + if (POLICY CMP0024) + cmake_policy(SET CMP0024 NEW) + endif() + include("${CMAKE_CURRENT_LIST_DIR}/@LXQT_GLOBALKEYS_UI_LIBRARY_NAME@-targets.cmake") endif() -include("${CMAKE_CURRENT_LIST_DIR}/lxqt-globalkeys-ui-targets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/CMakeLists.txt new/lxqt-globalkeys-0.13.0/config/CMakeLists.txt --- old/lxqt-globalkeys-0.12.0/config/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/CMakeLists.txt 2018-05-21 20:21:00.000000000 +0200 @@ -100,6 +100,12 @@ qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES}) +set_property(SOURCE + ${${PROJECT_NAME}_DBUS_INTERFACE_FILES} + ${${PROJECT_NAME}_DBUS_ADAPTOR_FILES} + PROPERTY SKIP_AUTOGEN ON +) + # Translations ********************************** lxqt_translate_ts(${PROJECT_NAME}_QM_FILES UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/actions.cpp new/lxqt-globalkeys-0.13.0/config/actions.cpp --- old/lxqt-globalkeys-0.12.0/config/actions.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/actions.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/actions.h new/lxqt-globalkeys-0.13.0/config/actions.h --- old/lxqt-globalkeys-0.12.0/config/actions.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/actions.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/default_model.cpp new/lxqt-globalkeys-0.13.0/config/default_model.cpp --- old/lxqt-globalkeys-0.12.0/config/default_model.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/default_model.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: @@ -206,7 +206,7 @@ beginInsertRows(QModelIndex(), 0, allIds.size() - 1); - foreach(qulonglong id, allIds) + for(qulonglong id : qAsConst(allIds)) { mContent[id] = mActions->actionById(id).second; mShortcuts[mContent[id].shortcut].insert(id); @@ -233,7 +233,7 @@ endInsertRows(); keys = mContent.keys(); - foreach(qulonglong siblingId, mShortcuts[mContent[id].shortcut]) + for(qulonglong siblingId : qAsConst(mShortcuts[mContent[id].shortcut])) { if (id != siblingId) { @@ -272,12 +272,12 @@ { mShortcuts[result.second.shortcut].insert(id); mShortcuts[mContent[id].shortcut].remove(id); - foreach(qulonglong siblingId, mShortcuts[mContent[id].shortcut]) + for(qulonglong siblingId : qAsConst(mShortcuts[mContent[id].shortcut])) { int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); } - foreach(qulonglong siblingId, mShortcuts[result.second.shortcut]) + for(qulonglong siblingId : qAsConst(mShortcuts[result.second.shortcut])) { int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); @@ -325,7 +325,7 @@ endRemoveRows(); - foreach(qulonglong siblingId, mShortcuts[shortcut]) + for(qulonglong siblingId : qAsConst(mShortcuts[shortcut])) { int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/default_model.h new/lxqt-globalkeys-0.13.0/config/default_model.h --- old/lxqt-globalkeys-0.12.0/config/default_model.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/default_model.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/edit_action_dialog.cpp new/lxqt-globalkeys-0.13.0/config/edit_action_dialog.cpp --- old/lxqt-globalkeys-0.12.0/config/edit_action_dialog.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/edit_action_dialog.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: @@ -197,6 +197,14 @@ else { command_PTE->clear(); + + // To disable all radio boxes, once one has been selected, we need to turn exclusivity off temporarily + command_RB->setAutoExclusive(false); + dbus_method_RB->setAutoExclusive(false); + command_RB->setChecked(false); + dbus_method_RB->setChecked(false); + command_RB->setAutoExclusive(true); + dbus_method_RB->setAutoExclusive(true); } description_LE->setEnabled(canEdit); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/edit_action_dialog.h new/lxqt-globalkeys-0.13.0/config/edit_action_dialog.h --- old/lxqt-globalkeys-0.12.0/config/edit_action_dialog.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/edit_action_dialog.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/main.cpp new/lxqt-globalkeys-0.13.0/config/main.cpp --- old/lxqt-globalkeys-0.12.0/config/main.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/main.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/main_window.cpp new/lxqt-globalkeys-0.13.0/config/main_window.cpp --- old/lxqt-globalkeys-0.12.0/config/main_window.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/main_window.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: @@ -155,7 +155,8 @@ void MainWindow::on_remove_PB_clicked() { - foreach(const QModelIndex &rowIndex, mSelectionModel->selectedRows()) + const auto rows = mSelectionModel->selectedRows(); + for(const QModelIndex &rowIndex : rows) mActions->removeAction(mDefaultModel->id(mSortFilterProxyModel->mapToSource(rowIndex))); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/main_window.h new/lxqt-globalkeys-0.13.0/config/main_window.h --- old/lxqt-globalkeys-0.12.0/config/main_window.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/main_window.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/shortcut_selector.cpp new/lxqt-globalkeys-0.13.0/config/shortcut_selector.cpp --- old/lxqt-globalkeys-0.12.0/config/shortcut_selector.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/shortcut_selector.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/shortcut_selector.h new/lxqt-globalkeys-0.13.0/config/shortcut_selector.h --- old/lxqt-globalkeys-0.12.0/config/shortcut_selector.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/shortcut_selector.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_es.desktop new/lxqt-globalkeys-0.13.0/config/translations/lxqt-config-globalkeyshortcuts_es.desktop --- old/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_es.desktop 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/translations/lxqt-config-globalkeyshortcuts_es.desktop 2018-05-21 20:21:00.000000000 +0200 @@ -1,4 +1,3 @@ -# Translations -Name[es]=Configuración de Atajos de LXQt -Comment[es]=Configure atajos globales del Escritorio de LXQt -GenericName[es]=Configuración de Atajos Globales de LXQt +Name[es]=Atajos de teclado +GenericName[es]=Configuración de los atajos de teclado +Comment[es]=Configurar los atajos de teclado en LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.desktop new/lxqt-globalkeys-0.13.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.desktop --- old/lxqt-globalkeys-0.12.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.desktop 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.desktop 2018-05-21 20:21:00.000000000 +0200 @@ -1,4 +1,4 @@ # Translations -Name[zh_CN]=LXQt 快捷键配置 +Name[zh_CN]=键盘快捷键配置 Comment[zh_CN]=配置 LXQt 桌面全局快捷键 GenericName[zh_CN]=LXQt 全局快捷键配置 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/CMakeLists.txt new/lxqt-globalkeys-0.13.0/daemon/CMakeLists.txt --- old/lxqt-globalkeys-0.12.0/daemon/CMakeLists.txt 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/CMakeLists.txt 2018-05-21 20:21:00.000000000 +0200 @@ -140,6 +140,12 @@ ${${PROJECT_NAME}_GENERATED_FILES} ) +set_property(SOURCE + ${${PROJECT_NAME}_DBUS_INTERFACE_FILES} + ${${PROJECT_NAME}_DBUS_ADAPTOR_FILES} + PROPERTY SKIP_AUTOGEN ON +) + add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_ALL_FILES}) target_link_libraries(${PROJECT_NAME} ${X11_LIBRARIES} lxqt Qt5::Widgets Qt5::DBus) lxqt_enable_target_exceptions(${PROJECT_NAME} PRIVATE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/base_action.cpp new/lxqt-globalkeys-0.13.0/daemon/base_action.cpp --- old/lxqt-globalkeys-0.12.0/daemon/base_action.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/base_action.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/base_action.h new/lxqt-globalkeys-0.13.0/daemon/base_action.h --- old/lxqt-globalkeys-0.12.0/daemon/base_action.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/base_action.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/client_action.cpp new/lxqt-globalkeys-0.13.0/daemon/client_action.cpp --- old/lxqt-globalkeys-0.12.0/daemon/client_action.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/client_action.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/client_action.h new/lxqt-globalkeys-0.13.0/daemon/client_action.h --- old/lxqt-globalkeys-0.12.0/daemon/client_action.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/client_action.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/client_proxy.cpp new/lxqt-globalkeys-0.13.0/daemon/client_proxy.cpp --- old/lxqt-globalkeys-0.12.0/daemon/client_proxy.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/client_proxy.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/client_proxy.h new/lxqt-globalkeys-0.13.0/daemon/client_proxy.h --- old/lxqt-globalkeys-0.12.0/daemon/client_proxy.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/client_proxy.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/command_action.cpp new/lxqt-globalkeys-0.13.0/daemon/command_action.cpp --- old/lxqt-globalkeys-0.12.0/daemon/command_action.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/command_action.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/command_action.h new/lxqt-globalkeys-0.13.0/daemon/command_action.h --- old/lxqt-globalkeys-0.12.0/daemon/command_action.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/command_action.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/core.cpp new/lxqt-globalkeys-0.13.0/daemon/core.cpp --- old/lxqt-globalkeys-0.12.0/daemon/core.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/core.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: @@ -532,7 +532,8 @@ mAllowGrabBaseKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad).toBool(); mAllowGrabMiscKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad).toBool(); - foreach(const QString §ion, settings.childGroups()) + const auto sections = settings.childGroups(); + for(const QString §ion : sections) { if (section != QLatin1String("General")) { @@ -1120,7 +1121,7 @@ Window rootWindow = DefaultRootWindow(mDisplay); - XSelectInput(mDisplay, rootWindow, KeyPressMask); + XSelectInput(mDisplay, rootWindow, KeyPressMask | KeyReleaseMask); mInterClientCommunicationWindow = XCreateSimpleWindow(mDisplay, rootWindow, 0, 0, 1, 1, 0, 0, 0); @@ -1140,10 +1141,14 @@ allModifiers.insert(ignoreLocks); } + const QString metaLeft = XKeysymToString(XK_Super_L); + const QString metaRight = XKeysymToString(XK_Super_R); char signal = 0; if (write(mX11ResponsePipe[STDOUT_FILENO], &signal, sizeof(signal)) == sizeof(signal)) { + bool keyReleaseExpected = false; + XEvent event; while (mX11EventLoopActive) { @@ -1153,7 +1158,15 @@ break; } - if (event.type == KeyPress && mDataMutex.tryLock(0)) + if ((event.type == KeyRelease) && !keyReleaseExpected) + { + // pop event from the x11 queue and do nothing + XNextEvent(mDisplay, &event); + continue; + } + keyReleaseExpected = false; // Close time window for accepting meta keys. + + if (((event.type == KeyPress) || (event.type == KeyRelease)) && mDataMutex.tryLock(0)) { std::unique_lock<QMutex> unlocker(mDataMutex, std::adopt_lock); @@ -1201,7 +1214,29 @@ } else { - if (isModifier(keySym) || !isAllowed(keySym, event.xkey.state & allShifts)) + if (isModifier(keySym)) + { + if (event.type == KeyPress) + { + ignoreKey = true; + keyReleaseExpected = true; + } + else + { + // Only the meta keys are allowed. + + if ((event.xkey.state & allShifts) == MetaMask) + { + shortcut = XKeysymToString(keySym); + event.xkey.state &= ~allShifts; // Modifier keys must not use shift states. + } + else + { + ignoreKey = true; + } + } + } + else if ((event.type == KeyRelease) || !isAllowed(keySym, event.xkey.state & allShifts)) { ignoreKey = true; } @@ -1243,6 +1278,11 @@ } } } + if (keySyms) + { + XFree(keySyms); + keySyms = nullptr; + } if (!ignoreKey) { IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut); @@ -1316,8 +1356,32 @@ } else { - QString shortcut = mShortcutByX11[qMakePair(static_cast<KeyCode>(event.xkey.keycode), event.xkey.state & allShifts)]; - log(LOG_DEBUG, "KeyPress %08x %08x %s", event.xkey.state & allShifts, event.xkey.keycode, qPrintable(shortcut)); + if (event.type == KeyRelease) + { + event.xkey.state &= ~allShifts; // Modifier keys must not use shift states. + } + + X11Shortcut shortcutKey = qMakePair(static_cast<KeyCode>(event.xkey.keycode), event.xkey.state & allShifts); + ShortcutByX11::const_iterator shortcutIt = mShortcutByX11.constFind(shortcutKey); + if (shortcutIt == mShortcutByX11.constEnd()) + { + continue; + } + const QString& shortcut = shortcutIt.value(); + + if (event.type == KeyPress) + { + if ((shortcut == metaLeft) || (shortcut == metaRight)) + { + keyReleaseExpected = true; + continue; + } + log(LOG_DEBUG, "KeyPress %08x %08x %s", event.xkey.state & allShifts, event.xkey.keycode, qPrintable(shortcut)); + } + else + { + log(LOG_DEBUG, "KeyRelease %08x %08x %s", event.xkey.state & allShifts, event.xkey.keycode, qPrintable(shortcut)); + } IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut); if (idsByShortcut != mIdsByShortcut.end()) @@ -1377,7 +1441,7 @@ else // check for pending pipe requests from other thread { - if (event.type != KeyPress) { + if ((event.type != KeyPress) && (event.type != KeyRelease)) { XNextEvent(mDisplay, &event); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/core.h new/lxqt-globalkeys-0.13.0/daemon/core.h --- old/lxqt-globalkeys-0.12.0/daemon/core.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/core.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/daemon_adaptor.cpp new/lxqt-globalkeys-0.13.0/daemon/daemon_adaptor.cpp --- old/lxqt-globalkeys-0.12.0/daemon/daemon_adaptor.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/daemon_adaptor.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/daemon_adaptor.h new/lxqt-globalkeys-0.13.0/daemon/daemon_adaptor.h --- old/lxqt-globalkeys-0.12.0/daemon/daemon_adaptor.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/daemon_adaptor.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/fixed_timeout.h new/lxqt-globalkeys-0.13.0/daemon/fixed_timeout.h --- old/lxqt-globalkeys-0.12.0/daemon/fixed_timeout.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/fixed_timeout.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/log_target.cpp new/lxqt-globalkeys-0.13.0/daemon/log_target.cpp --- old/lxqt-globalkeys-0.12.0/daemon/log_target.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/log_target.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/log_target.h new/lxqt-globalkeys-0.13.0/daemon/log_target.h --- old/lxqt-globalkeys-0.12.0/daemon/log_target.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/log_target.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/main.cpp new/lxqt-globalkeys-0.13.0/daemon/main.cpp --- old/lxqt-globalkeys-0.12.0/daemon/main.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/main.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/meta_types.cpp new/lxqt-globalkeys-0.13.0/daemon/meta_types.cpp --- old/lxqt-globalkeys-0.12.0/daemon/meta_types.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/meta_types.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/meta_types.h new/lxqt-globalkeys-0.13.0/daemon/meta_types.h --- old/lxqt-globalkeys-0.12.0/daemon/meta_types.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/meta_types.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/method_action.cpp new/lxqt-globalkeys-0.13.0/daemon/method_action.cpp --- old/lxqt-globalkeys-0.12.0/daemon/method_action.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/method_action.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/method_action.h new/lxqt-globalkeys-0.13.0/daemon/method_action.h --- old/lxqt-globalkeys-0.12.0/daemon/method_action.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/method_action.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/mutex.cpp new/lxqt-globalkeys-0.13.0/daemon/mutex.cpp --- old/lxqt-globalkeys-0.12.0/daemon/mutex.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/mutex.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/mutex.h new/lxqt-globalkeys-0.13.0/daemon/mutex.h --- old/lxqt-globalkeys-0.12.0/daemon/mutex.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/mutex.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/native_adaptor.cpp new/lxqt-globalkeys-0.13.0/daemon/native_adaptor.cpp --- old/lxqt-globalkeys-0.12.0/daemon/native_adaptor.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/native_adaptor.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/native_adaptor.h new/lxqt-globalkeys-0.13.0/daemon/native_adaptor.h --- old/lxqt-globalkeys-0.12.0/daemon/native_adaptor.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/native_adaptor.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/pipe_utils.cpp new/lxqt-globalkeys-0.13.0/daemon/pipe_utils.cpp --- old/lxqt-globalkeys-0.12.0/daemon/pipe_utils.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/pipe_utils.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/pipe_utils.h new/lxqt-globalkeys-0.13.0/daemon/pipe_utils.h --- old/lxqt-globalkeys-0.12.0/daemon/pipe_utils.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/pipe_utils.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/string_utils.cpp new/lxqt-globalkeys-0.13.0/daemon/string_utils.cpp --- old/lxqt-globalkeys-0.12.0/daemon/string_utils.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/string_utils.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/daemon/string_utils.h new/lxqt-globalkeys-0.13.0/daemon/string_utils.h --- old/lxqt-globalkeys-0.12.0/daemon/string_utils.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/daemon/string_utils.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/ui/shortcut_selector.cpp new/lxqt-globalkeys-0.13.0/ui/shortcut_selector.cpp --- old/lxqt-globalkeys-0.12.0/ui/shortcut_selector.cpp 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/ui/shortcut_selector.cpp 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/ui/shortcut_selector.h new/lxqt-globalkeys-0.13.0/ui/shortcut_selector.h --- old/lxqt-globalkeys-0.12.0/ui/shortcut_selector.h 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/ui/shortcut_selector.h 2018-05-21 20:21:00.000000000 +0200 @@ -1,8 +1,8 @@ /* 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: 2013 Razor team * Authors: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-globalkeys-0.12.0/xdg/globalkeyshortcuts.conf new/lxqt-globalkeys-0.13.0/xdg/globalkeyshortcuts.conf --- old/lxqt-globalkeys-0.12.0/xdg/globalkeyshortcuts.conf 2017-10-21 21:16:12.000000000 +0200 +++ new/lxqt-globalkeys-0.13.0/xdg/globalkeyshortcuts.conf 2018-05-21 20:21:00.000000000 +0200 @@ -39,3 +39,8 @@ Comment=screen shot Enabled=true Exec=lximage-qt, -s + +[Control%2BAlt%2BL.30] +Comment=lockscreen +Enabled=true +Exec=xdg-screensaver, lock
