diff -Nru lxqt-globalkeys-0.15.0/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hr.desktop --- lxqt-globalkeys-0.15.0/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.15.0/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop lxqt-globalkeys-0.16.0/autostart/translations/lxqt-globalkeyshortcuts_hu.desktop --- lxqt-globalkeys-0.15.0/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.15.0/CHANGELOG lxqt-globalkeys-0.16.0/CHANGELOG --- lxqt-globalkeys-0.15.0/CHANGELOG 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/CHANGELOG 2020-11-02 11:16:25.000000000 +0000 @@ -1,3 +1,10 @@ +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. diff -Nru lxqt-globalkeys-0.15.0/CMakeLists.txt lxqt-globalkeys-0.16.0/CMakeLists.txt --- lxqt-globalkeys-0.15.0/CMakeLists.txt 2020-04-23 18:21:33.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.15.0") -set(QT_MINIMUM_VERSION "5.10.0") +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,7 +28,7 @@ # Version set(LXQT_GLOBALKEYS_MAJOR_VERSION 0) -set(LXQT_GLOBALKEYS_MINOR_VERSION 15) +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.15.0/config/default_model.cpp lxqt-globalkeys-0.16.0/config/default_model.cpp --- lxqt-globalkeys-0.15.0/config/default_model.cpp 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/default_model.cpp 2020-11-02 11:16:25.000000000 +0000 @@ -178,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; } diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_arn.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_arn.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_arn.ts 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_arn.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_ar.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ar.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_ar.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_ca.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ca.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_ca.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_cs.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cs.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_cs.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_cy.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_cy.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_cy.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_da.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_da.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_da.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_de.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_de.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_de.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_el.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_el.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_el.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_en_GB.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_eo.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eo.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_eo.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_es.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_es.ts 2020-04-23 18:21:33.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,22 +142,26 @@ First - Primera + globalkeys/config/multipleActions + Primera Last - Última + globalkeys/config/multipleActions + Última None - Ninguna + globalkeys/config/multipleActions + Ninguna All - Todas + globalkeys/config/multipleActions + Todas diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_eu.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_eu.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_eu.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_fi.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fi.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_fi.ts 2020-04-23 18:21:33.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 @@ -142,22 +142,26 @@ 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 diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_fr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_fr.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_fr.ts 2020-04-23 18:21:33.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,22 +143,26 @@ 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 @@ -180,7 +184,7 @@ Your defined shortcuts will be removed. Do you want to proceed? Vos raccourcis définis seront supprimés. -Voulez-vous procéder ? +Voulez-vous procéder ? diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_gl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_gl.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_gl.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_he.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_he.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_he.ts 2020-04-23 18:21:33.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,22 +142,26 @@ First - ראשונה + globalkeys/config/multipleActions + ראשונה Last - אחרונה + globalkeys/config/multipleActions + אחרונה None - ללא + globalkeys/config/multipleActions + ללא All - הכול + globalkeys/config/multipleActions + הכול diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.desktop --- lxqt-globalkeys-0.15.0/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.15.0/config/translations/lxqt-config-globalkeyshortcuts_hr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hr.ts --- lxqt-globalkeys-0.15.0/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.15.0/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_hu.desktop 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_hu.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Parancs - + DBus call DBus hívás - + Client Kliens - + Id - + Azonosító - + Shortcut Gyorsbillentyű - + Description Leírás - + Type Típus - + Info Információ @@ -112,7 +112,7 @@ Global Actions Manager - Általános művelet kezelő + Általános műveletkezelő @@ -122,7 +122,7 @@ Remove - Törlés + Eltávolítás @@ -137,27 +137,31 @@ Multiple actions behaviour: - Több művelet viselkedése: + Viselkedés több műveletnél: First - Első + globalkeys/config/multipleActions + Első Last - Utolsó + globalkeys/config/multipleActions + Utolsó None - Nincs + globalkeys/config/multipleActions + Egyik sem All - Mind + globalkeys/config/multipleActions + Mind diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_id.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_id.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_id.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_it.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_it.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_it.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_ja.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ja.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_ja.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_lt.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lt.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_lt.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_lv.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_lv.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_lv.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_nb_NO.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_nl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_nl.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_nl.ts 2020-04-23 18:21:33.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,22 +142,26 @@ First - Eerste + globalkeys/config/multipleActions + Eerste Last - Laatste + globalkeys/config/multipleActions + Laatste None - Geen + globalkeys/config/multipleActions + Geen All - Alle + globalkeys/config/multipleActions + Alle diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pl.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pl.ts 2020-04-23 18:21:33.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,22 +142,26 @@ First - Pierwsze + globalkeys/config/multipleActions + Pierwsze Last - Ostatnie + globalkeys/config/multipleActions + Ostatnie None - Brak + globalkeys/config/multipleActions + Brak All - Wszystko + globalkeys/config/multipleActions + Wszystko diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts 2020-04-23 18:21:33.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 diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pt.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_pt.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_pt.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_ru.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_ru.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_ru.ts 2020-04-23 18:21:33.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,21 +142,25 @@ First + globalkeys/config/multipleActions Первое Last + globalkeys/config/multipleActions Последнее None + globalkeys/config/multipleActions Ни одного All + globalkeys/config/multipleActions Все diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_sk_SK.ts 2020-04-23 18:21:33.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,22 +142,26 @@ 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 diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_sl.ts 2020-11-02 11:16:25.000000000 +0000 @@ -4,42 +4,42 @@ DefaultModel - + Command Ukaz - + DBus call Klic DBus - + Client Odjemalec - + Id ID - + Shortcut Bližnjica - + Description Opis - + Type Vrsta - + Info Opis @@ -142,22 +142,26 @@ First - Prvo + globalkeys/config/multipleActions + Prvo Last - Zadnje + globalkeys/config/multipleActions + Zadnje None - Nič + globalkeys/config/multipleActions + Nič All - Vsa + globalkeys/config/multipleActions + Vsa diff -Nru lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_tr.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_tr.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_tr.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_uk.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_uk.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_uk.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts 2020-04-23 18:21:33.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.15.0/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts lxqt-globalkeys-0.16.0/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts --- lxqt-globalkeys-0.15.0/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts 2020-04-23 18:21:33.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.15.0/daemon/core.cpp lxqt-globalkeys-0.16.0/daemon/core.cpp --- lxqt-globalkeys-0.15.0/daemon/core.cpp 2020-04-23 18:21:33.000000000 +0000 +++ lxqt-globalkeys-0.16.0/daemon/core.cpp 2020-11-02 11:16:25.000000000 +0000 @@ -2233,7 +2233,7 @@ mShortcutAndActionById[id].first = newShortcut; } - if (!newShortcut.isEmpty()) + if (!newShortcut.isEmpty() && shortcutAndAction.second->isEnabled()) { newShortcut = grabOrReuseKey(X11shortcut, newShortcut); mIdsByShortcut[newShortcut].insert(id); @@ -2488,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(); @@ -2519,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(); @@ -2622,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; + } + newShortcut = grabOrReuseKey(X11shortcut, newShortcut); + if (newShortcut.isEmpty()) + { + return false; } - idsByShortcut = mDisabledIdsByShortcut.find(shortcut); + mIdsByShortcut[newShortcut].insert(id); + shortcutAndActionById.value().first = newShortcut; + + IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut); if (idsByShortcut != mDisabledIdsByShortcut.end()) { idsByShortcut.value().remove(id); @@ -2642,7 +2651,6 @@ mDisabledIdsByShortcut.erase(idsByShortcut); } } - mIdsByShortcut[shortcut].insert(id); } else { diff -Nru lxqt-globalkeys-0.15.0/debian/changelog lxqt-globalkeys-0.16.0/debian/changelog --- lxqt-globalkeys-0.15.0/debian/changelog 2020-06-04 18:58:05.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/changelog 2021-02-21 19:08:07.000000000 +0000 @@ -1,3 +1,16 @@ +lxqt-globalkeys (0.16.0-1ubuntu1) hirsute; urgency=medium + + * New upstream version. + * debhelper-compat requirement bumped to 13. + + -- Raman Sarda Mon, 22 Feb 2021 00:38:07 +0530 + +lxqt-globalkeys (0.16.0-1) unstable; urgency=medium + + * New upstream release. (Closes: #964648) + + -- Andrew Lee (李健秋) Wed, 06 Jan 2021 17:04:29 +0800 + lxqt-globalkeys (0.15.0-0ubuntu1) groovy; urgency=medium * New upstream release. @@ -52,6 +65,7 @@ * 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. @@ -84,6 +98,7 @@ * 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. @@ -108,6 +123,7 @@ * 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. @@ -323,3 +339,4 @@ * Use lower-case for description. -- Andrew Lee (李健秋) Sun, 16 Aug 2015 02:18:03 +0800 + diff -Nru lxqt-globalkeys-0.15.0/debian/control lxqt-globalkeys-0.16.0/debian/control --- lxqt-globalkeys-0.15.0/debian/control 2020-06-04 18:58:03.000000000 +0000 +++ lxqt-globalkeys-0.16.0/debian/control 2021-02-21 19:08:07.000000000 +0000 @@ -6,9 +6,9 @@ Andrew Lee (李健秋) Section: x11 Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), libkf5windowsystem-dev, - liblxqt0-dev (>= 0.15.0), + liblxqt0-dev (>= 0.16.0~), libqt5svg5-dev, libqt5x11extras5-dev, libx11-dev, @@ -36,8 +36,9 @@ Architecture: any Multi-Arch: same Section: libs -Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs: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. . @@ -58,10 +59,10 @@ Architecture: any Multi-Arch: same Section: libs -Pre-Depends: ${misc:Pre-Depends} -Depends: liblxqt-globalkeys0 (= ${binary:Version}), - ${misc:Depends}, - ${shlibs: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. . diff -Nru lxqt-globalkeys-0.15.0/README.md lxqt-globalkeys-0.16.0/README.md --- lxqt-globalkeys-0.15.0/README.md 2020-04-23 18:21:33.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.15.0/xdg/globalkeyshortcuts.conf lxqt-globalkeys-0.16.0/xdg/globalkeyshortcuts.conf --- lxqt-globalkeys-0.15.0/xdg/globalkeyshortcuts.conf 2020-04-23 18:21:33.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