Adding upstream version 0.10.0.

Signed-off-by: Andrew Lee (李健秋) <ajqlee@debian.org>

.gitignore

@@ -1 +1,2 @@
 build
+*.kdev4

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 project(lxqt-globalkeys)
 
@@ -11,64 +11,85 @@ if(NOT CMAKE_BUILD_TYPE)
      set(CMAKE_BUILD_TYPE Release)
 endif()
 
-# Set default library installation path
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation directory for libraries")
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5DBus REQUIRED)
 find_package(Qt5LinguistTools REQUIRED QUIET)
 find_package(lxqt REQUIRED QUIET)
-include(${LXQT_USE_FILE})
+
 
 include(LXQtTranslate)
+include(LXQtCreatePkgConfigFile)
+include(LXQtCompilerSettings NO_POLICY_SCOPE)
 
-# Standard directories for installation
-include(GNUInstallDirs)
+include(GNUInstallDirs) # Standard directories for installation
+include(CMakePackageConfigHelpers)
 
 set(LXQT_GLOBALKEYS_LIBRARY_NAME lxqt-globalkeys)
 set(LXQT_GLOBALKEYS_UI_LIBRARY_NAME lxqt-globalkeys-ui)
-set(LXQT_INSTALL_CMAKE_DIR     ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)
+set(LXQT_INSTALL_CMAKE_DIR     "${CMAKE_INSTALL_DATAROOTDIR}/cmake")
 
 #************************************************
 # Build config.cmake files
 #************************************************
-#set(LXQT_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/share/lxqt)
-#set(LXQT_TRANSLATIONS_DIR ${LXQT_SHARE_DIR}/translations)
-include(cmake/FindInstallConfigPath.cmake)
-
 set(LXQT_GLOBALKEYS_CMAKE_NAME ${LXQT_GLOBALKEYS_LIBRARY_NAME})
 set(LXQT_GLOBALKEYS_UI_CMAKE_NAME ${LXQT_GLOBALKEYS_UI_LIBRARY_NAME})
 
-set(LXQT_GLOBALKEYS_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/include/${LXQT_GLOBALKEYS_LIBRARY_NAME}")
-configure_file(
+configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/lxqt_globalkeys-config.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config.cmake"
-    @ONLY
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config.cmake"
+    INSTALL_DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}"
 )
 
-set(LXQT_GLOBALKEYS_UI_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/${LXQT_GLOBALKEYS_UI_LIBRARY_NAME})
-configure_file(
+configure_package_config_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/lxqt_globalkeys_ui-config.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config.cmake"
-    @ONLY
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config.cmake"
+    INSTALL_DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}"
 )
 #************************************************
 # End of build config.cmake
 #************************************************
+
+#************************************************
+# Generate config-version.cmake files
+#************************************************
+write_basic_package_version_file(
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config-version.cmake"
+    VERSION ${LXQT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
+
+write_basic_package_version_file(
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config-version.cmake"
+    VERSION ${LXQT_VERSION}
+    COMPATIBILITY AnyNewerVersion
+)
+#************************************************
+# End of generate config-version.cmake files
+#************************************************
+
 set(LXQT_GLOBALKEYS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 add_subdirectory(daemon)
 add_subdirectory(config)
 add_subdirectory(client)
 add_subdirectory(ui)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config.cmake DESTINATION ${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME})
-install(FILES cmake/lxqt_globalkeys_use.cmake DESTINATION ${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME})
+install(FILES
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config.cmake"
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}-config-version.cmake"
+    DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}"
+)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config.cmake DESTINATION ${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME})
-install(FILES cmake/lxqt_globalkeys_ui_use.cmake DESTINATION ${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME})
+install(FILES
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config.cmake"
+    "${CMAKE_BINARY_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}-config-version.cmake"
+    DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}"
+)
 
 # building tarball with CPack -------------------------------------------------
 include(InstallRequiredSystemLibraries)

LICENSE

@@ -1,9 +1,8 @@
-
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the
 Free Software Foundation and other authors who decide to use it.  You
 can use it too, but we suggest you first think carefully about whether
 this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
 
   When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -89,9 +87,9 @@ libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
   For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard.  To achieve this, non-free programs must
-be allowed to use the library.  A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
 library does the same job as widely used non-free libraries.  In this
 case, there is little to gain by limiting the free library to free
 software only, so we use the Lesser General Public License.
@@ -138,8 +136,8 @@ included without limitation in the term "modification".)
   "Source code" for a work means the preferred form of the work for
 making modifications to it.  For a library, complete source code means
 all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
 
   Activities other than copying, distribution and modification are not
 covered by this License; they are outside its scope.  The act of
@@ -305,10 +303,10 @@ of these things:
     the user installs one, as long as the modified version is
     interface-compatible with the version that the work was made with.
 
-    c) Accompany the work with a written offer, valid for at least
-    three years, to give the same user the materials specified in
-    Subsection 6a, above, for a charge no more than the cost of
-    performing this distribution.
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
 
     d) If distribution of the work is made by offering access to copy
     from a designated place, offer equivalent access to copy the above
@@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then
 the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Library.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
 
 It is not the purpose of this section to induce you to infringe any
 patents or other property right claims or to contest validity of any
@@ -407,11 +404,11 @@ be a consequence of the rest of this License.
 
   12. If the distribution and/or use of the Library is restricted in
 certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
 
   13. The Free Software Foundation may publish revised and/or new
 versions of the Lesser General Public License from time to time.

client/CMakeLists.txt

@@ -5,15 +5,8 @@ set(QT_DBUS_PREFIX "org.qtproject")
 
 set(${PROJECT_NAME}_HEADER_NAMESPACE "LXQtGlobalKeys")
 
-include_directories(
-    ${PROJECT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 set(${PROJECT_NAME}_PATH_TO_DAEMON "${LXQT_GLOBALKEYS_SOURCE_DIR}/daemon")
 
-add_definitions(-DSHARED_EXPORT=Q_DECL_EXPORT)
-
 set(${PROJECT_NAME}_SOURCES
     client.cpp
     action.cpp
@@ -21,7 +14,7 @@ set(${PROJECT_NAME}_SOURCES
 
 #
 # WARNING: Changing stuff here implies changing this:
-#           install(FILES ${${PROJECT_NAME}_MAIN_HEADER} DESTINATION include/${PROJECT_NAME} COMPONENT development RENAME "lxqtglobalkeys.h")
+#           install(FILES ${${PROJECT_NAME}_MAIN_HEADER} DESTINATION include/${PROJECT_NAME} COMPONENT Devel RENAME "lxqtglobalkeys.h")
 #
 set(${PROJECT_NAME}_MAIN_HEADER
     lxqt-globalkeys.h
@@ -53,10 +46,10 @@ set(${PROJECT_NAME}_TRANSLATIONS
 )
 
 set(${PROJECT_NAME}_DBUS_ADAPTORS
-    ${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.client.xml
+    "${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.client.xml"
 )
 
-set_source_files_properties(${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.client.xml PROPERTIES
+set_source_files_properties("${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.client.xml" PROPERTIES
     INCLUDE action_p.h
     PARENT_CLASSNAME GlobalKeyShortcut::ActionImpl
     BASENAME org.lxqt.global_key_shortcuts.client
@@ -64,10 +57,10 @@ set_source_files_properties(${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_ke
 )
 
 set(${PROJECT_NAME}_DBUS_INTERFACES
-    ${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.native.xml
+    "${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.native.xml"
 )
 
-set_source_files_properties(${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.native.xml PROPERTIES
+set_source_files_properties("${${PROJECT_NAME}_PATH_TO_DAEMON}/org.lxqt.global_key_shortcuts.native.xml" PROPERTIES
     BASENAME org.lxqt.global_key_shortcuts.native
 )
 
@@ -128,16 +121,15 @@ foreach(DBUS_INTERFACE ${${PROJECT_NAME}_DBUS_INTERFACES})
     get_source_file_property(DBUS_INTERFACE_INCLUDE ${DBUS_INTERFACE} INCLUDE)
     get_source_file_property(DBUS_INTERFACE_CLASSNAME ${DBUS_INTERFACE} CLASSNAME)
     get_source_file_property(DBUS_INTERFACE_NO_NAMESPACE ${DBUS_INTERFACE} NO_NAMESPACE)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} PROPERTIES
+    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" PROPERTIES
         INCLUDE ${DBUS_INTERFACE_INCLUDE}
         CLASSNAME ${DBUS_INTERFACE_CLASSNAME}
         NO_NAMESPACE ${DBUS_INTERFACE_NO_NAMESPACE}
     )
-    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} ${DBUS_INTERFACE_BASENAME})
+    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" ${DBUS_INTERFACE_BASENAME})
 endforeach()
 
 qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES})
-qt5_wrap_ui(${PROJECT_NAME}_FORM_FILES ${${PROJECT_NAME}_FORMS})
 
 set(${PROJECT_NAME}_GENERATED_FILES
     ${${PROJECT_NAME}_FORM_FILES}
@@ -153,13 +145,32 @@ set(${PROJECT_NAME}_ALL_FILES
     ${${PROJECT_NAME}_GENERATED_FILES}
 )
 
+set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widget, Qt5DBus")
+
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_ALL_FILES})
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::DBus)
+target_link_libraries(${PROJECT_NAME}
+    PUBLIC
+        Qt5::Widgets
+        Qt5::DBus
+)
 set_target_properties(${PROJECT_NAME}
     PROPERTIES
     VERSION ${LXQT_VERSION}
     SOVERSION ${LXQT_MAJOR_VERSION}
 )
+target_include_directories(${PROJECT_NAME}
+    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${LXQT_GLOBALKEYS_LIBRARY_NAME}>"
+)
+target_include_directories(${PROJECT_NAME}
+    INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/include>"
+    INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}>"
+)
+
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE "SHARED_EXPORT=Q_DECL_EXPORT"
+)
+
+export(TARGETS ${PROJECT_NAME} FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake")
 
 include(create_portable_headers)
 
@@ -167,11 +178,75 @@ create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
     NAMESPACE "${${PROJECT_NAME}_NAMESPACE}/"
     FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
 )
-install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT runtime)
-install(FILES ${${PROJECT_NAME}_MAIN_HEADER} DESTINATION include/${PROJECT_NAME} COMPONENT development)
-install(FILES ${${PROJECT_NAME}_MAIN_HEADER} DESTINATION include/${PROJECT_NAME} COMPONENT development RENAME "lxqtglobalkeys.h")
-install(FILES ${${PROJECT_NAME}_PORTABLE_HEADERS} DESTINATION include/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE} COMPONENT development)
-install(FILES ${${PROJECT_NAME}_PUBLIC_HEADERS} DESTINATION include/${PROJECT_NAME} COMPONENT development)
 
-include(create_pkgconfig_file)
-create_pkgconfig_file(${PROJECT_NAME} "LXQt global key shortcuts client library")
+# Copy public headers for intree building
+foreach(h ${${PROJECT_NAME}_PUBLIC_HEADERS})
+    get_filename_component(bh ${h} NAME)
+    configure_file(${h} "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/${bh}" COPYONLY)
+endforeach()
+
+foreach(h ${${PROJECT_NAME}_PORTABLE_HEADERS})
+    get_filename_component(bh ${h} NAME)
+    configure_file(${h} "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE}/${bh}" COPYONLY)
+endforeach()
+
+configure_file(
+    "${${PROJECT_NAME}_MAIN_HEADER}"
+    "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/${${PROJECT_NAME}_MAIN_HEADER}"
+    COPYONLY
+)
+
+configure_file(
+    "${${PROJECT_NAME}_MAIN_HEADER}"
+    "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/lxqtglobalkeys.h"
+    COPYONLY
+)
+
+install(TARGETS
+    ${PROJECT_NAME}
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    EXPORT ${PROJECT_NAME}-targets
+    COMPONENT Runtime
+)
+
+install(EXPORT
+    ${PROJECT_NAME}-targets
+    DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_CMAKE_NAME}"
+    COMPONENT Devel
+)
+
+install(FILES
+    ${${PROJECT_NAME}_MAIN_HEADER}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+    COMPONENT Devel
+)
+
+install(FILES
+    ${${PROJECT_NAME}_MAIN_HEADER}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+    COMPONENT Devel
+    RENAME "lxqtglobalkeys.h"
+)
+
+install(FILES
+    ${${PROJECT_NAME}_PORTABLE_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE}"
+    COMPONENT Devel
+)
+
+install(FILES
+    ${${PROJECT_NAME}_PUBLIC_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+    COMPONENT Devel
+)
+
+lxqt_create_pkgconfig_file(
+    PACKAGE_NAME ${PROJECT_NAME}
+    DESCRIPTIVE_NAME ${PROJECT_NAME}
+    DESCRIPTION "LXQt global key shortcuts client library"
+    INCLUDEDIRS ${PROJECT_NAME}
+    LIBS ${PROJECT_NAME}
+    REQUIRES ${${PROJECT_NAME}_PKG_CONFIG_REQUIRES}
+    VERSION ${LXQT_VERSION}
+    INSTALL
+)

client/action.cpp

@@ -41,9 +41,11 @@ ActionImpl::ActionImpl(ClientImpl *client, Action *interface, const QString &pat
     , mInterface(interface)
     , mPath(path)
     , mDescription(description)
+    , mRegistrationPending(false)
 {
     new OrgLxqtActionClientAdaptor(this);
 
+    connect(this, SIGNAL(emitRegistrationFinished()), mInterface, SIGNAL(registrationFinished()));
     connect(this, SIGNAL(emitActivated()), mInterface, SIGNAL(activated()));
     connect(this, SIGNAL(emitShortcutChanged(QString, QString)), mInterface, SIGNAL(shortcutChanged(QString, QString)));
 }
@@ -55,12 +57,18 @@ ActionImpl::~ActionImpl()
 
 QString ActionImpl::changeShortcut(const QString &shortcut)
 {
+    if (mRegistrationPending)
+        return mShortcut;
+
     mShortcut = mClient->changeClientActionShortcut(mPath, shortcut);
     return mShortcut;
 }
 
 bool ActionImpl::changeDescription(const QString &description)
 {
+    if (mRegistrationPending)
+        return false;
+
     bool result = mClient->modifyClientAction(mPath, description);
     if (result)
     {
@@ -99,6 +107,19 @@ bool ActionImpl::isValid() const
     return mValid;
 }
 
+void ActionImpl::setRegistrationPending(bool registrationPending)
+{
+    mRegistrationPending = registrationPending;
+    if (!mRegistrationPending)
+        emit emitRegistrationFinished();
+
+}
+
+bool ActionImpl::isRegistrationPending() const
+{
+    return mRegistrationPending;
+}
+
 void ActionImpl::activated()
 {
     emit emitActivated();

client/action.h

@@ -62,8 +62,10 @@ public:
     QString description() const;
 
     bool isValid() const;
+    bool isRegistrationPending() const;
 
 signals:
+    void registrationFinished();
     void activated();
     void shortcutChanged(const QString &oldShortcut, const QString &newShortcut);
 

client/action_p.h

@@ -60,11 +60,15 @@ public:
     void setValid(bool valid);
     bool isValid() const;
 
+    void setRegistrationPending(bool registrationPending);
+    bool isRegistrationPending() const;
+
 public slots:
     void activated();
     void shortcutChanged(const QString &oldShortcut, const QString &newShortcut);
 
 signals:
+    void emitRegistrationFinished();
     void emitActivated();
     void emitShortcutChanged(const QString &oldShortcut, const QString &newShortcut);
 
@@ -76,6 +80,7 @@ private:
     QString mShortcut;
     QString mDescription;
     bool mValid;
+    bool mRegistrationPending;
 };
 
 }

client/client.cpp

@@ -82,14 +82,11 @@ void ClientImpl::daemonAppeared(const QString &)
     {
         ActionImpl *globalActionImpl = I.value()->impl;
 
-        QDBusPendingReply<QString, qulonglong> reply = mProxy->addClientAction(globalActionImpl->shortcut(), QDBusObjectPath(globalActionImpl->path()), globalActionImpl->description());
-        reply.waitForFinished();
-        globalActionImpl->setValid(!reply.isError() && reply.argumentAt<1>());
-
-        if (globalActionImpl->isValid())
-        {
-            globalActionImpl->setShortcut(reply.argumentAt<0>());
-        }
+        QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(mProxy->addClientAction(globalActionImpl->shortcut(), QDBusObjectPath(globalActionImpl->path()), globalActionImpl->description()));
+        connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)), this, SLOT(registrationFinished(QDBusPendingCallWatcher *)));
+        mPendingRegistrationsActions[watcher] = globalActionImpl;
+        mPendingRegistrationsWatchers[globalActionImpl] = watcher;
+        globalActionImpl->setRegistrationPending(true);
     }
     mDaemonPresent = true;
     emit emitDaemonAppeared();
