From ea1be4532fc61698f5fdb4d8fae63e7df1115da7 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 18 Oct 2016 02:48:04 +0200 Subject: [PATCH] Cherry-picking upstream release 0.11.0. * Sync debian foo with experimental * Bumped Standards to 3.9.8, no changes needed * Bumped compat to 10 * Removed --parallel from rules, compat 10 standard * Bumped minimum version debhelper (>= 10) * Bumped minimum version libqtxdg-dev (>= 2.0.0) * Bumped minimum version liblxqt-dev (>= 0.11.0) * Added build dependency libqt5svg5-dev * Added build dependency libqt5xdgiconloader-dev (>= 2.0.0), * Added Recommends lxqt-globalkeys-l10n * Followin the Multiarch hinter: - Marked liblxqt-globalkeys-ui0 Multi-Arch: same - Marked liblxqt-globalkeys0 Multi-Arch: same * Fixed VCS-Fields, use https and plain /git/ * Fixed copyright Format field * Bumped copyright years * Don't install translations * Added translation control to rules * Set CMAKE_BUILD_TYPE=RelWithDebInfo * Exported LC_ALL=C.UTF-8, make builds reproducible * Added hardening options to rules * Fixed .gitignore * Removed Patches, applied upstream * Fixed *-dev.install --- .gitignore | 1 + AUTHORS | 4 +- CHANGELOG | 220 +++++++++++++++ README.md | 37 +++ client/CMakeLists.txt | 2 +- client/client.cpp | 8 +- config/CMakeLists.txt | 10 + config/actions.cpp | 8 +- config/edit_action_dialog.cpp | 10 +- config/main_window.cpp | 2 +- .../lxqt-config-globalkeyshortcuts.ts | 168 ------------ .../lxqt-config-globalkeyshortcuts_ar.ts | 194 ------------- .../lxqt-config-globalkeyshortcuts_ca.desktop | 4 + .../lxqt-config-globalkeyshortcuts_cs.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_cs_CZ.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_da_DK.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_de.desktop | 2 +- .../lxqt-config-globalkeyshortcuts_de.ts | 169 ------------ .../lxqt-config-globalkeyshortcuts_el.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_eo.ts | 194 ------------- .../lxqt-config-globalkeyshortcuts_es.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_es_VE.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_eu.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_fi.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_fr_FR.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_hu.ts | 257 ------------------ .../lxqt-config-globalkeyshortcuts_it.desktop | 3 + ...qt-config-globalkeyshortcuts_it_IT.desktop | 3 - .../lxqt-config-globalkeyshortcuts_it_IT.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ja.ts | 182 ------------- .../lxqt-config-globalkeyshortcuts_lt.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_nl.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_pl_PL.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_pt.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_pt_BR.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ro_RO.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ru.desktop | 2 +- .../lxqt-config-globalkeyshortcuts_ru.ts | 168 ------------ ...qt-config-globalkeyshortcuts_ru_RU.desktop | 4 - .../lxqt-config-globalkeyshortcuts_ru_RU.ts | 168 ------------ .../lxqt-config-globalkeyshortcuts_sl.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_th_TH.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_tr.ts | 182 ------------- .../lxqt-config-globalkeyshortcuts_uk.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_zh_CN.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_zh_TW.ts | 241 ---------------- daemon/core.cpp | 126 +++++---- daemon/core.h | 5 +- daemon/main.cpp | 3 + daemon/pipe_utils.cpp | 16 +- debian/.gitignore | 1 + debian/changelog | 30 ++ debian/compat | 2 +- debian/control | 17 +- debian/copyright | 6 +- debian/docs | 1 + debian/liblxqt-globalkeys-ui0-dev.install | 2 +- debian/liblxqt-globalkeys0-dev.install | 3 +- debian/lxqt-globalkeys.install | 1 - debian/patches/error_t.patch | 61 ----- debian/patches/series | 1 - debian/rules | 9 +- debian/upstream/signing-key.asc | 107 ++++---- debian/watch | 4 +- 64 files changed, 489 insertions(+), 6714 deletions(-) create mode 100644 CHANGELOG create mode 100644 README.md delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ar.ts create mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ca.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_cs.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_de.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_el.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_eo.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_es.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_eu.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_fi.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_hu.ts create mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ja.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_lt.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_nl.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pt.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_sl.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_tr.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_uk.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts delete mode 100644 debian/patches/error_t.patch delete mode 100644 debian/patches/series diff --git a/.gitignore b/.gitignore index 513eaeb..d34465a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ build *.kdev4 +config/translations/lxqt-globalkeys diff --git a/AUTHORS b/AUTHORS index 190d298..a66be6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2014 LXQt team + Copyright (c) 2012-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000..eb9cd07 --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,220 @@ + +lxqt-globalkeys-0.11.0 / 2016-09-24 +=================================== + + * Add README.md + * Add Catalan translation + * daemon: Use QDBusServiceWatcher + * Fix typo in German translation for desktop file (#38) + * build: Use external translations + * ts-files removal (#35) + * Improve foreach iterator use + * daemon/core: Optimize Core startup string stuff + * Client: Fix memory leak (static data) + * Fix untranslated string in French translation + * fix reseting the state of the edit dialog + * Default configs from /etc/xdg/lxqt must be loaded. + * static_cast, fixes FTBFS for the Hurd + * lxqt-globalkeys is LGPL only, there are no GPL files in it + * Update italian translation, remove country-specific variant + * Italian translation update + * Update Russian translation Remove ru_RU files + * Update French translation + * client: Fix typo in pkg-config dependencies + * upd: lxqt-config-globalkeyshortcuts_hu.ts + * Fix warning + +0.10.0 / 2015-10-31 +=================== + + * Fix license file + * Update translations + * Fix regression for config add dialog + * Remove shortcut grabbing from the main window + * Add KDevelop project type to .gitignore + * OnlyShowIn=LXQt; + * Rename LxQt to LXQt everywhere + * Update Greek translation Remove country variant from language code + * Updated german translation, make it common for all german speaking regions. + * Updated template. + * Handles CMake policy CMP0063 + * Export the ShortutSelector class + * Use LXQtCompilerSettings CMake module + * Install lxqt-globalkeysd to where it belongs + * Renames development and runtime CMake COMPONENT's + * Use target_compile_definitions() + * Coding style changes + * Double Quote CMake variables that may contain blanks + * Removes unneeded CMake stuff + * Use CMAKE_AUTOUIC + * Removes not needed include_directories() + * Removes hardcoded install dirs + * Drops LIB_SUFFIX. Use GNUInstallDirs. + * Fix three memory leaks in daemon error handling + * Fix FTBFS after new CMake Targets + * main: use standard liblxqt unix signal handling to quit + * Adds intree/superbuild support + * Generate -config-version.cmake files + * Drops xxx_use.cmake files. Adopt Targets + * Makes the config.cmake usable in an super build + * Update to use the new liblxqt Targets infrastructure + * daemon: fix two memory leaks + * Removes commented CMake code + * Removes unused FindInstallConfigPath.cmake + * Hungarian translation added + * Add additional map to track disabled actions + * daemon: not grabbing disabled shortcuts + * Update lxqt-config-globalkeyshortcuts_it_IT.desktop + * client: emitting registrationFinished signal + * Add check for NULL pointer. See lxde/lxqt#521 + * Use ~ instead of / as working dir. Fixes lxde/lxqt#521 + * Make DBus calls to addClientAction async + +0.9.0 / 2015-01-07 +================== + + * Portuguese update + * - Unify naming for a unique lxqt. No more suffixes + * Use the new LxQt::SingleApplication + * CMakeLists maitenance + * Uses the new translations cmake modules + * Update Russian translation + * Drop Qt4 support in code + * Clean up CMakeLists.txt and drop Qt 4 support + +0.8.0 / 2014-10-10 +================== + + * Adapt to the translation infrastructure + * - Fix Greek translation to conform with desktopfile validation + * Link to correct version of lxqt-globalkeys for lxqt-globalkeys-ui. + * Updates translations files install destination + * Adds include_directories() to the _use.cmake file + * Adds portable headers + * Fix broken qt4 build and make lib and include paths of qt4 and qt5 versions different. + * Do simplification and cleanup for the qt5 port. * Use cmake 2.8.9 by default and require 2.8.11 for qt5. + * Initial Qt5 support + * Use new LXQt header files. + * Improve FreeBSD support + +0.7.0 / 2014-05-07 +================== + + * Update COPYING + +0.6.99 / 2014-04-30 +=================== + + * remove old translation templates remove translated icon names + * Add #include for using basename(). Add typedef for error_t if it's not defined. + * Update AUTHORS + * Add CPack rules for creating tarball + * Bring desktop file in line with the others + * Don't append library suffix to library install path, but use it by default + * Respect standard LIB_INSTALL_DIR + * Removed CMAKE_SOURCE_DIR usage from CMakeLists.txt files + * Fix renaming bugs, replacing lxqt-qt with lxde-qt + * Finish the crazy razor=>lxqt renaming tasks. + * Project name added to cmake file + * Fix incorrect header inclusion. + * Fix broken cmake config and use files. + * Rename to lxqt-globalkeys. * Add cmake config and use files for liblxqt-globalkeys and liblxqt-globalkeys-ui. + * Add client and ui libs (original razor-global-key-shortcuts-client and razor-global-key-shortcut-selector). + * Fix incorrect dbus address by replacing razorqt with lxqt. + * Fix broken build and rename binary to lxqt-globalshortcutsd. + * Add COPYING and AUTHORS + * Desktop file for global key shortcut configurator added to install + * X-RAZOR changed to Razor in desktop files + * Small CMake improvements + * Qt 4.8.2+ compatibility improved + * C includes fixed + * Qt 4.6 compatibility + * No dependencies on STL + * Fix build + * Fix #601 + * Typo really fixed (https://github.com/Razor-qt/razor-qt/commit/a8e71608fad71dfe8ad6be6ff1057067a19d93dc#commitcomment-3111401) + * Fix 'Unknown CMake command "razor_translate_ts"' error. + * Global key shortcuts config behaviour fixed + * TODO file removed (github issues to be used) + * Todo list updated + * Shortcut selectors fix for reset by timeout + * Shortcut selectors unified + * Shortcut can be changed just in the table + * Typo fixed + * New shortcut can be automatically applied to the selector text + * Should not set empty shortcuts - there is "enabled" feature for this + * Never allow to grab printable keys + * Todo list updated + * Shortcuts can be cleared from manager + * Stricter checks for client actions + * Inactive client actions can be removed from manager + * Todo list updated + * Todo list updated + * Temp files removed + * Global shortcuts client library added and all support for it refactored and fixed. + * Todo list updated + * Run as app by default + * Using PROJECT_NAME variable instead of PROJECT in CMake files + * Configurator ready for translation + * Header guards updated + * HPP files renamed to H and AStyle applied + * Missing license header added + * Unused files removed + * AStyle applied + * Initial import of global shortcut configurator + * Initial import of global shortcut daemon + * Todo updated + * Edit action dialog added + * Model indexes fixed + * Smart column autoresize + * Better dbus proxy usage + * Better optimisation handling + * Always printing a message in case of action failure + * Grabbing already grabbed shortcut releases keyboard + * Better command line info + * Todo file added + * Disabled actions grayed out + * Duplicate shortcuts highlighted Algorithm speed increased + * Unorderness of QSet fixed + * Shortcut editor added (but not used yet) Multiple actions behaviour selector added Some minor code style changes + * Minor style changes + * Manager has complete default read-only model + * More headers included + * Delayed actions model initialisation (allows correct signals handling) + * Correct daemon service name + * Correct command action info generation + * Prevent actions from multiplying when saving to the settings file + * Fixed meta types + * getAllActionsById renamed to getAllActions + * The simplest proxy model added to the manager + * More info returned by daemon + * Standard Qt header used + * Demo client app + * Qt4 compatibility issues fixed + * CMakefiles standardised + * Better actions IDs code Enable action methods exposed to DBus Config file fixed + * Daemon presence can be detected by native library - and it can reconnect + * Library refactored heavily + * Checking X11 error after each call CancelShortcutGrab method added Freshly grabbed shortcut checked More verbose X11 error output + * Removed non existing signal connection + * daemon_native* renamed to native* grabShortcut method duplicated in native* interface now install/uninstall added to project + * Native client library + * Meta types improved Better request functions + * Initial copy of Qt-based global action system + * globalkeyshortucts: fix segfault and other bugs in daemon + * Translations updated + * Translations updated + * Fix components missing translations + * Translations + * Install translations into correct places + * Update translations + * Enable translations for some components that were missing them + * Removed line num from TS files. + * Deleted old translation methods. + * New translation infrastructure + * complete setting parsing part for dbus call + * re-define classes to make server side ready for DBUS shortcuts + * global keys: server settings renaming + * globalkeys config: UI fixes; translations; proper layouting + * globalkeys: missing license; display groups as a whole line in the config dialog + * global keyobard shortcuts: initial import from Aaron's repo. Astyle-d. License added where required. Renamed to be more descriptive. diff --git a/README.md b/README.md new file mode 100644 index 0000000..5ca16fc --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +# lxqt-globalkeys + +## 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. + +## 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. + +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`. + +## 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. + +### 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. diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index bf317a2..66932e8 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -145,7 +145,7 @@ set(${PROJECT_NAME}_ALL_FILES ${${PROJECT_NAME}_GENERATED_FILES} ) -set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widget, Qt5DBus") +set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widgets, Qt5DBus") add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_ALL_FILES}) target_link_libraries(${PROJECT_NAME} diff --git a/client/client.cpp b/client/client.cpp index ef6dfcd..cc4c40f 100644 --- a/client/client.cpp +++ b/client/client.cpp @@ -301,16 +301,16 @@ void ClientImpl::grabShortcutFinished(QDBusPendingCallWatcher *call) } -static Client *globalActionNativeClient = 0; +static QScopedPointer globalActionNativeClient; Client *Client::instance() { if (!globalActionNativeClient) { - globalActionNativeClient = new Client(); + globalActionNativeClient.reset(new Client()); } - return globalActionNativeClient; + return globalActionNativeClient.data(); } Client::Client() @@ -321,7 +321,7 @@ Client::Client() Client::~Client() { - globalActionNativeClient = 0; + globalActionNativeClient.take(); } Action *Client::addAction(const QString &shortcut, const QString &path, const QString &description, QObject *parent) { return impl->addClientAction(shortcut, path, description, parent); } diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 3002bc0..bc286c0 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -107,6 +107,16 @@ lxqt_translate_ts(${PROJECT_NAME}_QM_FILES ${${PROJECT_NAME}_TRANSLATABLE} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-globalkeys/${PROJECT_NAME}" ) lxqt_app_translation_loader(${PROJECT_NAME}_QM_LOADER ${PROJECT_NAME}) diff --git a/config/actions.cpp b/config/actions.cpp index 907c048..bbf2a7f 100644 --- a/config/actions.cpp +++ b/config/actions.cpp @@ -86,7 +86,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QDBusObjectPath path; if (getClientActionInfoById(I.key(), shortcut, description, enabled, path)) { @@ -104,7 +104,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString service; QDBusObjectPath path; QString interface; @@ -126,7 +126,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString command; QStringList arguments; if (getCommandActionInfoById(I.key(), shortcut, description, enabled, command, arguments)) @@ -223,7 +223,7 @@ void Actions::do_actionAdded(qulonglong id) { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString type; QString info; if (getActionById(id, shortcut, description, enabled, type, info)) diff --git a/config/edit_action_dialog.cpp b/config/edit_action_dialog.cpp index 168b4b4..aef6131 100644 --- a/config/edit_action_dialog.cpp +++ b/config/edit_action_dialog.cpp @@ -209,8 +209,6 @@ bool EditActionDialog::load(qulonglong id) shortcut_SS->setText(QString()); description_LE->clear(); enabled_CB->setChecked(true); - command_RB->setChecked(false); - dbus_method_RB->setChecked(false); action_SW->setCurrentWidget(command_P); command_PTE->clear(); service_LE->clear(); @@ -218,6 +216,14 @@ bool EditActionDialog::load(qulonglong id) interface_LE->clear(); method_LE->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(true); command_RB->setEnabled(true); dbus_method_RB->setEnabled(true); diff --git a/config/main_window.cpp b/config/main_window.cpp index 1297476..19aba3b 100644 --- a/config/main_window.cpp +++ b/config/main_window.cpp @@ -155,7 +155,7 @@ void MainWindow::on_swap_PB_clicked() void MainWindow::on_remove_PB_clicked() { - foreach(QModelIndex rowIndex, mSelectionModel->selectedRows()) + foreach(const QModelIndex &rowIndex, mSelectionModel->selectedRows()) mActions->removeAction(mDefaultModel->id(mSortFilterProxyModel->mapToSource(rowIndex))); } diff --git a/config/translations/lxqt-config-globalkeyshortcuts.ts b/config/translations/lxqt-config-globalkeyshortcuts.ts deleted file mode 100644 index 7d46c80..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - - - - - All - - - - - Close - - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ar.ts b/config/translations/lxqt-config-globalkeyshortcuts_ar.ts deleted file mode 100644 index 7f21fe7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ar.ts +++ /dev/null @@ -1,194 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - الوصف - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - إزالة - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - ﻻشيء - - - - All - - - - - Close - إغلاق - - - - ShortcutConfigWindow - - Description - الوصف - - - Remove - إزالة - - - Close - إغلاق - - - - ShortcutEditor - - None - ﻻشيء - - - Remove - إزالة - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ca.desktop b/config/translations/lxqt-config-globalkeyshortcuts_ca.desktop new file mode 100644 index 0000000..0618054 --- /dev/null +++ b/config/translations/lxqt-config-globalkeyshortcuts_ca.desktop @@ -0,0 +1,4 @@ +# Translations +Name[ca]=Tecles de les dreceres +GenericName[ca]=Ajusts de les dreceres de teclat +Comment[ca]=Configureu les tecles de les dreceres a LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_cs.ts b/config/translations/lxqt-config-globalkeyshortcuts_cs.ts deleted file mode 100644 index fbb8a2e..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_cs.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Najít příkaz - - - - DefaultModel - - - Command - Příkaz - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Zkratka - - - - Description - Popis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstranit - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Žádná - - - - All - - - - - Close - Zavřít - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor zkratek - - - Description - Popis - - - Shortcut - Zkratka - - - Command - Příkaz - - - Add New - Přidat novou - - - Remove - Odstranit - - - Add Group - Přidat skupinu - - - Reset - Vynulovat - - - Close - Zavřít - - - - ShortcutEditor - - None - Žádná - - - Add Shortcut - Přidat zkratku - - - Remove - Odstranit - - - New Group - Nová skupina - - - Reset Changes - Vynulovat změny - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts b/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts deleted file mode 100644 index d374897..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Najít příkaz - - - - DefaultModel - - - Command - Příkaz - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Zkratka - - - - Description - Popis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstranit - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Žádná - - - - All - - - - - Close - Zavřít - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor zkratek - - - Description - Popis - - - Shortcut - Zkratka - - - Command - Příkaz - - - Add New - Přidat novou - - - Remove - Odstranit - - - Add Group - Přidat skupinu - - - Reset - Vynulovat - - - Close - Zavřít - - - - ShortcutEditor - - None - Žádná - - - Add Shortcut - Přidat zkratku - - - Remove - Odstranit - - - New Group - Nová skupina - - - Reset Changes - Vynulovat změny - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts b/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts deleted file mode 100644 index cf33d41..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Find en kommando - - - - DefaultModel - - - Command - Kommando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Genvej - - - - Description - Beskrivelse - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Fjern - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Ingen - - - - All - - - - - Close - Afslut - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt Tastaturgenveje - - - Description - Beskrivelse - - - Shortcut - Genvej - - - Command - Kommando - - - Add New - Tilføj ny - - - Remove - Fjern - - - Add Group - Tilføj gruppe - - - Reset - Nulstil - - - Close - Afslut - - - - ShortcutEditor - - None - Ingen - - - Add Shortcut - Tilføj genvej - - - Remove - Fjern - - - New Group - Ny gruppe - - - Reset Changes - Nulstil ændringer - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_de.desktop b/config/translations/lxqt-config-globalkeyshortcuts_de.desktop index 6013145..aa6448c 100644 --- a/config/translations/lxqt-config-globalkeyshortcuts_de.desktop +++ b/config/translations/lxqt-config-globalkeyshortcuts_de.desktop @@ -1,4 +1,4 @@ # Translations Name[de]=Kurzbefehl-Konfiguration GenericName[de]=Globale Kurzbefehlkonfiguration -Comment[de]=Globale Kurzbefehle für die LXQt Arbeitsfläche definieren +Comment[de]=Globale Kurzbefehle für die LXQt-Arbeitsfläche definieren diff --git a/config/translations/lxqt-config-globalkeyshortcuts_de.ts b/config/translations/lxqt-config-globalkeyshortcuts_de.ts deleted file mode 100644 index 60aa810..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_de.ts +++ /dev/null @@ -1,169 +0,0 @@ - - - - - DefaultModel - - - Command - Befehl - - - - DBus call - DBus-Aufruf - - - - Client - Client - - - - Id - Kennung - - - - Shortcut - Kurzbefehl - - - - Description - Beschreibung - - - - Type - Typ - - - - Info - Information - - - - EditActionDialog - - - Edit Action - Befehl bearbeiten - - - - &Shortcut: - &Kurzbefehl: - - - - &Description: - &Beschreibung: - - - - &Enabled - &Aktiviert - - - - &Command - B&efehl - - - - &DBus message - &DBus-Nachricht - - - - Type: - Typ: - - - - Co&mmand: - Be&fehl: - - - - S&ervice: - Ser&vice: - - - - &Path: - &Pfad: - - - - &Interface: - &Schnittstelle: - &Interface: - - - - &Method: - &Methode: - - - - MainWindow - - - Global Actions Manager - Globaler Aktionsmanager - - - - Add ... - Hinzufügen ... - - - - Remove - Entfernen - - - - Modify ... - Ändern ... - - - - Swap - Tauschen - - - - Multiple actions behaviour: - Verhalten bei mehreren Aktionen: - - - - First - Erste - - - - Last - Letzte - - - - None - Keine - - - - All - Alle - - - - Close - Schließen - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_el.ts b/config/translations/lxqt-config-globalkeyshortcuts_el.ts deleted file mode 100644 index c0a5427..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_el.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Εύρεση εντολής - - - - DefaultModel - - - Command - Εντολή - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Συντόμευση - - - - Description - Περιγραφή - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Αφαίρεση - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Κανένα - - - - All - - - - - Close - Κλείσιμο - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Επεξεργασία συντομεύσεων LXQt - - - Description - Περιγραφή - - - Shortcut - Συντόμευση - - - Command - Εντολή - - - Add New - Προσθήκη νέας - - - Remove - Αφαίρεση - - - Add Group - Προσθήκη ομάδας - - - Reset - Επαναφορά - - - Close - Κλείσιμο - - - - ShortcutEditor - - None - Κανένα - - - Add Shortcut - Προσθήκη συντόμευσης - - - Remove - Αφαίρεση - - - New Group - Νέα ομάδα - - - Reset Changes - Επαναφορά αλλαγών - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_eo.ts b/config/translations/lxqt-config-globalkeyshortcuts_eo.ts deleted file mode 100644 index c8ea875..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_eo.ts +++ /dev/null @@ -1,194 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - Priskribo - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Forigi - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nenio - - - - All - - - - - Close - Fermi - - - - ShortcutConfigWindow - - Description - Priskribo - - - Remove - Forigi - - - Close - Fermi - - - - ShortcutEditor - - None - Nenio - - - Remove - Forigi - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_es.ts b/config/translations/lxqt-config-globalkeyshortcuts_es.ts deleted file mode 100644 index 2fdf33e..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_es.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atajo - - - - Description - Descripción - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Borrar - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Ninguno - - - - All - - - - - Close - Cerrar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de Atajos de LXQt - - - Description - Descripción - - - Shortcut - Atajo - - - Command - Comando - - - Add New - Agregar nuevo - - - Remove - Borrar - - - Add Group - Agregar Grupo - - - Reset - Reiniciar - - - Close - Cerrar - - - - ShortcutEditor - - None - Ninguno - - - Add Shortcut - Agregar Atajo - - - Remove - Borrar - - - New Group - Nuevo Grupo - - - Reset Changes - Reiniciar Cambios - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts b/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts deleted file mode 100644 index a7614fb..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atajo - - - - Description - Descripcion - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nada - - - - All - - - - - Close - Cerrar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de atajos - - - Description - Descripcion - - - Shortcut - Atajo - - - Command - Comando - - - Add New - Agregar Nuevo - - - Remove - Remover - - - Add Group - Agregar Grupo - - - Reset - Reiniciar - - - Close - Cerrar - - - - ShortcutEditor - - None - Nada - - - Add Shortcut - Nuevo atajo - - - Remove - Remover - - - New Group - Nuevo Grupo - - - Reset Changes - Reiniciar cambios - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_eu.ts b/config/translations/lxqt-config-globalkeyshortcuts_eu.ts deleted file mode 100644 index 44d3113..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_eu.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Bilatu komando bat - - - - DefaultModel - - - Command - Komandoa - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Lasterbidea - - - - Description - Deskribapena - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Kendu - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Bat ere ez - - - - All - - - - - Close - Itxi - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt lasterbide-editorea - - - Description - Deskribapena - - - Shortcut - Lasterbidea - - - Command - Komandoa - - - Add New - Gehitu berria - - - Remove - Kendu - - - Add Group - Gehitu taldea - - - Reset - Berrezarri - - - Close - Itxi - - - - ShortcutEditor - - None - Bat ere ez - - - Add Shortcut - Gehitu lasterbidea - - - Remove - Kendu - - - New Group - Talde berria - - - Reset Changes - Berrezarri aldaketak - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_fi.ts b/config/translations/lxqt-config-globalkeyshortcuts_fi.ts deleted file mode 100644 index 2bcecf7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_fi.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - Kuvaus - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Poista - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - - - - - All - - - - - Close - Sulje - - - - ShortcutConfigWindow - - Description - Kuvaus - - - Remove - Poista - - - Close - Sulje - - - - ShortcutEditor - - Remove - Poista - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts b/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts deleted file mode 100644 index 7e1273a..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Supprimer - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Aucun(e) - - - - All - - - - - Close - Fermer - - - - ShortcutConfigWindow - - Remove - Supprimer - - - Close - Fermer - - - - ShortcutEditor - - None - Aucun(e) - - - Remove - Supprimer - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_hu.ts b/config/translations/lxqt-config-globalkeyshortcuts_hu.ts deleted file mode 100644 index 816c613..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_hu.ts +++ /dev/null @@ -1,257 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Parancs keresés - - - - DefaultModel - - - Command - Parancs - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Forróbillentyű - - - - Description - Leírás - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Törlés - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nincs - - - - All - - - - - Close - Bezár - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt forróbillentyű szerkesztés - - - Description - Leírás - - - Shortcut - Forróbillentyű - - - Command - Parancs - - - Add New - Új - - - Remove - Törlés - - - Add Group - Csoport - - - Reset - Visszavon - - - Close - Bezár - - - - ShortcutEditor - - None - Nincs - - - Add Shortcut - Forróbillentyű adás - - - Remove - Törlés - - - New Group - Új csoport - - - Reset Changes - Visszavonás - - - Question - Kérdés - - - Delete group: %1? (everything inside will be removed altogether) - A %1 csoport törlése? (Minden kapcsolata is törlődik) - - - Delete %1? - %1 törlése? - - - Binding for %1 already exists. Replace old one? - A %1 már foglalt. Felváltsuk az újjal? - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it.desktop b/config/translations/lxqt-config-globalkeyshortcuts_it.desktop new file mode 100644 index 0000000..39d2987 --- /dev/null +++ b/config/translations/lxqt-config-globalkeyshortcuts_it.desktop @@ -0,0 +1,3 @@ +# Translations +Name[it]=Scorciatoie globali +Comment[it]=Configura le scorciatoie globali di LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop b/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop deleted file mode 100644 index 7fd114b..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -Name[it_IT]=Scorciatoie globali -Comment[it_IT]=Configura le scorciatoie globali di LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts b/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts deleted file mode 100644 index badd050..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Trova un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Scorciatoie - - - - Description - Descrizione - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Rimuovi - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nessuna - - - - All - - - - - Close - Chiudi - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor delle scorciatoie di LXQt - - - Description - Descrizione - - - Shortcut - Scorciatoie - - - Command - Comando - - - Add New - Aggiungi nuova - - - Remove - Rimuovi - - - Add Group - Aggiungi gruppo - - - Reset - Azzera - - - Close - Chiudi - - - - ShortcutEditor - - None - Nessuna - - - Add Shortcut - Aggiungi scorciatoia - - - Remove - Rimuovi - - - New Group - Nuovo gruppo - - - Reset Changes - Azzera le modifiche - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ja.ts b/config/translations/lxqt-config-globalkeyshortcuts_ja.ts deleted file mode 100644 index 09580d9..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ja.ts +++ /dev/null @@ -1,182 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - なし - - - - All - - - - - Close - 閉じる - - - - ShortcutConfigWindow - - Close - 閉じる - - - - ShortcutEditor - - None - なし - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_lt.ts b/config/translations/lxqt-config-globalkeyshortcuts_lt.ts deleted file mode 100644 index e7e9221..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_lt.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Pašalinti - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nieko - - - - All - - - - - Close - Uždaryti - - - - ShortcutConfigWindow - - Remove - Pašalinti - - - Close - Uždaryti - - - - ShortcutEditor - - None - Nieko - - - Remove - Pašalinti - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_nl.ts b/config/translations/lxqt-config-globalkeyshortcuts_nl.ts deleted file mode 100644 index cf505c2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_nl.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Verwijderen - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Geen - - - - All - - - - - Close - Sluiten - - - - ShortcutConfigWindow - - Remove - Verwijderen - - - Close - Sluiten - - - - ShortcutEditor - - None - Geen - - - Remove - Verwijderen - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts b/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts deleted file mode 100644 index 6ad44a5..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Znajdź polecenie - - - - DefaultModel - - - Command - Polecenie - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Skrót - - - - Description - Opis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Usuń - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Brak - - - - All - - - - - Close - Zamknij - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Edytor Skrótów LXQt - - - Description - Opis - - - Shortcut - Skrót - - - Command - Polecenie - - - Add New - Dodaj - - - Remove - Usuń - - - Add Group - Dodaj grupę - - - Reset - Reset - - - Close - Zamknij - - - - ShortcutEditor - - None - Brak - - - Add Shortcut - Dodaj skrót - - - Remove - Usuń - - - New Group - Dodaj grupę - - - Reset Changes - Resetuj zmiany - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pt.ts b/config/translations/lxqt-config-globalkeyshortcuts_pt.ts deleted file mode 100644 index dd17dd2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pt.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar um comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atalho - - - - Description - Descrição - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nada - - - - All - - - - - Close - Fechar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de atalhos do LXQt - - - Description - Descrição - - - Shortcut - Atalho - - - Command - Comando - - - Add New - Adicionar - - - Remove - Remover - - - Add Group - Adicionar grupo - - - Reset - Restaurar - - - Close - Fechar - - - - ShortcutEditor - - None - Nada - - - Add Shortcut - Adicionar atalho - - - Remove - Remover - - - New Group - Novo grupo - - - Reset Changes - Restaurar alterações - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts b/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts deleted file mode 100644 index a6dd489..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar um comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atalho - - - - Description - Descrição - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nenhum - - - - All - - - - - Close - Fechar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor De Atalhos - - - Description - Descrição - - - Shortcut - Atalho - - - Command - Comando - - - Add New - Adicionar Novo - - - Remove - Remover - - - Add Group - Adicionar Grupo - - - Reset - Redefinir - - - Close - Fechar - - - - ShortcutEditor - - None - Nenhum - - - Add Shortcut - Adicionat Atalho - - - Remove - Remover - - - New Group - Novo Grupo - - - Reset Changes - Redefinir Alterações - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts b/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts deleted file mode 100644 index c19136d..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Caută o comandă - - - - DefaultModel - - - Command - Comandă - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Accelerator - - - - Description - Descriere - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Elimină - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nimic - - - - All - - - - - Close - Închide - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor acceleratori LXQt - - - Description - Descriere - - - Shortcut - Accelerator - - - Command - Comandă - - - Add New - Adaugă nou - - - Remove - Elimină - - - Add Group - Adaugă grup - - - Reset - Resetează - - - Close - Închide - - - - ShortcutEditor - - None - Nimic - - - Add Shortcut - Adaugă accelerator - - - Remove - Elimină - - - New Group - Grup nou - - - Reset Changes - Resetează modificările - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop b/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop index f8a39e1..babcca1 100644 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop +++ b/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop @@ -1,4 +1,4 @@ # Translations Name[ru]=Сочетания клавиш -Comment[ru]=Настроить сочетание клавиш в LXQt +Comment[ru]=Настроить сочетания клавиш в LXQt GenericName[ru]=Настроить сочетания клавиш \ No newline at end of file diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru.ts b/config/translations/lxqt-config-globalkeyshortcuts_ru.ts deleted file mode 100644 index b632e5a..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - Команда - - - - DBus call - Вызов DBus - - - - Client - Клиент - - - - Id - id - - - - Shortcut - Сочетание клавиш - - - - Description - Описание - - - - Type - Тип - - - - Info - Информация - - - - EditActionDialog - - - Edit Action - Изменить действие - - - - &Shortcut: - &Сочетание клавиш: - - - - &Description: - &Описание: - - - - &Enabled - &Разрешено - - - - &Command - &Команда - - - - &DBus message - Сообщение &DBus - - - - Type: - Тип: - - - - Co&mmand: - Ко&манда: - - - - S&ervice: - С&ервис: - - - - &Path: - &Путь: - - - - &Interface: - &Интерфейс: - - - - &Method: - &Метод: - - - - MainWindow - - - Global Actions Manager - Управление глобальными действиями - - - - Add ... - Добавить… - - - - Remove - Удалить - - - - Modify ... - Изменить… - - - - Swap - Заменить - - - - Multiple actions behaviour: - Поведение нескольких действий: - - - - First - Первое - - - - Last - Последнее - - - - None - Не задано - - - - All - Все - - - - Close - Закрыть - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop b/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop deleted file mode 100644 index 20df390..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[ru_RU]=Сочетания клавиш -Comment[ru_RU]=Настроить сочетание клавиш в LXQt -GenericName[ru_RU]=Настроить сочетания клавиш \ No newline at end of file diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts b/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts deleted file mode 100644 index f98baef..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - Команда - - - - DBus call - Вызов DBus - - - - Client - Клиент - - - - Id - id - - - - Shortcut - Сочетание клавиш - - - - Description - Описание - - - - Type - Тип - - - - Info - Информация - - - - EditActionDialog - - - Edit Action - Изменить действие - - - - &Shortcut: - &Сочетание клавиш: - - - - &Description: - &Описание: - - - - &Enabled - &Разрешено - - - - &Command - &Команда - - - - &DBus message - Сообщение &DBus - - - - Type: - Тип: - - - - Co&mmand: - Ко&манда: - - - - S&ervice: - С&ервис: - - - - &Path: - &Путь: - - - - &Interface: - &Интерфейс: - - - - &Method: - &Метод: - - - - MainWindow - - - Global Actions Manager - Управление глобальными действиями - - - - Add ... - Добавить… - - - - Remove - Удалить - - - - Modify ... - Изменить… - - - - Swap - Заменить - - - - Multiple actions behaviour: - Поведение нескольких действий: - - - - First - Первое - - - - Last - Последнее - - - - None - Не задано - - - - All - Все - - - - Close - Закрыть - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_sl.ts b/config/translations/lxqt-config-globalkeyshortcuts_sl.ts deleted file mode 100644 index b913086..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_sl.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstrani - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Brez - - - - All - - - - - Close - Zapri - - - - ShortcutConfigWindow - - Remove - Odstrani - - - Close - Zapri - - - - ShortcutEditor - - None - Brez - - - Remove - Odstrani - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts b/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts deleted file mode 100644 index 1bd93d7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - หาคำสั่ง - - - - DefaultModel - - - Command - คำสั่ง - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - ปุ่มลัด - - - - Description - รายละเอียด - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - ลบทิ้ง - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - ไม่ต้อง - - - - All - - - - - Close - ปิด - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - ตัวแก้ไขปุ่มลัด LXQt - - - Description - รายละเอียด - - - Shortcut - ปุ่มลัด - - - Command - คำสั่ง - - - Add New - เพิ่มใหม่ - - - Remove - ลบทิ้ง - - - Add Group - เพิ่มกลุ่ม - - - Reset - กลับค่าเดิม - - - Close - ปิด - - - - ShortcutEditor - - None - ไม่ต้อง - - - Add Shortcut - เพิ่มปุ่มลัด - - - Remove - ลบทิ้ง - - - New Group - กลุ่มใหม่ - - - Reset Changes - กลับค่าเดิม - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_tr.ts b/config/translations/lxqt-config-globalkeyshortcuts_tr.ts deleted file mode 100644 index 49464c2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_tr.ts +++ /dev/null @@ -1,182 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Yok - - - - All - - - - - Close - Kapat - - - - ShortcutConfigWindow - - Close - Kapat - - - - ShortcutEditor - - None - Yok - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_uk.ts b/config/translations/lxqt-config-globalkeyshortcuts_uk.ts deleted file mode 100644 index 6426507..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_uk.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Знайти команду - - - - DefaultModel - - - Command - Команда - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Cкорочення - - - - Description - Опис - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Вилучити - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Нічого - - - - All - - - - - Close - Закрити - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Редактор скорочень LXQt - - - Description - Опис - - - Shortcut - Cкорочення - - - Command - Команда - - - Add New - Додати нове - - - Remove - Вилучити - - - Add Group - Додати групу - - - Reset - Cкинути - - - Close - Закрити - - - - ShortcutEditor - - None - Нічого - - - Add Shortcut - Додати скорочення - - - Remove - Вилучити - - - New Group - Нова група - - - Reset Changes - Скинути зміни - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts b/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts deleted file mode 100644 index 43cc2e3..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - 查找命令 - - - - DefaultModel - - - Command - 命令 - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - 快捷键 - - - - Description - 描述 - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - 删除 - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - 无 - - - - All - - - - - Close - 关闭 - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt 快捷键编辑器 - - - Description - 描述 - - - Shortcut - 快捷键 - - - Command - 命令 - - - Add New - 添加新 - - - Remove - 删除 - - - Add Group - 添加组 - - - Reset - 重置 - - - Close - 关闭 - - - - ShortcutEditor - - None - 无 - - - Add Shortcut - 添加快捷键 - - - Remove - 删除 - - - New Group - 新建组 - - - Reset Changes - 重置更改 - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts b/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts deleted file mode 100644 index 94a70cb..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - 尋找指令 - - - - DefaultModel - - - Command - 指令 - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - 快捷鍵 - - - - Description - 描述 - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - 移除 - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - 無 - - - - All - - - - - Close - 關閉 - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt快捷鍵編輯器 - - - Description - 描述 - - - Shortcut - 快捷鍵 - - - Command - 指令 - - - Add New - 新增 - - - Remove - 移除 - - - Add Group - 新增群組 - - - Reset - 重設 - - - Close - 關閉 - - - - ShortcutEditor - - None - 無 - - - Add Shortcut - 增加快捷鍵 - - - Remove - 移除 - - - New Group - 新群組 - - - Reset Changes - 重設更改 - - - diff --git a/daemon/core.cpp b/daemon/core.cpp index a5d6295..b461e0e 100644 --- a/daemon/core.cpp +++ b/daemon/core.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include @@ -69,6 +70,18 @@ enum static Core *s_Core = 0; +static const QLatin1String ExecKey("Exec"); +static const QLatin1String EnabledKey("Enabled"); +static const QLatin1String CommentKey("Comment"); +static const QLatin1String serviceKey("service"); +static const QLatin1String pathKey("path"); +static const QLatin1String interfaceKey("interface"); +static const QLatin1String methodKey("method"); + +static const QLatin1String firstStr("first"); +static const QLatin1String lastStr("last"); +static const QLatin1String allStr("all"); +static const QLatin1String noneStr("none"); int x11ErrorHandler(Display *display, XErrorEvent *errorEvent) { @@ -369,6 +382,7 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi , mMinLogLevel(minLogLevel) , mDisplay(0) , mInterClientCommunicationWindow(0) + , mServiceWatcher{new QDBusServiceWatcher{this}} , mDaemonAdaptor(0) , mNativeAdaptor(0) , mLastId(0ull) @@ -396,7 +410,7 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi initBothPipeEnds(mX11RequestPipe); initBothPipeEnds(mX11ResponsePipe); - mConfigFile = QString(getenv("HOME")) + "/.config/global_key_shortcutss.ini"; + mConfigFile = QString(getenv("HOME")) + QStringLiteral("/.config/global_key_shortcutss.ini"); try { @@ -461,26 +475,26 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi if (!minLogLevelSet) { - iniValue = settings.value(/* General/ */"LogLevel").toString(); + iniValue = settings.value(/* General/ */QStringLiteral("LogLevel")).toString(); if (!iniValue.isEmpty()) { - if (iniValue == "error") + if (iniValue == QLatin1String("error")) { mMinLogLevel = LOG_ERR; } - else if (iniValue == "warning") + else if (iniValue == QLatin1String("warning")) { mMinLogLevel = LOG_WARNING; } - else if (iniValue == "notice") + else if (iniValue == QLatin1String("notice")) { mMinLogLevel = LOG_NOTICE; } - else if (iniValue == "info") + else if (iniValue == QLatin1String("info")) { mMinLogLevel = LOG_INFO; } - else if (iniValue == "debug") + else if (iniValue == QLatin1String("debug")) { mMinLogLevel = LOG_DEBUG; } @@ -489,42 +503,42 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi if (!multipleActionsBehaviourSet) { - iniValue = settings.value(/* General/ */"MultipleActionsBehaviour").toString(); + iniValue = settings.value(/* General/ */QStringLiteral("MultipleActionsBehaviour")).toString(); if (!iniValue.isEmpty()) { - if (iniValue == "first") + if (iniValue == firstStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_FIRST; } - else if (iniValue == "last") + else if (iniValue == lastStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_LAST; } - else if (iniValue == "all") + else if (iniValue == allStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_ALL; } - else if (iniValue == "none") + else if (iniValue == noneStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_NONE; } } } - mAllowGrabLocks = settings.value(/* General/ */"AllowGrabLocks", mAllowGrabLocks).toBool(); - mAllowGrabBaseSpecial = settings.value(/* General/ */"AllowGrabBaseSpecial", mAllowGrabBaseSpecial).toBool(); - mAllowGrabMiscSpecial = settings.value(/* General/ */"AllowGrabMiscSpecial", mAllowGrabMiscSpecial).toBool(); - mAllowGrabBaseKeypad = settings.value(/* General/ */"AllowGrabBaseKeypad", mAllowGrabBaseKeypad).toBool(); - mAllowGrabMiscKeypad = settings.value(/* General/ */"AllowGrabMiscKeypad", mAllowGrabMiscKeypad).toBool(); + mAllowGrabLocks = settings.value(/* General/ */QStringLiteral("AllowGrabLocks"), mAllowGrabLocks).toBool(); + mAllowGrabBaseSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial).toBool(); + mAllowGrabMiscSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial).toBool(); + mAllowGrabBaseKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad).toBool(); + mAllowGrabMiscKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad).toBool(); - foreach(QString section, settings.childGroups()) + foreach(const QString §ion, settings.childGroups()) { - if (section != "General") + if (section != QLatin1String("General")) { settings.beginGroup(section); QString shortcut = section; - int pos = shortcut.indexOf('.'); + int pos = shortcut.indexOf(QLatin1Char('.')); if (pos != -1) { shortcut = shortcut.left(pos); @@ -532,32 +546,32 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi qulonglong id = 0ull; - bool enabled = settings.value("Enabled", true).toBool(); + bool enabled = settings.value(EnabledKey, true).toBool(); - QString description = settings.value("Comment").toString(); + QString description = settings.value(CommentKey).toString(); - if (settings.contains("Exec")) + if (settings.contains(ExecKey)) { - QStringList values = settings.value("Exec").toStringList(); + QStringList values = settings.value(ExecKey).toStringList(); id = registerCommandAction(shortcut, values[0], values.mid(1), description); } else { - iniValue = settings.value("path").toString(); + iniValue = settings.value(pathKey).toString(); if (!iniValue.isEmpty()) { QString path = iniValue; - if (settings.contains("interface")) + if (settings.contains(interfaceKey)) { - QString interface = settings.value("interface").toString(); + QString interface = settings.value(interfaceKey).toString(); - iniValue = settings.value("service").toString(); + iniValue = settings.value(serviceKey).toString(); if (!iniValue.isEmpty()) { QString service = iniValue; - iniValue = settings.value("method").toString(); + iniValue = settings.value(methodKey).toString(); if (!iniValue.isEmpty()) { QString method = iniValue; @@ -617,20 +631,21 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi saveConfig(); + mServiceWatcher->setConnection(QDBusConnection::sessionBus()); mDaemonAdaptor = new DaemonAdaptor(this); - if (!QDBusConnection::sessionBus().registerObject("/daemon", mDaemonAdaptor)) + if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/daemon"), mDaemonAdaptor)) { throw std::runtime_error(std::string("Cannot create daemon adaptor")); } mNativeAdaptor = new NativeAdaptor(this); - if (!QDBusConnection::sessionBus().registerObject("/native", mNativeAdaptor)) + if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/native"), mNativeAdaptor)) { throw std::runtime_error(std::string("Cannot create daemon native client adaptor")); } - connect(QDBusConnection::sessionBus().interface(), SIGNAL(serviceOwnerChanged(QString, QString, QString)), this, SLOT(serviceOwnerChanged(QString, QString, QString))); + connect(mServiceWatcher, &QDBusServiceWatcher::serviceUnregistered, this, &Core::serviceDisappeared); connect(mDaemonAdaptor, SIGNAL(onAddMethodAction(QPair&, QString, QString, QDBusObjectPath, QString, QString, QString)), this, SLOT(addMethodAction(QPair&, QString, QString, QDBusObjectPath, QString, QString, QString))); connect(mDaemonAdaptor, SIGNAL(onAddCommandAction(QPair&, QString, QString, QStringList, QString)), this, SLOT(addCommandAction(QPair&, QString, QString, QStringList, QString))); @@ -720,19 +735,19 @@ void Core::saveConfig() switch (mMultipleActionsBehaviour) { case MULTIPLE_ACTIONS_BEHAVIOUR_FIRST: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "first"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", firstStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_LAST: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "last"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", lastStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_ALL: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "all"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", allStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_NONE: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "none"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", noneStr); break; default: @@ -753,26 +768,26 @@ void Core::saveConfig() settings.beginGroup(section); - settings.setValue("Enabled", action->isEnabled()); - settings.setValue("Comment", action->description()); + settings.setValue(EnabledKey, action->isEnabled()); + settings.setValue(CommentKey, action->description()); if (!strcmp(action->type(), CommandAction::id())) { const CommandAction *commandAction = dynamic_cast(action); - settings.setValue("Exec", QVariant(QStringList() << commandAction->command() += commandAction->args())); + settings.setValue(ExecKey, QVariant(QStringList() << commandAction->command() += commandAction->args())); } else if (!strcmp(action->type(), MethodAction::id())) { const MethodAction *methodAction = dynamic_cast(action); - settings.setValue("service", methodAction->service()); - settings.setValue("path", methodAction->path().path()); - settings.setValue("interface", methodAction->interface()); - settings.setValue("method", methodAction->method()); + settings.setValue(serviceKey, methodAction->service()); + settings.setValue(pathKey, methodAction->path().path()); + settings.setValue(interfaceKey, methodAction->interface()); + settings.setValue(methodKey, methodAction->method()); } else if (!strcmp(action->type(), ClientAction::id())) { const ClientAction *clientAction = dynamic_cast(action); - settings.setValue("path", clientAction->path().path()); + settings.setValue(pathKey, clientAction->path().path()); } settings.endGroup(); @@ -1640,14 +1655,6 @@ void Core::run() checkX11Error(0); } -void Core::serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner) -{ - if (!oldOwner.isEmpty() && newOwner.isEmpty()) - { - serviceDisappeared(oldOwner); - } -} - void Core::serviceDisappeared(const QString &sender) { log(LOG_DEBUG, "serviceDisappeared '%s'", qPrintable(sender)); @@ -1714,6 +1721,7 @@ void Core::serviceDisappeared(const QString &sender) mSenderByClientPath.remove(path); } mClientPathsBySender.erase(clientPathsBySender); + mServiceWatcher->removeWatchedService(clientPathsBySender.key()); } } @@ -2130,7 +2138,13 @@ void Core::addClientAction(QPair &result, const QString &sh mSenderByClientPath[path] = sender; - mClientPathsBySender[sender].insert(path); + auto it = mClientPathsBySender.find(sender); + if (mClientPathsBySender.end() == it) + { + mServiceWatcher->addWatchedService(sender); + it = mClientPathsBySender.insert(sender, {}); + } + it->insert(path); result = addOrRegisterClientAction(useShortcut, path, description, sender); @@ -2850,7 +2864,10 @@ void Core::removeClientAction(bool &result, const QDBusObjectPath &path, const Q mClientPathsBySender[sender].remove(path); if (mClientPathsBySender[sender].isEmpty()) + { mClientPathsBySender.remove(sender); + mServiceWatcher->removeWatchedService(sender); + } saveConfig(); @@ -3013,7 +3030,10 @@ void Core::deactivateClientAction(bool &result, const QDBusObjectPath &path, con mClientPathsBySender[sender].remove(path); if (mClientPathsBySender[sender].isEmpty()) + { mClientPathsBySender.remove(sender); + mServiceWatcher->removeWatchedService(sender); + } result = true; diff --git a/daemon/core.h b/daemon/core.h index f729dc2..fff9b5b 100644 --- a/daemon/core.h +++ b/daemon/core.h @@ -37,7 +37,6 @@ #include #include #include -#include #include #include @@ -58,6 +57,7 @@ class DaemonAdaptor; class NativeAdaptor; class DBusProxy; class BaseAction; +class QDBusServiceWatcher; template class QOrderedSet : public QMap @@ -102,7 +102,6 @@ private: typedef QMap ClientPathsBySender; private slots: - void serviceOwnerChanged(const QString &name, const QString &oldOwner, const QString &newOwner); void serviceDisappeared(const QString &sender); void addClientAction(QPair &result, const QString &shortcut, const QDBusObjectPath &path, const QString &description, const QString &sender); @@ -206,7 +205,7 @@ private: mutable QMutex mX11ErrorMutex; - QDBusConnection *mSessionConnection; + QDBusServiceWatcher *mServiceWatcher; DaemonAdaptor *mDaemonAdaptor; NativeAdaptor *mNativeAdaptor; diff --git a/daemon/main.cpp b/daemon/main.cpp index 6c29912..8f66a10 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -29,6 +29,7 @@ #include #include +#include #include "meta_types.h" #include "core.h" @@ -236,6 +237,8 @@ int main(int argc, char *argv[]) if (configFiles.empty() && home && *home) { + if( ! QFile::exists(QString::fromLocal8Bit(home) + "/" DEFAULT_CONFIG) ) //Load default settings + configFiles.push_back("/etc/xdg/lxqt/globalkeyshortcuts.conf"); configFiles.push_back(QString::fromLocal8Bit(home) + "/" DEFAULT_CONFIG); } diff --git a/daemon/pipe_utils.cpp b/daemon/pipe_utils.cpp index 7ed0b8b..40b4857 100644 --- a/daemon/pipe_utils.cpp +++ b/daemon/pipe_utils.cpp @@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2]) error_t createPipe(int fd[2]) { - error_t result = 0; + error_t result = static_cast(0); if (pipe(fd) < 0) { - result = errno; + result = static_cast(errno); } if (!result) { @@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size_t length) ssize_t bytes_read = read(fd, data, length); if (bytes_read < 0) { - return errno; + return static_cast(errno); } if (!bytes_read) { - return -1; + return static_cast(-1); } data = reinterpret_cast(data) + bytes_read; length -= bytes_read; } - return 0; + return static_cast(0); } error_t writeAll(int fd, const void *data, size_t length) @@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *data, size_t length) ssize_t bytes_written = write(fd, data, length); if (bytes_written < 0) { - return errno; + return static_cast(errno); } if (!bytes_written) { - return -1; + return static_cast(-1); } data = reinterpret_cast(data) + bytes_written; length -= bytes_written; } - return 0; + return static_cast(0); } void closeBothPipeEnds(int fd[2]) diff --git a/debian/.gitignore b/debian/.gitignore index 19a8859..459ca6c 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,6 +1,7 @@ /*.debhelper /*.log /*.substvars +/debhelper-build-stamp /files /lxqt-globalkeys/ diff --git a/debian/changelog b/debian/changelog index 7d3a0fc..8f07dee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,33 @@ +lxqt-globalkeys (0.11.0-3) unstable; urgency=medium + + * Cherry-picking upstream release 0.11.0. + * Sync debian foo with experimental + * Bumped Standards to 3.9.8, no changes needed + * Bumped compat to 10 + * Removed --parallel from rules, compat 10 standard + * Bumped minimum version debhelper (>= 10) + * Bumped minimum version libqtxdg-dev (>= 2.0.0) + * Bumped minimum version liblxqt-dev (>= 0.11.0) + * Added build dependency libqt5svg5-dev + * Added build dependency libqt5xdgiconloader-dev (>= 2.0.0), + * Added Recommends lxqt-globalkeys-l10n + * Followin the Multiarch hinter: + - Marked liblxqt-globalkeys-ui0 Multi-Arch: same + - Marked liblxqt-globalkeys0 Multi-Arch: same + * Fixed VCS-Fields, use https and plain /git/ + * Fixed copyright Format field + * Bumped copyright years + * Don't install translations + * Added translation control to rules + * Set CMAKE_BUILD_TYPE=RelWithDebInfo + * Exported LC_ALL=C.UTF-8, make builds reproducible + * Added hardening options to rules + * Fixed .gitignore + * Removed Patches, applied upstream + * Fixed *-dev.install + + -- Alf Gaida Tue, 18 Oct 2016 02:47:50 +0200 + lxqt-globalkeys (0.10.0-5) unstable; urgency=medium * use static_cast for errno diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index b699d6e..24321aa 100644 --- a/debian/control +++ b/debian/control @@ -5,25 +5,28 @@ Uploaders: Alf Gaida , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), cmake (>= 3.0.2), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.10.0), + liblxqt0-dev (>= 0.11.0), + libqt5svg5-dev, libqt5x11extras5-dev, - libqt5xdg-dev (>= 1.3.0), + libqt5xdg-dev (>= 2.0.0), + libqt5xdgiconloader-dev (>= 2.0.0), libx11-dev, pkg-config, qttools5-dev, qttools5-dev-tools -Standards-Version: 3.9.6 -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/sid -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/lxqt-globalkeys.git -b debian/sid +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-lxqt/lxqt-globalkeys.git/?h=debian/sid +Vcs-Git: https://anonscm.debian.org/git/pkg-lxqt/lxqt-globalkeys.git -b debian/sid Homepage: https://github.com/lxde/lxqt-globalkeys Package: lxqt-globalkeys Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends} +Recommends: lxqt-globalkeys-l10n Description: daemon used to register global keyboard shortcuts (appl.) Daemon used to register global keyboard shortcuts. . @@ -31,6 +34,7 @@ Description: daemon used to register global keyboard shortcuts (appl.) Package: liblxqt-globalkeys0 Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Pre-Depends}, ${misc:Depends}, @@ -53,6 +57,7 @@ Description: daemon used to register global keyboard shortcuts (dev files) Package: liblxqt-globalkeys-ui0 Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Pre-Depends}, ${misc:Depends}, diff --git a/debian/copyright b/debian/copyright index 974ea47..93e1792 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,14 +1,14 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name:lxqt-globalkeys Source: https://github.com/lxde/lxqt-globalkeys Files: * -Copyright: 2012-2015 LXQt team +Copyright: 2012-2016 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2015 Alf Gaida +Copyright: 2014-2016 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff --git a/debian/docs b/debian/docs index 62deb04..0b6e0f3 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1,2 @@ AUTHORS +README.md diff --git a/debian/liblxqt-globalkeys-ui0-dev.install b/debian/liblxqt-globalkeys-ui0-dev.install index 8817645..0eb0bdc 100644 --- a/debian/liblxqt-globalkeys-ui0-dev.install +++ b/debian/liblxqt-globalkeys-ui0-dev.install @@ -5,7 +5,7 @@ usr/include/lxqt-globalkeys-ui/LXQtGlobalKeysUi/ShortcutSelector usr/lib/*/liblxqt-globalkeys-ui.so usr/lib/*/pkgconfig/lxqt-globalkeys-ui.pc -usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets-none.cmake usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config.cmake usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-config-version.cmake usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets.cmake +usr/share/cmake/lxqt-globalkeys-ui/lxqt-globalkeys-ui-targets-relwithdebinfo.cmake diff --git a/debian/liblxqt-globalkeys0-dev.install b/debian/liblxqt-globalkeys0-dev.install index 37d183c..d81d4bc 100644 --- a/debian/liblxqt-globalkeys0-dev.install +++ b/debian/liblxqt-globalkeys0-dev.install @@ -4,6 +4,5 @@ usr/lib/*/liblxqt-globalkeys.so usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config.cmake usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-config-version.cmake -usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-none.cmake usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets.cmake - +usr/share/cmake/lxqt-globalkeys/lxqt-globalkeys-targets-relwithdebinfo.cmake diff --git a/debian/lxqt-globalkeys.install b/debian/lxqt-globalkeys.install index 72cdcc4..72190d7 100644 --- a/debian/lxqt-globalkeys.install +++ b/debian/lxqt-globalkeys.install @@ -4,4 +4,3 @@ usr/bin/lxqt-globalkeysd #shortcuts usr/bin/lxqt-config-globalkeyshortcuts usr/share/applications/lxqt-config-globalkeyshortcuts.desktop -usr/share/lxqt/translations/lxqt-config-globalkeyshortcuts/ diff --git a/debian/patches/error_t.patch b/debian/patches/error_t.patch deleted file mode 100644 index 982ed82..0000000 --- a/debian/patches/error_t.patch +++ /dev/null @@ -1,61 +0,0 @@ -Description: cast return values to error_t -Author: Alf Gaida - -Bug: -Last-Update: 2015-12-27 - ---- lxqt-globalkeys-0.10.0.orig/daemon/pipe_utils.cpp -+++ lxqt-globalkeys-0.10.0/daemon/pipe_utils.cpp -@@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2]) - - error_t createPipe(int fd[2]) - { -- error_t result = 0; -+ error_t result = static_cast(0); - if (pipe(fd) < 0) - { -- result = errno; -+ result = static_cast( errno); - } - if (!result) - { -@@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size - ssize_t bytes_read = read(fd, data, length); - if (bytes_read < 0) - { -- return errno; -+ return static_cast( errno); - } - if (!bytes_read) - { -- return -1; -+ return static_cast( -1); - } - data = reinterpret_cast(data) + bytes_read; - length -= bytes_read; - } -- return 0; -+ return static_cast(0); - } - - error_t writeAll(int fd, const void *data, size_t length) -@@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *dat - ssize_t bytes_written = write(fd, data, length); - if (bytes_written < 0) - { -- return errno; -+ return static_cast( errno); - } - if (!bytes_written) - { -- return -1; -+ return static_cast( -1); - } - data = reinterpret_cast(data) + bytes_written; - length -= bytes_written; - } -- return 0; -+ return static_cast( 0); - } - - void closeBothPipeEnds(int fd[2]) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 35becee..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -error_t.patch diff --git a/debian/rules b/debian/rules index 1f88e7d..f85fee0 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,16 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 +export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh ${@} --buildsystem cmake \ - --parallel \ --fail-missing + +override_dh_auto_configure: + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF\ + -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc index 05cd1df..4936633 100644 --- a/debian/upstream/signing-key.asc +++ b/debian/upstream/signing-key.asc @@ -1,63 +1,50 @@ -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.22 (GNU/Linux) -mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U -WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA -Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ -OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 -7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE -FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb -ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 -+Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 -ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 -ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC -iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB -tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC -Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a -SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ -OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb -sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF -UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho -P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu -6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn -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 -=fF8P +mQINBFXQeMMBEACif4+9pTrC6uNmRng0ZbzLh7p3cazmbnp2YFgDQDJZ7ZNmebxy +ngRuRhjGuDcFAL/37BwJnrBpfZFK9ljoH4Fo5Jm9cOELaTy7AIcEiV9dKMyrKF1E +C76d8jHVuzuPbI92DkFdLZAdk+qjrrAy0x43PvUd+aaBGLcFs1ZMk7gOvElc2d95 +zWWSp5anjukmGbp+EsStnWJkF6VHj56qmklfYy5ioiVBOSpXo/RsACAcIlz8C8A1 +d4tNMiB2uF2OrUfrL8DD6m3nBqep+AYbIQrxMl9kUQH3I33e9kH/L+SHQyE6phS8 +Czq06WjV4TcJ9VWxm7hQCNLYSxhZYYr1AW45lS5+xmfBOq2qeLgvjbFxa8PPrsp6 +Bqgt8MjwUkXjU5IB7YulUBvFU2l0MJZWDBuNy0oNtCe1cU3JyIqLKjvzQQQ9eD5L +o3Ul704TLHz0z+67Rxh05Mi4JvyFMjnooSJkNH8/7yXoBN0ZGOh1/5zMU1gK5bmP +6hKgis2exSZNIS74mF6/PqGgcwk3PyI4T3keUQoNPj11M2EznLHxY19QZfQ5oMed +8xOlHKjpcm8PYMB4gduNXlV7gI9h7UxuC5GuPiP2lmM6wUyHu48divxDk5UYgPEC +xlPI2wHCNDsuy0EruCYIvrMSZfpYCCSrmXiOORBLO5qXkauILLkJarHqjQARAQAB +tCBBbGYgR2FpZGEgPGFnYWlkYUBzaWR1Y3Rpb24ub3JnPokCOAQTAQIAIgUCVdB4 +wwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQQsnI069epeOT2xAAgSHf +41103cnElGf6TokPl4J6hdRPy2CUAjmBtMfr8eajYvGDGgnmsh9AGYGURjfFVCCf +Ag+8b6nF3xg03UmgsuSO8H78HGv9kKzF9aHmLt+SXq3jUX+LnIkFHErZWjFAKdJr +luu1j6ltxLe9PQljxZnugzMaUbW8eEPKvcriiDn3S4/DtikW/jpGA0MTY4ZWs9pZ +L/6iRRH99L2X/cWO4sCgDXCTt4oK0f5OvwiuCoVOM+PYoIm31JICCKOlqamkCn7d +2KH3nsy0v7tXgnrnb/zr8jVGsZLzUE51AFOzb5Ec74/2SAq8X4gbTppttLXEIooq +nbepitW/PePkPY5gpfwHtFbl88qFnir+ABMefqRZkzeh0tsxJVLVHGP1KZykXpv7 +96A6Q1h7Zo9Ny7WwN5Xl02g35LVCaPyzd3A8A4315uMuP3iziq57UktKqh9d5S3t +jfK7e9UfFQZBLfxn2sNPsjdYSNUQp/PXTTk/599h359WVuUIR866T8K7N7EEon3p +qLItZljQ9Nmr/yGwKi9iQgi2LtZj5KUcF1zBLzZKf95FvoqSZqBXdFSjm+eYGaCH +Q2IBnhyP92lEknSK9ystUJXmY69tQKBFqJxScwaS+7a/rfLKssQjSWxqk+SX4QeW +e9z9FUpo71bq0Zkc/M9aOCoEEmhg4Ob/JWy08oC5Ag0EVdB4wwEQAKZDCc/C41y0 +omLFCAJybvHiFScM+jOpyGpQvceoviEhIT7h1br/pnSEMkgPQEDPWJGtKueg1/94 +sXTH24uefr3Y6JdZoBtprxl4JXUoOndgq1QH1xuUsy3/9YWU8Qboy9j8a8w0oCDE +T8Z03KHCwqzD3K+44jhmhF+0eLoaaY8ohS8ziP+DcFKVHyatmS5yCCdjVrj6PxMp +uy/y5SXT1kmiPdVAIzQlM5DlN6o46TV+BH0pPvVYjtwf31o0FckJxy5S1v0koCNB +vX2b7tTDPKzn8G18eUVhGoUTZBUCp1gg36wJ0YY4xgZ9vI/xDCeHeAkyvGtaTAoy +qP4rHoUO5KVRSDh7frSlrdbLGWHaQwOhcqoKd4qP/164wHPGkgHL1vztdOc7l1wx +q3gMh2uwmJR0NRrw4WVuaIqL9lEbGBNijlmGsuqXfsMRhc/qoqgVDWvrcCtEoOwl +TONGobW3jpCCjpa9SeGNjxuY6IVLn0lfX4hItNVY9sFA+H+yj4uBQ7zsmMUXafxt +Yllm0f98yGNg5lnJg4bLOYu3IkpogUKNA3qkZ+6vRtwH70/bJGp7qdx/3G4W5dMX +asd/rJjdELW+R/NVULAmK1ETSklaa3Z6vbTu8bN8gvP8pmMJ8f/U8+qzkuAqc201 +Z4O+s7ZsQfTiz5mm7zPGIYTnppDSno/rABEBAAGJAh8EGAECAAkFAlXQeMMCGwwA +CgkQQsnI069epeMt0g/+JrwLhULD6NOxaLgxboh/KZkh/7ViU4cB+QPT8JIcWxkZ +zj8uk85TUitEUzKmjp/ItCrhQE5WNNWbz/FBnAuLtaQuHhcHMA3Vu95UUCGi1vyZ +ZRlS3YRM6S9BOzrjG7fGQJmO/RU3g6rb0TAwGFxDHj8t4JEDTc3zASG7wV/VTn06 +d8XIH9CZOw3kUuhkQ3OR/PEj1BCeCC+caC+tBjO0fgvDp8RV7NFQQ9kH8R3/xlWd +6KMPtILE6fUft6LubWRGd1P5JBuzXivELolASajewbYtL/s87CCji3ngq0aT9raK +m02wqFzNbX1iv+w2iqPQXq6pdRyxtJ8+Q8Z7zEBGJS5nkrYjsLTduZIjJHYHYH7f +3/ydVjQ3z12iqHKElgaRI7RUmpNiNxVIr+TtuxzeC6G+CF++XNkUtJODvCmRaoJS +waYsitz8+LSv3tawZJ0iQkKc9nerQMuBD+AzIr3i4NgXiEIN513esUtnKzeyIIsL +ntUcBjXKuLCj8OZrZtexjq7edWWbN57/3ikyS2Z7y0i3O30qk5jmccSaS6kA7xTY +WCDFzbN2v2y+vGu9KYn+2HtrP2BtNa8JTh3waNeLUTpn4GV4mMrsZjOy6vhhHb91 +1TKfI1gvjk7lE9xaWmcDjdI55dw3jIq8kK9SdgORGq9/S3g7KJNRjme+6GjqQfk= +=h7ww -----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index 7f86777..1e145b9 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ -version=3 +version=4 opts="pgpsigurlmangle=s/$/.asc/" \ - https://github.com/lxde/lxqt-globalkeys/releases .*/([\d\.]+).tar.gz + https://github.com/lxde/lxqt-globalkeys/releases .*/lxqt-globalkeys-([\d\.]+).tar.xz