Cherry-picked upstream version 0.9.0+20150831.

.gitignore

@@ -1,2 +0,0 @@
-build
-nbproject

AUTHORS

@@ -6,5 +6,5 @@ Copyright:
     Copyright (c) 2010-2012 Razor team
     Copyright (c) 2012-2014 LXQt team
 
-License: GPL-2 and LGPL-2.1+
+License: LGPL-2.1+
 The full text of the licenses can be found in the 'COPYING' file.

CMakeLists.txt

@@ -1,12 +1,24 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)
 
 project(lxqt-runner)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTORCC ON)
+
+include(CMakeDependentOption)
+include(GNUInstallDirs)
 
 option(UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF)
+option(USE_MENU_CACHE "Use libmenu-cache from LXDE to generate the app menu" ON)
+option(RUNNER_MATH "Math operations support" ON)
+option(RUNNER_VBOX "Virtual Box support" ON)
+cmake_dependent_option(RUNNER_VBOX_HEADLESS
+    "Use headless mode instead of default window" OFF
+    "RUNNER_VBOX" OFF
+)
 
 find_package(KF5WindowSystem REQUIRED)
 find_package(Qt5Widgets REQUIRED)
@@ -14,33 +26,23 @@ find_package(Qt5Xml REQUIRED)
 find_package(Qt5Script REQUIRED)
 find_package(Qt5LinguistTools REQUIRED QUIET)
 find_package(lxqt REQUIRED)
-find_package(Qt5Xdg REQUIRED)
 find_package(lxqt-globalkeys REQUIRED)
 find_package(lxqt-globalkeys-ui REQUIRED)
 message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+
+include(LXQtCompilerSettings NO_POLICY_SCOPE)
+
 set(QTX_LIBRARIES Qt5::Widgets Qt5::Xml Qt5::Script)
 
-include(${LXQT_USE_FILE})
+if (USE_MENU_CACHE)
-include(${QTXDG_USE_FILE})
+    # optionally use libmenu-cache from lxde to generate the application menu
-include(${LXQT_GLOBALKEYS_USE_FILE})
+    find_package(PkgConfig REQUIRED QUIET)
-include(${LXQT_GLOBALKEYS_UI_USE_FILE})
 