@@ -101,6 +98,29 @@ bool ClientImpl::isDaemonPresent() const
     return mDaemonPresent;
 }
 
+void ClientImpl::registrationFinished(QDBusPendingCallWatcher *watcher)
+{
+    QMap<QDBusPendingCallWatcher*, ActionImpl*>::Iterator I = mPendingRegistrationsActions.find(watcher);
+    if (I != mPendingRegistrationsActions.end())
+    {
+        ActionImpl *globalActionImpl = I.value();
+
+        QDBusPendingReply<QString, qulonglong> reply = *watcher;
+        globalActionImpl->setValid(!reply.isError() && reply.argumentAt<1>());
+
+        if (globalActionImpl->isValid())
+        {
+            globalActionImpl->setShortcut(reply.argumentAt<0>());
+        }
+
+        mPendingRegistrationsWatchers.remove(globalActionImpl);
+        mPendingRegistrationsActions.erase(I);
+        watcher->deleteLater();
+
+        globalActionImpl->setRegistrationPending(false);
+    }
+}
+
 Action *ClientImpl::addClientAction(const QString &shortcut, const QString &path, const QString &description, QObject *parent)
 {
     if (!QRegExp("(/[A-Za-z0-9_]+){2,}").exactMatch(path))
@@ -125,13 +145,11 @@ Action *ClientImpl::addClientAction(const QString &shortcut, const QString &path
 
     if (mDaemonPresent)
     {
-        QDBusPendingReply<QString, qulonglong> reply = mProxy->addClientAction(shortcut, QDBusObjectPath(path), description);
-        reply.waitForFinished();
-        globalActionImpl->setValid(!reply.isError() && reply.argumentAt<1>());
-        if (globalActionImpl->isValid())
-        {
-            globalActionImpl->setShortcut(reply.argumentAt<0>());
-        }
+        QDBusPendingCallWatcher* watcher = new QDBusPendingCallWatcher(mProxy->addClientAction(shortcut, QDBusObjectPath(path), description));
+        connect(watcher, SIGNAL(finished(QDBusPendingCallWatcher *)), this, SLOT(registrationFinished(QDBusPendingCallWatcher *)));
+        mPendingRegistrationsActions[watcher] = globalActionImpl;
+        mPendingRegistrationsWatchers[globalActionImpl] = watcher;
+        globalActionImpl->setRegistrationPending(true);
     }
     else
     {
@@ -204,6 +222,21 @@ bool ClientImpl::removeClientAction(const QString &path)
 
 void ClientImpl::removeAction(ActionImpl *actionImpl)
 {
+    if (actionImpl->isRegistrationPending())
+    {
+        QMap<ActionImpl*, QDBusPendingCallWatcher*>::Iterator I = mPendingRegistrationsWatchers.find(actionImpl);
+        if (I != mPendingRegistrationsWatchers.end())
+        {
+            QDBusPendingCallWatcher *watcher = I.value();
+
+            watcher->disconnect();
+
+            mPendingRegistrationsActions.remove(watcher);
+            mPendingRegistrationsWatchers.erase(I);
+            watcher->deleteLater();
+        }
+    }
+
     QString path = actionImpl->path();
     if (!mActions.contains(path))
     {

client/client_p.h

@@ -81,6 +81,7 @@ public slots:
     void grabShortcutFinished(QDBusPendingCallWatcher *call);
     void daemonDisappeared(const QString &);
     void daemonAppeared(const QString &);
+    void registrationFinished(QDBusPendingCallWatcher *call);
 
 signals:
     void emitShortcutGrabbed(const QString &);
@@ -98,6 +99,9 @@ private:
     QMap<QString, Action*> mActions;
     QDBusServiceWatcher *mServiceWatcher;
     bool mDaemonPresent;
+
+    QMap<QDBusPendingCallWatcher*, ActionImpl*> mPendingRegistrationsActions;
+    QMap<ActionImpl*, QDBusPendingCallWatcher*> mPendingRegistrationsWatchers;
 };
 
 }

cmake/FindInstallConfigPath.cmake

@@ -1,20 +0,0 @@
-# XDG standards expects system-wide configuration files in the /etc/xdg/lxqt location.
-# Unfortunately QSettings we are using internally can be overriden in the Qt compilation
-# time to use different path for system-wide configs. (for example configure ... -sysconfdir /etc/settings ...)
-# This path can be found calling Qt4's qmake:
-#   qmake -query QT_INSTALL_CONFIGURATION
-#
-if(NOT DEFINED LXQT_ETC_XDG_DIR)
-    if(NOT QT_QMAKE_EXECUTABLE)
-        message(FATAL_ERROR "LXQT_ETC_XDG_DIR: qmake not found or wrongly detected (inlude before qt configured?)")
-    endif()
-
-    execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_CONFIGURATION
-                        OUTPUT_VARIABLE LXQT_ETC_XDG_DIR
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    message(STATUS "LXQT_ETC_XDG_DIR autodetected as '${LXQT_ETC_XDG_DIR}'")
-    message(STATUS "You can set it manually with -DLXQT_ETC_XDG_DIR=<value>")
-    message(STATUS "")
-endif ()
-

cmake/create_pkgconfig_file.cmake

@@ -1,33 +0,0 @@
-#
-# Write a pkg-config pc file for given "name" with "decription"
-# Arguments:
-#   name: a library name (withoud "lib" prefix and "so" suffixes
-#   desc: a desription string
-#
-macro (create_pkgconfig_file name desc)
-    set(_pkgfname "${CMAKE_CURRENT_BINARY_DIR}/${name}.pc")
-    #message(STATUS "${name}: writing pkgconfig file ${_pkgfname}")
-
-    file(WRITE "${_pkgfname}"
-            "# file generated by LXQt cmake build\n"
-            "prefix=${CMAKE_INSTALL_PREFIX}\n"
-            "libdir=\${prefix}/lib${LIB_SUFFIX}\n"
-            "includedir=\${prefix}/include\n"
-            "\n"
-            "Name: ${name}\n"
-            "Description: ${desc}\n"
-            "Version: ${LXQT_VERSION}\n"
-            "Libs: -L\${libdir} -l${name}\n"
-            "Cflags: -I\${includedir}\n"
-            "\n"
-    )
-
-    # FreeBSD loves to install files to different locations
-    # http://www.freebsd.org/doc/handbook/dirstructure.html
-    if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
-        install(FILES ${_pkgfname} DESTINATION libdata/pkgconfig)
-    else()
-        install(FILES ${_pkgfname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-    endif()
-
-endmacro()

cmake/lxqt_globalkeys-config.cmake.in

@@ -3,41 +3,24 @@
 # The module defines the following variables
 #  LXQT_GLOBALKEYS_FOUND         - Set to TRUE if all of the above has been found
 #
-#  LXQT_GLOBALKEYS_INCLUDE_DIR   - The lxqt-globalkeys include directory
-#
-#  LXQT_GLOBALKEYS_INCLUDE_DIRS  - The lxqt-globalkeys include directory
-#
-#  LXQT_GLOBALKEYS_LIBRARY_DIRS  - The lxqt-globalkeys include directory
-#
-#  LXQT_GLOBALKEYS_LIBRARIES     - The libraries needed to use lxqt-globalkeys
-#
-#  LXQT_GLOBALKEYS_USE_FILE      - The variable LXQT_GLOBALKEYS_USE_FILE is set which is the path
-#                        to a CMake file that can be included to compile lxqt-globalkeys
-#                        applications and libraries. It sets up the compilation
-#                        environment for include directories and populates a
-#                        LXQT_GLOBALKEYS_LIBRARIES variable.
-#
-# LXQT_GLOBALKEYS_QT_LIBRARIES   - The Qt libraries needed by lxqt-globalkeys
-#
 # Typical usage:
 #    find_package(lxqt-globalkeys)
-#    include(${LXQT_GLOBALKEYS_USE_FILE})
 #    add_executable(use-lxqt-globalkeys main.cpp)
-#    target_link_libraries(use-qtxdg ${LXQT_GLOBALKEYS_QT_LIBRARIES} ${LXQT_GLOBALKEYS_LIBRARIES})
+#    target_link_libraries(use-lxqt-globalkeys lxqt-globalkeys)
 
-set(LXQT_GLOBALKEYS_INCLUDE_DIR   @LXQT_GLOBALKEYS_INCLUDE_DIR@)
-set(LXQT_GLOBALKEYS_LIBRARY       @LXQT_GLOBALKEYS_LIBRARY_NAME@)
+@PACKAGE_INIT@
 
-set(LXQT_GLOBALKEYS_LIBRARIES     "${LXQT_GLOBALKEYS_LIBRARY}")
-set(LXQT_GLOBALKEYS_INCLUDE_DIRS  "${LXQT_GLOBALKEYS_INCLUDE_DIR}")
-set(LXQT_GLOBALKEYS_LIBRARY_DIRS  @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@)
-
-set(LXQT_GLOBALKEYS_USE_FILE      "${CMAKE_CURRENT_LIST_DIR}/lxqt_globalkeys_use.cmake")
-set(LXQT_GLOBALKEYS_FOUND 1)
+include(CMakeFindDependencyMacro)
 
 set(LXQT_GLOBALKEYS_MAJOR_VERSION @LXQT_MAJOR_VERSION@)
 set(LXQT_GLOBALKEYS_MINOR_VERSION @LXQT_MINOR_VERSION@)
 set(LXQT_GLOBALKEYS_PATCH_VERSION @LXQT_PATCH_VERSION@)
 set(LXQT_GLOBALKEYS_VERSION @LXQT_VERSION@)
 
-mark_as_advanced(LXQT_GLOBALKEYS_LIBRARY LXQT_GLOBALKEYS_INCLUDE_DIR)
+find_dependency(Qt5Widgets)
+find_dependency(Qt5DBus)
+
+if (CMAKE_VERSION VERSION_GREATER 2.8.12)
+    cmake_policy(SET CMP0024 OLD)
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/lxqt-globalkeys-targets.cmake")

cmake/lxqt_globalkeys_ui-config.cmake.in

@@ -3,41 +3,25 @@
 # The module defines the following variables
 #  LXQT_GLOBALKEYS_UI_FOUND         - Set to TRUE if all of the above has been found
 #
-#  LXQT_GLOBALKEYS_UI_INCLUDE_DIR   - The lxqt-globalkeys-ui include directory
-#
-#  LXQT_GLOBALKEYS_UI_INCLUDE_DIRS  - The lxqt-globalkeys-ui include directory
-#
-#  LXQT_GLOBALKEYS_LIBRARY_DIRS  - The lxqt-globalkeys include directory
-#
-#  LXQT_GLOBALKEYS_UI_LIBRARIES     - The libraries needed to use lxqt-globalkeys-ui
-#
-#  LXQT_GLOBALKEYS_UI_USE_FILE      - The variable LXQT_GLOBALKEYS_UI_USE_FILE is set which is the path
-#                        to a CMake file that can be included to compile lxqt-globalkeys-ui
-#                        applications and libraries. It sets up the compilation
-#                        environment for include directories and populates a
-#                        LXQT_GLOBALKEYS_UI_LIBRARIES variable.
-#
-# LXQT_GLOBALKEYS_UI_QT_LIBRARIES   - The Qt libraries needed by lxqt-globalkeys-ui
-#
 # Typical usage:
 #    find_package(lxqt-globalkeys-ui)
-#    include(${LXQT_GLOBALKEYS_UI_USE_FILE})
 #    add_executable(use-lxqt-globalkeys-ui main.cpp)
-#    target_link_libraries(use-qtxdg ${LXQT_GLOBALKEYS_UI_QT_LIBRARIES} ${LXQT_GLOBALKEYS_UI_LIBRARIES})
+#    target_link_libraries(use-lxqt-globalkeys-ui lxqt-globalkeys-ui)
 
-set(LXQT_GLOBALKEYS_UI_INCLUDE_DIR   @LXQT_GLOBALKEYS_UI_INCLUDE_DIR@)
-set(LXQT_GLOBALKEYS_UI_LIBRARY       @LXQT_GLOBALKEYS_UI_LIBRARY_NAME@)
+@PACKAGE_INIT@
 
-set(LXQT_GLOBALKEYS_UI_LIBRARIES     "${LXQT_GLOBALKEYS_UI_LIBRARY}")
-set(LXQT_GLOBALKEYS_UI_INCLUDE_DIRS  "${LXQT_GLOBALKEYS_UI_INCLUDE_DIR}")
-set(LXQT_GLOBALKEYS_UI_LIBRARY_DIRS  @CMAKE_INSTALL_PREFIX@/@LIB_INSTALL_DIR@)
-
-set(LXQT_GLOBALKEYS_UI_USE_FILE      "${CMAKE_CURRENT_LIST_DIR}/lxqt_globalkeys_ui_use.cmake")
-set(LXQT_GLOBALKEYS_UI_FOUND 1)
+include(CMakeFindDependencyMacro)
 
 set(LXQT_GLOBALKEYS_UI_MAJOR_VERSION @LXQT_MAJOR_VERSION@)
 set(LXQT_GLOBALKEYS_UI_MINOR_VERSION @LXQT_MINOR_VERSION@)
 set(LXQT_GLOBALKEYS_UI_PATCH_VERSION @LXQT_PATCH_VERSION@)
 set(LXQT_GLOBALKEYS_UI_VERSION @LXQT_VERSION@)
 
-mark_as_advanced(LXQT_GLOBALKEYS_UI_LIBRARY LXQT_GLOBALKEYS_UI_INCLUDE_DIR)
+find_dependency(Qt5Widgets)
+find_dependency(Qt5DBus)
+find_dependency(lxqt-globalkeys)
+
+if (CMAKE_VERSION VERSION_GREATER 2.8.12)
+    cmake_policy(SET CMP0024 OLD)
+endif()
+include("${CMAKE_CURRENT_LIST_DIR}/lxqt-globalkeys-ui-targets.cmake")

cmake/lxqt_globalkeys_ui_use.cmake

@@ -1,2 +0,0 @@
-include_directories(${LXQT_GLOBALKEYS_UI_INCLUDE_DIRS})
-link_directories(${LXQT_GLOBALKEYS_UI_LIBRARY_DIRS})

cmake/lxqt_globalkeys_use.cmake

@@ -1,2 +0,0 @@
-include_directories(${LXQT_GLOBALKEYS_INCLUDE_DIRS})
-link_directories(${LXQT_GLOBALKEYS_LIBRARY_DIRS})

config/CMakeLists.txt

@@ -7,18 +7,8 @@ endif()
 
 find_package(KF5WindowSystem REQUIRED QUIET)
 
-set(QTX_INCLUDE_DIRS "")
-set(QTX_LIBRARIES Qt5::Widgets Qt5::DBus)
-
 set(QT_DBUS_PREFIX "org.qtproject")
 
-include_directories(
-    "${PROJECT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ${QTX_INCLUDE_DIRS}
-    ${LXQT_INCLUDE_DIRS}
-)
-
 set(${PROJECT_NAME}_PATH_TO_DAEMON "${LXQT_GLOBALKEYS_SOURCE_DIR}/daemon")
 
 set(${PROJECT_NAME}_SOURCES
@@ -29,7 +19,6 @@ set(${PROJECT_NAME}_SOURCES
     shortcut_selector.cpp
     ${${PROJECT_NAME}_PATH_TO_DAEMON}/meta_types.cpp
     edit_action_dialog.cpp
-    shortcut_delegate.cpp
 )
 
 set(${PROJECT_NAME}_FORMS
@@ -94,23 +83,22 @@ foreach(DBUS_INTERFACE ${${PROJECT_NAME}_DBUS_INTERFACES})
     get_filename_component(DBUS_INTERFACE_FILENAME ${DBUS_INTERFACE} NAME)
     configure_file(
         ${DBUS_INTERFACE}
-        ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}
+        "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}"
         @ONLY
     )
     get_source_file_property(DBUS_INTERFACE_BASENAME ${DBUS_INTERFACE} BASENAME)
     get_source_file_property(DBUS_INTERFACE_INCLUDE ${DBUS_INTERFACE} INCLUDE)
     get_source_file_property(DBUS_INTERFACE_CLASSNAME ${DBUS_INTERFACE} CLASSNAME)
     get_source_file_property(DBUS_INTERFACE_NO_NAMESPACE ${DBUS_INTERFACE} NO_NAMESPACE)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} PROPERTIES
+    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" PROPERTIES
         INCLUDE ${DBUS_INTERFACE_INCLUDE}
         CLASSNAME ${DBUS_INTERFACE_CLASSNAME}
         NO_NAMESPACE ${DBUS_INTERFACE_NO_NAMESPACE}
     )
-    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} ${DBUS_INTERFACE_BASENAME})
+    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" ${DBUS_INTERFACE_BASENAME})
 endforeach()
 
 qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES})
