diff -Nru lxqt-globalkeys-0.14.3/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop --- lxqt-globalkeys-0.14.3/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop 2020-11-02 11:16:25.000000000 +0000 @@ -0,0 +1,2 @@ +# Translations +Name[hr]=Globalni tipkovnički prečaci diff -Nru lxqt-globalkeys-0.14.3/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop --- lxqt-globalkeys-0.14.3/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop 2020-11-02 11:16:25.000000000 +0000 @@ -0,0 +1,2 @@ +# Translations +Name[hu]=Globális gyorsbillentyűk diff -Nru lxqt-globalkeys-0.14.3/CHANGELOG lxqt-globalkeys-0.16.0/CHANGELOG --- lxqt-globalkeys-0.14.3/CHANGELOG 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/CHANGELOG 2020-11-02 11:16:25.000000000 +0000 @@ -1,3 +1,17 @@ +lxqt-globalkeys-0.16.0 / 2020-11-01 +=================================== + * Added shortcut to configure display. + * Silenced unused function parameters warnings. + * Do not grab keys of disabled client actions. + * Do not requite daemon restart for enabling shortcuts. + +lxqt-globalkeys-0.15.0 / 2020-04-22 +=================================== + * Removed (duplicated) string casts definitions. + * Removed obsolete `qBinaryFind`. + * Added some translation context to `main_window.ui`. + * Don't mix const and non-const iterators. + lxqt-globalkeys-0.14.3 / 2019-10-14 =================================== diff -Nru lxqt-globalkeys-0.14.3/client/CMakeLists.txt lxqt-globalkeys-0.16.0/client/CMakeLists.txt --- lxqt-globalkeys-0.14.3/client/CMakeLists.txt 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/client/CMakeLists.txt 2020-11-02 11:16:25.000000000 +0000 @@ -175,11 +175,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE "SHARED_EXPORT=Q_DECL_EXPORT" - "QT_USE_QSTRINGBUILDER" - "QT_NO_CAST_FROM_ASCII" - "QT_NO_CAST_TO_ASCII" - "QT_NO_URL_CAST_FROM_STRING" - "QT_NO_CAST_FROM_BYTEARRAY" ) export(TARGETS ${PROJECT_NAME} FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake") diff -Nru lxqt-globalkeys-0.14.3/CMakeLists.txt lxqt-globalkeys-0.16.0/CMakeLists.txt --- lxqt-globalkeys-0.14.3/CMakeLists.txt 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/CMakeLists.txt 2020-11-02 11:16:25.000000000 +0000 @@ -12,8 +12,8 @@ option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) set(KF5_MINIMUM_VERSION "5.36.0") -set(LXQT_MINIMUM_VERSION "0.14.1") -set(QT_MINIMUM_VERSION "5.7.1") +set(LXQT_MINIMUM_VERSION "0.16.0") +set(QT_MINIMUM_VERSION "5.12.0") set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) @@ -28,8 +28,8 @@ # Version set(LXQT_GLOBALKEYS_MAJOR_VERSION 0) -set(LXQT_GLOBALKEYS_MINOR_VERSION 14) -set(LXQT_GLOBALKEYS_PATCH_VERSION 3) +set(LXQT_GLOBALKEYS_MINOR_VERSION 16) +set(LXQT_GLOBALKEYS_PATCH_VERSION 0) set(LXQT_GLOBALKEYS_VERSION ${LXQT_GLOBALKEYS_MAJOR_VERSION}.${LXQT_GLOBALKEYS_MINOR_VERSION}.${LXQT_GLOBALKEYS_PATCH_VERSION}) add_definitions("-DLXQT_GLOBALKEYS_VERSION=\"${LXQT_GLOBALKEYS_VERSION}\"") diff -Nru lxqt-globalkeys-0.14.3/config/CMakeLists.txt lxqt-globalkeys-0.16.0/config/CMakeLists.txt --- lxqt-globalkeys-0.14.3/config/CMakeLists.txt 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/CMakeLists.txt 2020-11-02 11:16:25.000000000 +0000 @@ -133,14 +133,6 @@ ) add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_ALL_FILES}) -target_compile_definitions(${PROJECT_NAME} - PRIVATE - "QT_USE_QSTRINGBUILDER" - "QT_NO_CAST_FROM_ASCII" - "QT_NO_CAST_TO_ASCII" - "QT_NO_URL_CAST_FROM_STRING" - "QT_NO_CAST_FROM_BYTEARRAY" -) target_link_libraries(${PROJECT_NAME} KF5::WindowSystem lxqt) install(TARGETS diff -Nru lxqt-globalkeys-0.14.3/config/default_model.cpp lxqt-globalkeys-0.16.0/config/default_model.cpp --- lxqt-globalkeys-0.14.3/config/default_model.cpp 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/default_model.cpp 2020-11-02 11:16:25.000000000 +0000 @@ -29,6 +29,8 @@ #include "default_model.h" #include "actions.h" +#include + DefaultModel::DefaultModel(Actions *actions, const QColor &grayedOutColour, const QFont &highlightedFont, const QFont &italicFont, const QFont &highlightedItalicFont, QObject *parent) : QAbstractTableModel(parent) @@ -176,7 +178,7 @@ return result; } -bool DefaultModel::setData(const QModelIndex &index, const QVariant &value, int role) +bool DefaultModel::setData(const QModelIndex & /*index*/, const QVariant & /*(value*/, int /*role*/) { return false; } @@ -223,7 +225,7 @@ if (result.first) { QList keys = mContent.keys(); - int row = qBinaryFind(keys, mContent.lowerBound(id).key()) - keys.constBegin(); + int row = std::lower_bound(keys.constBegin(), keys.constEnd(), mContent.lowerBound(id).key()) - keys.constBegin(); beginInsertRows(QModelIndex(), row, row); @@ -237,7 +239,7 @@ { if (id != siblingId) { - int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); + int siblingRow = std::lower_bound(keys.constBegin(), keys.constEnd(), siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); } } @@ -250,7 +252,7 @@ if (mContent.contains(id)) { QList keys = mContent.keys(); - int row = qBinaryFind(keys, id) - keys.constBegin(); + int row = std::lower_bound(keys.constBegin(), keys.constEnd(), id) - keys.constBegin(); mContent[id].enabled = enabled; @@ -266,7 +268,7 @@ if (result.first) { QList keys = mContent.keys(); - int row = qBinaryFind(keys, id) - keys.constBegin(); + int row = std::lower_bound(keys.constBegin(), keys.constEnd(), id) - keys.constBegin(); if (mContent[id].shortcut != result.second.shortcut) { @@ -274,12 +276,12 @@ mShortcuts[mContent[id].shortcut].remove(id); for(qulonglong siblingId : qAsConst(mShortcuts[mContent[id].shortcut])) { - int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); + int siblingRow = std::lower_bound(keys.constBegin(), keys.constEnd(), siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); } for(qulonglong siblingId : qAsConst(mShortcuts[result.second.shortcut])) { - int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); + int siblingRow = std::lower_bound(keys.constBegin(), keys.constEnd(), siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); } } @@ -296,8 +298,8 @@ if (mContent.contains(id1) && mContent.contains(id2)) { QList keys = mContent.keys(); - int row1 = qBinaryFind(keys, id1) - keys.constBegin(); - int row2 = qBinaryFind(keys, id2) - keys.constBegin(); + int row1 = std::lower_bound(keys.constBegin(), keys.constEnd(), id1) - keys.constBegin(); + int row2 = std::lower_bound(keys.constBegin(), keys.constEnd(), id2) - keys.constBegin(); // swap GeneralActionInfo tmp = mContent[id1]; @@ -314,7 +316,7 @@ if (mContent.contains(id)) { QList keys = mContent.keys(); - int row = qBinaryFind(keys, id) - keys.constBegin(); + int row = std::lower_bound(keys.constBegin(), keys.constEnd(), id) - keys.constBegin(); beginRemoveRows(QModelIndex(), row, row); @@ -327,7 +329,7 @@ for(qulonglong siblingId : qAsConst(mShortcuts[shortcut])) { - int siblingRow = qBinaryFind(keys, siblingId) - keys.constBegin(); + int siblingRow = std::lower_bound(keys.constBegin(), keys.constEnd(), siblingId) - keys.constBegin(); emit dataChanged(index(siblingRow, 1), index(siblingRow, 1)); } } diff -Nru lxqt-globalkeys-0.14.3/config/main_window.ui lxqt-globalkeys-0.16.0/config/main_window.ui --- lxqt-globalkeys-0.14.3/config/main_window.ui 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/main_window.ui 2020-11-02 11:16:25.000000000 +0000 @@ -123,22 +123,22 @@ - First + First - Last + Last - None + None - All + All diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_arn.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_arn.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_arn.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_arn.ts 2020-11-02 11:16:25.000000000 +0000 @@ -0,0 +1,188 @@ + + + + + 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 + globalkeys/config/multipleActions + + + + + Last + globalkeys/config/multipleActions + + + + + None + globalkeys/config/multipleActions + + + + + All + globalkeys/config/multipleActions + + + + + Default + + + + + Close + + + + + Restore Default + + + + + Your defined shortcuts will be removed. +Do you want to proceed? + + + + diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ar.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ar.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ar.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ar.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command أمر - + DBus call نداء DBus - + Client عميل - + Id المعرّف - + Shortcut الاختصار - + Description الوصف - + Type النوع - + Info معلومات @@ -142,22 +142,26 @@ First - الأول + globalkeys/config/multipleActions + الأول Last - الأخير + globalkeys/config/multipleActions + الأخير None - بلا + globalkeys/config/multipleActions + بلا All - الكل + globalkeys/config/multipleActions + الكل diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ca.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ca.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ca.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ca.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Ordre - + DBus call Crida DBus - + Client Client - + Id Id - + Shortcut Drecera - + Description Descripció - + Type Tipus - + Info Informació @@ -142,22 +142,26 @@ First - Primera + globalkeys/config/multipleActions + Primera Last - Última + globalkeys/config/multipleActions + Última None - Cap + globalkeys/config/multipleActions + Cap All - Totes + globalkeys/config/multipleActions + Totes diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_cs.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cs.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_cs.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cs.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Příkaz - + DBus call DBus volání - + Client Klient - + Id Identif. - + Shortcut Zkratka - + Description Popis - + Type Typ - + Info Informace @@ -142,22 +142,26 @@ First - První + globalkeys/config/multipleActions + První Last - Poslední + globalkeys/config/multipleActions + Poslední None - Žádná + globalkeys/config/multipleActions + Žádná All - Vše + globalkeys/config/multipleActions + Vše diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_cy.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cy.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_cy.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cy.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command - + DBus call - + Client - + Id - + Shortcut - + Description - + Type - + Info @@ -142,22 +142,26 @@ First - + globalkeys/config/multipleActions + Last - + globalkeys/config/multipleActions + None - + globalkeys/config/multipleActions + All - + globalkeys/config/multipleActions + diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_da.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_da.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_da.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_da.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Kommando - + DBus call DBus-kald - + Client Klient - + Id Id - + Shortcut Genvej - + Description Beskrivelse - + Type Type - + Info Info @@ -142,22 +142,26 @@ First - Første + globalkeys/config/multipleActions + Første Last - Sidste + globalkeys/config/multipleActions + Sidste None - Ingen + globalkeys/config/multipleActions + Ingen All - Alle + globalkeys/config/multipleActions + Alle diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_de.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_de.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_de.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_de.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Befehl - + DBus call DBus-Aufruf - + Client Client - + Id Kennung - + Shortcut Tastenkürzel - + Description Beschreibung - + Type Typ - + Info Info @@ -143,22 +143,26 @@ First - Erste + globalkeys/config/multipleActions + Erste Last - Letzte + globalkeys/config/multipleActions + Letzte None - Keine + globalkeys/config/multipleActions + Keine All - Alle + globalkeys/config/multipleActions + Alle diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_el.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_el.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_el.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_el.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Εντολή - + DBus call Κλήση DBus - + Client Πελάτης - + Id Αναγνωριστικό - + Shortcut Συντόμευση - + Description Περιγραφή - + Type Τύπος - + Info Πληροφορίες @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Πρώτη Last + globalkeys/config/multipleActions Τελευταία None + globalkeys/config/multipleActions Ουδεμία All + globalkeys/config/multipleActions Όλες diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Command - + DBus call DBus call - + Client Client - + Id Id - + Shortcut Shortcut - + Description Description - + Type Type - + Info Info @@ -142,22 +142,26 @@ First - First + globalkeys/config/multipleActions + First Last - Last + globalkeys/config/multipleActions + Last None - None + globalkeys/config/multipleActions + None All - All + globalkeys/config/multipleActions + All diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_eo.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eo.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_eo.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eo.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command - + DBus call - + Client - + Id - + Shortcut - + Description Priskribo - + Type - + Info @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Last + globalkeys/config/multipleActions None + globalkeys/config/multipleActions Nenio All + globalkeys/config/multipleActions diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_es.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_es.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comando - + DBus call Llamada a DBus - + Client Cliente - + Id Identificador - + Shortcut Atajo - + Description Descripción - + Type Tipo - + Info Información @@ -142,27 +142,31 @@ First - Primera + globalkeys/config/multipleActions + Primera Last - Última + globalkeys/config/multipleActions + Última None - Ninguna + globalkeys/config/multipleActions + Ninguna All - Todas + globalkeys/config/multipleActions + Todas Default - + Predeterminado @@ -172,13 +176,14 @@ Restore Default - + Restaurar a predeterminado Your defined shortcuts will be removed. Do you want to proceed? - + Los atajos definidos por usted serán eliminados. +¿Quiere proseguir? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comando - + DBus call - + Client - + Id - + Shortcut Atajo - + Description Descripcion - + Type - + Info @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Last + globalkeys/config/multipleActions None + globalkeys/config/multipleActions Nada All + globalkeys/config/multipleActions diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_eu.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eu.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_eu.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eu.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Komandoa - + DBus call DBus deia - + Client Bezeroa - + Id id - + Shortcut Lasterbidea - + Description Deskribapena - + Type Mota - + Info Informazioa @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Last + globalkeys/config/multipleActions None + globalkeys/config/multipleActions Bat ere ez All + globalkeys/config/multipleActions diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_fi.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fi.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_fi.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fi.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Komento - + DBus call D-Bus-kutsu - + Client Sovellus - + Id ID - + Shortcut Pikanäppäin - + Description Kuvaus - + Type Tyyppi - + Info Toiminto @@ -99,7 +99,7 @@ &Interface: - + &Käyttöliittymä: @@ -142,27 +142,31 @@ First - Ensimmäinen + globalkeys/config/multipleActions + Ensimmäinen Last - Viimeinen + globalkeys/config/multipleActions + Viimeinen None - Ei mitään + globalkeys/config/multipleActions + Ei mitään All - Kaikki + globalkeys/config/multipleActions + Kaikki Default - + Oletusasetukset @@ -172,13 +176,14 @@ Restore Default - + Palauta Oletusasetukset Your defined shortcuts will be removed. Do you want to proceed? - + Määritellyt pikanäppäimet poistetaan. +Haluatko jatkaa? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_fr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fr.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_fr.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fr.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Commande - + DBus call Appel DBus - + Client Client - + Id Id - + Shortcut Raccourci - + Description Description - + Type Type - + Info Info @@ -143,27 +143,31 @@ First - Première + globalkeys/config/multipleActions + Première Last - Dernière + globalkeys/config/multipleActions + Dernière None - Aucun + globalkeys/config/multipleActions + Aucun All - Toutes + globalkeys/config/multipleActions + Toutes Default - + Par défaut @@ -173,13 +177,14 @@ Restore Default - + Restaurer les paramètres par défaut Your defined shortcuts will be removed. Do you want to proceed? - + Vos raccourcis définis seront supprimés. +Voulez-vous procéder ? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_gl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_gl.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_gl.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_gl.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Orde - + DBus call Chamada a DBus - + Client Cliente - + Id ID - + Shortcut Atallo - + Description Descrición - + Type Tipo - + Info Información @@ -142,22 +142,26 @@ First - Primeira + globalkeys/config/multipleActions + Primeira Last - Última + globalkeys/config/multipleActions + Última None - Ningunha + globalkeys/config/multipleActions + Ningunha All - Todas + globalkeys/config/multipleActions + Todas diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_he.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_he.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_he.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_he.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command פקודה - + DBus call קריאת DBus - + Client לקוח - + Id מזהה - + Shortcut קיצור דרך - + Description תיאור - + Type סוג - + Info מידע @@ -142,27 +142,31 @@ First - ראשונה + globalkeys/config/multipleActions + ראשונה Last - אחרונה + globalkeys/config/multipleActions + אחרונה None - ללא + globalkeys/config/multipleActions + ללא All - הכול + globalkeys/config/multipleActions + הכול Default - + בררת מחדל @@ -172,13 +176,14 @@ Restore Default - + שחזור בררת מחדל Your defined shortcuts will be removed. Do you want to proceed? - + קיצורי הדרך שהגדרת יוסרו. +להמשיך? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop 2020-11-02 11:16:25.000000000 +0000 @@ -0,0 +1,4 @@ +# Translations +Name[hr]=Tipkovnički prečaci +GenericName[hr]=Postavke tipkovničkih prečaca +Comment[hr]=Konfiguriraj tipkovničke prečace za LXQt diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hr.ts 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.ts 2020-11-02 11:16:25.000000000 +0000 @@ -0,0 +1,189 @@ + + + + + DefaultModel + + + Command + Naredba + + + + DBus call + DBus poziv + + + + Client + Klijent + + + + Id + Id + + + + Shortcut + Prečac + + + + Description + Opis + + + + Type + Vrsta + + + + Info + Informacije + + + + EditActionDialog + + + Edit Action + Uredi radnju + + + + &Shortcut: + &Prečac: + + + + &Description: + &Opis: + + + + &Enabled + &Aktivirano + + + + &Command + &Naredba + + + + &DBus message + &DBus poruka + + + + Type: + Vrsta: + + + + Co&mmand: + Nared&ba: + + + + S&ervice: + Us&luga: + + + + &Path: + &Staza: + + + + &Interface: + S&učelje: + + + + &Method: + &Metoda: + + + + MainWindow + + + Global Actions Manager + Upravljanje globalnim radnjama + + + + Add ... + Dodaj … + + + + Remove + Ukloni + + + + Modify ... + Promijeni … + + + + Swap + Zamijeni + + + + Multiple actions behaviour: + Redoslijed izvršavanja radnji: + + + + First + globalkeys/config/multipleActions + Prva + + + + Last + globalkeys/config/multipleActions + Zadnja + + + + None + globalkeys/config/multipleActions + Nijedna + + + + All + globalkeys/config/multipleActions + Sve + + + + Default + Standardno + + + + Close + Zatvori + + + + Restore Default + Vrati standardne postavke + + + + Your defined shortcuts will be removed. +Do you want to proceed? + Tvoji prečaci će se ukloniti. +Želiš li nastaviti? + + + diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop 2020-11-02 11:16:25.000000000 +0000 @@ -1,4 +1,4 @@ # Translations -Name[hu]=LXQt gyorsbillentyűk -Comment[hu]=LXQt általános forróbillentyűinek beállítása -GenericName[hu]=LXQt gyorsbillentyűk beállítása +Name[hu]=Gyorsbillentyűk +Comment[hu]=LXQt gyorsbillentyűinek beállítása +GenericName[hu]=Gyorsbillentyűk beállítása diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hu.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_hu.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,44 +4,44 @@ DefaultModel - + Command Parancs - + DBus call DBus hívás - + Client Kliens - + Id - + Azonosító - + Shortcut Gyorsbillentyű - + Description Leírás - + Type Típus - + Info - Infó + Információ @@ -49,7 +49,7 @@ Edit Action - Akció szerkesztés + Művelet szerkesztése @@ -112,57 +112,61 @@ Global Actions Manager - Általános akció kezelés + Általános műveletkezelő Add ... - Hozzáad ... + Hozzáadás ... Remove - Töröl + Eltávolítás Modify ... - Módosít ... + Módosítás ... Swap - Vált + Csere Multiple actions behaviour: - Többes viselkedés: + Viselkedés több műveletnél: First - Első + globalkeys/config/multipleActions + Első Last - Utolsó + globalkeys/config/multipleActions + Utolsó None - Semmi + globalkeys/config/multipleActions + Egyik sem All - Mind + globalkeys/config/multipleActions + Mind Default - + Alapértelmezett @@ -172,13 +176,14 @@ Restore Default - + Alapértelmezett visszaállítása Your defined shortcuts will be removed. Do you want to proceed? - + A megadott hivatkozások eltávolításra kerülnek. +Akarod folytatni? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_id.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_id.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_id.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_id.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Perintah - + DBus call DBus call - + Client Klien - + Id Id - + Shortcut Pintasan - + Description Deskripsi - + Type Tipe - + Info Info @@ -142,22 +142,26 @@ First - Pertama + globalkeys/config/multipleActions + Pertama Last - Terakhir + globalkeys/config/multipleActions + Terakhir None - Tidak ada + globalkeys/config/multipleActions + Tidak ada All - Semua + globalkeys/config/multipleActions + Semua diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_it.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_it.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_it.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_it.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comando - + DBus call Chiamata DBus - + Client Client - + Id Id - + Shortcut Scorciatoia - + Description Descrizione - + Type Tipo - + Info Informazione @@ -142,27 +142,31 @@ First + globalkeys/config/multipleActions Primo Last + globalkeys/config/multipleActions Ultimo None - Nessuno + globalkeys/config/multipleActions + Nessuno All + globalkeys/config/multipleActions Tutti Default - + Ripristina @@ -172,13 +176,14 @@ Restore Default - + Ripristina scorciatoie predefinite Your defined shortcuts will be removed. Do you want to proceed? - + Le scorciatoie personalizzate saranno rimosse. +Procedere? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ja.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ja.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ja.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ja.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command コマンド - + DBus call DBus コール - + Client クライアント - + Id ID - + Shortcut ショートカット - + Description 説明 - + Type タイプ - + Info 情報 @@ -142,22 +142,26 @@ First - 最初のみ実行 + globalkeys/config/multipleActions + 1 番目 Last - 最後のみ実行 + globalkeys/config/multipleActions + 最後 None + globalkeys/config/multipleActions 何もしない All - すべて実行 + globalkeys/config/multipleActions + すべて diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_lt.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lt.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_lt.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lt.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Komanda - + DBus call DBus iškvieta - + Client Klientas - + Id Id - + Shortcut Spartusis klavišas - + Description Aprašas - + Type Tipas - + Info Informacija @@ -142,22 +142,26 @@ First - Pirmas + globalkeys/config/multipleActions + Pirmas Last - Paskutinis + globalkeys/config/multipleActions + Paskutinis None - Nėra + globalkeys/config/multipleActions + Nėra All - Visi + globalkeys/config/multipleActions + Visi diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_lv.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lv.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_lv.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lv.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Komanda - + DBus call DBus izsaukums - + Client Klients - + Id Identifikators - + Shortcut Saīsne - + Description Apraksts - + Type Tips - + Info Informācija @@ -142,22 +142,26 @@ First - Pirmais + globalkeys/config/multipleActions + Pirmais Last - Pēdējais + globalkeys/config/multipleActions + Pēdējais None - Neviens + globalkeys/config/multipleActions + Neviens All - Visi + globalkeys/config/multipleActions + Visi diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Kommando - + DBus call DBus-kommando - + Client Klient - + Id - + Shortcut Tastatursnarevei - + Description Beskrivelse - + Type - + Info @@ -142,22 +142,26 @@ First - Første + globalkeys/config/multipleActions + Første Last - Siste + globalkeys/config/multipleActions + Siste None - Ingen + globalkeys/config/multipleActions + Ingen All - Alle + globalkeys/config/multipleActions + Alle diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_nl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nl.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_nl.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nl.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Opdracht - + DBus call DBus-aanroeping - + Client Cliënt - + Id Id - + Shortcut Sneltoets - + Description Beschrijving - + Type Soort - + Info Info @@ -142,27 +142,31 @@ First - Eerste + globalkeys/config/multipleActions + Eerste Last - Laatste + globalkeys/config/multipleActions + Laatste None - Geen + globalkeys/config/multipleActions + Geen All - Alle + globalkeys/config/multipleActions + Alle Default - + Standaard @@ -172,13 +176,14 @@ Restore Default - + Herstel standaard Your defined shortcuts will be removed. Do you want to proceed? - + Je ingestelde snelkoppelingen worden verwijderd. +Wil je verder gaan? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pl.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pl.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pl.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Polecenie - + DBus call Połączenie DBus - + Client Klient - + Id ID - + Shortcut Skrót - + Description Opis - + Type Rodzaj - + Info Informacje @@ -142,27 +142,31 @@ First - Pierwsze + globalkeys/config/multipleActions + Pierwsze Last - Ostatnie + globalkeys/config/multipleActions + Ostatnie None - Brak + globalkeys/config/multipleActions + Brak All - Wszystko + globalkeys/config/multipleActions + Wszystko Default - + Domyślne @@ -172,13 +176,14 @@ Restore Default - + Przywróć domyślne Your defined shortcuts will be removed. Do you want to proceed? - + Zdefiniowane przez Ciebie skróty zostaną usunięte. +Na pewno chcesz kontynuować? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comando - + DBus call Chamada DBus - + Client Cliente - + Id Id - + Shortcut Atalho - + Description Descrição - + Type Tipo - + Info Informação @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Primeiro Last + globalkeys/config/multipleActions Último None + globalkeys/config/multipleActions Nenhum All + globalkeys/config/multipleActions Todos @@ -179,7 +183,7 @@ Your defined shortcuts will be removed. Do you want to proceed? Seus atalhos definidos serão removidos. -Você quer prosseguir? +Você deseja prosseguir? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pt.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_pt.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comando - + DBus call Chamada DBus - + Client Cliente - + Id ID - + Shortcut Atalho - + Description Descrição - + Type Tipo - + Info Informação @@ -142,22 +142,26 @@ First - Primeira + globalkeys/config/multipleActions + Primeira Last - Última + globalkeys/config/multipleActions + Última None - Nada + globalkeys/config/multipleActions + Nada All - Todas + globalkeys/config/multipleActions + Todas diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Comandă - + DBus call Apel DBus - + Client Client - + Id Identificare - + Shortcut Accelerator - + Description Descriere - + Type Tip - + Info Informare @@ -142,22 +142,26 @@ First - Primul + globalkeys/config/multipleActions + Primul Last - Ultimul + globalkeys/config/multipleActions + Ultimul None + globalkeys/config/multipleActions Nimic All - Toate + globalkeys/config/multipleActions + Toate diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ru.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ru.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_ru.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ru.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Команда - + DBus call Вызов DBus - + Client Клиент - + Id Id - + Shortcut Сочетание клавиш - + Description Описание - + Type Тип - + Info Информация @@ -142,27 +142,31 @@ First + globalkeys/config/multipleActions Первое Last + globalkeys/config/multipleActions Последнее None - Нет + globalkeys/config/multipleActions + Ни одного All + globalkeys/config/multipleActions Все Default - + По умолчанию @@ -172,13 +176,14 @@ Restore Default - + Восстановить значения по умолчанию Your defined shortcuts will be removed. Do you want to proceed? - + Сочетания клавиш, созданные вами будут удалены. +Вы хотите продолжить? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Príkaz - + DBus call Volanie DBus - + Client Klient - + Id Id - + Shortcut Klávesová skratka - + Description Popis - + Type Typ - + Info Informácie @@ -142,27 +142,31 @@ First - Prvé + globalkeys/config/multipleActions + Prvé Last - Posledné + globalkeys/config/multipleActions + Posledné None - Žiadne + globalkeys/config/multipleActions + Žiadne All - Všetko + globalkeys/config/multipleActions + Všetko Default - + Predvolené @@ -172,13 +176,14 @@ Restore Default - + Vrátiť na východzie hodnoty Your defined shortcuts will be removed. Do you want to proceed? - + Vami určené klávesové skratky budú odobrané +Naozaj to chcete? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_sl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_sl.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,44 +4,44 @@ DefaultModel - + Command - + Ukaz - + DBus call - + Klic DBus - + Client - + Odjemalec - + Id - + ID - + Shortcut - + Bližnjica - + Description - + Opis - + Type - + Vrsta - + Info - + Opis @@ -49,62 +49,62 @@ Edit Action - + Uredi dejanje &Shortcut: - + Bli&žnjica: &Description: - + Op&is: &Enabled - + Omogoč&en &Command - + &Ukaz &DBus message - + Sporočilo &DBus Type: - + Vrsta: Co&mmand: - + U&kaz: S&ervice: - + Storit&ev: &Path: - + &Pot: &Interface: - + Vmesn&ik: &Method: - + &Metoda: @@ -112,73 +112,78 @@ Global Actions Manager - + Upravljalnik globalnih nastavitev Add ... - + Dodaj Remove - Odstrani + Odstrani Modify ... - + Uredi Swap - + Zamenjaj Multiple actions behaviour: - + Obnašanje več dejanj: First - + globalkeys/config/multipleActions + Prvo Last - + globalkeys/config/multipleActions + Zadnje None - Brez + globalkeys/config/multipleActions + Nič All - + globalkeys/config/multipleActions + Vsa Default - + Privzeto Close - Zapri + Zapri Restore Default - + Povrni privzeto Your defined shortcuts will be removed. Do you want to proceed? - + Vaše bližnjice bodo odstranjene. +Želite nadaljevati? diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command คำสั่ง - + DBus call - + Client - + Id - + Shortcut ปุ่มลัด - + Description รายละเอียด - + Type - + Info @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Last + globalkeys/config/multipleActions None + globalkeys/config/multipleActions ไม่ต้อง All + globalkeys/config/multipleActions diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_tr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_tr.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_tr.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_tr.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Komut - + DBus call DBus çağrısı - + Client İstemci - + Id Id - + Shortcut Kısayol - + Description Açıklama - + Type Tür - + Info Bilgi @@ -142,22 +142,26 @@ First - Birinci + globalkeys/config/multipleActions + Birinci Last - Sonuncu + globalkeys/config/multipleActions + Sonuncu None - Hiçbiri + globalkeys/config/multipleActions + Hiçbiri All - Hepsi + globalkeys/config/multipleActions + Hepsi diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command - + DBus call - + Client - + Id - + Shortcut - + Description - + Type - + Info @@ -142,21 +142,25 @@ First + globalkeys/config/multipleActions Last + globalkeys/config/multipleActions None + globalkeys/config/multipleActions All + globalkeys/config/multipleActions diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_uk.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_uk.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_uk.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_uk.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Команда - + DBus call Виклик DBus - + Client Клієнт - + Id Id - + Shortcut Cкорочення - + Description Опис - + Type Тип - + Info Інформація @@ -142,22 +142,26 @@ First - Перша + globalkeys/config/multipleActions + Перша Last - Остання + globalkeys/config/multipleActions + Остання None - Нічого + globalkeys/config/multipleActions + Нічого All - Все + globalkeys/config/multipleActions + Все diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command 命令 - + DBus call DBus 调用 - + Client 客户端 - + Id ID - + Shortcut 快捷键 - + Description 描述 - + Type 类型 - + Info 信息 @@ -143,22 +143,26 @@ First - 第一个 + globalkeys/config/multipleActions + 第一个 Last - 最后一个 + globalkeys/config/multipleActions + 最后一个 None - 无 + globalkeys/config/multipleActions + 无 All - 所有 + globalkeys/config/multipleActions + 所有 diff -Nru lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts --- lxqt-globalkeys-0.14.3/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command 指令 - + DBus call DBus 呼叫 - + Client 用戶端 - + Id ID - + Shortcut 快捷鍵 - + Description 描述 - + Type 類型 - + Info 資訊 @@ -142,22 +142,26 @@ First - 第一項 + globalkeys/config/multipleActions + 第一項 Last - 最後一項 + globalkeys/config/multipleActions + 最後一項 None - 無 + globalkeys/config/multipleActions + 無 All - 全部 + globalkeys/config/multipleActions + 全部 diff -Nru lxqt-globalkeys-0.14.3/daemon/CMakeLists.txt lxqt-globalkeys-0.16.0/daemon/CMakeLists.txt --- lxqt-globalkeys-0.14.3/daemon/CMakeLists.txt 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/daemon/CMakeLists.txt 2020-11-02 11:16:25.000000000 +0000 @@ -143,14 +143,6 @@ ) add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_ALL_FILES}) -target_compile_definitions(${PROJECT_NAME} - PRIVATE - "QT_USE_QSTRINGBUILDER" - "QT_NO_CAST_FROM_ASCII" - "QT_NO_CAST_TO_ASCII" - "QT_NO_URL_CAST_FROM_STRING" - "QT_NO_CAST_FROM_BYTEARRAY" -) target_link_libraries(${PROJECT_NAME} ${X11_LIBRARIES} lxqt Qt5::Widgets Qt5::DBus) lxqt_enable_target_exceptions(${PROJECT_NAME} PRIVATE) diff -Nru lxqt-globalkeys-0.14.3/daemon/core.cpp lxqt-globalkeys-0.16.0/daemon/core.cpp --- lxqt-globalkeys-0.14.3/daemon/core.cpp 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/daemon/core.cpp 2020-11-02 11:16:25.000000000 +0000 @@ -33,6 +33,7 @@ #include #include #include +#include #include #include @@ -1372,8 +1373,8 @@ XUngrabKeyboard(mDisplay, CurrentTime); checkX11Error(); - QSet::const_iterator lastAllModifiers = allModifiers.end(); - for (QSet::const_iterator modifiers = allModifiers.begin(); modifiers != lastAllModifiers; ++modifiers) + QSet::const_iterator lastAllModifiers = allModifiers.cend(); + for (QSet::const_iterator modifiers = allModifiers.cbegin(); modifiers != lastAllModifiers; ++modifiers) { log(LOG_DEBUG, "grabShortcut: checking %02x + %02x", event.xkey.keycode, event.xkey.state | *modifiers); lockX11Error(); @@ -1683,8 +1684,8 @@ break; } - QSet::const_iterator lastAllModifiers = allModifiers.end(); - for (QSet::const_iterator modifiers = allModifiers.begin(); modifiers != lastAllModifiers; ++modifiers) + QSet::const_iterator lastAllModifiers = allModifiers.cend(); + for (QSet::const_iterator modifiers = allModifiers.cbegin(); modifiers != lastAllModifiers; ++modifiers) { lockX11Error(); XGrabKey(mDisplay, X11shortcut.first, X11shortcut.second | *modifiers, rootWindow, False, GrabModeAsync, GrabModeAsync); @@ -1727,8 +1728,8 @@ } lockX11Error(); - QSet::const_iterator lastAllModifiers = allModifiers.end(); - for (QSet::const_iterator modifiers = allModifiers.begin(); modifiers != lastAllModifiers; ++modifiers) + QSet::const_iterator lastAllModifiers = allModifiers.cend(); + for (QSet::const_iterator modifiers = allModifiers.cbegin(); modifiers != lastAllModifiers; ++modifiers) { XUngrabKey(mDisplay, X11shortcut.first, X11shortcut.second | *modifiers, rootWindow); } @@ -1812,8 +1813,8 @@ ClientPathsBySender::iterator clientPathsBySender = mClientPathsBySender.find(sender); if (clientPathsBySender != mClientPathsBySender.end()) { - ClientPaths::const_iterator lastClientPath = clientPathsBySender.value().end(); - for (ClientPaths::const_iterator clientPath = clientPathsBySender.value().begin(); clientPath != lastClientPath; ++clientPath) + ClientPaths::const_iterator lastClientPath = clientPathsBySender.value().cend(); + for (ClientPaths::const_iterator clientPath = clientPathsBySender.value().cbegin(); clientPath != lastClientPath; ++clientPath) { const QDBusObjectPath &path = *clientPath; @@ -2232,7 +2233,7 @@ mShortcutAndActionById[id].first = newShortcut; } - if (!newShortcut.isEmpty()) + if (!newShortcut.isEmpty() && shortcutAndAction.second->isEnabled()) { newShortcut = grabOrReuseKey(X11shortcut, newShortcut); mIdsByShortcut[newShortcut].insert(id); @@ -2487,8 +2488,11 @@ return; } + bool isEnabled = action->isEnabled(); delete action; - shortcutAndActionById.value().second = new MethodAction(this, QDBusConnection::sessionBus(), service, path, interface, method, description); + MethodAction *newAction = new MethodAction(this, QDBusConnection::sessionBus(), service, path, interface, method, description); + newAction->setEnabled(isEnabled); + shortcutAndActionById.value().second = newAction; saveConfig(); @@ -2518,8 +2522,11 @@ return; } + bool isEnabled = action->isEnabled(); delete action; - shortcutAndActionById.value().second = new CommandAction(this, command, arguments, description); + CommandAction *newAction = new CommandAction(this, command, arguments, description); + newAction->setEnabled(isEnabled); + shortcutAndActionById.value().second = newAction; saveConfig(); @@ -2621,18 +2628,21 @@ shortcutAndActionById.value().second->setEnabled(enabled); if (enabled) { - IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut); - if (idsByShortcut != mIdsByShortcut.end()) + X11Shortcut X11shortcut; + QString newShortcut = checkShortcut(shortcut, X11shortcut); + if (newShortcut.isEmpty()) { - if (idsByShortcut.value().isEmpty()) - { - if (!remoteXGrabKey(mX11ByShortcut[shortcut])) - { - log(LOG_WARNING, "Cannot grab shortcut '%s'", qPrintable(shortcut)); - } - } + return false; } - idsByShortcut = mDisabledIdsByShortcut.find(shortcut); + newShortcut = grabOrReuseKey(X11shortcut, newShortcut); + if (newShortcut.isEmpty()) + { + return false; + } + mIdsByShortcut[newShortcut].insert(id); + shortcutAndActionById.value().first = newShortcut; + + IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut); if (idsByShortcut != mDisabledIdsByShortcut.end()) { idsByShortcut.value().remove(id); @@ -2641,7 +2651,6 @@ mDisabledIdsByShortcut.erase(idsByShortcut); } } - mIdsByShortcut[shortcut].insert(id); } else { diff -Nru lxqt-globalkeys-0.14.3/debian/changelog lxqt-globalkeys-0.16.0/debian/changelog --- lxqt-globalkeys-0.14.3/debian/changelog 2020-03-22 15:48:38.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/changelog 2021-01-10 21:36:30.000000000 +0000 @@ -1,29 +1,14 @@ -lxqt-globalkeys (0.14.3-1ubuntu2) focal; urgency=medium +lxqt-globalkeys (0.16.0-0~ppa1) focal; urgency=medium - * No-change rebuild for libgcc-s1 package name change. + * Sync with Debian. - -- Matthias Klose Sun, 22 Mar 2020 16:48:38 +0100 + -- Julien Lavergne Sun, 10 Jan 2021 22:36:30 +0100 -lxqt-globalkeys (0.14.3-1ubuntu1) focal; urgency=low +lxqt-globalkeys (0.16.0-1) unstable; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Modified lxqt-globalkeys.install to include ubuntu specific changes. - The changes install default config file to another location so that distribution specific config files provided via xdg take precedence. - - new dependencies in control file. - - Translations from debian for following: - 1. config/translations/lxqt-config-globalkeyshortcuts_cs.ts - 2. config/translations/lxqt-config-globalkeyshortcuts_da.ts - 3. config/translations/lxqt-config-globalkeyshortcuts_de.ts - 4. config/translations/lxqt-config-globalkeyshortcuts_el.ts - 5. config/translations/lxqt-config-globalkeyshortcuts_gl.ts - 6. config/translations/lxqt-config-globalkeyshortcuts_gl.ts - 7. config/translations/lxqt-config-globalkeyshortcuts_ja.ts - 8. config/translations/lxqt-config-globalkeyshortcuts_it.ts - 9. config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts - 10. config/translations/lxqt-config-globalkeyshortcuts_pt.ts - 11. config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts + * New upstream release. (Closes: #964648) - -- Raman Sarda Tue, 07 Jan 2020 03:22:41 +0530 + -- Andrew Lee (李健秋) Wed, 06 Jan 2021 17:04:29 +0800 lxqt-globalkeys (0.14.3-1) unstable; urgency=medium @@ -40,12 +25,6 @@ -- Alf Gaida Thu, 10 Oct 2019 23:34:49 +0200 -lxqt-globalkeys (0.14.1+git20190923-0ubuntu1) eoan; urgency=medium - - * Picked the latest git. - - -- Raman Sarda Tue, 08 Oct 2019 03:27:38 +0530 - lxqt-globalkeys (0.14.1-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.1. @@ -54,31 +33,6 @@ -- Alf Gaida Sun, 24 Feb 2019 21:28:30 +0100 -lxqt-globalkeys (0.14.1-0ubuntu4) eoan; urgency=medium - - * Correctly changed the location of upstream config. - - -- Raman Sarda Thu, 05 Sep 2019 22:35:29 +0000 - -lxqt-globalkeys (0.14.1-0ubuntu3) eoan; urgency=medium - - * Changed the location of upstream config. - - -- Raman Sarda Wed, 04 Sep 2019 23:15:09 +0530 - -lxqt-globalkeys (0.14.1-0ubuntu2) eoan; urgency=medium - - * Add XDG support. - * Bump Standards-Version to 4.4.0, no changes needed. - - -- Walter Lapchynski Tue, 20 Aug 2019 22:46:08 -0700 - -lxqt-globalkeys (0.14.1-0ubuntu1) disco; urgency=medium - - * New upstream release. - - -- Simon Quigley Sat, 09 Mar 2019 13:06:02 -0600 - lxqt-globalkeys (0.14.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.14.0. @@ -94,16 +48,6 @@ -- Alf Gaida Sun, 27 Jan 2019 17:37:07 +0100 -lxqt-globalkeys (0.14.0-0ubuntu1) disco; urgency=medium - - * New upstream release. - - Bump build dependencies. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add a lxqt-globalkeys-l10n package. - - -- Simon Quigley Sat, 26 Jan 2019 00:15:52 -0600 - lxqt-globalkeys (0.13.0-1) unstable; urgency=medium * Cherry-picking new upstream version 0.13.0. @@ -111,34 +55,6 @@ -- Alf Gaida Thu, 24 May 2018 21:23:58 +0200 -lxqt-globalkeys (0.13.0-0ubuntu2) cosmic; urgency=medium - - * Provide a more complete default configuration file. - - -- Walter Lapchynski Sat, 06 Oct 2018 23:26:56 -0700 - -lxqt-globalkeys (0.13.0-0ubuntu1) cosmic; urgency=medium - - * New upstream release. - * Keep the Vcs entries as Lubuntu-specific; drop all other changes. - * Update build dependencies. - - -- Simon Quigley Tue, 22 May 2018 23:29:33 -0500 - -lxqt-globalkeys (0.12.0-4ubuntu1) cosmic; urgency=medium - - * Merge from Debian Sid. Remaining changes: - - Backport two upstream patches: - + Fix wrong radio buttons when changing shortcuts. - * fix-wrong-radio-buttons.patch - * Upstream commit a9ec3c0. - + Avoid polluting the the x11 shortcut map. - * avoid-polluting-x11-shortcut-map.patch - * Upstream commit c79d560. - * Change the Vcs entries to be Lubuntu-specific. - - -- Simon Quigley Sat, 19 May 2018 17:37:34 -0500 - lxqt-globalkeys (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 @@ -150,19 +66,6 @@ -- Alf Gaida Sat, 28 Apr 2018 13:53:23 +0200 -lxqt-globalkeys (0.12.0-3ubuntu1) bionic; urgency=medium - - * Cherry-pick some upstream commits because the upstream release cycle is - too slow: - - Fix wrong radio buttons when changing shortcuts. - + fix-wrong-radio-buttons.patch - + Upstream commit a9ec3c0. - - Avoid polluting the the x11 shortcut map. - + avoid-polluting-x11-shortcut-map.patch - + Upstream commit c79d560. - - -- Simon Quigley Mon, 05 Feb 2018 21:19:18 -0600 - lxqt-globalkeys (0.12.0-3) unstable; urgency=medium * Bumped Standards to 4.1.2, no changes needed @@ -319,4 +222,3 @@ * Use lower-case for description. -- Andrew Lee (李健秋) Sun, 16 Aug 2015 02:18:03 +0800 - diff -Nru lxqt-globalkeys-0.14.3/debian/compat lxqt-globalkeys-0.16.0/debian/compat --- lxqt-globalkeys-0.14.3/debian/compat 2019-10-07 21:57:38.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -12 diff -Nru lxqt-globalkeys-0.14.3/debian/control lxqt-globalkeys-0.16.0/debian/control --- lxqt-globalkeys-0.14.3/debian/control 2020-01-06 21:08:01.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/control 2021-01-10 21:33:57.000000000 +0000 @@ -1,14 +1,13 @@ Source: lxqt-globalkeys -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , ChangZhuo Chen (陳昌倬) , Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.14.0), + liblxqt0-dev (>= 0.16.0~), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, @@ -29,7 +28,9 @@ Breaks: lxqt-common (<< 0.12.0) Replaces: lxqt-common (<< 0.12.0) Description: daemon used to register global keyboard shortcuts (appl.) - Daemon used to register global keyboard shortcuts. + LXQt globalkey 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. . This package contain the program files for LXQt globalskeys. @@ -37,11 +38,13 @@ Architecture: any Multi-Arch: same Section: libs -Depends: ${misc:Pre-Depends}, - ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends} Description: daemon used to register global keyboard shortcuts (shared libs) - Daemon used to register global keyboard shortcuts. + LXQt globalkey 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. . This package contain the shared libs for LXQt globalkeys. @@ -52,7 +55,9 @@ ${shlibs:Depends}, liblxqt-globalkeys0 (= ${binary:Version}) Description: daemon used to register global keyboard shortcuts (dev files) - Daemon used to register global keyboard shortcuts. + LXQt globalkey 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. . This package contain the development files. @@ -60,12 +65,14 @@ Architecture: any Multi-Arch: same Section: libs -Depends: ${misc:Pre-Depends}, - ${misc:Depends}, +Pre-Depends: ${misc:Pre-Depends}, +Depends: ${misc:Depends}, ${shlibs:Depends}, liblxqt-globalkeys0 (= ${binary:Version}) Description: daemon used to register global keyboard shortcuts (ui files) - Daemon used to register global keyboard shortcuts. + LXQt globalkey 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. . This package contain the ui for LXQt globalkeys. @@ -76,7 +83,9 @@ ${shlibs:Depends}, liblxqt-globalkeys-ui0 (= ${binary:Version}) Description: daemon used to register global keyboard shortcuts (ui dev files) - Daemon used to register global keyboard shortcuts. + LXQt globalkey 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. . This package contain the ui development files. @@ -89,4 +98,8 @@ Breaks: lxqt-globalkeys (<< 0.11.0) Replaces: lxqt-globalkeys (<< 0.11.0) Description: Language package for lxqt-globalkeys + LXQt globalkey 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. + . This package contains the l10n files needed by lxqt-globalkeys. diff -Nru lxqt-globalkeys-0.14.3/debian/copyright lxqt-globalkeys-0.16.0/debian/copyright --- lxqt-globalkeys-0.14.3/debian/copyright 2019-10-17 03:44:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/copyright 2021-01-10 21:33:57.000000000 +0000 @@ -3,12 +3,12 @@ Source: https://github.com/lxqt/lxqt-globalkeys Files: * -Copyright: 2012-2018 LXQt team +Copyright: 2012-2019 LXQt team 2010-2012 Razor team License: LGPL-2.1+ Files: debian/* -Copyright: 2014-2018 Alf Gaida +Copyright: 2014-2019 Alf Gaida 2015 Andrew Lee (李健秋) License: LGPL-2.1+ diff -Nru lxqt-globalkeys-0.14.3/debian/liblxqt-globalkeys0.symbols lxqt-globalkeys-0.16.0/debian/liblxqt-globalkeys0.symbols --- lxqt-globalkeys-0.14.3/debian/liblxqt-globalkeys0.symbols 2019-10-17 03:44:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/liblxqt-globalkeys0.symbols 2021-01-10 21:33:57.000000000 +0000 @@ -1,4 +1,5 @@ liblxqt-globalkeys.so.0 liblxqt-globalkeys0 #MINVER# +* Build-Depends-Package: liblxqt-globalkeys0-dev (c++)"GlobalKeyShortcut::Action::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::qt_metacast(char const*)@Base" 0.8.0 (c++)"GlobalKeyShortcut::Action::changeShortcut(QString const&)@Base" 0.8.0 diff -Nru lxqt-globalkeys-0.14.3/debian/liblxqt-globalkeys-ui0.symbols lxqt-globalkeys-0.16.0/debian/liblxqt-globalkeys-ui0.symbols --- lxqt-globalkeys-0.14.3/debian/liblxqt-globalkeys-ui0.symbols 2019-10-17 03:44:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/liblxqt-globalkeys-ui0.symbols 2021-01-10 21:33:57.000000000 +0000 @@ -1,4 +1,5 @@ liblxqt-globalkeys-ui.so.0 liblxqt-globalkeys-ui0 #MINVER# +* Build-Depends-Package: liblxqt-globalkeys-ui0-dev (c++)"ShortcutSelector::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0 (c++)"ShortcutSelector::qt_metacast(char const*)@Base" 0.8.0 (c++)"ShortcutSelector::grabShortcut(int)@Base" 0.8.0 diff -Nru lxqt-globalkeys-0.14.3/debian/lxqt-globalkeys.install lxqt-globalkeys-0.16.0/debian/lxqt-globalkeys.install --- lxqt-globalkeys-0.14.3/debian/lxqt-globalkeys.install 2020-01-06 21:09:17.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/lxqt-globalkeys.install 2021-01-10 21:33:57.000000000 +0000 @@ -6,5 +6,5 @@ usr/share/applications/lxqt-config-globalkeyshortcuts.desktop # configuration and autostart from lxqt-common -usr/share/lxqt/globalkeyshortcuts.conf etc/xdg/lxqt/globalkeyshortcuts.conf +/usr/share/lxqt/globalkeyshortcuts.conf etc/xdg/autostart/lxqt-globalkeyshortcuts.desktop diff -Nru lxqt-globalkeys-0.14.3/debian/lxqt-globalkeys-l10n.install lxqt-globalkeys-0.16.0/debian/lxqt-globalkeys-l10n.install --- lxqt-globalkeys-0.14.3/debian/lxqt-globalkeys-l10n.install 2019-10-17 03:44:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/lxqt-globalkeys-l10n.install 2021-01-10 21:33:57.000000000 +0000 @@ -1 +1 @@ -usr/share/lxqt/translations/lxqt-config-globalkeyshortcuts + usr/share/lxqt/translations/lxqt-config-globalkeyshortcuts diff -Nru lxqt-globalkeys-0.14.3/debian/rules lxqt-globalkeys-0.16.0/debian/rules --- lxqt-globalkeys-0.14.3/debian/rules 2019-10-17 03:44:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/rules 2021-01-10 21:33:57.000000000 +0000 @@ -13,6 +13,5 @@ override_dh_auto_configure: dh_auto_configure -- \ - -DPULL_TRANSLATIONS=OFF\ - -DUPDATE_TRANSLATIONS=OFF\ + -DUPDATE_TRANSLATIONS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff -Nru lxqt-globalkeys-0.14.3/debian/upstream/metadata lxqt-globalkeys-0.16.0/debian/upstream/metadata --- lxqt-globalkeys-0.14.3/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/upstream/metadata 2021-01-10 21:33:57.000000000 +0000 @@ -0,0 +1,7 @@ +Name: lxqt-globalkeys +Bug-Database: https://github.com/lxqt/lxqt-globalkeys/issues +Bug-Submit: https://github.com/lxqt/lxqt-globalkeys/issues/new +Changelog: https://github.com/lxqt/lxqt-globalkeys/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-globalkeys +Repository-Browser: https://github.com/lxqt/lxqt-globalkeys + diff -Nru lxqt-globalkeys-0.14.3/README.md lxqt-globalkeys-0.16.0/README.md --- lxqt-globalkeys-0.14.3/README.md 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/README.md 2020-11-02 11:16:25.000000000 +0000 @@ -64,8 +64,10 @@ [Configuration Center](https://github.com/lxqt/lxqt-config#configuration-center) of [lxqt-config](https://github.com/lxqt/lxqt-config) as well. -### Translation (Weblate) +### Translations - -Translation status +Translations can be done in [LXQt-Weblate](https://translate.lxqt-project.org/projects/lxqt-configuration/lxqt-globalkeys) + + +Translation status diff -Nru lxqt-globalkeys-0.14.3/ui/CMakeLists.txt lxqt-globalkeys-0.16.0/ui/CMakeLists.txt --- lxqt-globalkeys-0.14.3/ui/CMakeLists.txt 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/ui/CMakeLists.txt 2020-11-02 11:16:25.000000000 +0000 @@ -150,11 +150,6 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE "SHARED_EXPORT=Q_DECL_EXPORT" - "QT_USE_QSTRINGBUILDER" - "QT_NO_CAST_FROM_ASCII" - "QT_NO_CAST_TO_ASCII" - "QT_NO_URL_CAST_FROM_STRING" - "QT_NO_CAST_FROM_BYTEARRAY" ) export(TARGETS ${PROJECT_NAME} APPEND FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake") diff -Nru lxqt-globalkeys-0.14.3/xdg/globalkeyshortcuts.conf lxqt-globalkeys-0.16.0/xdg/globalkeyshortcuts.conf --- lxqt-globalkeys-0.14.3/xdg/globalkeyshortcuts.conf 2019-10-16 15:17:40.000000000 +0000 +++ lxqt-globalkeys-0.16.0/xdg/globalkeyshortcuts.conf 2020-11-02 11:16:25.000000000 +0000 @@ -38,9 +38,14 @@ [Print.8] Comment=screen shot Enabled=true -Exec=lximage-qt, -s +Exec=screengrab, -f [Control%2BAlt%2BL.30] Comment=lockscreen Enabled=true Exec=xdg-screensaver, lock + +[XF86Display.31] +Comment=Launch Monitor +Enabled=true +Exec=lxqt-config-monitor