From 4877462caa7d83449ae62e49007ab3d315e12337 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 17 Jul 2016 15:15:06 +0200 Subject: [PATCH] Adding upstream version 0.10.96~20-g984e0e9. --- .gitignore | 2 - AUTHORS | 4 +- client/CMakeLists.txt | 2 +- client/client.cpp | 8 +- config/CMakeLists.txt | 10 + config/actions.cpp | 8 +- config/edit_action_dialog.cpp | 10 +- config/main_window.cpp | 2 +- .../lxqt-config-globalkeyshortcuts.ts | 168 ------------ .../lxqt-config-globalkeyshortcuts_ar.ts | 194 ------------- .../lxqt-config-globalkeyshortcuts_cs.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_cs_CZ.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_da_DK.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_de.desktop | 2 +- .../lxqt-config-globalkeyshortcuts_de.ts | 169 ------------ .../lxqt-config-globalkeyshortcuts_el.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_eo.ts | 194 ------------- .../lxqt-config-globalkeyshortcuts_es.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_es_VE.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_eu.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_fi.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_fr_FR.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_hu.ts | 257 ------------------ .../lxqt-config-globalkeyshortcuts_it.desktop | 3 + ...qt-config-globalkeyshortcuts_it_IT.desktop | 3 - .../lxqt-config-globalkeyshortcuts_it_IT.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ja.ts | 182 ------------- .../lxqt-config-globalkeyshortcuts_lt.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_nl.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_pl_PL.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_pt.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_pt_BR.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ro_RO.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_ru.desktop | 2 +- .../lxqt-config-globalkeyshortcuts_ru.ts | 168 ------------ ...qt-config-globalkeyshortcuts_ru_RU.desktop | 4 - .../lxqt-config-globalkeyshortcuts_ru_RU.ts | 168 ------------ .../lxqt-config-globalkeyshortcuts_sl.ts | 190 ------------- .../lxqt-config-globalkeyshortcuts_th_TH.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_tr.ts | 182 ------------- .../lxqt-config-globalkeyshortcuts_uk.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_zh_CN.ts | 241 ---------------- .../lxqt-config-globalkeyshortcuts_zh_TW.ts | 241 ---------------- daemon/core.cpp | 98 ++++--- daemon/main.cpp | 3 + daemon/pipe_utils.cpp | 16 +- 46 files changed, 101 insertions(+), 6564 deletions(-) delete mode 100644 .gitignore delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ar.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_cs.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_de.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_el.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_eo.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_es.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_eu.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_fi.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_hu.ts create mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ja.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_lt.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_nl.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pt.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_sl.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_tr.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_uk.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts delete mode 100644 config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 513eaeb..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -build -*.kdev4 diff --git a/AUTHORS b/AUTHORS index 190d298..a66be6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -4,7 +4,7 @@ Upstream Authors: Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2014 LXQt team + Copyright (c) 2012-2016 LXQt team -License: GPL-2 and LGPL-2.1+ +License: LGPL-2.1+ The full text of the licenses can be found in the 'COPYING' file. diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index bf317a2..66932e8 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -145,7 +145,7 @@ set(${PROJECT_NAME}_ALL_FILES ${${PROJECT_NAME}_GENERATED_FILES} ) -set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widget, Qt5DBus") +set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widgets, Qt5DBus") add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_ALL_FILES}) target_link_libraries(${PROJECT_NAME} diff --git a/client/client.cpp b/client/client.cpp index ef6dfcd..cc4c40f 100644 --- a/client/client.cpp +++ b/client/client.cpp @@ -301,16 +301,16 @@ void ClientImpl::grabShortcutFinished(QDBusPendingCallWatcher *call) } -static Client *globalActionNativeClient = 0; +static QScopedPointer globalActionNativeClient; Client *Client::instance() { if (!globalActionNativeClient) { - globalActionNativeClient = new Client(); + globalActionNativeClient.reset(new Client()); } - return globalActionNativeClient; + return globalActionNativeClient.data(); } Client::Client() @@ -321,7 +321,7 @@ Client::Client() Client::~Client() { - globalActionNativeClient = 0; + globalActionNativeClient.take(); } Action *Client::addAction(const QString &shortcut, const QString &path, const QString &description, QObject *parent) { return impl->addClientAction(shortcut, path, description, parent); } diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 3002bc0..bc286c0 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -107,6 +107,16 @@ lxqt_translate_ts(${PROJECT_NAME}_QM_FILES ${${PROJECT_NAME}_TRANSLATABLE} INSTALL_DIR ${LXQT_TRANSLATIONS_DIR}/${PROJECT_NAME} + PULL_TRANSLATIONS + ${PULL_TRANSLATIONS} + CLEAN_TRANSLATIONS + ${CLEAN_TRANSLATIONS} + TRANSLATIONS_REPO + ${TRANSLATIONS_REPO} + TRANSLATIONS_REFSPEC + ${TRANSLATIONS_REFSPEC} + REPO_SUBDIR + "lxqt-globalkeys/${PROJECT_NAME}" ) lxqt_app_translation_loader(${PROJECT_NAME}_QM_LOADER ${PROJECT_NAME}) diff --git a/config/actions.cpp b/config/actions.cpp index 907c048..bbf2a7f 100644 --- a/config/actions.cpp +++ b/config/actions.cpp @@ -86,7 +86,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QDBusObjectPath path; if (getClientActionInfoById(I.key(), shortcut, description, enabled, path)) { @@ -104,7 +104,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString service; QDBusObjectPath path; QString interface; @@ -126,7 +126,7 @@ void Actions::init() { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString command; QStringList arguments; if (getCommandActionInfoById(I.key(), shortcut, description, enabled, command, arguments)) @@ -223,7 +223,7 @@ void Actions::do_actionAdded(qulonglong id) { QString shortcut; QString description; - bool enabled; + bool enabled = false; QString type; QString info; if (getActionById(id, shortcut, description, enabled, type, info)) diff --git a/config/edit_action_dialog.cpp b/config/edit_action_dialog.cpp index 168b4b4..aef6131 100644 --- a/config/edit_action_dialog.cpp +++ b/config/edit_action_dialog.cpp @@ -209,8 +209,6 @@ bool EditActionDialog::load(qulonglong id) shortcut_SS->setText(QString()); description_LE->clear(); enabled_CB->setChecked(true); - command_RB->setChecked(false); - dbus_method_RB->setChecked(false); action_SW->setCurrentWidget(command_P); command_PTE->clear(); service_LE->clear(); @@ -218,6 +216,14 @@ bool EditActionDialog::load(qulonglong id) interface_LE->clear(); method_LE->clear(); + // To disable all radio boxes, once one has been selected, we need to turn exclusivity off temporarily + command_RB->setAutoExclusive(false); + dbus_method_RB->setAutoExclusive(false); + command_RB->setChecked(false); + dbus_method_RB->setChecked(false); + command_RB->setAutoExclusive(true); + dbus_method_RB->setAutoExclusive(true); + description_LE->setEnabled(true); command_RB->setEnabled(true); dbus_method_RB->setEnabled(true); diff --git a/config/main_window.cpp b/config/main_window.cpp index 1297476..19aba3b 100644 --- a/config/main_window.cpp +++ b/config/main_window.cpp @@ -155,7 +155,7 @@ void MainWindow::on_swap_PB_clicked() void MainWindow::on_remove_PB_clicked() { - foreach(QModelIndex rowIndex, mSelectionModel->selectedRows()) + foreach(const QModelIndex &rowIndex, mSelectionModel->selectedRows()) mActions->removeAction(mDefaultModel->id(mSortFilterProxyModel->mapToSource(rowIndex))); } diff --git a/config/translations/lxqt-config-globalkeyshortcuts.ts b/config/translations/lxqt-config-globalkeyshortcuts.ts deleted file mode 100644 index 7d46c80..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - - - - - All - - - - - Close - - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ar.ts b/config/translations/lxqt-config-globalkeyshortcuts_ar.ts deleted file mode 100644 index 7f21fe7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ar.ts +++ /dev/null @@ -1,194 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - الوصف - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - إزالة - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - ﻻشيء - - - - All - - - - - Close - إغلاق - - - - ShortcutConfigWindow - - Description - الوصف - - - Remove - إزالة - - - Close - إغلاق - - - - ShortcutEditor - - None - ﻻشيء - - - Remove - إزالة - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_cs.ts b/config/translations/lxqt-config-globalkeyshortcuts_cs.ts deleted file mode 100644 index fbb8a2e..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_cs.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Najít příkaz - - - - DefaultModel - - - Command - Příkaz - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Zkratka - - - - Description - Popis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstranit - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Žádná - - - - All - - - - - Close - Zavřít - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor zkratek - - - Description - Popis - - - Shortcut - Zkratka - - - Command - Příkaz - - - Add New - Přidat novou - - - Remove - Odstranit - - - Add Group - Přidat skupinu - - - Reset - Vynulovat - - - Close - Zavřít - - - - ShortcutEditor - - None - Žádná - - - Add Shortcut - Přidat zkratku - - - Remove - Odstranit - - - New Group - Nová skupina - - - Reset Changes - Vynulovat změny - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts b/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts deleted file mode 100644 index d374897..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Najít příkaz - - - - DefaultModel - - - Command - Příkaz - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Zkratka - - - - Description - Popis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstranit - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Žádná - - - - All - - - - - Close - Zavřít - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor zkratek - - - Description - Popis - - - Shortcut - Zkratka - - - Command - Příkaz - - - Add New - Přidat novou - - - Remove - Odstranit - - - Add Group - Přidat skupinu - - - Reset - Vynulovat - - - Close - Zavřít - - - - ShortcutEditor - - None - Žádná - - - Add Shortcut - Přidat zkratku - - - Remove - Odstranit - - - New Group - Nová skupina - - - Reset Changes - Vynulovat změny - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts b/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts deleted file mode 100644 index cf33d41..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Find en kommando - - - - DefaultModel - - - Command - Kommando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Genvej - - - - Description - Beskrivelse - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Fjern - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Ingen - - - - All - - - - - Close - Afslut - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt Tastaturgenveje - - - Description - Beskrivelse - - - Shortcut - Genvej - - - Command - Kommando - - - Add New - Tilføj ny - - - Remove - Fjern - - - Add Group - Tilføj gruppe - - - Reset - Nulstil - - - Close - Afslut - - - - ShortcutEditor - - None - Ingen - - - Add Shortcut - Tilføj genvej - - - Remove - Fjern - - - New Group - Ny gruppe - - - Reset Changes - Nulstil ændringer - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_de.desktop b/config/translations/lxqt-config-globalkeyshortcuts_de.desktop index 6013145..aa6448c 100644 --- a/config/translations/lxqt-config-globalkeyshortcuts_de.desktop +++ b/config/translations/lxqt-config-globalkeyshortcuts_de.desktop @@ -1,4 +1,4 @@ # Translations Name[de]=Kurzbefehl-Konfiguration GenericName[de]=Globale Kurzbefehlkonfiguration -Comment[de]=Globale Kurzbefehle für die LXQt Arbeitsfläche definieren +Comment[de]=Globale Kurzbefehle für die LXQt-Arbeitsfläche definieren diff --git a/config/translations/lxqt-config-globalkeyshortcuts_de.ts b/config/translations/lxqt-config-globalkeyshortcuts_de.ts deleted file mode 100644 index 60aa810..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_de.ts +++ /dev/null @@ -1,169 +0,0 @@ - - - - - DefaultModel - - - Command - Befehl - - - - DBus call - DBus-Aufruf - - - - Client - Client - - - - Id - Kennung - - - - Shortcut - Kurzbefehl - - - - Description - Beschreibung - - - - Type - Typ - - - - Info - Information - - - - EditActionDialog - - - Edit Action - Befehl bearbeiten - - - - &Shortcut: - &Kurzbefehl: - - - - &Description: - &Beschreibung: - - - - &Enabled - &Aktiviert - - - - &Command - B&efehl - - - - &DBus message - &DBus-Nachricht - - - - Type: - Typ: - - - - Co&mmand: - Be&fehl: - - - - S&ervice: - Ser&vice: - - - - &Path: - &Pfad: - - - - &Interface: - &Schnittstelle: - &Interface: - - - - &Method: - &Methode: - - - - MainWindow - - - Global Actions Manager - Globaler Aktionsmanager - - - - Add ... - Hinzufügen ... - - - - Remove - Entfernen - - - - Modify ... - Ändern ... - - - - Swap - Tauschen - - - - Multiple actions behaviour: - Verhalten bei mehreren Aktionen: - - - - First - Erste - - - - Last - Letzte - - - - None - Keine - - - - All - Alle - - - - Close - Schließen - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_el.ts b/config/translations/lxqt-config-globalkeyshortcuts_el.ts deleted file mode 100644 index c0a5427..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_el.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Εύρεση εντολής - - - - DefaultModel - - - Command - Εντολή - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Συντόμευση - - - - Description - Περιγραφή - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Αφαίρεση - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Κανένα - - - - All - - - - - Close - Κλείσιμο - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Επεξεργασία συντομεύσεων LXQt - - - Description - Περιγραφή - - - Shortcut - Συντόμευση - - - Command - Εντολή - - - Add New - Προσθήκη νέας - - - Remove - Αφαίρεση - - - Add Group - Προσθήκη ομάδας - - - Reset - Επαναφορά - - - Close - Κλείσιμο - - - - ShortcutEditor - - None - Κανένα - - - Add Shortcut - Προσθήκη συντόμευσης - - - Remove - Αφαίρεση - - - New Group - Νέα ομάδα - - - Reset Changes - Επαναφορά αλλαγών - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_eo.ts b/config/translations/lxqt-config-globalkeyshortcuts_eo.ts deleted file mode 100644 index c8ea875..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_eo.ts +++ /dev/null @@ -1,194 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - Priskribo - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Forigi - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nenio - - - - All - - - - - Close - Fermi - - - - ShortcutConfigWindow - - Description - Priskribo - - - Remove - Forigi - - - Close - Fermi - - - - ShortcutEditor - - None - Nenio - - - Remove - Forigi - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_es.ts b/config/translations/lxqt-config-globalkeyshortcuts_es.ts deleted file mode 100644 index 2fdf33e..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_es.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atajo - - - - Description - Descripción - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Borrar - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Ninguno - - - - All - - - - - Close - Cerrar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de Atajos de LXQt - - - Description - Descripción - - - Shortcut - Atajo - - - Command - Comando - - - Add New - Agregar nuevo - - - Remove - Borrar - - - Add Group - Agregar Grupo - - - Reset - Reiniciar - - - Close - Cerrar - - - - ShortcutEditor - - None - Ninguno - - - Add Shortcut - Agregar Atajo - - - Remove - Borrar - - - New Group - Nuevo Grupo - - - Reset Changes - Reiniciar Cambios - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts b/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts deleted file mode 100644 index a7614fb..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atajo - - - - Description - Descripcion - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nada - - - - All - - - - - Close - Cerrar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de atajos - - - Description - Descripcion - - - Shortcut - Atajo - - - Command - Comando - - - Add New - Agregar Nuevo - - - Remove - Remover - - - Add Group - Agregar Grupo - - - Reset - Reiniciar - - - Close - Cerrar - - - - ShortcutEditor - - None - Nada - - - Add Shortcut - Nuevo atajo - - - Remove - Remover - - - New Group - Nuevo Grupo - - - Reset Changes - Reiniciar cambios - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_eu.ts b/config/translations/lxqt-config-globalkeyshortcuts_eu.ts deleted file mode 100644 index 44d3113..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_eu.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Bilatu komando bat - - - - DefaultModel - - - Command - Komandoa - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Lasterbidea - - - - Description - Deskribapena - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Kendu - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Bat ere ez - - - - All - - - - - Close - Itxi - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt lasterbide-editorea - - - Description - Deskribapena - - - Shortcut - Lasterbidea - - - Command - Komandoa - - - Add New - Gehitu berria - - - Remove - Kendu - - - Add Group - Gehitu taldea - - - Reset - Berrezarri - - - Close - Itxi - - - - ShortcutEditor - - None - Bat ere ez - - - Add Shortcut - Gehitu lasterbidea - - - Remove - Kendu - - - New Group - Talde berria - - - Reset Changes - Berrezarri aldaketak - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_fi.ts b/config/translations/lxqt-config-globalkeyshortcuts_fi.ts deleted file mode 100644 index 2bcecf7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_fi.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - Kuvaus - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Poista - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - - - - - All - - - - - Close - Sulje - - - - ShortcutConfigWindow - - Description - Kuvaus - - - Remove - Poista - - - Close - Sulje - - - - ShortcutEditor - - Remove - Poista - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts b/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts deleted file mode 100644 index 7e1273a..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Supprimer - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Aucun(e) - - - - All - - - - - Close - Fermer - - - - ShortcutConfigWindow - - Remove - Supprimer - - - Close - Fermer - - - - ShortcutEditor - - None - Aucun(e) - - - Remove - Supprimer - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_hu.ts b/config/translations/lxqt-config-globalkeyshortcuts_hu.ts deleted file mode 100644 index 816c613..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_hu.ts +++ /dev/null @@ -1,257 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Parancs keresés - - - - DefaultModel - - - Command - Parancs - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Forróbillentyű - - - - Description - Leírás - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Törlés - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nincs - - - - All - - - - - Close - Bezár - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt forróbillentyű szerkesztés - - - Description - Leírás - - - Shortcut - Forróbillentyű - - - Command - Parancs - - - Add New - Új - - - Remove - Törlés - - - Add Group - Csoport - - - Reset - Visszavon - - - Close - Bezár - - - - ShortcutEditor - - None - Nincs - - - Add Shortcut - Forróbillentyű adás - - - Remove - Törlés - - - New Group - Új csoport - - - Reset Changes - Visszavonás - - - Question - Kérdés - - - Delete group: %1? (everything inside will be removed altogether) - A %1 csoport törlése? (Minden kapcsolata is törlődik) - - - Delete %1? - %1 törlése? - - - Binding for %1 already exists. Replace old one? - A %1 már foglalt. Felváltsuk az újjal? - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it.desktop b/config/translations/lxqt-config-globalkeyshortcuts_it.desktop new file mode 100644 index 0000000..39d2987 --- /dev/null +++ b/config/translations/lxqt-config-globalkeyshortcuts_it.desktop @@ -0,0 +1,3 @@ +# Translations +Name[it]=Scorciatoie globali +Comment[it]=Configura le scorciatoie globali di LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop b/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop deleted file mode 100644 index 7fd114b..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop +++ /dev/null @@ -1,3 +0,0 @@ -# Translations -Name[it_IT]=Scorciatoie globali -Comment[it_IT]=Configura le scorciatoie globali di LXQt diff --git a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts b/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts deleted file mode 100644 index badd050..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Trova un comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Scorciatoie - - - - Description - Descrizione - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Rimuovi - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nessuna - - - - All - - - - - Close - Chiudi - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor delle scorciatoie di LXQt - - - Description - Descrizione - - - Shortcut - Scorciatoie - - - Command - Comando - - - Add New - Aggiungi nuova - - - Remove - Rimuovi - - - Add Group - Aggiungi gruppo - - - Reset - Azzera - - - Close - Chiudi - - - - ShortcutEditor - - None - Nessuna - - - Add Shortcut - Aggiungi scorciatoia - - - Remove - Rimuovi - - - New Group - Nuovo gruppo - - - Reset Changes - Azzera le modifiche - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ja.ts b/config/translations/lxqt-config-globalkeyshortcuts_ja.ts deleted file mode 100644 index 09580d9..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ja.ts +++ /dev/null @@ -1,182 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - なし - - - - All - - - - - Close - 閉じる - - - - ShortcutConfigWindow - - Close - 閉じる - - - - ShortcutEditor - - None - なし - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_lt.ts b/config/translations/lxqt-config-globalkeyshortcuts_lt.ts deleted file mode 100644 index e7e9221..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_lt.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Pašalinti - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nieko - - - - All - - - - - Close - Uždaryti - - - - ShortcutConfigWindow - - Remove - Pašalinti - - - Close - Uždaryti - - - - ShortcutEditor - - None - Nieko - - - Remove - Pašalinti - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_nl.ts b/config/translations/lxqt-config-globalkeyshortcuts_nl.ts deleted file mode 100644 index cf505c2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_nl.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Verwijderen - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Geen - - - - All - - - - - Close - Sluiten - - - - ShortcutConfigWindow - - Remove - Verwijderen - - - Close - Sluiten - - - - ShortcutEditor - - None - Geen - - - Remove - Verwijderen - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts b/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts deleted file mode 100644 index 6ad44a5..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Znajdź polecenie - - - - DefaultModel - - - Command - Polecenie - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Skrót - - - - Description - Opis - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Usuń - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Brak - - - - All - - - - - Close - Zamknij - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Edytor Skrótów LXQt - - - Description - Opis - - - Shortcut - Skrót - - - Command - Polecenie - - - Add New - Dodaj - - - Remove - Usuń - - - Add Group - Dodaj grupę - - - Reset - Reset - - - Close - Zamknij - - - - ShortcutEditor - - None - Brak - - - Add Shortcut - Dodaj skrót - - - Remove - Usuń - - - New Group - Dodaj grupę - - - Reset Changes - Resetuj zmiany - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pt.ts b/config/translations/lxqt-config-globalkeyshortcuts_pt.ts deleted file mode 100644 index dd17dd2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pt.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar um comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atalho - - - - Description - Descrição - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nada - - - - All - - - - - Close - Fechar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor de atalhos do LXQt - - - Description - Descrição - - - Shortcut - Atalho - - - Command - Comando - - - Add New - Adicionar - - - Remove - Remover - - - Add Group - Adicionar grupo - - - Reset - Restaurar - - - Close - Fechar - - - - ShortcutEditor - - None - Nada - - - Add Shortcut - Adicionar atalho - - - Remove - Remover - - - New Group - Novo grupo - - - Reset Changes - Restaurar alterações - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts b/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts deleted file mode 100644 index a6dd489..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Encontrar um comando - - - - DefaultModel - - - Command - Comando - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Atalho - - - - Description - Descrição - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Remover - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nenhum - - - - All - - - - - Close - Fechar - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor De Atalhos - - - Description - Descrição - - - Shortcut - Atalho - - - Command - Comando - - - Add New - Adicionar Novo - - - Remove - Remover - - - Add Group - Adicionar Grupo - - - Reset - Redefinir - - - Close - Fechar - - - - ShortcutEditor - - None - Nenhum - - - Add Shortcut - Adicionat Atalho - - - Remove - Remover - - - New Group - Novo Grupo - - - Reset Changes - Redefinir Alterações - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts b/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts deleted file mode 100644 index c19136d..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Caută o comandă - - - - DefaultModel - - - Command - Comandă - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Accelerator - - - - Description - Descriere - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Elimină - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Nimic - - - - All - - - - - Close - Închide - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Editor acceleratori LXQt - - - Description - Descriere - - - Shortcut - Accelerator - - - Command - Comandă - - - Add New - Adaugă nou - - - Remove - Elimină - - - Add Group - Adaugă grup - - - Reset - Resetează - - - Close - Închide - - - - ShortcutEditor - - None - Nimic - - - Add Shortcut - Adaugă accelerator - - - Remove - Elimină - - - New Group - Grup nou - - - Reset Changes - Resetează modificările - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop b/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop index f8a39e1..babcca1 100644 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop +++ b/config/translations/lxqt-config-globalkeyshortcuts_ru.desktop @@ -1,4 +1,4 @@ # Translations Name[ru]=Сочетания клавиш -Comment[ru]=Настроить сочетание клавиш в LXQt +Comment[ru]=Настроить сочетания клавиш в LXQt GenericName[ru]=Настроить сочетания клавиш \ No newline at end of file diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru.ts b/config/translations/lxqt-config-globalkeyshortcuts_ru.ts deleted file mode 100644 index b632e5a..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - Команда - - - - DBus call - Вызов DBus - - - - Client - Клиент - - - - Id - id - - - - Shortcut - Сочетание клавиш - - - - Description - Описание - - - - Type - Тип - - - - Info - Информация - - - - EditActionDialog - - - Edit Action - Изменить действие - - - - &Shortcut: - &Сочетание клавиш: - - - - &Description: - &Описание: - - - - &Enabled - &Разрешено - - - - &Command - &Команда - - - - &DBus message - Сообщение &DBus - - - - Type: - Тип: - - - - Co&mmand: - Ко&манда: - - - - S&ervice: - С&ервис: - - - - &Path: - &Путь: - - - - &Interface: - &Интерфейс: - - - - &Method: - &Метод: - - - - MainWindow - - - Global Actions Manager - Управление глобальными действиями - - - - Add ... - Добавить… - - - - Remove - Удалить - - - - Modify ... - Изменить… - - - - Swap - Заменить - - - - Multiple actions behaviour: - Поведение нескольких действий: - - - - First - Первое - - - - Last - Последнее - - - - None - Не задано - - - - All - Все - - - - Close - Закрыть - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop b/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop deleted file mode 100644 index 20df390..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop +++ /dev/null @@ -1,4 +0,0 @@ -# Translations -Name[ru_RU]=Сочетания клавиш -Comment[ru_RU]=Настроить сочетание клавиш в LXQt -GenericName[ru_RU]=Настроить сочетания клавиш \ No newline at end of file diff --git a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts b/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts deleted file mode 100644 index f98baef..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts +++ /dev/null @@ -1,168 +0,0 @@ - - - - - DefaultModel - - - Command - Команда - - - - DBus call - Вызов DBus - - - - Client - Клиент - - - - Id - id - - - - Shortcut - Сочетание клавиш - - - - Description - Описание - - - - Type - Тип - - - - Info - Информация - - - - EditActionDialog - - - Edit Action - Изменить действие - - - - &Shortcut: - &Сочетание клавиш: - - - - &Description: - &Описание: - - - - &Enabled - &Разрешено - - - - &Command - &Команда - - - - &DBus message - Сообщение &DBus - - - - Type: - Тип: - - - - Co&mmand: - Ко&манда: - - - - S&ervice: - С&ервис: - - - - &Path: - &Путь: - - - - &Interface: - &Интерфейс: - - - - &Method: - &Метод: - - - - MainWindow - - - Global Actions Manager - Управление глобальными действиями - - - - Add ... - Добавить… - - - - Remove - Удалить - - - - Modify ... - Изменить… - - - - Swap - Заменить - - - - Multiple actions behaviour: - Поведение нескольких действий: - - - - First - Первое - - - - Last - Последнее - - - - None - Не задано - - - - All - Все - - - - Close - Закрыть - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_sl.ts b/config/translations/lxqt-config-globalkeyshortcuts_sl.ts deleted file mode 100644 index b913086..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_sl.ts +++ /dev/null @@ -1,190 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Odstrani - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Brez - - - - All - - - - - Close - Zapri - - - - ShortcutConfigWindow - - Remove - Odstrani - - - Close - Zapri - - - - ShortcutEditor - - None - Brez - - - Remove - Odstrani - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts b/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts deleted file mode 100644 index 1bd93d7..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - หาคำสั่ง - - - - DefaultModel - - - Command - คำสั่ง - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - ปุ่มลัด - - - - Description - รายละเอียด - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - ลบทิ้ง - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - ไม่ต้อง - - - - All - - - - - Close - ปิด - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - ตัวแก้ไขปุ่มลัด LXQt - - - Description - รายละเอียด - - - Shortcut - ปุ่มลัด - - - Command - คำสั่ง - - - Add New - เพิ่มใหม่ - - - Remove - ลบทิ้ง - - - Add Group - เพิ่มกลุ่ม - - - Reset - กลับค่าเดิม - - - Close - ปิด - - - - ShortcutEditor - - None - ไม่ต้อง - - - Add Shortcut - เพิ่มปุ่มลัด - - - Remove - ลบทิ้ง - - - New Group - กลุ่มใหม่ - - - Reset Changes - กลับค่าเดิม - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_tr.ts b/config/translations/lxqt-config-globalkeyshortcuts_tr.ts deleted file mode 100644 index 49464c2..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_tr.ts +++ /dev/null @@ -1,182 +0,0 @@ - - - - - DefaultModel - - - Command - - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - - - - - Description - - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Yok - - - - All - - - - - Close - Kapat - - - - ShortcutConfigWindow - - Close - Kapat - - - - ShortcutEditor - - None - Yok - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_uk.ts b/config/translations/lxqt-config-globalkeyshortcuts_uk.ts deleted file mode 100644 index 6426507..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_uk.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - Знайти команду - - - - DefaultModel - - - Command - Команда - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - Cкорочення - - - - Description - Опис - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - Вилучити - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - Нічого - - - - All - - - - - Close - Закрити - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - Редактор скорочень LXQt - - - Description - Опис - - - Shortcut - Cкорочення - - - Command - Команда - - - Add New - Додати нове - - - Remove - Вилучити - - - Add Group - Додати групу - - - Reset - Cкинути - - - Close - Закрити - - - - ShortcutEditor - - None - Нічого - - - Add Shortcut - Додати скорочення - - - Remove - Вилучити - - - New Group - Нова група - - - Reset Changes - Скинути зміни - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts b/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts deleted file mode 100644 index 43cc2e3..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - 查找命令 - - - - DefaultModel - - - Command - 命令 - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - 快捷键 - - - - Description - 描述 - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - 删除 - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - 无 - - - - All - - - - - Close - 关闭 - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt 快捷键编辑器 - - - Description - 描述 - - - Shortcut - 快捷键 - - - Command - 命令 - - - Add New - 添加新 - - - Remove - 删除 - - - Add Group - 添加组 - - - Reset - 重置 - - - Close - 关闭 - - - - ShortcutEditor - - None - 无 - - - Add Shortcut - 添加快捷键 - - - Remove - 删除 - - - New Group - 新建组 - - - Reset Changes - 重置更改 - - - diff --git a/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts b/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts deleted file mode 100644 index 94a70cb..0000000 --- a/config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts +++ /dev/null @@ -1,241 +0,0 @@ - - - - - CommandFinder - - ... - ... - - - Find a command - 尋找指令 - - - - DefaultModel - - - Command - 指令 - - - - DBus call - - - - - Client - - - - - Id - - - - - Shortcut - 快捷鍵 - - - - Description - 描述 - - - - Type - - - - - Info - - - - - EditActionDialog - - - Edit Action - - - - - &Shortcut: - - - - - &Description: - - - - - &Enabled - - - - - &Command - - - - - &DBus message - - - - - Type: - - - - - Co&mmand: - - - - - S&ervice: - - - - - &Path: - - - - - &Interface: - - - - - &Method: - - - - - MainWindow - - - Global Actions Manager - - - - - Add ... - - - - - Remove - 移除 - - - - Modify ... - - - - - Swap - - - - - Multiple actions behaviour: - - - - - First - - - - - Last - - - - - None - 無 - - - - All - - - - - Close - 關閉 - - - - ShortcutConfigWindow - - LXQt Shortcut Editor - LXQt快捷鍵編輯器 - - - Description - 描述 - - - Shortcut - 快捷鍵 - - - Command - 指令 - - - Add New - 新增 - - - Remove - 移除 - - - Add Group - 新增群組 - - - Reset - 重設 - - - Close - 關閉 - - - - ShortcutEditor - - None - 無 - - - Add Shortcut - 增加快捷鍵 - - - Remove - 移除 - - - New Group - 新群組 - - - Reset Changes - 重設更改 - - - diff --git a/daemon/core.cpp b/daemon/core.cpp index a5d6295..84ea9d5 100644 --- a/daemon/core.cpp +++ b/daemon/core.cpp @@ -69,6 +69,18 @@ enum static Core *s_Core = 0; +static const QLatin1String ExecKey("Exec"); +static const QLatin1String EnabledKey("Enabled"); +static const QLatin1String CommentKey("Comment"); +static const QLatin1String serviceKey("service"); +static const QLatin1String pathKey("path"); +static const QLatin1String interfaceKey("interface"); +static const QLatin1String methodKey("method"); + +static const QLatin1String firstStr("first"); +static const QLatin1String lastStr("last"); +static const QLatin1String allStr("all"); +static const QLatin1String noneStr("none"); int x11ErrorHandler(Display *display, XErrorEvent *errorEvent) { @@ -396,7 +408,7 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi initBothPipeEnds(mX11RequestPipe); initBothPipeEnds(mX11ResponsePipe); - mConfigFile = QString(getenv("HOME")) + "/.config/global_key_shortcutss.ini"; + mConfigFile = QString(getenv("HOME")) + QStringLiteral("/.config/global_key_shortcutss.ini"); try { @@ -461,26 +473,26 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi if (!minLogLevelSet) { - iniValue = settings.value(/* General/ */"LogLevel").toString(); + iniValue = settings.value(/* General/ */QStringLiteral("LogLevel")).toString(); if (!iniValue.isEmpty()) { - if (iniValue == "error") + if (iniValue == QLatin1String("error")) { mMinLogLevel = LOG_ERR; } - else if (iniValue == "warning") + else if (iniValue == QLatin1String("warning")) { mMinLogLevel = LOG_WARNING; } - else if (iniValue == "notice") + else if (iniValue == QLatin1String("notice")) { mMinLogLevel = LOG_NOTICE; } - else if (iniValue == "info") + else if (iniValue == QLatin1String("info")) { mMinLogLevel = LOG_INFO; } - else if (iniValue == "debug") + else if (iniValue == QLatin1String("debug")) { mMinLogLevel = LOG_DEBUG; } @@ -489,42 +501,42 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi if (!multipleActionsBehaviourSet) { - iniValue = settings.value(/* General/ */"MultipleActionsBehaviour").toString(); + iniValue = settings.value(/* General/ */QStringLiteral("MultipleActionsBehaviour")).toString(); if (!iniValue.isEmpty()) { - if (iniValue == "first") + if (iniValue == firstStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_FIRST; } - else if (iniValue == "last") + else if (iniValue == lastStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_LAST; } - else if (iniValue == "all") + else if (iniValue == allStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_ALL; } - else if (iniValue == "none") + else if (iniValue == noneStr) { mMultipleActionsBehaviour = MULTIPLE_ACTIONS_BEHAVIOUR_NONE; } } } - mAllowGrabLocks = settings.value(/* General/ */"AllowGrabLocks", mAllowGrabLocks).toBool(); - mAllowGrabBaseSpecial = settings.value(/* General/ */"AllowGrabBaseSpecial", mAllowGrabBaseSpecial).toBool(); - mAllowGrabMiscSpecial = settings.value(/* General/ */"AllowGrabMiscSpecial", mAllowGrabMiscSpecial).toBool(); - mAllowGrabBaseKeypad = settings.value(/* General/ */"AllowGrabBaseKeypad", mAllowGrabBaseKeypad).toBool(); - mAllowGrabMiscKeypad = settings.value(/* General/ */"AllowGrabMiscKeypad", mAllowGrabMiscKeypad).toBool(); + mAllowGrabLocks = settings.value(/* General/ */QStringLiteral("AllowGrabLocks"), mAllowGrabLocks).toBool(); + mAllowGrabBaseSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabBaseSpecial"), mAllowGrabBaseSpecial).toBool(); + mAllowGrabMiscSpecial = settings.value(/* General/ */QStringLiteral("AllowGrabMiscSpecial"), mAllowGrabMiscSpecial).toBool(); + mAllowGrabBaseKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabBaseKeypad"), mAllowGrabBaseKeypad).toBool(); + mAllowGrabMiscKeypad = settings.value(/* General/ */QStringLiteral("AllowGrabMiscKeypad"), mAllowGrabMiscKeypad).toBool(); - foreach(QString section, settings.childGroups()) + foreach(const QString §ion, settings.childGroups()) { - if (section != "General") + if (section != QLatin1String("General")) { settings.beginGroup(section); QString shortcut = section; - int pos = shortcut.indexOf('.'); + int pos = shortcut.indexOf(QLatin1Char('.')); if (pos != -1) { shortcut = shortcut.left(pos); @@ -532,32 +544,32 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi qulonglong id = 0ull; - bool enabled = settings.value("Enabled", true).toBool(); + bool enabled = settings.value(EnabledKey, true).toBool(); - QString description = settings.value("Comment").toString(); + QString description = settings.value(CommentKey).toString(); - if (settings.contains("Exec")) + if (settings.contains(ExecKey)) { - QStringList values = settings.value("Exec").toStringList(); + QStringList values = settings.value(ExecKey).toStringList(); id = registerCommandAction(shortcut, values[0], values.mid(1), description); } else { - iniValue = settings.value("path").toString(); + iniValue = settings.value(pathKey).toString(); if (!iniValue.isEmpty()) { QString path = iniValue; - if (settings.contains("interface")) + if (settings.contains(interfaceKey)) { - QString interface = settings.value("interface").toString(); + QString interface = settings.value(interfaceKey).toString(); - iniValue = settings.value("service").toString(); + iniValue = settings.value(serviceKey).toString(); if (!iniValue.isEmpty()) { QString service = iniValue; - iniValue = settings.value("method").toString(); + iniValue = settings.value(methodKey).toString(); if (!iniValue.isEmpty()) { QString method = iniValue; @@ -619,13 +631,13 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi mDaemonAdaptor = new DaemonAdaptor(this); - if (!QDBusConnection::sessionBus().registerObject("/daemon", mDaemonAdaptor)) + if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/daemon"), mDaemonAdaptor)) { throw std::runtime_error(std::string("Cannot create daemon adaptor")); } mNativeAdaptor = new NativeAdaptor(this); - if (!QDBusConnection::sessionBus().registerObject("/native", mNativeAdaptor)) + if (!QDBusConnection::sessionBus().registerObject(QStringLiteral("/native"), mNativeAdaptor)) { throw std::runtime_error(std::string("Cannot create daemon native client adaptor")); } @@ -720,19 +732,19 @@ void Core::saveConfig() switch (mMultipleActionsBehaviour) { case MULTIPLE_ACTIONS_BEHAVIOUR_FIRST: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "first"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", firstStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_LAST: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "last"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", lastStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_ALL: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "all"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", allStr); break; case MULTIPLE_ACTIONS_BEHAVIOUR_NONE: - settings.setValue(/* General/ */"MultipleActionsBehaviour", "none"); + settings.setValue(/* General/ */"MultipleActionsBehaviour", noneStr); break; default: @@ -753,26 +765,26 @@ void Core::saveConfig() settings.beginGroup(section); - settings.setValue("Enabled", action->isEnabled()); - settings.setValue("Comment", action->description()); + settings.setValue(EnabledKey, action->isEnabled()); + settings.setValue(CommentKey, action->description()); if (!strcmp(action->type(), CommandAction::id())) { const CommandAction *commandAction = dynamic_cast(action); - settings.setValue("Exec", QVariant(QStringList() << commandAction->command() += commandAction->args())); + settings.setValue(ExecKey, QVariant(QStringList() << commandAction->command() += commandAction->args())); } else if (!strcmp(action->type(), MethodAction::id())) { const MethodAction *methodAction = dynamic_cast(action); - settings.setValue("service", methodAction->service()); - settings.setValue("path", methodAction->path().path()); - settings.setValue("interface", methodAction->interface()); - settings.setValue("method", methodAction->method()); + settings.setValue(serviceKey, methodAction->service()); + settings.setValue(pathKey, methodAction->path().path()); + settings.setValue(interfaceKey, methodAction->interface()); + settings.setValue(methodKey, methodAction->method()); } else if (!strcmp(action->type(), ClientAction::id())) { const ClientAction *clientAction = dynamic_cast(action); - settings.setValue("path", clientAction->path().path()); + settings.setValue(pathKey, clientAction->path().path()); } settings.endGroup(); diff --git a/daemon/main.cpp b/daemon/main.cpp index 6c29912..8f66a10 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -29,6 +29,7 @@ #include #include +#include #include "meta_types.h" #include "core.h" @@ -236,6 +237,8 @@ int main(int argc, char *argv[]) if (configFiles.empty() && home && *home) { + if( ! QFile::exists(QString::fromLocal8Bit(home) + "/" DEFAULT_CONFIG) ) //Load default settings + configFiles.push_back("/etc/xdg/lxqt/globalkeyshortcuts.conf"); configFiles.push_back(QString::fromLocal8Bit(home) + "/" DEFAULT_CONFIG); } diff --git a/daemon/pipe_utils.cpp b/daemon/pipe_utils.cpp index 7ed0b8b..40b4857 100644 --- a/daemon/pipe_utils.cpp +++ b/daemon/pipe_utils.cpp @@ -39,10 +39,10 @@ void initBothPipeEnds(int fd[2]) error_t createPipe(int fd[2]) { - error_t result = 0; + error_t result = static_cast(0); if (pipe(fd) < 0) { - result = errno; + result = static_cast(errno); } if (!result) { @@ -59,16 +59,16 @@ error_t readAll(int fd, void *data, size_t length) ssize_t bytes_read = read(fd, data, length); if (bytes_read < 0) { - return errno; + return static_cast(errno); } if (!bytes_read) { - return -1; + return static_cast(-1); } data = reinterpret_cast(data) + bytes_read; length -= bytes_read; } - return 0; + return static_cast(0); } error_t writeAll(int fd, const void *data, size_t length) @@ -78,16 +78,16 @@ error_t writeAll(int fd, const void *data, size_t length) ssize_t bytes_written = write(fd, data, length); if (bytes_written < 0) { - return errno; + return static_cast(errno); } if (!bytes_written) { - return -1; + return static_cast(-1); } data = reinterpret_cast(data) + bytes_written; length -= bytes_written; } - return 0; + return static_cast(0); } void closeBothPipeEnds(int fd[2])