-qt5_wrap_ui(${PROJECT_NAME}_FORM_FILES ${${PROJECT_NAME}_FORMS})
 
 # Translations **********************************
 lxqt_translate_ts(${PROJECT_NAME}_QM_FILES
@@ -145,7 +133,16 @@ set(${PROJECT_NAME}_ALL_FILES
 )
 
 add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_ALL_FILES})
-target_link_libraries(${PROJECT_NAME} KF5::WindowSystem ${QTX_LIBRARIES} ${LXQT_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} KF5::WindowSystem lxqt)
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-install(FILES ${${PROJECT_NAME}_DESKTOP_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+install(TARGETS
+    ${PROJECT_NAME}
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)
+
+install(FILES
+    ${${PROJECT_NAME}_DESKTOP_FILES}
+    DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
+    COMPONENT Runtime
+)

config/default_model.cpp

@@ -91,12 +91,6 @@ QVariant DefaultModel::data(const QModelIndex &index, int role) const
         break;
 
     case Qt::EditRole:
-        if ((index.row() >= 0) && (index.row() < rowCount()) && (index.column() >= 0) && (index.column() < columnCount()))
-            switch (index.column())
-            {
-            case 1:
-                return mContent[mContent.keys()[index.row()]].shortcut;
-            }
         break;
 
     case Qt::FontRole:
@@ -179,25 +173,11 @@ Qt::ItemFlags DefaultModel::flags(const QModelIndex &index) const
     {
         result |= Qt::ItemIsUserCheckable;
     }
-    if (index.column() == 1)
-    {
-        result |= Qt::ItemIsEditable;
-    }
     return result;
 }
 
 bool DefaultModel::setData(const QModelIndex &index, const QVariant &value, int role)
 {
-    switch (role)
-    {
-    case Qt::EditRole:
-        if ((index.row() >= 0) && (index.row() < rowCount()) && index.column() == 1)
-        {
-            mActions->changeShortcut(mContent.keys()[index.row()], value.toString());
-            return true;
-        }
-        break;
-    }
     return false;
 }
 

config/lxqt-config-globalkeyshortcuts.desktop.in

@@ -6,6 +6,6 @@ Comment=Configure shortcut keys in LXQt
 Exec=lxqt-config-globalkeyshortcuts
 Icon=preferences-desktop-keyboard
 Categories=Settings;DesktopSettings;Qt;LXQt;
-OnlyShowIn=LXQt;LXDE;
+OnlyShowIn=LXQt;
 
 #TRANSLATIONS_DIR=translations

config/main.cpp

@@ -31,7 +31,7 @@
 
 int main(int argc, char *argv[])
 {
-    LxQt::SingleApplication a(argc, argv);
+    LXQt::SingleApplication a(argc, argv);
 
     MainWindow w;
     a.setActivationWindow(&w);

config/main_window.cpp

@@ -29,7 +29,6 @@
 #include "actions.h"
 #include "default_model.h"
 #include "edit_action_dialog.h"
-#include "shortcut_delegate.h"
 
 #include <QItemSelectionModel>
 #include <QSortFilterProxyModel>
@@ -66,8 +65,6 @@ MainWindow::MainWindow(QWidget *parent)
     mSelectionModel = new QItemSelectionModel(actions_TV->model());
     actions_TV->setSelectionModel(mSelectionModel);
 
-    actions_TV->setItemDelegateForColumn(1, new ShortcutDelegate(mActions, this));
-
     connect(mSelectionModel, SIGNAL(selectionChanged(QItemSelection, QItemSelection)), SLOT(selectionChanged(QItemSelection, QItemSelection)));
 
     connect(mActions, SIGNAL(daemonDisappeared()), SLOT(daemonDisappeared()));
@@ -173,9 +170,6 @@ void MainWindow::on_actions_TV_doubleClicked(const QModelIndex &index)
     }
         break;
 
-    case 1:
-        break;
-
     default:
         editAction(index);
     }
@@ -186,17 +180,11 @@ void MainWindow::editAction(const QModelIndex &index)
     qulonglong id = 0;
 
     if (index.isValid())
-    {
         id = mDefaultModel->id(mSortFilterProxyModel->mapToSource(index));
-    }
 
     if (!mEditActionDialog)
-    {
         mEditActionDialog = new EditActionDialog(mActions, this);
-    }
 
     if (mEditActionDialog->load(id))
-    {
         mEditActionDialog->exec();
-    }
 }

config/shortcut_delegate.cpp

@@ -1,72 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2013 Razor team
- * Authors:
- *   Kuzma Shapran <kuzma.shapran@gmail.com>
- *
- * This program or library is free software; you can redistribute it
- * and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#include "shortcut_delegate.h"
-#include "shortcut_selector.h"
-#include "actions.h"
-
-#include <QTimer>
-
-
-ShortcutDelegate::ShortcutDelegate(Actions *actions, QObject *parent)
-    : QItemDelegate(parent)
-    , mActions(actions)
-{
-}
-
-QWidget *ShortcutDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &/* index */) const
-{
-    ShortcutSelector *button = new ShortcutSelector(mActions, parent);
-    button->autoApplyShortcut();
-    QTimer::singleShot(0, button, SLOT(click()));
-    return button;
-}
-
-void ShortcutDelegate::setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const
-{
-    ShortcutSelector *button = static_cast<ShortcutSelector*>(editor);
-    if (button->isGrabbing())
-        button->cancelNow();
-    model->setData(index, button->text(), Qt::EditRole);
-}
-
-void ShortcutDelegate::updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const
-{
-    editor->setGeometry(option.rect);
-}
-
-void ShortcutDelegate::setEditorData(QWidget *editor, const QModelIndex &index) const
-{
-    static_cast<QAbstractButton*>(editor)->setText(index.model()->data(index, Qt::EditRole).toString());
-}
-
-QSize ShortcutDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-    QSize sizeHint = QItemDelegate::sizeHint(option , index);
-    sizeHint.setHeight(sizeHint.height() + 15);
-    return sizeHint;
-}

config/shortcut_delegate.h

@@ -1,57 +0,0 @@
-/* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
- *
- * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * http://razor-qt.org
- *
- * Copyright: 2013 Razor team
- * Authors:
- *   Kuzma Shapran <kuzma.shapran@gmail.com>
- *
- * This program or library is free software; you can redistribute it
- * and/or modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
-
- * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301 USA
- *
- * END_COMMON_COPYRIGHT_HEADER */
-
-#ifndef GLOBAL_ACTION_CONFIG__SHORTCUT_DELEGATE__INCLUDED
-#define GLOBAL_ACTION_CONFIG__SHORTCUT_DELEGATE__INCLUDED
-
-
-#include <QItemDelegate>
-
-
-class Actions;
-
-class ShortcutDelegate : public QItemDelegate
-{
-    Q_OBJECT
-
-public:
-    explicit ShortcutDelegate(Actions *actions, QObject *parent = 0);
-
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-
-    void setEditorData(QWidget *editor, const QModelIndex &index) const;
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
-
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
-
-    void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const;
-
-private:
-    Actions *mActions;
-};
-
-#endif // GLOBAL_ACTION_CONFIG__SHORTCUT_DELEGATE__INCLUDED

config/translations/lxqt-config-globalkeyshortcuts.ts

@@ -1,92 +1,167 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="en_US">
+<TS version="2.1">
 <context>
-    <name>CommandFinder</name>
-    <message>
-        <source>...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Find a command</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>DefaultModel</name>
     <message>
+        <location filename="../default_model.cpp" line="49"/>
         <source>Command</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add New</source>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Group</source>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reset</source>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close</source>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ShortcutEditor</name>
+    <name>EditActionDialog</name>
     <message>
-        <source>None</source>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Shortcut</source>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Group</source>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reset Changes</source>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Question</source>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete group: %1? (everything inside will be removed altogether)</source>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete %1?</source>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Binding for %1 already exists. Replace old one?</source>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

config/translations/lxqt-config-globalkeyshortcuts_ar.ts

@@ -1,75 +1,194 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ar">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">الوصف</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">إزالة</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">ﻻشيء</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">إغلاق</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Description</source>
-        <translation>الوصف</translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">الوصف</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>إزالة</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">إزالة</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>إغلاق</translation>
+        <translation type="vanished">إغلاق</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>ﻻشيء</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">ﻻشيء</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>إزالة</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">إزالة</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_cs.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[cs]=Nastavení klávesových zkratek
-Comment[cs]=Nastavit celkové klávesové zkratky pro prostředí LxQt
+Comment[cs]=Nastavit celkové klávesové zkratky pro prostředí LXQt
 GenericName[cs]=Nastavení celkových klávesových zkratek