-# optionally use libmenu-cache from lxde to generate the application menu
+    pkg_check_modules(MENU_CACHE REQUIRED QUIET
-find_package(PkgConfig)
-
-if (NOT WITHOUT_MENU_CACHE)
-    pkg_check_modules(MENU_CACHE
         libmenu-cache>=0.3.3
     )
-endif(NOT WITHOUT_MENU_CACHE)
-
-# if libmenu-cache is available
-if (MENU_CACHE_FOUND)
-    include_directories(${MENU_CACHE_INCLUDE_DIRS})
-    add_definitions(-DHAVE_MENU_CACHE=1)
 endif()
 
-
 set(lxqt-runner_H_FILES
     dialog.h
     commanditemmodel.h
@@ -70,16 +72,13 @@ set(QRC_FILES
 )
 
 set(lxqt-runner_LIBRARIES
-    ${LXQT_LIBRARIES}
+    lxqt
-    ${LXQT_GLOBALKEYS_LIBRARIES}
+    lxqt-globalkeys
-    ${LXQT_GLOBALKEYS_UI_LIBRARIES}
+    lxqt-globalkeys-ui
-    ${QTXDG_LIBRARIES}
     ${MENU_CACHE_LIBRARIES}
     ${QTX_LIBRARIES}
 )
 
-
-
 include(LXQtTranslate)
 
 lxqt_translate_ts(lxqt-runner_QM_FILES
@@ -94,69 +93,42 @@ lxqt_translate_ts(lxqt-runner_QM_FILES
 
 lxqt_app_translation_loader(lxqt-runner_QM_LOADER ${PROJECT_NAME})
 
-#************************************************
-
-include_directories(
-    ${LXQT_INCLUDE_DIRS}
-    ${LXQT_GLOBALKEYS_INCLUDE_DIRS}
-    ${LXQT_GLOBALKEYS_UI_INCLUDE_DIRS}
-    ${QTXDG_INCLUDE_DIRS}
-)
-
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
 endif()
 
-add_definitions(-Wall)
-
-set(LXQT_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/lxqt")
-set(APP_SHARE_DIR "${LXQT_SHARE_DIR}/${PROJECT_NAME}")
-
-#************************************************
-
-if(NOT DEFINED RUNNER_MATH)
-    set(RUNNER_MATH Yes)
-endif()
-
-if(RUNNER_MATH)
-    add_definitions(-DMATH_ENABLED)
-endif(RUNNER_MATH)
-
-# *******************************************************************
-# Optional: start VBOX machines in headless mode,
-# instead of default window
-
-if(NOT DEFINED RUNNER_VBOX)
-    set(RUNNER_VBOX Yes)
-endif()
-
-if(VBOXRUNNER_HEADLESS)
-    add_definitions(-DVBOXRUNNER_HEADLESS)
-endif()
-
 if (RUNNER_VBOX)
-    set(QRC_FILES
+    list(APPEND QRC_FILES virtualbox-icons.qrc)
-        ${QRC_FILES}
-        virtualbox-icons.qrc
-    )
-    add_definitions(-DVBOX_ENABLED)
 endif()
 
-qt5_wrap_ui(lxqt-runner_UI_HEADERS ${lxqt-runner_UI_FILES})
-qt5_add_resources(lxqt-runner_QRC_SOURCES ${QRC_FILES})
-
 add_executable(${PROJECT_NAME}
     ${lxqt-runner_CPP_FILES}
-    ${lxqt-runner_UI_FILES}
     ${lxqt-runner_QRC_SOURCES}
     ${lxqt-runner_QM_FILES}
     ${lxqt-runner_QM_LOADER}
 )
 
-target_link_libraries(${PROJECT_NAME} ${lxqt-runner_LIBRARIES} KF5::WindowSystem)
+target_include_directories(${PROJECT_NAME}
+    PRIVATE "$<$<BOOL:${MENU_CACHE_FOUND}>:${MENU_CACHE_INCLUDE_DIRS}>"
+)
 
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+target_compile_definitions(${PROJECT_NAME}
-install(FILES ${CONFIG_FILES} DESTINATION ${APP_SHARE_DIR})
+    PRIVATE "$<$<BOOL:${RUNNER_MATH}>:MATH_ENABLED>"
+    PRIVATE "$<$<BOOL:${RUNNER_VBOX}>:VBOX_ENABLED>"
+    PRIVATE "$<$<BOOL:${RUNNER_VBOX_HEADLESS}>:VBOX_HEADLESS_ENABLED>"
+    PRIVATE "$<$<BOOL:${MENU_CACHE_FOUND}>:HAVE_MENU_CACHE=1>"
+)
+
+target_link_libraries(${PROJECT_NAME}
+    ${lxqt-runner_LIBRARIES}
+    KF5::WindowSystem
+)
+
+install(TARGETS
+    ${PROJECT_NAME}
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+    COMPONENT Runtime
+)
 
 # building tarball with CPack -------------------------------------------------
 include(InstallRequiredSystemLibraries)

commanditemmodel.cpp

@@ -42,7 +42,9 @@ CommandItemModel::CommandItemModel(QObject *parent) :
     mSourceModel(new CommandSourceItemModel(this)),
     mOnlyHistory(false)
 {
-	setDynamicSortFilter(false); // required in Qt5
+    setDynamicSortFilter(false); // required in Qt5
+    setFilterCaseSensitivity(Qt::CaseInsensitive);
+    setSortCaseSensitivity(Qt::CaseInsensitive);
     setSourceModel(mSourceModel);
 }
 
@@ -138,7 +140,7 @@ int CommandItemModel::itemType(const QModelIndex &index) const
         return 1;
     else if (index.row() < mSourceModel->externalProviderStartIndex().row())
         return 2;
-    else 
+    else
         return 3;
 }
 
@@ -214,14 +216,12 @@ CommandSourceItemModel::CommandSourceItemModel(QObject *parent) :
     mProviders.append(new VirtualBoxProvider());
 #endif
 
-    mProviders.append(new PowerProvider());
-
     rebuild();
     mExternalProviderStartIndex = index(rowCount(), 0);
 
-    LxQt::Settings settings("lxqt-runner");
+    LXQt::Settings settings("lxqt-runner");
     int numExternalProviders = settings.beginReadArray("external providers");
-    for (int i = 0; i < numExternalProviders; i++) 
+    for (int i = 0; i < numExternalProviders; i++)
     {
         settings.setArrayIndex(i);
         qDebug() << "Adding external provider:" << settings.value("name") << settings.value("executable");
@@ -237,7 +237,7 @@ CommandSourceItemModel::CommandSourceItemModel(QObject *parent) :
         connect(provider, SIGNAL(changed()), this, SIGNAL(layoutChanged()));
         connect(provider, SIGNAL(aboutToBeChanged()), this, SIGNAL(layoutAboutToBeChanged()));
     }
-   
+
     rebuild();
 }
 
@@ -384,11 +384,11 @@ void CommandSourceItemModel::addHistoryCommand(const QString &command)
 
 
 /***********************************************
- 
+
  ***********************************************/
 void CommandSourceItemModel::setCommand(const QString& command)
 {
-    mCustomCommandProvider->setCommand(command); 
+    mCustomCommandProvider->setCommand(command);
     foreach (ExternalProvider* externalProvider, mExternalProviders)
     {
         externalProvider->setSearchTerm(command);

commanditemmodel.h

@@ -8,7 +8,7 @@
  * Authors:
  *   Alexander Sokoloff <sokoloff.a@gmail.com>
  *
- * This program or library is free software; you can/ redistribute it
+ * 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.
@@ -51,7 +51,7 @@ public:
     void addHistoryCommand(const QString &command);
 
     QString command() const { return mCustomCommandProvider->command(); }
-    void setCommand(const QString &command); 
+    void setCommand(const QString &command);
 
     QPersistentModelIndex customCommandIndex() const { return mCustomCommandIndex; }
     QPersistentModelIndex externalProviderStartIndex() const { return mExternalProviderStartIndex; }

configuredialog/configuredialog.cpp

@@ -49,7 +49,7 @@ ConfigureDialog::ConfigureDialog(QSettings *settings, const QString &defaultShor
     QDialog(parent),
     ui(new Ui::ConfigureDialog),
     mSettings(settings),
-    mOldSettings(new LxQt::SettingsCache(settings)),
+    mOldSettings(new LXQt::SettingsCache(settings)),
     mDefaultShortcut(defaultShortcut)
 {
     ui->setupUi(this);

configuredialog/configuredialog.h

@@ -37,7 +37,7 @@ namespace Ui {
 
 class QSettings;
 
-namespace LxQt {
+namespace LXQt {
     class SettingsCache;
 }
 
@@ -61,7 +61,7 @@ protected:
 private:
     Ui::ConfigureDialog *ui;
     QSettings *mSettings;
-    LxQt::SettingsCache *mOldSettings;
+    LXQt::SettingsCache *mOldSettings;
     QString mDefaultShortcut;
 
 private slots:

debian/changelog

@@ -1,9 +1,10 @@
 lxqt-runner (0.9.0+20150831-1) unstable; urgency=medium
 
+  * Cherry-picked upstream version 0.9.0+20150831.
   * Added upstream signing key and use in watch file
   * Fixed control with cme fix
 
- -- Alf Gaida <agaida@siduction.org>  Fri, 04 Sep 2015 21:15:04 +0200
+ -- Alf Gaida <agaida@siduction.org>  Fri, 04 Sep 2015 21:20:43 +0200
 
 lxqt-runner (0.9.0-1) experimental; urgency=low
 

dialog.cpp

@@ -51,7 +51,7 @@
 #include <QWindow>
 #include <QScrollBar>
 
-#include <KF5/KWindowSystem/KWindowSystem>
+#include <KWindowSystem/KWindowSystem>
 
 #define DEFAULT_SHORTCUT "Alt+F2"
 
@@ -59,9 +59,9 @@
 
  ************************************************/
 Dialog::Dialog(QWidget *parent) :
-    QDialog(parent, Qt::Tool | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint),
+    QDialog(parent, Qt::Dialog | Qt::WindowStaysOnTopHint | Qt::CustomizeWindowHint),
     ui(new Ui::Dialog),
-    mSettings(new LxQt::Settings("lxqt-runner", this)),
+    mSettings(new LXQt::Settings("lxqt-runner", this)),
     mGlobalShortcut(0),
     mLockCascadeChanges(false),
     mConfigureDialog(0)
@@ -70,7 +70,7 @@ Dialog::Dialog(QWidget *parent) :
     setWindowTitle("LXQt Runner");
     setAttribute(Qt::WA_TranslucentBackground);
 
-    connect(LxQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(update()));
+    connect(LXQt::Settings::globalSettings(), SIGNAL(iconThemeChanged()), this, SLOT(update()));
     connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide()));
     connect(mSettings, SIGNAL(settingsChanged()), this, SLOT(applySettings()));
 
@@ -87,7 +87,7 @@ Dialog::Dialog(QWidget *parent) :
     setFilter("");
     dataChanged();
 
-    ui->commandList->setItemDelegate(new LxQt::HtmlDelegate(QSize(32, 32), ui->commandList));
+    ui->commandList->setItemDelegate(new LXQt::HtmlDelegate(QSize(32, 32), ui->commandList));
 
     // Popup menu ...............................
     QAction *a = new QAction(XdgIcon::fromTheme("configure"), tr("Configure"), this);
@@ -98,9 +98,9 @@ Dialog::Dialog(QWidget *parent) :
     connect(a, SIGNAL(triggered()), mCommandItemModel, SLOT(clearHistory()));
     addAction(a);
 
-    mPowerManager = new LxQt::PowerManager(this);
+    mPowerManager = new LXQt::PowerManager(this);
     addActions(mPowerManager->availableActions());
-    mScreenSaver = new LxQt::ScreenSaver(this);
+    mScreenSaver = new LXQt::ScreenSaver(this);
     addActions(mScreenSaver->availableActions());
 
     setContextMenuPolicy(Qt::ActionsContextMenu);
@@ -108,7 +108,6 @@ Dialog::Dialog(QWidget *parent) :
     QMenu *menu = new QMenu(this);
     menu->addActions(actions());
     ui->actionButton->setMenu(menu);
-    ui->actionButton->setIcon(XdgIcon::fromTheme("configure"));
     // End of popup menu ........................
 
     applySettings();
@@ -117,6 +116,7 @@ Dialog::Dialog(QWidget *parent) :
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), SLOT(realign()));
     connect(mGlobalShortcut, SIGNAL(activated()), this, SLOT(showHide()));
     connect(mGlobalShortcut, SIGNAL(shortcutChanged(QString,QString)), this, SLOT(shortcutChanged(QString,QString)));
+    connect(KWindowSystem::self(), SIGNAL(activeWindowChanged(WId)), this, SLOT(onActiveWindowChanged(WId)));
 
     resize(mSettings->value("dialog/width", 400).toInt(), size().height());
 
@@ -140,7 +140,7 @@ Dialog::~Dialog()
 void Dialog::closeEvent(QCloseEvent *event)
 {
     hide();
-    event->ignore();
+    event->accept();
 }
 
 
@@ -179,11 +179,6 @@ bool Dialog::eventFilter(QObject *object, QEvent *event)
         if (object == ui->commandList)
             return listKeyPressEvent(keyEvent);
     }
-    else if (event->type() == QEvent::FocusOut)
-    {
-        hide();
-        return true;
-    }
 
     return QDialog::eventFilter(object, event);
 }
@@ -292,7 +287,9 @@ bool Dialog::listKeyPressEvent(QKeyEvent *event)
  ************************************************/
 void Dialog::showHide()
 {
-    if (isVisible() && isActiveWindow())
+    // Using KWindowSystem to detect the active window since
+    // QWidget::isActiveWindow is not working reliably.
+    if (isVisible() && (KWindowSystem::activeWindow() == winId()))
     {
         hide();
     }
@@ -375,19 +372,28 @@ void Dialog::shortcutChanged(const QString &/*oldShortcut*/, const QString &newS
 }
 
 
+/************************************************
+
+ ************************************************/
+void Dialog::onActiveWindowChanged(WId id)
+{
+    if (isVisible() && id != winId())
+        showHide();
+}
+
+
 /************************************************
 
  ************************************************/
 void Dialog::setFilter(const QString &text, bool onlyHistory)
 {
-    qDebug() << "Ind i setFilter...";
     if (mCommandItemModel->isOutDated())
         mCommandItemModel->rebuild();
 
     QString trimmedText = text.simplified();
     mCommandItemModel->setCommand(trimmedText);
     mCommandItemModel->showOnlyHistory(onlyHistory);
-    mCommandItemModel->setFilterWildcard(trimmedText);
+    mCommandItemModel->setFilterRegExp(trimmedText);
     mCommandItemModel->sort(0);
 }
 

dialog.h

@@ -34,7 +34,7 @@ namespace Ui {
     class Dialog;
 }
 
-namespace LxQt {
+namespace LXQt {
     class Settings;
     class PowerManager;
     class ScreenSaver;
@@ -69,21 +69,18 @@ protected:
 
 private:
     Ui::Dialog *ui;
-    LxQt::Settings *mSettings;
+    LXQt::Settings *mSettings;
     GlobalKeyShortcut::Action *mGlobalShortcut;
     CommandItemModel *mCommandItemModel;
     bool mShowOnTop;
     int mMonitor;
-    LxQt::PowerManager *mPowerManager;
+    LXQt::PowerManager *mPowerManager;
-    LxQt::ScreenSaver *mScreenSaver;
+    LXQt::ScreenSaver *mScreenSaver;
 
     bool mLockCascadeChanges;
 
     ConfigureDialog *mConfigureDialog;
 
-    //! \brief handle various additional behaviours (math only for now)
-    bool editEnterPressed();
-
 private slots:
     void realign();
     void applySettings();
@@ -93,6 +90,7 @@ private slots:
     void runCommand();
     void showConfigDialog();
     void shortcutChanged(const QString &oldShortcut, const QString &newShortcut);
+    void onActiveWindowChanged(WId id);
 };
 
 #endif // DIALOG_H

main.cpp

@@ -32,7 +32,7 @@
 
 int main(int argc, char *argv[])
 {
-    LxQt::Application a(argc, argv);
+    LXQt::Application a(argc, argv);
     a.setQuitOnLastWindowClosed(false);
 
     QWidget *hiddenPreviewParent = new QWidget(0, Qt::Tool);

man/lxqt-runner.1

@@ -23,7 +23,7 @@ technologies, ships several core desktop components, all of which are optional:
 .P
 These components perform similar actions to those available in other desktop
 environments, and their names are self-descriptive.  They are usually not launched
-by hand but automatically, when choosing a \fBLxQt\-qt\fR session in the Display
+by hand but automatically, when choosing a \fBLXQt\fR session in the Display
 Manager.
 .SH BEHAVIOR
 As you type, suggestions will appear. Once you see the application you wish to run you can navigate
@@ -34,7 +34,7 @@ such as \fBlxqt-globalkeyshortcuts\fR.
 This module only shows at \fBLXQt\fR desktop environment, but you can use in others desktops, by
 setting an configuring into session startup.
 .SH "REPORTING BUGS"
-Report bugs to https://github.com/lxde/lxde-qt/issues
+Report bugs to https://github.com/lxde/lxqt/issues
 .SH "SEE ALSO"
 \fBLXQt\fR it has been tailored for users who value simplicity, speed, and
 an intuitive interface, also intended for less powerful machines. See also:

providers.cpp

@@ -89,8 +89,18 @@ bool startProcess(QString command)
     QString program  = expandCommand(command, &args);
     if (program.isEmpty())
         return false;
+    if (QProcess::startDetached(program, args))
+    {
+        return true;
+    } else
+    {
+        //fallback for executable script with no #!
+        //trying as in system(2)
+        args.prepend(program);
+        args.prepend(QStringLiteral("-c"));
+        return QProcess::startDetached(QStringLiteral("/bin/sh"), args);
+    }
 
-    return QProcess::startDetached(program, args);
 }
 
 
@@ -230,11 +240,8 @@ bool AppLinkItem::compare(const QRegExp &regExp) const
     if (regExp.isEmpty())
         return false;
 
-    QRegExp re(regExp);
+    return mProgram.contains(regExp) ||
-
+           mTitle.contains(regExp) ;
-    re.setCaseSensitivity(Qt::CaseInsensitive);
-    return mProgram.contains(re) ||
-           mTitle.contains(re) ;
 }
 
 
@@ -255,7 +262,7 @@ AppLinkProvider::AppLinkProvider():
         mMenuCacheNotify = 0;
 #else
     mXdgMenu = new XdgMenu();
-    mXdgMenu->setEnvironments(QStringList() << "X-LXQT" << "LxQt");
+    mXdgMenu->setEnvironments(QStringList() << "X-LXQT" << "LXQt");
     connect(mXdgMenu, SIGNAL(changed()), this, SLOT(update()));
     mXdgMenu->read(XdgMenu::getMenuFileName());
     update();
@@ -355,7 +362,7 @@ void AppLinkProvider::update()
                 // Otherwise the copied item will have no icon.
                 // FIXME: this is a dirty hack and it should be made cleaner later.
                 if(item->icon().isNull())
-		    QMetaObject::invokeMethod(item, "updateIcon", Qt::QueuedConnection);
+                    QMetaObject::invokeMethod(item, "updateIcon", Qt::QueuedConnection);
                 delete newItem;
             }
             else
@@ -407,10 +414,7 @@ bool HistoryItem::run() const
  ************************************************/
 bool HistoryItem::compare(const QRegExp &regExp) const
 {
-    QRegExp re(regExp);
+    return mCommand.contains(regExp);
-
-    re.setCaseSensitivity(Qt::CaseSensitive);
-    return mCommand.contains(re);
 }
 
 
@@ -597,13 +601,13 @@ VirtualBoxItem::VirtualBoxItem(const QString & MachineName , const QIcon & Icon)
 
 void VirtualBoxItem::setRDEPort(const QString & portNum)
 {
-	m_rdePortNum = portNum;
+    m_rdePortNum = portNum;
 }
 
 bool VirtualBoxItem::run() const
 {
     QStringList arguments;
-#ifdef VBOXRUNNER_HEADLESS
+#ifdef VBOX_HEADLESS_ENABLED
     arguments << "-startvm" << title();
     return QProcess::startDetached ("VBoxHeadless" , arguments);
 #else
@@ -615,9 +619,7 @@ bool VirtualBoxItem::run() const
 
 bool VirtualBoxItem::compare(const QRegExp &regExp) const
 {
-    QRegExp re(regExp);
+    return (! regExp.isEmpty() && -1 != regExp.indexIn (title ()));
-    re.setCaseSensitivity(Qt::CaseInsensitive);
-    return (! regExp.isEmpty() && -1 != re.indexIn (title ()));
 }
 
 unsigned int VirtualBoxItem::rank(const QString &pattern) const
@@ -833,54 +835,6 @@ MathProvider::MathProvider()
     append(new MathItem());
 }
 
-
-PowerProviderItem::PowerProviderItem(QAction *action)
-    : CommandProviderItem(),
-      m_action(action)
-{
-    mIcon = action->icon();
-    mTitle = action->text();
-    mComment = QObject::tr("Power Management");
-    mToolTip = mComment;
-}
-
-bool PowerProviderItem::run() const
-{
-    m_action->activate(QAction::Trigger);
-    return true;
-}
-
-bool PowerProviderItem::compare(const QRegExp &regExp) const
-{
-    if (regExp.isEmpty())
-        return false;
-
-    QRegExp re(regExp);
-
-    re.setCaseSensitivity(Qt::CaseInsensitive);
-    return mTitle.contains(re) ;
-}
-
-unsigned int PowerProviderItem::rank(const QString &pattern) const
-{
-    return stringRank(mTitle, pattern);
-}
-
-PowerProvider::PowerProvider() : CommandProvider()
-{
-    m_power = new LxQt::PowerManager(this);
-    foreach (QAction *a, m_power->availableActions())
-    {
-        append(new PowerProviderItem(a));
-    }
-
-    m_screensaver = new LxQt::ScreenSaver(this);
-    foreach (QAction *a, m_screensaver->availableActions())
-    {
-        append(new PowerProviderItem(a));
-    }
-}
-
 ExternalProviderItem::ExternalProviderItem()
 {
 }

providers.h

@@ -269,7 +269,7 @@ class VirtualBoxItem: public CommandProviderItem
 {
 public:
   VirtualBoxItem(const QString & MachineName , const QIcon & Icon);
-  
+
   void setRDEPort (const QString & portNum);
   bool run() const;
   bool compare(const QRegExp &regExp) const;
@@ -284,7 +284,7 @@ public:
   VirtualBoxProvider ();
   void rebuild();
   bool isOutDated() const;
-  
+
 private:
   QFile fp;
   QMap<QString,QString> osIcons;
@@ -293,40 +293,6 @@ private:
 };
 #endif
 
-
-class QAction;
-/*! Power management built in into runner
- */
-class PowerProviderItem : public CommandProviderItem
-{
-public:
-    PowerProviderItem(QAction *action);
-
-    bool run() const;
-    bool compare(const QRegExp &regExp) const;
-    unsigned int rank(const QString &pattern) const;
-private:
-    QAction *m_action;
-};
-
-namespace LxQt {
-    class PowerManager;
-    class ScreenSaver;
-}
-
-/*! Power management built in into runner
- */
-class PowerProvider: public CommandProvider
-{
-    Q_OBJECT
-public:
-    PowerProvider();
-
-private:
-    LxQt::PowerManager *m_power;
-    LxQt::ScreenSaver *m_screensaver;
-};
-
 class ExternalProviderItem: public CommandProviderItem
 {
     Q_OBJECT
@@ -338,7 +304,7 @@ public:
 
     bool run() const;
     bool compare(const QRegExp &regExp) const {return true;} // We leave the decision to the external process
-    unsigned int rank(const QString &pattern) const; 
+    unsigned int rank(const QString &pattern) const;
 
     QString mCommand;
 };
@@ -351,21 +317,21 @@ class ExternalProvider: public CommandProvider
 
 public:
     ExternalProvider(const QString name, const QString externalProgram);
-  
+
     void setSearchTerm(const QString searchTerm);
-    
+
 signals:
     void dataChanged();
 
 private slots:
     void readFromProcess();
     void newListOfMaps(QList<QMap<QString, QString> > maps);
-    
+
 private:
-    QString mName; 
+    QString mName;
     QProcess *mExternalProcess;
-    QTextStream *mDataToProcess; 
+    QTextStream *mDataToProcess;
-    YamlParser *mYamlParser; 
+    YamlParser *mYamlParser;
 
     QByteArray mBuffer;
 };

translations/lxqt-runner_ar.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>إعدادات مُطلق ريزر</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
         <translation>الرِّياضيَّات</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation>إدارة الطاقة لبيئة ريزر</translation>
     </message>
 </context>

translations/lxqt-runner_cs.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Nastavení spouštěče programů</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
         <translation>Matematika</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation>Správa energie</translation>
     </message>
 </context>

translations/lxqt-runner_cs_CZ.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Nastavení spouštěče programů</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
         <translation>Matematika</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation>Správa energie</translation>
     </message>
 </context>

translations/lxqt-runner_da.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_da_DK.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Programstarter Indstillinger</translation>
     </message>
     <message>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Indstil LxQt programstarter</translation>
+        <translation>Indstil LXQt programstarter</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +68,8 @@
         <translation>Matematik</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt Strømstyring</translation>
+        <translation>LXQt Strømstyring</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_de.ts

@@ -1,50 +1,57 @@
-<?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>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>Runner Settings</source>
-        <translation type="unfinished"/>
+        <translation>Anwendungsstarter-Einstellungen</translation>
     </message>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="20"/>
         <source>Appearance</source>
-        <translation type="unfinished"/>
+        <translation>Aussehen</translation>
     </message>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="26"/>
         <source>Positioning:</source>
-        <translation type="unfinished"/>
+        <translation>Positionierung:</translation>
     </message>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="36"/>
         <source>Show on:</source>
-        <translation type="unfinished"/>
+        <translation>Anzeigen auf:</translation>
     </message>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="56"/>
         <source>Shortcut:</source>
-        <translation type="unfinished"/>
+        <translation>Tastenkürzel:</translation>
     </message>
     <message>
-        <location filename="../configuredialog/configuredialog.cpp" line="70"/>
+        <location filename="../configuredialog/configuredialog.cpp" line="60"/>
-        <source>Top edge of screen</source>
+        <source>Top edge of the screen</source>
-        <translation type="unfinished"/>
+        <translation>Bildschirmoberkante</translation>
+    </message>
+    <message>
+        <location filename="../configuredialog/configuredialog.cpp" line="61"/>
+        <source>Center of the screen</source>
+        <translation>Bildschirmmitte</translation>
+    </message>
+    <message>
+        <location filename="../configuredialog/configuredialog.cpp" line="67"/>
+        <source>Focused screen</source>
+        <translation>Fokussierter Bildschirm</translation>
     </message>
     <message>
         <location filename="../configuredialog/configuredialog.cpp" line="71"/>
-        <source>Center of screen</source>
+        <source>Always on screen %1</source>
-        <translation type="unfinished"/>
+        <translation>Immer auf Bildschirm %1</translation>
     </message>
     <message>
-        <location filename="../configuredialog/configuredialog.cpp" line="77"/>
+        <location filename="../configuredialog/configuredialog.cpp" line="80"/>
-        <source>Monitor where the mouse</source>
+        <source>Reset</source>
-        <translation type="unfinished"/>
+        <translation>Zurücksetzen</translation>
-    </message>
-    <message>
-        <location filename="../configuredialog/configuredialog.cpp" line="82"/>
-        <source>Always on %1 monitor</source>
-        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -52,30 +59,35 @@
     <message>
         <location filename="../dialog.ui" line="26"/>
         <source>Application launcher </source>
-        <translation type="unfinished"/>
+        <translation>Anwendungsstarter</translation>
     </message>
     <message>
-        <location filename="../dialog.cpp" line="91"/>
+        <location filename="../dialog.cpp" line="93"/>
-        <source>Configure lxqt-runner</source>
+        <source>Configure</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurieren</translation>
     </message>
     <message>
-        <location filename="../dialog.cpp" line="296"/>
+        <location filename="../dialog.cpp" line="97"/>
-        <source>Press &quot;%1&quot; to see dialog.</source>
+        <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation>Verlauf löschen</translation>
+    </message>
+    <message>
+        <location filename="../dialog.cpp" line="345"/>
+        <source>Show/hide runner dialog</source>
+        <translation>Dialog anzeigen/verstecken</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../providers.cpp" line="221"/>
+        <location filename="../providers.cpp" line="398"/>
         <source>History</source>
-        <translation type="unfinished"/>
+        <translation>Verlauf</translation>
     </message>
     <message>
-        <location filename="../providers.cpp" line="307"/>
+        <location filename="../providers.cpp" line="784"/>
         <source>Mathematics</source>
-        <translation type="unfinished"/>
+        <translation>Mathematik</translation>
     </message>
 </context>
-</TS>
+</TS>

translations/lxqt-runner_de_DE.ts

@@ -1,75 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
-<context>
-    <name>ConfigureDialog</name>
-    <message>
-        <source>LxQt-runner Settings</source>
-        <translation>LxQt-runner-Einstellungen</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Aussehen</translation>
-    </message>
-    <message>
-        <source>Positioning:</source>
-        <translation>Positionierung:</translation>
-    </message>
-    <message>
-        <source>Show on:</source>
-        <translation>Anzeigen auf:</translation>
-    </message>
-    <message>
-        <source>Shortcut:</source>
-        <translation>Tastenkürzel:</translation>
-    </message>
-    <message>
-        <source>Top edge of screen</source>
-        <translation>Bildschirmoberkante</translation>
-    </message>
-    <message>
-        <source>Center of screen</source>
-        <translation>Bildschirmmitte</translation>
-    </message>
-    <message>
-        <source>Monitor where the mouse</source>
-        <translation>Anzeigen, wo die Maus ist</translation>
-    </message>
-    <message>
-        <source>Always on %1 monitor</source>
-        <translation>Immer auf Monitor %1</translation>
-    </message>
-</context>
-<context>
-    <name>Dialog</name>
-    <message>
-        <source>Application launcher </source>
-        <translation>Anwendungsstarter</translation>
-    </message>
-    <message>
-        <source>Configure lxqt-runner</source>
-        <translation>Konfiguriere lxqt-runner</translation>
-    </message>
-    <message>
-        <source>Clear lxqt-runner History</source>
-        <translation>LxQt-runner Verlauf löschen</translation>
-    </message>
-    <message>
-        <source>Press &quot;%1&quot; to see dialog.</source>
-        <translation>Klicke &quot;%1&quot; für Dialogsansicht.</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>History</source>
-        <translation>Verlauf</translation>
-    </message>
-    <message>
-        <source>Mathematics</source>
-        <translation>Mathematik</translation>
-    </message>
-    <message>
-        <source>LxQt Power Management</source>
-        <translation>LxQt Energieverwaltung</translation>
-    </message>
-</context>
-</TS>

translations/lxqt-runner_el.ts

@@ -1,9 +1,11 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="el_GR" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="el">
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Ρυθμίσεις εκτελεστή LxQt</translation>
+        <translation>Ρυθμίσεις εκτελεστή LXQt</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -68,8 +70,8 @@
         <translation>Μαθηματικά</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Διαχείριση ενέργειας LxQt</translation>
+        <translation>Διαχείριση ενέργειας LXQt</translation>
     </message>
 </context>
-</TS>
+</TS>

translations/lxqt-runner_eo.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Agordoj de lxqt-runner</translation>
     </message>
     <message>
@@ -68,8 +68,8 @@
         <translation>Matematiko</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Kurentmastrumilo de LxQt</translation>
+        <translation>Kurentmastrumilo de LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_es.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Configuración de LxQt-runner</translation>
+        <translation>Configuración de LXQt-runner</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -50,7 +50,7 @@
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>Limpiar historial de LxQt-Runner</translation>
+        <translation>Limpiar historial de LXQt-Runner</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>Matemáticas</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Administrador de energía de LxQt</translation>
+        <translation>Administrador de energía de LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_es_VE.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Configuraciones de LxQt-Ejecutor</translation>
+        <translation>Configuraciones de LXQt-Ejecutor</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Configurar lanzador de LxQt</translation>
+        <translation>Configurar lanzador de LXQt</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +68,8 @@
         <translation>Matematicas</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Manejador de energia de LxQt</translation>
+        <translation>Manejador de energia de LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_eu.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt-runner ezarpenak</translation>
+        <translation>LXQt-runner ezarpenak</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -68,8 +68,8 @@
         <translation>Matematikak</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt energia-kudeaketa</translation>
+        <translation>LXQt energia-kudeaketa</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_fi.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQtin käynnistimen asetukset</translation>
+        <translation>LXQtin käynnistimen asetukset</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,11 +46,11 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Hallitse LxQtin käynnistintä</translation>
+        <translation>Hallitse LXQtin käynnistintä</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>Tyhjennä LxQt-käynnistimen historia</translation>
+        <translation>Tyhjennä LXQt-käynnistimen historia</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>Matematiikka</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQtin virranhallinta</translation>
+        <translation>LXQtin virranhallinta</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_fr_FR.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Paramètres du lanceur de commandes</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
         <translation>Mathématiques</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation>Gestion de l&apos;énergie</translation>
     </message>
 </context>

translations/lxqt-runner_hu.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_ia.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_id_ID.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_it.ts

@@ -1,9 +1,11 @@
-<?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">
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Impostazioni di LxQt-runner</translation>
+        <translation>Impostazioni di LXQt-runner</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +48,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Configura LxQt-runner</translation>
+        <translation>Configura LXQt-runner</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +70,8 @@
         <translation>Matematica</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Gestione energetica di LxQt</translation>
+        <translation>Gestione energetica di LXQt</translation>
     </message>
 </context>
-</TS>
+</TS>

translations/lxqt-runner_ja.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt-runnerの設定</translation>
+        <translation>LXQt-runnerの設定</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -50,7 +50,7 @@
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>LxQt-runnerの履歴を消去</translation>
+        <translation>LXQt-runnerの履歴を消去</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>計算</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt電源管理</translation>
+        <translation>LXQt電源管理</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_ko.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_lt.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt paleidiklio nuostatos</translation>
+        <translation>LXQt paleidiklio nuostatos</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -68,8 +68,8 @@
         <translation>Matematika</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt energijos valdymas</translation>
+        <translation>LXQt energijos valdymas</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_nl.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt-uitvoeren Instellingen</translation>
+        <translation>LXQt-uitvoeren Instellingen</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Configureer LxQt-uitvoeren</translation>
+        <translation>Configureer LXQt-uitvoeren</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +68,8 @@
         <translation>Wiskundig</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt Energiebeheer</translation>
+        <translation>LXQt Energiebeheer</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_pl_PL.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Ustawienia LxQt-runner</translation>
+        <translation>Ustawienia LXQt-runner</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -68,8 +68,8 @@
         <translation>Matematyka</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Zarządzanie zasilaniem LxQt</translation>
+        <translation>Zarządzanie zasilaniem LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_pt.ts

@@ -4,8 +4,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Definições do LxQt-runner</translation>
+        <translation>Definições do LXQt-runner</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -70,8 +70,8 @@
         <translation>Matemática</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Gestão de energia do LxQt</translation>
+        <translation>Gestão de energia do LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_pt_BR.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Configurações do executor do LxQt</translation>
+        <translation>Configurações do executor do LXQt</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,11 +46,11 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Configurar o executor do LxQt</translation>
+        <translation>Configurar o executor do LXQt</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>Limpar o histórico do executor do LxQt</translation>
+        <translation>Limpar o histórico do executor do LXQt</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>Matemática</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Gerenciamento de energia do LxQt</translation>
+        <translation>Gerenciamento de energia do LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_ro_RO.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Setări lxqt-runner</translation>
     </message>
     <message>
@@ -68,8 +68,8 @@
         <translation>Matematică</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Gestiune alimentare LxQt</translation>
+        <translation>Gestiune alimentare LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_sk_SK.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Nastavenia Spúšťača LxQt</translation>
+        <translation>Nastavenia Spúšťača LXQt</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Nastaviť Spúšťač LxQt</translation>
+        <translation>Nastaviť Spúšťač LXQt</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,7 +68,7 @@
         <translation>Matematika</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/lxqt-runner_sl.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Nastavitve za LxQt-runner</translation>
+        <translation>Nastavitve za LXQt-runner</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,11 +46,11 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Nastavitve za LxQt-runner</translation>
+        <translation>Nastavitve za LXQt-runner</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>Počisti zgodovino za LxQt-runner</translation>
+        <translation>Počisti zgodovino za LXQt-runner</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,7 +68,7 @@
         <translation>Matematika</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation>Upravljanje z energijo</translation>
     </message>
 </context>

translations/lxqt-runner_sr@latin.ts

@@ -3,7 +3,7 @@
     <name>ConfigureDialog</name>
     <message>
         <location filename="../configuredialog/configuredialog.ui" line="14"/>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>

translations/lxqt-runner_sr_BA.ts

@@ -4,7 +4,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Подешавања Рејзор-покретача</translation>
     </message>
     <message>

translations/lxqt-runner_sr_RS.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>Подешавања Рејзор-покретача</translation>
     </message>
     <message>
@@ -68,7 +68,7 @@
         <translation>Математика</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/lxqt-runner_th_TH.ts

@@ -2,7 +2,7 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
         <translation>ค่าตั้งกล่องป้อนคำสั่ง-lxqt</translation>
     </message>
     <message>
@@ -68,8 +68,8 @@
         <translation>การคำนวณเลข</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>การจัดการพลังงานของ LxQt</translation>
+        <translation>การจัดการพลังงานของ LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_tr.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt-çalıştırıcı Ayarları</translation>
+        <translation>LXQt-çalıştırıcı Ayarları</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,11 +46,11 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>LxQt-çalıştırıcıyı yapılandır</translation>
+        <translation>LXQt-çalıştırıcıyı yapılandır</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>LxQt-çalıştırıcı geçmişini temizle</translation>
+        <translation>LXQt-çalıştırıcı geçmişini temizle</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>İşlemler</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt Güç Yönetimi</translation>
+        <translation>LXQt Güç Yönetimi</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_uk.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>Налаштування запускача програм LxQt</translation>
+        <translation>Налаштування запускача програм LXQt</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>Налаштувати запускач програм LxQt</translation>
+        <translation>Налаштувати запускач програм LXQt</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +68,8 @@
         <translation>Математика</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>Керування живленням LxQt</translation>
+        <translation>Керування живленням LXQt</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_zh_CN.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt启动器设置</translation>
+        <translation>LXQt启动器设置</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,7 +46,7 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>配置LxQt启动器</translation>
+        <translation>配置LXQt启动器</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
@@ -68,8 +68,8 @@
         <translation>数学</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt 电源管理</translation>
+        <translation>LXQt 电源管理</translation>
     </message>
 </context>
 </TS>

translations/lxqt-runner_zh_TW.ts

@@ -2,8 +2,8 @@
 <context>
     <name>ConfigureDialog</name>
     <message>
-        <source>LxQt-runner Settings</source>
+        <source>LXQt-runner Settings</source>
-        <translation>LxQt快速執行設定</translation>
+        <translation>LXQt快速執行設定</translation>
     </message>
     <message>
         <source>Appearance</source>
@@ -46,11 +46,11 @@
     </message>
     <message>
         <source>Configure lxqt-runner</source>
-        <translation>設定LxQt快速執行</translation>
+        <translation>設定LXQt快速執行</translation>
     </message>
     <message>
         <source>Clear lxqt-runner History</source>
-        <translation>清除LxQt快速執行的歷史紀錄</translation>
+        <translation>清除LXQt快速執行的歷史紀錄</translation>
     </message>
     <message>
         <source>Press &quot;%1&quot; to see dialog.</source>
@@ -68,8 +68,8 @@
         <translation>數學</translation>
     </message>
     <message>
-        <source>LxQt Power Management</source>
+        <source>LXQt Power Management</source>
-        <translation>LxQt電源管理</translation>
+        <translation>LXQt電源管理</translation>
     </message>
 </context>
 </TS>

yamlparser.cpp

@@ -1,9 +1,29 @@
-/* 
+/* BEGIN_COMMON_COPYRIGHT_HEADER
- * File:   YamlParser.cpp
+ * (c)LGPL2+
- * Author: christian
+ *
- * 
+ * LXDE-Qt - a lightweight, Qt based, desktop toolset
- * Created on 9. maj 2013, 13:13
+ * http://razor-qt.org
- */
+ *
+ * Copyright: 2013 Razor team
+ * Authors:
+ *   Christian Surlykke <christian@surlykke.dk>
+ *
+ * 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 <QIODevice>
 #include <QRegExp>
@@ -28,7 +48,7 @@ void YamlParser::consumeLine(QString line)
     static QRegExp continuation("(\\s*)(.*)");
     static QRegExp documentEnd("...\\s*");
     static QRegExp emptyLine("\\s*(#.*)?");
-  
+
     qDebug() << line;
 
     if (documentStart.exactMatch(line))
@@ -37,7 +57,7 @@ void YamlParser::consumeLine(QString line)
         state = atdocumentstart;
         m_CurrentIndent = -1;
     }
-    else if (state == error) 
+    else if (state == error)
     {
         // Skip
     }
@@ -45,7 +65,7 @@ void YamlParser::consumeLine(QString line)
     {
         // Skip
     }
-    else if ((state == atdocumentstart || state == inlist) && mapStart.exactMatch(line)) 
+    else if ((state == atdocumentstart || state == inlist) && mapStart.exactMatch(line))
     {
         m_ListOfMaps << QMap<QString, QString>();
         addEntryToCurrentMap(mapStart.cap(2), mapStart.cap(3));
@@ -66,7 +86,7 @@ void YamlParser::consumeLine(QString line)
         emit newListOfMaps(m_ListOfMaps);
         state = documentdone;
     }
-    else 
+    else
     {
         qWarning() << "Yaml parser could not read:" << line;
         state = error;

yamlparser.h

@@ -1,12 +1,32 @@
-/* 
+/* BEGIN_COMMON_COPYRIGHT_HEADER
- * File:   YamlParser.h
+ * (c)LGPL2+
- * Author: christian
  *
- * Created on 9. maj 2013, 13:13
+ * LXDE-Qt - a lightweight, Qt based, desktop toolset
- */
+ * http://razor-qt.org
+ *
+ * Copyright: 2013 Razor team
+ * Authors:
+ *   Christian Surlykke <christian@surlykke.dk>
+ *
+ * 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 YAMLPARSER_H
-#define	YAMLPARSER_H
+#define YAMLPARSER_H
 
 #include <QObject>
 #include <QList>
@@ -21,17 +41,17 @@ class YamlParser : public QObject
 public:
     YamlParser();
     virtual ~YamlParser();
-   
+
     void consumeLine(QString line);
- 
+
 signals:
     void newListOfMaps(QList<QMap<QString, QString> > maps);
-    
+
 private:
-    
+
     QList<QMap<QString, QString> > m_ListOfMaps;
 
-    enum 
+    enum
     {
         start,
         atdocumentstart,
@@ -46,4 +66,4 @@ private:
     void addEntryToCurrentMap(QString key, QString value);
 };
 
-#endif	/* YAMLPARSER_H */
+#endif /* YAMLPARSER_H */