config/translations/lxqt-config-globalkeyshortcuts_cs.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="cs">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Najít příkaz</translation>
+        <translation type="vanished">Najít příkaz</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Příkaz</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Zkratka</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Popis</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Odstranit</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Žádná</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Zavřít</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor zkratek</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor zkratek</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Popis</translation>
+        <translation type="vanished">Popis</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Zkratka</translation>
+        <translation type="vanished">Zkratka</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Příkaz</translation>
+        <translation type="vanished">Příkaz</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Přidat novou</translation>
+        <translation type="vanished">Přidat novou</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Odstranit</translation>
+        <translation type="vanished">Odstranit</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Přidat skupinu</translation>
+        <translation type="vanished">Přidat skupinu</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Vynulovat</translation>
+        <translation type="vanished">Vynulovat</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Zavřít</translation>
+        <translation type="vanished">Zavřít</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Žádná</translation>
+        <translation type="vanished">Žádná</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Přidat zkratku</translation>
+        <translation type="vanished">Přidat zkratku</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Odstranit</translation>
+        <translation type="vanished">Odstranit</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Nová skupina</translation>
+        <translation type="vanished">Nová skupina</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Vynulovat změny</translation>
+        <translation type="vanished">Vynulovat změny</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[cs_CZ]=Nastavení klávesových zkratek
-Comment[cs_CZ]=Nastavit celkové klávesové zkratky pro prostředí LxQt
+Comment[cs_CZ]=Nastavit celkové klávesové zkratky pro prostředí LXQt
 GenericName[cs_CZ]=Nastavení celkových klávesových zkratek

config/translations/lxqt-config-globalkeyshortcuts_cs_CZ.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Najít příkaz</translation>
+        <translation type="vanished">Najít příkaz</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Příkaz</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Zkratka</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Popis</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Odstranit</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Žádná</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Zavřít</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor zkratek</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor zkratek</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Popis</translation>
+        <translation type="vanished">Popis</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Zkratka</translation>
+        <translation type="vanished">Zkratka</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Příkaz</translation>
+        <translation type="vanished">Příkaz</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Přidat novou</translation>
+        <translation type="vanished">Přidat novou</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Odstranit</translation>
+        <translation type="vanished">Odstranit</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Přidat skupinu</translation>
+        <translation type="vanished">Přidat skupinu</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Vynulovat</translation>
+        <translation type="vanished">Vynulovat</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Zavřít</translation>
+        <translation type="vanished">Zavřít</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Žádná</translation>
+        <translation type="vanished">Žádná</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Přidat zkratku</translation>
+        <translation type="vanished">Přidat zkratku</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Odstranit</translation>
+        <translation type="vanished">Odstranit</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Nová skupina</translation>
+        <translation type="vanished">Nová skupina</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Vynulovat změny</translation>
+        <translation type="vanished">Vynulovat změny</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_da.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[da]=Konfiguration af LxQt Tastaturgenveje
-Comment[da]=Konfigurer globale tastaturgenveje for LxQt-skrivebordet
-GenericName[da]=Konfiguration af LxQt Globale Tastaturgenveje
+Name[da]=Konfiguration af LXQt Tastaturgenveje
+Comment[da]=Konfigurer globale tastaturgenveje for LXQt-skrivebordet
+GenericName[da]=Konfiguration af LXQt Globale Tastaturgenveje

config/translations/lxqt-config-globalkeyshortcuts_da_DK.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[da_DK]=Konfiguration af LxQt Tastaturgenveje
-Comment[da_DK]=Konfigurer globale tastaturgenveje for LxQt-skrivebordet
-GenericName[da_DK]=Konfiguration af LxQt Globale Tastaturgenveje
+Name[da_DK]=Konfiguration af LXQt Tastaturgenveje
+Comment[da_DK]=Konfigurer globale tastaturgenveje for LXQt-skrivebordet
+GenericName[da_DK]=Konfiguration af LXQt Globale Tastaturgenveje

config/translations/lxqt-config-globalkeyshortcuts_da_DK.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="da_DK">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Find en kommando</translation>
+        <translation type="vanished">Find en kommando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Kommando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Genvej</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Beskrivelse</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Fjern</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Ingen</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Afslut</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>LxQt Tastaturgenveje</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">LXQt Tastaturgenveje</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Beskrivelse</translation>
+        <translation type="vanished">Beskrivelse</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Genvej</translation>
+        <translation type="vanished">Genvej</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Kommando</translation>
+        <translation type="vanished">Kommando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Tilføj ny</translation>
+        <translation type="vanished">Tilføj ny</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Fjern</translation>
+        <translation type="vanished">Fjern</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Tilføj gruppe</translation>
+        <translation type="vanished">Tilføj gruppe</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Nulstil</translation>
+        <translation type="vanished">Nulstil</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Afslut</translation>
+        <translation type="vanished">Afslut</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Ingen</translation>
+        <translation type="vanished">Ingen</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Tilføj genvej</translation>
+        <translation type="vanished">Tilføj genvej</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Fjern</translation>
+        <translation type="vanished">Fjern</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Ny gruppe</translation>
+        <translation type="vanished">Ny gruppe</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Nulstil ændringer</translation>
+        <translation type="vanished">Nulstil ændringer</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_de.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[de]=Kurzbefehl-Konfiguration
+GenericName[de]=Globale Kurzbefehlkonfiguration
+Comment[de]=Globale Kurzbefehle für die LXQt Arbeitsfläche definieren

config/translations/lxqt-config-globalkeyshortcuts_de.ts

@@ -1,75 +1,169 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation>Befehl</translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation>DBus-Aufruf</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation>Client</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation>Kennung</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation>Kurzbefehl</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation>Beschreibung</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation>Information</translation>
     </message>
 </context>
 <context>
-    <name>ShortcutConfigWindow</name>
+    <name>EditActionDialog</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation>Befehl bearbeiten</translation>
     </message>
     <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation>&amp;Kurzbefehl:</translation>
     </message>
     <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation>&amp;Beschreibung:</translation>
     </message>
     <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation>&amp;Aktiviert</translation>
     </message>
     <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation>B&amp;efehl</translation>
     </message>
     <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation>&amp;DBus-Nachricht</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation>Typ:</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation>Be&amp;fehl:</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation>Ser&amp;vice:</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation>&amp;Pfad:</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translatorcomment>&amp;Schnittstelle:</translatorcomment>
+        <translation>&amp;Interface:</translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation>&amp;Methode:</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation>Globaler Aktionsmanager</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation>Hinzufügen ...</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
         <source>Remove</source>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation>Ändern ...</translation>
     </message>
     <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation>Tauschen</translation>
     </message>
     <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation>Verhalten bei mehreren Aktionen:</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation>Erste</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation>Letzte</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation>Keine</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation>Alle</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
 </context>
-<context>
-    <name>ShortcutEditor</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_de_DE.desktop

@@ -1,4 +0,0 @@
-# Translations
-Name[de_DE]=LxQt Hotkey Konfiguration
-Comment[de_DE]=Globalen Hotkey für LxQt Desktop definieren
-GenericName[de_DE]=LxQt Globale Hotkey Konfiguration

config/translations/lxqt-config-globalkeyshortcuts_de_DE.ts

@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
-<context>
-    <name>CommandFinder</name>
-    <message>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <source>Find a command</source>
-        <translation>Finde einen Befehl</translation>
-    </message>
-</context>
-<context>
-    <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>LxQt Hotkey Editor</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Beschreibung</translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation>Hotkey</translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation>Befehl</translation>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation>Hinzufügen</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation>Gruppe hinzufügen</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation>Verwerfen</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Schließen</translation>
-    </message>
-</context>
-<context>
-    <name>ShortcutEditor</name>
-    <message>
-        <source>None</source>
-        <translation>Kein</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation>Hotkey hinzufügen</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Entfernen</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation>Neue Gruppe</translation>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation>Änderungen verwerfen</translation>
-    </message>
-</context>
-</TS>

config/translations/lxqt-config-globalkeyshortcuts_el.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[el]=Πλήκτρα συντομεύσεων
+GenericName[el]=Ρυθμίσεις συντομεύσεων πληκτρολογίου
+Comment[el]=Διαμόρφωση των πλήκτρων συντομεύσεων του LXQt

config/translations/lxqt-config-globalkeyshortcuts_el.ts

@@ -0,0 +1,241 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
+<context>
+    <name>CommandFinder</name>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
+    </message>
+    <message>
+        <source>Find a command</source>
+        <translation type="vanished">Εύρεση εντολής</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Εντολή</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Συντόμευση</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Περιγραφή</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Αφαίρεση</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Κανένα</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Κλείσιμο</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutConfigWindow</name>
+    <message>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Επεξεργασία συντομεύσεων LXQt</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="vanished">Περιγραφή</translation>
+    </message>
+    <message>
+        <source>Shortcut</source>
+        <translation type="vanished">Συντόμευση</translation>
+    </message>
+    <message>
+        <source>Command</source>
+        <translation type="vanished">Εντολή</translation>
+    </message>
+    <message>
+        <source>Add New</source>
+        <translation type="vanished">Προσθήκη νέας</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="vanished">Αφαίρεση</translation>
+    </message>
+    <message>
+        <source>Add Group</source>
+        <translation type="vanished">Προσθήκη ομάδας</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="vanished">Επαναφορά</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="vanished">Κλείσιμο</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutEditor</name>
+    <message>
+        <source>None</source>
+        <translation type="vanished">Κανένα</translation>
+    </message>
+    <message>
+        <source>Add Shortcut</source>
+        <translation type="vanished">Προσθήκη συντόμευσης</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="vanished">Αφαίρεση</translation>
+    </message>
+    <message>
+        <source>New Group</source>
+        <translation type="vanished">Νέα ομάδα</translation>
+    </message>
+    <message>
+        <source>Reset Changes</source>
+        <translation type="vanished">Επαναφορά αλλαγών</translation>
+    </message>
+</context>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_el_GR.desktop

@@ -1,4 +0,0 @@
-# Translations
-Name[el_GR]=Διαμόρφωση συντομεύσεων LxQt
-Comment[el_GR]=Διαμόρφωση των καθολικών συντομεύσεων του LxQt
-GenericName[el_GR]=Διαμόρφωση καθολικών συντομεύσεων LxQt

config/translations/lxqt-config-globalkeyshortcuts_el_GR.ts

@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0">
-<context>
-    <name>CommandFinder</name>
-    <message>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
-    <message>
-        <source>Find a command</source>
-        <translation>Εύρεση εντολής</translation>
-    </message>
-</context>
-<context>
-    <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Επεξεργασία συντομεύσεων LxQt</translation>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation>Περιγραφή</translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation>Συντόμευση</translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation>Εντολή</translation>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation>Προσθήκη νέας</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation>Προσθήκη ομάδας</translation>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation>Επαναφορά</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Κλείσιμο</translation>
-    </message>
-</context>
-<context>
-    <name>ShortcutEditor</name>
-    <message>
-        <source>None</source>
-        <translation>Κανένα</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation>Προσθήκη συντόμευσης</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation>Νέα ομάδα</translation>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation>Επαναφορά αλλαγών</translation>
-    </message>
-</context>
-</TS>

config/translations/lxqt-config-globalkeyshortcuts_eo.ts

@@ -1,75 +1,194 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="eo">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Priskribo</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Forigi</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nenio</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Description</source>
-        <translation>Priskribo</translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Priskribo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Forigi</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Forigi</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Fermi</translation>
+        <translation type="vanished">Fermi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nenio</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Nenio</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Forigi</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Forigi</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_es.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[es]=Configuración de Atajos de LxQt
-Comment[es]=Configure atajos globales del Escritorio de LxQt
-GenericName[es]=Configuración de Atajos Globales de LxQt
+Name[es]=Configuración de Atajos de LXQt
+Comment[es]=Configure atajos globales del Escritorio de LXQt
+GenericName[es]=Configuración de Atajos Globales de LXQt

config/translations/lxqt-config-globalkeyshortcuts_es.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Encontrar un comando</translation>
+        <translation type="vanished">Encontrar un comando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Atajo</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descripción</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Borrar</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Ninguno</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor de Atajos de LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor de Atajos de LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripción</translation>
+        <translation type="vanished">Descripción</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Atajo</translation>
+        <translation type="vanished">Atajo</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comando</translation>
+        <translation type="vanished">Comando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Agregar nuevo</translation>
+        <translation type="vanished">Agregar nuevo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Borrar</translation>
+        <translation type="vanished">Borrar</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Agregar Grupo</translation>
+        <translation type="vanished">Agregar Grupo</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Reiniciar</translation>
+        <translation type="vanished">Reiniciar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation type="vanished">Cerrar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Ninguno</translation>
+        <translation type="vanished">Ninguno</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Agregar Atajo</translation>
+        <translation type="vanished">Agregar Atajo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Borrar</translation>
+        <translation type="vanished">Borrar</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Nuevo Grupo</translation>
+        <translation type="vanished">Nuevo Grupo</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Reiniciar Cambios</translation>
+        <translation type="vanished">Reiniciar Cambios</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_es_VE.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[es_VE]=Configuracion de atajos de LxQt
-Comment[es_VE]=Configura atajos de teclado para el escritorio LxQt
-GenericName[es_VE]=Configuracion de Atajos globales de LxQt
+Name[es_VE]=Configuracion de atajos de LXQt
+Comment[es_VE]=Configura atajos de teclado para el escritorio LXQt
+GenericName[es_VE]=Configuracion de Atajos globales de LXQt

config/translations/lxqt-config-globalkeyshortcuts_es_VE.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_VE" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="es_VE">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Encontrar un comando</translation>
+        <translation type="vanished">Encontrar un comando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Atajo</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descripcion</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Remover</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nada</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Cerrar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor de atajos</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor de atajos</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descripcion</translation>
+        <translation type="vanished">Descripcion</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Atajo</translation>
+        <translation type="vanished">Atajo</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comando</translation>
+        <translation type="vanished">Comando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Agregar Nuevo</translation>
+        <translation type="vanished">Agregar Nuevo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Agregar Grupo</translation>
+        <translation type="vanished">Agregar Grupo</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Reiniciar</translation>
+        <translation type="vanished">Reiniciar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Cerrar</translation>
+        <translation type="vanished">Cerrar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nada</translation>
+        <translation type="vanished">Nada</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Nuevo atajo</translation>
+        <translation type="vanished">Nuevo atajo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Nuevo Grupo</translation>
+        <translation type="vanished">Nuevo Grupo</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Reiniciar cambios</translation>
+        <translation type="vanished">Reiniciar cambios</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_eu.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[eu]=LxQt lasterbideen konfigurazioa
-Comment[eu]=Konfiguratu LxQt mahaigainaren lasterbide globalak
-GenericName[eu]=LxQt lasterbide globalen konfigurazioa
+Name[eu]=LXQt lasterbideen konfigurazioa
+Comment[eu]=Konfiguratu LXQt mahaigainaren lasterbide globalak
+GenericName[eu]=LXQt lasterbide globalen konfigurazioa

config/translations/lxqt-config-globalkeyshortcuts_eu.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="eu">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Bilatu komando bat</translation>
+        <translation type="vanished">Bilatu komando bat</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Komandoa</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Lasterbidea</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Deskribapena</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Kendu</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Bat ere ez</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Itxi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>LxQt lasterbide-editorea</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">LXQt lasterbide-editorea</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Deskribapena</translation>
+        <translation type="vanished">Deskribapena</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Lasterbidea</translation>
+        <translation type="vanished">Lasterbidea</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Komandoa</translation>
+        <translation type="vanished">Komandoa</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Gehitu berria</translation>
+        <translation type="vanished">Gehitu berria</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Kendu</translation>
+        <translation type="vanished">Kendu</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Gehitu taldea</translation>
+        <translation type="vanished">Gehitu taldea</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Berrezarri</translation>
+        <translation type="vanished">Berrezarri</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Itxi</translation>
+        <translation type="vanished">Itxi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Bat ere ez</translation>
+        <translation type="vanished">Bat ere ez</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Gehitu lasterbidea</translation>
+        <translation type="vanished">Gehitu lasterbidea</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Kendu</translation>
+        <translation type="vanished">Kendu</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Talde berria</translation>
+        <translation type="vanished">Talde berria</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Berrezarri aldaketak</translation>
+        <translation type="vanished">Berrezarri aldaketak</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_fi.ts

@@ -1,75 +1,190 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fi">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Kuvaus</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Poista</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Sulje</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Description</source>
-        <translation>Kuvaus</translation>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Kuvaus</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Poista</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Poista</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Sulje</translation>
+        <translation type="vanished">Sulje</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
-    <message>
-        <source>None</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Remove</source>
-        <translation>Poista</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Poista</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_fr_FR.ts

@@ -1,75 +1,190 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Aucun(e)</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Fermer</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Supprimer</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Fermer</translation>
+        <translation type="vanished">Fermer</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Aucun(e)</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Aucun(e)</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Supprimer</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_hu.desktop

@@ -0,0 +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

config/translations/lxqt-config-globalkeyshortcuts_hu.ts

@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="hu_HU">
+<context>
+    <name>CommandFinder</name>
+    <message>
+        <source>...</source>
+        <translation type="vanished">...</translation>
+    </message>
+    <message>
+        <source>Find a command</source>
+        <translation type="vanished">Parancs keresés</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Parancs</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Forróbillentyű</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Leírás</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Törlés</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nincs</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Bezár</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutConfigWindow</name>
+    <message>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">LXQt forróbillentyű szerkesztés</translation>
+    </message>
+    <message>
+        <source>Description</source>
+        <translation type="vanished">Leírás</translation>
+    </message>
+    <message>
+        <source>Shortcut</source>
+        <translation type="vanished">Forróbillentyű</translation>
+    </message>
+    <message>
+        <source>Command</source>
+        <translation type="vanished">Parancs</translation>
+    </message>
+    <message>
+        <source>Add New</source>
+        <translation type="vanished">Új</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="vanished">Törlés</translation>
+    </message>
+    <message>
+        <source>Add Group</source>
+        <translation type="vanished">Csoport</translation>
+    </message>
+    <message>
+        <source>Reset</source>
+        <translation type="vanished">Visszavon</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation type="vanished">Bezár</translation>
+    </message>
+</context>
+<context>
+    <name>ShortcutEditor</name>
+    <message>
+        <source>None</source>
+        <translation type="vanished">Nincs</translation>
+    </message>
+    <message>
+        <source>Add Shortcut</source>
+        <translation type="vanished">Forróbillentyű adás</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="vanished">Törlés</translation>
+    </message>
+    <message>
+        <source>New Group</source>
+        <translation type="vanished">Új csoport</translation>
+    </message>
+    <message>
+        <source>Reset Changes</source>
+        <translation type="vanished">Visszavonás</translation>
+    </message>
+    <message>
+        <source>Question</source>
+        <translation type="vanished">Kérdés</translation>
+    </message>
+    <message>
+        <source>Delete group: %1? (everything inside will be removed altogether)</source>
+        <translation type="vanished">A %1 csoport törlése? (Minden kapcsolata is törlődik)</translation>
+    </message>
+    <message>
+        <source>Delete %1?</source>
+        <translation type="vanished">%1 törlése?</translation>
+    </message>
+    <message>
+        <source>Binding for %1 already exists. Replace old one?</source>
+        <translation type="vanished">A %1 már foglalt. Felváltsuk az újjal?</translation>
+    </message>
+</context>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_it_IT.desktop

@@ -1,4 +1,3 @@
 # Translations
-Name[it_IT]=Configurazione delle scorciatoie di LxQt
-Comment[it_IT]=Configura le scorciatoie globali del desktop LxQt
-GenericName[it_IT]=Configurazione delle scorciatoie globali di LxQt
+Name[it_IT]=Scorciatoie globali
+Comment[it_IT]=Configura le scorciatoie globali di LXQt 

config/translations/lxqt-config-globalkeyshortcuts_it_IT.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it_IT">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Trova un comando</translation>
+        <translation type="vanished">Trova un comando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Scorciatoie</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descrizione</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Rimuovi</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nessuna</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Chiudi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor delle scorciatoie di LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor delle scorciatoie di LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrizione</translation>
+        <translation type="vanished">Descrizione</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Scorciatoie</translation>
+        <translation type="vanished">Scorciatoie</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comando</translation>
+        <translation type="vanished">Comando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Aggiungi nuova</translation>
+        <translation type="vanished">Aggiungi nuova</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Rimuovi</translation>
+        <translation type="vanished">Rimuovi</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Aggiungi gruppo</translation>
+        <translation type="vanished">Aggiungi gruppo</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Azzera</translation>
+        <translation type="vanished">Azzera</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Chiudi</translation>
+        <translation type="vanished">Chiudi</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nessuna</translation>
+        <translation type="vanished">Nessuna</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Aggiungi scorciatoia</translation>
+        <translation type="vanished">Aggiungi scorciatoia</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Rimuovi</translation>
+        <translation type="vanished">Rimuovi</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Nuovo gruppo</translation>
+        <translation type="vanished">Nuovo gruppo</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Azzera le modifiche</translation>
+        <translation type="vanished">Azzera le modifiche</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_ja.ts

@@ -1,75 +1,182 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ja">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">なし</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">閉じる</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Close</source>
-        <translation>閉じる</translation>
+        <translation type="vanished">閉じる</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>なし</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">なし</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_lt.ts

@@ -1,75 +1,190 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="lt">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Pašalinti</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nieko</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Uždaryti</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Remove</source>
-        <translation>Pašalinti</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Pašalinti</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Uždaryti</translation>
+        <translation type="vanished">Uždaryti</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nieko</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Nieko</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Pašalinti</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Pašalinti</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_nl.ts

@@ -1,75 +1,190 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Geen</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Sluiten</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Remove</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Verwijderen</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Sluiten</translation>
+        <translation type="vanished">Sluiten</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Geen</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Geen</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Verwijderen</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_pl_PL.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[pl_PL]=Konfiguracja skrótów pulpitu LxQt
-Comment[pl_PL]=Określ globalny skrót pulpitu LxQt
-GenericName[pl_PL]=Konfiguracja globalnych skrótów pulpitu LxQt
+Name[pl_PL]=Konfiguracja skrótów pulpitu LXQt
+Comment[pl_PL]=Określ globalny skrót pulpitu LXQt
+GenericName[pl_PL]=Konfiguracja globalnych skrótów pulpitu LXQt

config/translations/lxqt-config-globalkeyshortcuts_pl_PL.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pl_PL">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Znajdź polecenie</translation>
+        <translation type="vanished">Znajdź polecenie</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Polecenie</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Skrót</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Opis</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Usuń</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Brak</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Zamknij</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Edytor Skrótów LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Edytor Skrótów LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Opis</translation>
+        <translation type="vanished">Opis</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Skrót</translation>
+        <translation type="vanished">Skrót</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Polecenie</translation>
+        <translation type="vanished">Polecenie</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Dodaj</translation>
+        <translation type="vanished">Dodaj</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="vanished">Usuń</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Dodaj grupę</translation>
+        <translation type="vanished">Dodaj grupę</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Reset</translation>
+        <translation type="vanished">Reset</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Zamknij</translation>
+        <translation type="vanished">Zamknij</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Brak</translation>
+        <translation type="vanished">Brak</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Dodaj skrót</translation>
+        <translation type="vanished">Dodaj skrót</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Usuń</translation>
+        <translation type="vanished">Usuń</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Dodaj grupę</translation>
+        <translation type="vanished">Dodaj grupę</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Resetuj zmiany</translation>
+        <translation type="vanished">Resetuj zmiany</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_pt.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[pt]=Teclas de atalho
 GenericName[pt]=Definições das teclas de atalho
-Comment[pt]=Configurar as teclas de atalho do LxQt
+Comment[pt]=Configurar as teclas de atalho do LXQt

config/translations/lxqt-config-globalkeyshortcuts_pt.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Encontrar um comando</translation>
+        <translation type="vanished">Encontrar um comando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Atalho</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Remover</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nada</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Fechar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor de atalhos do LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor de atalhos do LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="vanished">Descrição</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Atalho</translation>
+        <translation type="vanished">Atalho</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comando</translation>
+        <translation type="vanished">Comando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Adicionar</translation>
+        <translation type="vanished">Adicionar</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Adicionar grupo</translation>
+        <translation type="vanished">Adicionar grupo</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Restaurar</translation>
+        <translation type="vanished">Restaurar</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Fechar</translation>
+        <translation type="vanished">Fechar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nada</translation>
+        <translation type="vanished">Nada</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Adicionar atalho</translation>
+        <translation type="vanished">Adicionar atalho</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Novo grupo</translation>
+        <translation type="vanished">Novo grupo</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Restaurar alterações</translation>
+        <translation type="vanished">Restaurar alterações</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_pt_BR.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[pt_BR]=Configuração Do Atalho
-Comment[pt_BR]=Configurar atalhos globais do desktop LxQt
+Comment[pt_BR]=Configurar atalhos globais do desktop LXQt
 GenericName[pt_BR]=Configurações Dos Atalhos Globais

config/translations/lxqt-config-globalkeyshortcuts_pt_BR.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt_BR">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Encontrar um comando</translation>
+        <translation type="vanished">Encontrar um comando</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comando</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Atalho</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descrição</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Remover</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nenhum</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Fechar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor De Atalhos</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor De Atalhos</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descrição</translation>
+        <translation type="vanished">Descrição</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Atalho</translation>
+        <translation type="vanished">Atalho</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comando</translation>
+        <translation type="vanished">Comando</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Adicionar Novo</translation>
+        <translation type="vanished">Adicionar Novo</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Adicionar Grupo</translation>
+        <translation type="vanished">Adicionar Grupo</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Redefinir</translation>
+        <translation type="vanished">Redefinir</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Fechar</translation>
+        <translation type="vanished">Fechar</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nenhum</translation>
+        <translation type="vanished">Nenhum</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Adicionat Atalho</translation>
+        <translation type="vanished">Adicionat Atalho</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Remover</translation>
+        <translation type="vanished">Remover</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Novo Grupo</translation>
+        <translation type="vanished">Novo Grupo</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Redefinir Alterações</translation>
+        <translation type="vanished">Redefinir Alterações</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_ro_RO.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[ro_RO]=Configurație acceleratori LxQt
-Comment[ro_RO]=Configurează acceleratorii globali pentru LxQt
-GenericName[ro_RO]=Configurație acceleratori globali LxQt
+Name[ro_RO]=Configurație acceleratori LXQt
+Comment[ro_RO]=Configurează acceleratorii globali pentru LXQt
+GenericName[ro_RO]=Configurație acceleratori globali LXQt

config/translations/lxqt-config-globalkeyshortcuts_ro_RO.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro_RO" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="ro_RO">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Caută o comandă</translation>
+        <translation type="vanished">Caută o comandă</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Comandă</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Accelerator</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Descriere</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Elimină</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Nimic</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Închide</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Editor acceleratori LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Editor acceleratori LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Descriere</translation>
+        <translation type="vanished">Descriere</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Accelerator</translation>
+        <translation type="vanished">Accelerator</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Comandă</translation>
+        <translation type="vanished">Comandă</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Adaugă nou</translation>
+        <translation type="vanished">Adaugă nou</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Elimină</translation>
+        <translation type="vanished">Elimină</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Adaugă grup</translation>
+        <translation type="vanished">Adaugă grup</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Resetează</translation>
+        <translation type="vanished">Resetează</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Închide</translation>
+        <translation type="vanished">Închide</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Nimic</translation>
+        <translation type="vanished">Nimic</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Adaugă accelerator</translation>
+        <translation type="vanished">Adaugă accelerator</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Elimină</translation>
+        <translation type="vanished">Elimină</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Grup nou</translation>
+        <translation type="vanished">Grup nou</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Resetează modificările</translation>
+        <translation type="vanished">Resetează modificările</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_ru.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[ru]=Сочетания клавиш
-Comment[ru]=Настроить сочетание клавиш в LxQt
+Comment[ru]=Настроить сочетание клавиш в LXQt
 GenericName[ru]=Настроить сочетания клавиш

config/translations/lxqt-config-globalkeyshortcuts_ru.ts

@@ -19,27 +19,27 @@
         <translation>Клиент</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="147"/>
+        <location filename="../default_model.cpp" line="141"/>
         <source>Id</source>
         <translation>id</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="150"/>
+        <location filename="../default_model.cpp" line="144"/>
         <source>Shortcut</source>
         <translation>Сочетание клавиш</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="153"/>
+        <location filename="../default_model.cpp" line="147"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="156"/>
+        <location filename="../default_model.cpp" line="150"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="159"/>
+        <location filename="../default_model.cpp" line="153"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>

config/translations/lxqt-config-globalkeyshortcuts_ru_RU.desktop

@@ -1,4 +1,4 @@
 # Translations
 Name[ru_RU]=Сочетания клавиш
-Comment[ru_RU]=Настроить сочетание клавиш в LxQt
+Comment[ru_RU]=Настроить сочетание клавиш в LXQt
 GenericName[ru_RU]=Настроить сочетания клавиш

config/translations/lxqt-config-globalkeyshortcuts_ru_RU.ts

@@ -19,27 +19,27 @@
         <translation>Клиент</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="147"/>
+        <location filename="../default_model.cpp" line="141"/>
         <source>Id</source>
         <translation>id</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="150"/>
+        <location filename="../default_model.cpp" line="144"/>
         <source>Shortcut</source>
         <translation>Сочетание клавиш</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="153"/>
+        <location filename="../default_model.cpp" line="147"/>
         <source>Description</source>
         <translation>Описание</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="156"/>
+        <location filename="../default_model.cpp" line="150"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../default_model.cpp" line="159"/>
+        <location filename="../default_model.cpp" line="153"/>
         <source>Info</source>
         <translation>Информация</translation>
     </message>

config/translations/lxqt-config-globalkeyshortcuts_sl.ts

@@ -1,75 +1,190 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sl">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Odstrani</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Brez</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Zapri</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Odstrani</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Zapri</translation>
+        <translation type="vanished">Zapri</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Brez</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Brez</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Odstrani</translation>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Odstrani</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_th_TH.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[th_TH]=การตั้งค่าปุ่มลัด LxQt
-Comment[th_TH]=ตั้งค่าปุ่มลัดหลักของ LxQt เดกส์ท็อป
-GenericName[th_TH]=การตั้งค่าปุ่มลัดหลัก LxQt
+Name[th_TH]=การตั้งค่าปุ่มลัด LXQt
+Comment[th_TH]=ตั้งค่าปุ่มลัดหลักของ LXQt เดกส์ท็อป
+GenericName[th_TH]=การตั้งค่าปุ่มลัดหลัก LXQt

config/translations/lxqt-config-globalkeyshortcuts_th_TH.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="th_TH">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>หาคำสั่ง</translation>
+        <translation type="vanished">หาคำสั่ง</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">คำสั่ง</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">ปุ่มลัด</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">รายละเอียด</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">ลบทิ้ง</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">ไม่ต้อง</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">ปิด</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>ตัวแก้ไขปุ่มลัด LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">ตัวแก้ไขปุ่มลัด LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>รายละเอียด</translation>
+        <translation type="vanished">รายละเอียด</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>ปุ่มลัด</translation>
+        <translation type="vanished">ปุ่มลัด</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>คำสั่ง</translation>
+        <translation type="vanished">คำสั่ง</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>เพิ่มใหม่</translation>
+        <translation type="vanished">เพิ่มใหม่</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>ลบทิ้ง</translation>
+        <translation type="vanished">ลบทิ้ง</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>เพิ่มกลุ่ม</translation>
+        <translation type="vanished">เพิ่มกลุ่ม</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>กลับค่าเดิม</translation>
+        <translation type="vanished">กลับค่าเดิม</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>ปิด</translation>
+        <translation type="vanished">ปิด</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>ไม่ต้อง</translation>
+        <translation type="vanished">ไม่ต้อง</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>เพิ่มปุ่มลัด</translation>
+        <translation type="vanished">เพิ่มปุ่มลัด</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>ลบทิ้ง</translation>
+        <translation type="vanished">ลบทิ้ง</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>กลุ่มใหม่</translation>
+        <translation type="vanished">กลุ่มใหม่</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>กลับค่าเดิม</translation>
+        <translation type="vanished">กลับค่าเดิม</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_tr.ts

@@ -1,75 +1,182 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="tr">
 <context>
-    <name>CommandFinder</name>
+    <name>DefaultModel</name>
     <message>
-        <source>...</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Find a command</source>
-        <translation type="unfinished"/>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Yok</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Kapat</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
-    <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Description</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add New</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Close</source>
-        <translation>Kapat</translation>
+        <translation type="vanished">Kapat</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Yok</translation>
-    </message>
-    <message>
-        <source>Add Shortcut</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>New Group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset Changes</source>
-        <translation type="unfinished"/>
+        <translation type="vanished">Yok</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_uk.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[uk]=Налаштування скорочень LxQt
-Comment[uk]=Налаштувати глобальні скорочення стільниці LxQt
-GenericName[uk]=Налаштування глобальних скорочень LxQt
+Name[uk]=Налаштування скорочень LXQt
+Comment[uk]=Налаштувати глобальні скорочення стільниці LXQt
+GenericName[uk]=Налаштування глобальних скорочень LXQt

config/translations/lxqt-config-globalkeyshortcuts_uk.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="uk">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>Знайти команду</translation>
+        <translation type="vanished">Знайти команду</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">Команда</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">Cкорочення</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">Опис</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Вилучити</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">Нічого</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">Закрити</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>Редактор скорочень LxQt</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">Редактор скорочень LXQt</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>Опис</translation>
+        <translation type="vanished">Опис</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>Cкорочення</translation>
+        <translation type="vanished">Cкорочення</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>Команда</translation>
+        <translation type="vanished">Команда</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>Додати нове</translation>
+        <translation type="vanished">Додати нове</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Вилучити</translation>
+        <translation type="vanished">Вилучити</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>Додати групу</translation>
+        <translation type="vanished">Додати групу</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>Cкинути</translation>
+        <translation type="vanished">Cкинути</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>Закрити</translation>
+        <translation type="vanished">Закрити</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>Нічого</translation>
+        <translation type="vanished">Нічого</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>Додати скорочення</translation>
+        <translation type="vanished">Додати скорочення</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Вилучити</translation>
+        <translation type="vanished">Вилучити</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>Нова група</translation>
+        <translation type="vanished">Нова група</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>Скинути зміни</translation>
+        <translation type="vanished">Скинути зміни</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_zh_CN.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[zh_CN]=LxQt 快捷键配置
-Comment[zh_CN]=配置 LxQt 桌面全局快捷键
-GenericName[zh_CN]=LxQt 全局快捷键配置
+Name[zh_CN]=LXQt 快捷键配置
+Comment[zh_CN]=配置 LXQt 桌面全局快捷键
+GenericName[zh_CN]=LXQt 全局快捷键配置

config/translations/lxqt-config-globalkeyshortcuts_zh_CN.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>查找命令</translation>
+        <translation type="vanished">查找命令</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">命令</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">快捷键</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">描述</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">删除</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">无</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">关闭</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>LxQt 快捷键编辑器</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">LXQt 快捷键编辑器</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>描述</translation>
+        <translation type="vanished">描述</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>快捷键</translation>
+        <translation type="vanished">快捷键</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>命令</translation>
+        <translation type="vanished">命令</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>添加新</translation>
+        <translation type="vanished">添加新</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>删除</translation>
+        <translation type="vanished">删除</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>添加组</translation>
+        <translation type="vanished">添加组</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>重置</translation>
+        <translation type="vanished">重置</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>关闭</translation>
+        <translation type="vanished">关闭</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>无</translation>
+        <translation type="vanished">无</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>添加快捷键</translation>
+        <translation type="vanished">添加快捷键</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>删除</translation>
+        <translation type="vanished">删除</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>新建组</translation>
+        <translation type="vanished">新建组</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>重置更改</translation>
+        <translation type="vanished">重置更改</translation>
     </message>
 </context>
-</TS>
+</TS>

config/translations/lxqt-config-globalkeyshortcuts_zh_TW.desktop

@@ -1,4 +1,4 @@
 # Translations
-Name[zh_TW]=LxQt快捷鍵設定
-Comment[zh_TW]=設定LxQt桌面的全域快捷鍵
-GenericName[zh_TW]=LxQt全域快捷鍵設定
+Name[zh_TW]=LXQt快捷鍵設定
+Comment[zh_TW]=設定LXQt桌面的全域快捷鍵
+GenericName[zh_TW]=LXQt全域快捷鍵設定

config/translations/lxqt-config-globalkeyshortcuts_zh_TW.ts

@@ -1,75 +1,241 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_TW">
 <context>
     <name>CommandFinder</name>
     <message>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="vanished">...</translation>
     </message>
     <message>
         <source>Find a command</source>
-        <translation>尋找指令</translation>
+        <translation type="vanished">尋找指令</translation>
+    </message>
+</context>
+<context>
+    <name>DefaultModel</name>
+    <message>
+        <location filename="../default_model.cpp" line="49"/>
+        <source>Command</source>
+        <translation type="unfinished">指令</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="50"/>
+        <source>DBus call</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="51"/>
+        <source>Client</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="141"/>
+        <source>Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="144"/>
+        <source>Shortcut</source>
+        <translation type="unfinished">快捷鍵</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="147"/>
+        <source>Description</source>
+        <translation type="unfinished">描述</translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="150"/>
+        <source>Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../default_model.cpp" line="153"/>
+        <source>Info</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EditActionDialog</name>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="14"/>
+        <source>Edit Action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="31"/>
+        <source>&amp;Shortcut:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="74"/>
+        <source>&amp;Description:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="87"/>
+        <source>&amp;Enabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="102"/>
+        <source>&amp;Command</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="109"/>
+        <source>&amp;DBus message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="118"/>
+        <source>Type:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="164"/>
+        <source>Co&amp;mmand:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="206"/>
+        <source>S&amp;ervice:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="219"/>
+        <source>&amp;Path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="232"/>
+        <source>&amp;Interface:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../edit_action_dialog.ui" line="245"/>
+        <source>&amp;Method:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../main_window.ui" line="14"/>
+        <source>Global Actions Manager</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="52"/>
+        <source>Add ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">移除</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="72"/>
+        <source>Modify ...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="89"/>
+        <source>Swap</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="115"/>
+        <source>Multiple actions behaviour:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="123"/>
+        <source>First</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="128"/>
+        <source>Last</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="133"/>
+        <source>None</source>
+        <translation type="unfinished">無</translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="138"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../main_window.ui" line="176"/>
+        <source>Close</source>
+        <translation type="unfinished">關閉</translation>
     </message>
 </context>
 <context>
     <name>ShortcutConfigWindow</name>
     <message>
-        <source>LxQt Shortcut Editor</source>
-        <translation>LxQt快捷鍵編輯器</translation>
+        <source>LXQt Shortcut Editor</source>
+        <translation type="vanished">LXQt快捷鍵編輯器</translation>
     </message>
     <message>
         <source>Description</source>
-        <translation>描述</translation>
+        <translation type="vanished">描述</translation>
     </message>
     <message>
         <source>Shortcut</source>
-        <translation>快捷鍵</translation>
+        <translation type="vanished">快捷鍵</translation>
     </message>
     <message>
         <source>Command</source>
-        <translation>指令</translation>
+        <translation type="vanished">指令</translation>
     </message>
     <message>
         <source>Add New</source>
-        <translation>新增</translation>
+        <translation type="vanished">新增</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>移除</translation>
+        <translation type="vanished">移除</translation>
     </message>
     <message>
         <source>Add Group</source>
-        <translation>新增群組</translation>
+        <translation type="vanished">新增群組</translation>
     </message>
     <message>
         <source>Reset</source>
-        <translation>重設</translation>
+        <translation type="vanished">重設</translation>
     </message>
     <message>
         <source>Close</source>
-        <translation>關閉</translation>
+        <translation type="vanished">關閉</translation>
     </message>
 </context>
 <context>
     <name>ShortcutEditor</name>
     <message>
         <source>None</source>
-        <translation>無</translation>
+        <translation type="vanished">無</translation>
     </message>
     <message>
         <source>Add Shortcut</source>
-        <translation>增加快捷鍵</translation>
+        <translation type="vanished">增加快捷鍵</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>移除</translation>
+        <translation type="vanished">移除</translation>
     </message>
     <message>
         <source>New Group</source>
-        <translation>新群組</translation>
+        <translation type="vanished">新群組</translation>
     </message>
     <message>
         <source>Reset Changes</source>
-        <translation>重設更改</translation>
+        <translation type="vanished">重設更改</translation>
     </message>
 </context>
-</TS>
+</TS>

daemon/CMakeLists.txt

@@ -6,15 +6,10 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 find_package(X11)
-include_directories(${X11_INCLUDE_DIR})
+include_directories("${X11_INCLUDE_DIR}")
 
 set(QT_DBUS_PREFIX "org.qtproject")
 
-include_directories(
-    ${PROJECT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}
-)
-
 set(${PROJECT_NAME}_SOURCES
     main.cpp
     core.cpp
@@ -92,7 +87,7 @@ foreach(DBUS_ADAPTOR ${${PROJECT_NAME}_DBUS_ADAPTORS})
     get_filename_component(DBUS_ADAPTOR_FILENAME ${DBUS_ADAPTOR} NAME)
     configure_file(
         ${DBUS_ADAPTOR}
-        ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME}
+        "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME}"
         @ONLY
     )
     get_source_file_property(DBUS_ADAPTOR_INCLUDE ${DBUS_ADAPTOR} INCLUDE)
@@ -101,12 +96,12 @@ foreach(DBUS_ADAPTOR ${${PROJECT_NAME}_DBUS_ADAPTORS})
     get_source_file_property(DBUS_ADAPTOR_CLASSNAME ${DBUS_ADAPTOR} CLASSNAME)
     if(DBUS_ADAPTOR_BASENAME)
         if(DBUS_ADAPTOR_CLASSNAME)
-            qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME} ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME} ${DBUS_ADAPTOR_BASENAME} ${DBUS_ADAPTOR_CLASSNAME})
+            qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME}" ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME} ${DBUS_ADAPTOR_BASENAME} ${DBUS_ADAPTOR_CLASSNAME})
         else()
-            qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME} ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME} ${DBUS_ADAPTOR_BASENAME})
+            qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME}" ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME} ${DBUS_ADAPTOR_BASENAME})
         endif()
     else()
-        qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME} ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME})
+        qt5_add_dbus_adaptor(${PROJECT_NAME}_DBUS_ADAPTOR_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_ADAPTOR_FILENAME}" ${DBUS_ADAPTOR_INCLUDE} ${DBUS_ADAPTOR_PARENT_CLASSNAME})
     endif()
 endforeach()
 
@@ -114,23 +109,22 @@ foreach(DBUS_INTERFACE ${${PROJECT_NAME}_DBUS_INTERFACES})
     get_filename_component(DBUS_INTERFACE_FILENAME ${DBUS_INTERFACE} NAME)
     configure_file(
         ${DBUS_INTERFACE}
-        ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}
+        "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}"
         @ONLY
     )
     get_source_file_property(DBUS_INTERFACE_BASENAME ${DBUS_INTERFACE} BASENAME)
     get_source_file_property(DBUS_INTERFACE_INCLUDE ${DBUS_INTERFACE} INCLUDE)
     get_source_file_property(DBUS_INTERFACE_CLASSNAME ${DBUS_INTERFACE} CLASSNAME)
     get_source_file_property(DBUS_INTERFACE_NO_NAMESPACE ${DBUS_INTERFACE} NO_NAMESPACE)
-    set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} PROPERTIES
+    set_source_files_properties("${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" PROPERTIES
         INCLUDE ${DBUS_INTERFACE_INCLUDE}
         CLASSNAME ${DBUS_INTERFACE_CLASSNAME}
         NO_NAMESPACE ${DBUS_INTERFACE_NO_NAMESPACE}
     )
-    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} ${DBUS_INTERFACE_BASENAME})
+    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" ${DBUS_INTERFACE_BASENAME})
 endforeach()
 
 qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES})
-qt5_wrap_ui(${PROJECT_NAME}_FORM_FILES ${${PROJECT_NAME}_FORMS})
 
 set(${PROJECT_NAME}_GENERATED_FILES
     ${${PROJECT_NAME}_FORM_FILES}
@@ -147,6 +141,11 @@ set(${PROJECT_NAME}_ALL_FILES
 )
 
 add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_ALL_FILES})
-target_link_libraries(${PROJECT_NAME} ${X11_LIBRARIES} Qt5::Widgets Qt5::DBus)
+target_link_libraries(${PROJECT_NAME} ${X11_LIBRARIES} lxqt Qt5::Widgets Qt5::DBus)
+lxqt_enable_target_exceptions(${PROJECT_NAME} PRIVATE)
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+install(TARGETS
+    ${PROJECT_NAME}
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)

daemon/core.cpp

@@ -25,8 +25,9 @@
  *
  * END_COMMON_COPYRIGHT_HEADER */
 
-#include <QCoreApplication>
+#include <LXQt/Application>
 
+#include <QScopedArrayPointer>
 #include <QSettings>
 #include <QTimer>
 #include <QDBusConnectionInterface>
@@ -69,14 +70,6 @@ enum
 static Core *s_Core = 0;
 
 
-void unixSignalHandler(int signalNumber)
-{
-    if (s_Core)
-    {
-        s_Core->unixSignalHandler(signalNumber);
-    }
-}
-
 int x11ErrorHandler(Display *display, XErrorEvent *errorEvent)
 {
     if (s_Core)
@@ -411,8 +404,8 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi
 
         openlog("lxqt-global-action-daemon", LOG_PID, LOG_USER);
 
-        ::signal(SIGTERM, ::unixSignalHandler);
-        ::signal(SIGINT, ::unixSignalHandler);
+        connect(lxqtApp, &LXQt::Application::unixSignal, this, &Core::unixSignalHandler);
+        lxqtApp->listenToUnixSignals(QList<int>() << SIGTERM << SIGINT);
 
 
         if (!QDBusConnection::sessionBus().registerService("org.lxqt.global_key_shortcuts"))
@@ -581,7 +574,7 @@ Core::Core(bool useSyslog, bool minLogLevelSet, int minLogLevel, const QStringLi
                         }
                         if (id)
                         {
-                            mShortcutAndActionById[id].second->setEnabled(enabled);
+                            enableActionNonGuarded(id, enabled);
                         }
 
                         settings.endGroup();
@@ -828,7 +821,7 @@ int Core::x11ErrorHandler(Display */*display*/, XErrorEvent *errorEvent)
 
 bool Core::waitForX11Error(int level, uint timeout)
 {
-    pollfd *fds = new pollfd[1];
+    pollfd fds[1];
     fds[0].fd = mX11ErrorPipe[STDIN_FILENO];
     fds[0].events = POLLIN | POLLERR | POLLHUP;
     if (poll(fds, 1, timeout) < 0)
@@ -1367,7 +1360,7 @@ void Core::run()
 
             default:
             {
-                pollfd *fds = new pollfd[1];
+                pollfd fds[1];
                 fds[0].fd = mX11RequestPipe[STDIN_FILENO];
                 fds[0].events = POLLIN | POLLERR | POLLHUP;
                 if (poll(fds, 1, 0) >= 0)
@@ -1400,17 +1393,16 @@ void Core::run()
                             }
                             if (length)
                             {
-                                char *str = new char[length + 1];
+                                QScopedArrayPointer<char> str(new char[length + 1]);
                                 str[length] = '\0';
-                                if (error_t error = readAll(mX11RequestPipe[STDIN_FILENO], str, length))
+                                if (error_t error = readAll(mX11RequestPipe[STDIN_FILENO], str.data(), length))
                                 {
                                     log(LOG_CRIT, "Cannot read from X11 request pipe: %s", strerror(error));
                                     close(mX11ResponsePipe[STDIN_FILENO]);
                                     mX11EventLoopActive = false;
                                     break;
                                 }
-                                KeySym keySym = XStringToKeysym(str);
-                                delete[] str;
+                                KeySym keySym = XStringToKeysym(str.data());
                                 lockX11Error();
                                 keyCode = XKeysymToKeycode(mDisplay, keySym);
                                 x11Error = checkX11Error();
@@ -1682,22 +1674,38 @@ void Core::serviceDisappeared(const QString &sender)
                 {
                     const QString &shortcut = shortcutAndActionById.value().first;
 
-                    dynamic_cast<ClientAction *>(shortcutAndActionById.value().second)->disappeared();
+                    ClientAction * action = dynamic_cast<ClientAction *>(shortcutAndActionById.value().second);
+                    action->disappeared();
                     mDaemonAdaptor->emit_clientActionSenderChanged(id, QString());
 
                     X11Shortcut X11shortcut = mX11ByShortcut[shortcut];
 
-                    IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
-                    if (idsByShortcut != mIdsByShortcut.end())
+                    if (action->isEnabled())
                     {
-                        idsByShortcut.value().remove(id);
-                        if (idsByShortcut.value().isEmpty())
+                        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+                        if (idsByShortcut != mIdsByShortcut.end())
                         {
-                            mIdsByShortcut.erase(idsByShortcut);
-
-                            if (!remoteXUngrabKey(X11shortcut))
+                            idsByShortcut.value().remove(id);
+                            if (idsByShortcut.value().isEmpty())
                             {
-                                log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                                mIdsByShortcut.erase(idsByShortcut);
+
+                                if (!remoteXUngrabKey(X11shortcut))
+                                {
+                                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut);
+                        if (idsByShortcut != mDisabledIdsByShortcut.end())
+                        {
+                            idsByShortcut.value().remove(id);
+                            if (idsByShortcut.value().isEmpty())
+                            {
+                                mDisabledIdsByShortcut.erase(idsByShortcut);
                             }
                         }
                     }
@@ -1798,17 +1806,15 @@ QString Core::remoteKeycodeToString(KeyCode keyCode)
     }
     if (length)
     {
-        char *str = new char[length + 1];
+        QScopedArrayPointer<char> str(new char[length + 1]);
         str[length] = '\0';
-        if (error_t error = readAll(mX11ResponsePipe[STDIN_FILENO], str, length))
+        if (error_t error = readAll(mX11ResponsePipe[STDIN_FILENO], str.data(), length))
         {
             log(LOG_CRIT, "Cannot read from X11 response pipe: %s", strerror(error));
             qApp->quit();
             return QString();
         }
-        result = str;
-
-        delete[] str;
+        result = str.data();
     }
 
     return result;
@@ -2389,7 +2395,7 @@ void Core::enableClientAction(bool &result, const QDBusObjectPath &path, bool en
 
     qulonglong id = idByNativeClient.value();
 
-    mShortcutAndActionById[id].second->setEnabled(enabled);
+    enableActionNonGuarded(id, enabled);
 
     saveConfig();
 
@@ -2429,24 +2435,75 @@ void Core::isClientActionEnabled(bool &enabled, const QDBusObjectPath &path, con
 }
 
 void Core::enableAction(bool &result, qulonglong id, bool enabled)
+{
+    QMutexLocker lock(&mDataMutex);
+    result = enableActionNonGuarded(id, enabled);
+}
+
+bool Core::enableActionNonGuarded(qulonglong id, bool enabled)
 {
     log(LOG_INFO, "enableAction id:%llu enabled:%s", id, enabled ? "true" : " false");
 
-    QMutexLocker lock(&mDataMutex);
 
     ShortcutAndActionById::iterator shortcutAndActionById = mShortcutAndActionById.find(id);
     if (shortcutAndActionById == mShortcutAndActionById.end())
     {
         log(LOG_WARNING, "No action registered with id #%llu", id);
-        result = false;
-        return;
+        return false;
     }
 
-    shortcutAndActionById.value().second->setEnabled(enabled);
+    BaseAction * action = shortcutAndActionById.value().second;
+    QString const & shortcut = shortcutAndActionById.value().first;
+    if (action->isEnabled() != enabled)
+    {
+        shortcutAndActionById.value().second->setEnabled(enabled);
+        if (enabled)
+        {
+            IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+            if (idsByShortcut != mIdsByShortcut.end())
+            {
+                if (idsByShortcut.value().isEmpty())
+                {
+                    if (!remoteXGrabKey(mX11ByShortcut[shortcut]))
+                    {
+                        log(LOG_WARNING, "Cannot grab shortcut '%s'", qPrintable(shortcut));
+                    }
+                }
+            }
+            idsByShortcut = mDisabledIdsByShortcut.find(shortcut);
+            if (idsByShortcut != mDisabledIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
+                {
+                    mDisabledIdsByShortcut.erase(idsByShortcut);
+                }
+            }
+            mIdsByShortcut[shortcut].insert(id);
+        }
+        else
+        {
+            IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+            if (idsByShortcut != mIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
+                {
+                    mIdsByShortcut.erase(idsByShortcut);
 
-    saveConfig();
+                    if (!remoteXUngrabKey(mX11ByShortcut[shortcut]))
+                    {
+                        log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                    }
+                }
+            }
+            mDisabledIdsByShortcut[shortcut].insert(id);
+        }
 
-    result = true;
+        saveConfig();
+    }
+
+    return true;
 }
 
 void Core::isActionEnabled(bool &enabled, qulonglong id)
@@ -2540,29 +2597,48 @@ void Core::changeClientActionShortcut(QPair<QString, qulonglong> &result, const
 
     if (oldShortcut != newShortcut)
     {
-        newShortcut = grabOrReuseKey(X11shortcut, newShortcut);
-        if (newShortcut.isEmpty())
-        {
-            result = qMakePair(QString(), id);
-            return;
-        }
+        BaseAction const * const action = shortcutAndActionById.value().second;
 
-        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(oldShortcut);
-        if (idsByShortcut != mIdsByShortcut.end())
+        if (action->isEnabled())
         {
-            idsByShortcut.value().remove(id);
-            if (idsByShortcut.value().isEmpty())
+            newShortcut = grabOrReuseKey(X11shortcut, newShortcut);
+            if (newShortcut.isEmpty())
             {
-                mIdsByShortcut.erase(idsByShortcut);
+                result = qMakePair(QString(), id);
+                return;
+            }
 
-                if (!remoteXUngrabKey(mX11ByShortcut[oldShortcut]))
+            IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(oldShortcut);
+            if (idsByShortcut != mIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
                 {
-                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                    mIdsByShortcut.erase(idsByShortcut);
+
+                    if (!remoteXUngrabKey(mX11ByShortcut[oldShortcut]))
+                    {
+                        log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                    }
                 }
             }
-        }
 
-        mIdsByShortcut[newShortcut].insert(id);
+            mIdsByShortcut[newShortcut].insert(id);
+        }
+        else
+        {
+            IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(oldShortcut);
+            if (idsByShortcut != mDisabledIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
+                {
+                    mDisabledIdsByShortcut.erase(idsByShortcut);
+                }
+            }
+
+            mDisabledIdsByShortcut[newShortcut].insert(id);
+        }
         shortcutAndActionById.value().first = newShortcut;
     }
 
@@ -2607,29 +2683,48 @@ void Core::changeShortcut(QString &result, const qulonglong &id, const QString &
 
     if (oldShortcut != newShortcut)
     {
-        newShortcut = grabOrReuseKey(X11shortcut, newShortcut);
-        if (newShortcut.isEmpty())
-        {
-            result = QString();
-            return;
-        }
+        BaseAction const * const action = shortcutAndActionById.value().second;
 
-        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(oldShortcut);
-        if (idsByShortcut != mIdsByShortcut.end())
+        if (action->isEnabled())
         {
-            idsByShortcut.value().remove(id);
-            if (idsByShortcut.value().isEmpty())
+            newShortcut = grabOrReuseKey(X11shortcut, newShortcut);
+            if (newShortcut.isEmpty())
             {
-                mIdsByShortcut.erase(idsByShortcut);
+                result = QString();
+                return;
+            }
 
-                if (!remoteXUngrabKey(mX11ByShortcut[oldShortcut]))
+            IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(oldShortcut);
+            if (idsByShortcut != mIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
                 {
-                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                    mIdsByShortcut.erase(idsByShortcut);
+
+                    if (!remoteXUngrabKey(mX11ByShortcut[oldShortcut]))
+                    {
+                        log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                    }
                 }
             }
-        }
 
-        mIdsByShortcut[newShortcut].insert(id);
+            mIdsByShortcut[newShortcut].insert(id);
+        }
+        else
+        {
+            IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(oldShortcut);
+            if (idsByShortcut != mDisabledIdsByShortcut.end())
+            {
+                idsByShortcut.value().remove(id);
+                if (idsByShortcut.value().isEmpty())
+                {
+                    mDisabledIdsByShortcut.erase(idsByShortcut);
+                }
+            }
+
+            mDisabledIdsByShortcut[newShortcut].insert(id);
+        }
         shortcutAndActionById.value().first = newShortcut;
 
         if (!strcmp(shortcutAndActionById.value().second->type(), ClientAction::id()))
@@ -2715,21 +2810,38 @@ void Core::removeClientAction(bool &result, const QDBusObjectPath &path, const Q
 
     X11Shortcut X11shortcut = mX11ByShortcut[shortcut];
 
-    delete shortcutAndActionById.value().second;
+    BaseAction * action = shortcutAndActionById.value().second;
+    const bool enabled = action->isEnabled();
+    delete action;
     mShortcutAndActionById.erase(shortcutAndActionById);
     mIdByClientPath.remove(path);
 
-    IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
-    if (idsByShortcut != mIdsByShortcut.end())
+    if (enabled)
     {
-        idsByShortcut.value().remove(id);
-        if (idsByShortcut.value().isEmpty())
+        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mIdsByShortcut.end())
         {
-            mIdsByShortcut.erase(idsByShortcut);
-
-            if (!remoteXUngrabKey(X11shortcut))
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
             {
-                log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                mIdsByShortcut.erase(idsByShortcut);
+
+                if (!remoteXUngrabKey(X11shortcut))
+                {
+                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                }
+            }
+        }
+    }
+    else
+    {
+        IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mDisabledIdsByShortcut.end())
+        {
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
+            {
+                mDisabledIdsByShortcut.erase(idsByShortcut);
             }
         }
     }
@@ -2791,21 +2903,36 @@ void Core::removeAction(bool &result, const qulonglong &id)
     QString shortcut = shortcutAndActionById.value().first;
 
     X11Shortcut X11shortcut = mX11ByShortcut[shortcut];
-
+    const bool enabled = action->isEnabled();
     delete action;
     mShortcutAndActionById.erase(shortcutAndActionById);
 
-    IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
-    if (idsByShortcut != mIdsByShortcut.end())
+    if (enabled)
     {
-        idsByShortcut.value().remove(id);
-        if (idsByShortcut.value().isEmpty())
+        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mIdsByShortcut.end())
         {
-            mIdsByShortcut.erase(idsByShortcut);
-
-            if (!remoteXUngrabKey(X11shortcut))
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
             {
-                log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                mIdsByShortcut.erase(idsByShortcut);
+
+                if (enabled && !remoteXUngrabKey(X11shortcut))
+                {
+                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                }
+            }
+        }
+    }
+    else
+    {
+        IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mDisabledIdsByShortcut.end())
+        {
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
+            {
+                mDisabledIdsByShortcut.erase(idsByShortcut);
             }
         }
     }
@@ -2849,19 +2976,35 @@ void Core::deactivateClientAction(bool &result, const QDBusObjectPath &path, con
     ShortcutAndActionById::iterator shortcutAndActionById = mShortcutAndActionById.find(id);
     QString shortcut = shortcutAndActionById.value().first;
 
-    dynamic_cast<ClientAction*>(shortcutAndActionById.value().second)->disappeared();
+    ClientAction * const action = dynamic_cast<ClientAction*>(shortcutAndActionById.value().second);
+    action->disappeared();
 
-    IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
-    if (idsByShortcut != mIdsByShortcut.end())
+    if (action->isEnabled())
     {
-        idsByShortcut.value().remove(id);
-        if (idsByShortcut.value().isEmpty())
+        IdsByShortcut::iterator idsByShortcut = mIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mIdsByShortcut.end())
         {
-            mIdsByShortcut.erase(idsByShortcut);
-
-            if (!remoteXUngrabKey(mX11ByShortcut[shortcut]))
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
             {
-                log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                mIdsByShortcut.erase(idsByShortcut);
+
+                if (!remoteXUngrabKey(mX11ByShortcut[shortcut]))
+                {
+                    log(LOG_WARNING, "Cannot ungrab shortcut '%s'", qPrintable(shortcut));
+                }
+            }
+        }
+    }
+    else
+    {
+        IdsByShortcut::iterator idsByShortcut = mDisabledIdsByShortcut.find(shortcut);
+        if (idsByShortcut != mDisabledIdsByShortcut.end())
+        {
+            idsByShortcut.value().remove(id);
+            if (idsByShortcut.value().isEmpty())
+            {
+                mDisabledIdsByShortcut.erase(idsByShortcut);
             }
         }
     }
@@ -3174,17 +3317,15 @@ void Core::shortcutGrabbed()
         }
         if (length)
         {
-            char *str = new char[length + 1];
+            QScopedArrayPointer<char> str(new char[length + 1]);
             str[length] = '\0';
-            if (error_t error = readAll(mX11ResponsePipe[STDIN_FILENO], str, length))
+            if (error_t error = readAll(mX11ResponsePipe[STDIN_FILENO], str.data(), length))
             {
                 log(LOG_CRIT, "Cannot read from X11 response pipe: %s", strerror(error));
                 qApp->quit();
                 return;
             }
-            shortcut = str;
-
-            delete[] str;
+            shortcut = str.data();
         }
     }
 

daemon/core.h

@@ -150,6 +150,7 @@ private slots:
     void shortcutGrabTimedout();
 
 private:
+    bool enableActionNonGuarded(qulonglong id, bool enabled);
     QPair<QString, qulonglong> addOrRegisterClientAction(const QString &shortcut, const QDBusObjectPath &path, const QString &description, const QString &sender);
     qulonglong registerClientAction(const QString &shortcut, const QDBusObjectPath &path, const QString &description);
     qulonglong registerMethodAction(const QString &shortcut, const QString &service, const QDBusObjectPath &path, const QString &interface, const QString &method, const QString &description);
@@ -218,6 +219,7 @@ private:
     X11ByShortcut mX11ByShortcut;
     ShortcutByX11 mShortcutByX11;
     IdsByShortcut mIdsByShortcut;
+    IdsByShortcut mDisabledIdsByShortcut;
     ShortcutAndActionById mShortcutAndActionById;
     IdByClientPath mIdByClientPath;
     SenderByClientPath mSenderByClientPath; // add: path->sender

daemon/main.cpp

@@ -25,7 +25,7 @@
  *
  * END_COMMON_COPYRIGHT_HEADER */
 
-#include <QCoreApplication>
+#include <LXQt/Application>
 
 #include <QString>
 #include <QStringList>
@@ -230,15 +230,16 @@ int main(int argc, char *argv[])
         }
     }
 
-    int ignoreIt = chdir("/");
+    const char* home = getenv("HOME");
+    int ignoreIt = chdir((home && *home) ? home : "/");
     (void)ignoreIt;
 
-    if (configFiles.empty())
+    if (configFiles.empty() && home && *home)
     {
-        configFiles.push_back(QString::fromLocal8Bit(getenv("HOME")) + "/" DEFAULT_CONFIG);
+        configFiles.push_back(QString::fromLocal8Bit(home) + "/" DEFAULT_CONFIG);
     }
 
-    QCoreApplication app(argc, argv);
+    LXQt::Application app(argc, argv);
 
     Core core(runAsDaemon || useSyslog, minLogLevelSet, minLogLevel, configFiles, multipleActionsBehaviourSet, multipleActionsBehaviour);
 

ui/CMakeLists.txt

@@ -6,14 +6,6 @@ set(QT_DBUS_PREFIX "org.qtproject")
 set(LXQT_GLOBALKEYS_LIBRARY lxqt-globalkeys)
 set(${PROJECT_NAME}_HEADER_NAMESPACE "LXQtGlobalKeysUi")
 
-include_directories(
-    "${PROJECT_SOURCE_DIR}"
-    "${CMAKE_CURRENT_BINARY_DIR}"
-    ${LXQT_INCLUDE_DIRS}
-)
-
-add_definitions(-DSHARED_EXPORT=Q_DECL_EXPORT)
-
 set(${PROJECT_NAME}_SOURCES
     shortcut_selector.cpp
 )
@@ -23,7 +15,7 @@ set(${PROJECT_NAME}_MAIN_HEADER
 
 #
 # WARNING: Changing stuff here implies changing this:
-#install(FILES ${${PROJECT_NAME}_PUBLIC_HEADERS} DESTINATION include/${PROJECT_NAME} COMPONENT development RENAME "shortcutselector.h")
+#install(FILES ${${PROJECT_NAME}_PUBLIC_HEADERS} DESTINATION include/${PROJECT_NAME} COMPONENT Devel RENAME "shortcutselector.h")
 #
 set(${PROJECT_NAME}_PUBLIC_CPP_HEADERS
     shortcut_selector.h
@@ -101,7 +93,7 @@ foreach(DBUS_INTERFACE ${${PROJECT_NAME}_DBUS_INTERFACES})
     get_filename_component(DBUS_INTERFACE_FILENAME ${DBUS_INTERFACE} NAME)
     configure_file(
         ${DBUS_INTERFACE}
-        ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}
+        "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}"
         @ONLY
     )
     get_source_file_property(DBUS_INTERFACE_BASENAME ${DBUS_INTERFACE} BASENAME)
@@ -113,11 +105,10 @@ foreach(DBUS_INTERFACE ${${PROJECT_NAME}_DBUS_INTERFACES})
         CLASSNAME ${DBUS_INTERFACE_CLASSNAME}
         NO_NAMESPACE ${DBUS_INTERFACE_NO_NAMESPACE}
     )
-    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME} ${DBUS_INTERFACE_BASENAME})
+    qt5_add_dbus_interface(${PROJECT_NAME}_DBUS_INTERFACE_FILES "${CMAKE_CURRENT_BINARY_DIR}/${DBUS_INTERFACE_FILENAME}" ${DBUS_INTERFACE_BASENAME})
 endforeach()
 
 qt5_add_resources(${PROJECT_NAME}_RESOURCE_FILES ${${PROJECT_NAME}_RESOURCES})
-qt5_wrap_ui(${PROJECT_NAME}_FORM_FILES ${${PROJECT_NAME}_FORMS})
 
 set(${PROJECT_NAME}_GENERATED_FILES
     ${${PROJECT_NAME}_FORM_FILES}
@@ -133,17 +124,34 @@ set(${PROJECT_NAME}_ALL_FILES
     ${${PROJECT_NAME}_GENERATED_FILES}
 )
 
+set(${PROJECT_NAME}_PKG_CONFIG_REQUIRES "Qt5Widgets, Qt5DBus, ${LXQT_GLOBALKEYS_LIBRARY}")
+
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_ALL_FILES})
 target_link_libraries(${PROJECT_NAME}
-    Qt5::Widgets
-    Qt5::DBus
-    ${LXQT_GLOBALKEYS_LIBRARY}
+    PUBLIC
+        Qt5::Widgets
+        Qt5::DBus
+        ${LXQT_GLOBALKEYS_LIBRARY}
 )
 set_target_properties(${PROJECT_NAME}
     PROPERTIES
     VERSION ${LXQT_VERSION}
     SOVERSION ${LXQT_MAJOR_VERSION}
 )
+target_include_directories(${PROJECT_NAME}
+    INTERFACE "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${LXQT_GLOBALKEYS_UI_LIBRARY_NAME}>"
+)
+
+target_include_directories(${PROJECT_NAME}
+    INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/include>"
+    INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}>"
+)
+
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE "SHARED_EXPORT=Q_DECL_EXPORT"
+)
+
+export(TARGETS ${PROJECT_NAME} APPEND FILE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}-targets.cmake")
 
 include(create_portable_headers)
 create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
@@ -151,11 +159,62 @@ create_portable_headers(${PROJECT_NAME}_PORTABLE_HEADERS
     FILENAMES ${${PROJECT_NAME}_PUBLIC_CLASSES}
 )
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} COMPONENT runtime)
-install(FILES ${${PROJECT_NAME}_PUBLIC_HEADERS} DESTINATION include/${PROJECT_NAME} COMPONENT development)
-install(FILES ${${PROJECT_NAME}_PUBLIC_HEADERS} DESTINATION include/${PROJECT_NAME} COMPONENT development RENAME "shortcutselector.h")
-install(FILES ${${PROJECT_NAME}_PORTABLE_HEADERS} DESTINATION include/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE} COMPONENT development)
+# Copy public headers for intree building
+foreach(h ${${PROJECT_NAME}_PUBLIC_HEADERS})
+    get_filename_component(bh ${h} NAME)
+    configure_file("${h}" "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/${bh}" COPYONLY)
+endforeach()
+
+foreach(h ${${PROJECT_NAME}_PORTABLE_HEADERS})
+    get_filename_component(bh ${h} NAME)
+    configure_file("${h}" "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE}/${bh}" COPYONLY)
+endforeach()
+
+foreach(h ${${PROJECT_NAME}_PUBLIC_HEADERS})
+    get_filename_component(bh ${h} NAME)
+    configure_file("${h}" "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/include/${PROJECT_NAME}/shortcutselector.h" COPYONLY)
+endforeach()
+
+install(TARGETS
+    ${PROJECT_NAME}
+    DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    EXPORT ${PROJECT_NAME}-targets
+    COMPONENT Runtime
+)
+
+install(EXPORT
+    ${PROJECT_NAME}-targets
+    DESTINATION "${LXQT_INSTALL_CMAKE_DIR}/${LXQT_GLOBALKEYS_UI_CMAKE_NAME}"
+    COMPONENT Devel
+)
+
+install(FILES
+    ${${PROJECT_NAME}_PUBLIC_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+    COMPONENT Devel
+)
+
+install(FILES
+    ${${PROJECT_NAME}_PUBLIC_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}"
+    COMPONENT Devel
+    RENAME "shortcutselector.h"
+)
+
+install(FILES
+    ${${PROJECT_NAME}_PORTABLE_HEADERS}
+    DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${${PROJECT_NAME}_HEADER_NAMESPACE}"
+    COMPONENT Devel
+)
 
 
-include(create_pkgconfig_file)
-create_pkgconfig_file(${PROJECT_NAME} "LXQt global key shortcuts GUI support library")
+lxqt_create_pkgconfig_file(
+    PACKAGE_NAME ${PROJECT_NAME}
+    DESCRIPTIVE_NAME ${PROJECT_NAME}
+    DESCRIPTION "LXQt global key shortcuts GUI support library"
+    INCLUDEDIRS ${PROJECT_NAME}
+    LIBS ${PROJECT_NAME}
+    REQUIRES ${${PROJECT_NAME}_PKG_CONFIG_REQUIRES}
+    VERSION ${LXQT_VERSION}
+    INSTALL
+)

ui/shortcut_selector.h

@@ -40,7 +40,11 @@ namespace GlobalKeyShortcut
 class Client;
 }
 
-class ShortcutSelector : public QToolButton
+#ifndef SHARED_EXPORT
+#define SHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+class SHARED_EXPORT ShortcutSelector : public QToolButton
 {
     Q_OBJECT
 public: