Adding upstream version 0.11.1.

Signed-off-by: Alf Gaida <agaida@siduction.org>

.gitignore

@@ -1,3 +0,0 @@
-build
-lxqt-config.kdev4
-*/translations/lxqt-config

CHANGELOG

@@ -1,7 +1,28 @@
 
-lxqt-config-0.11.0 / 2016-09-24
+lxqt-config-0.11.1 / 2017-01-01
 ===============================
 
+  * lxqt-config-monitor: remove unnecessary wait before settings load (#114)
+  * Fix self icontheme update (#113)
+  * liblxqt-config-cursor: Don't check for null pointer before deleting it
+  * liblxqt-config-cursor: Explicitly ignore function return value
+  * Updated and added *_da.desktop files and removed da_DK
+  * Use FindXCB CMake module
+  * Activate items on releasing Enter instead of pressing it. (#78)
+  * Update and rename lxqt-config_fr_FR.desktop to lxqt-config_fr.desktop
+  * Fix faulty link in README.md
+  * if not set, set the build type to Release
+  * Desktop entry files: Update French translation
+  * lxqt-config: Avoid multiple spawn on auto-repeat
+  * Fix loading of translations for brightness
+  * Create lxqt-config-brightness_it.desktop
+  * Remove cpack (#104)
+  * lxqt-config-brightness: Add GenericName and Comment to desktop entry
+
+0.11.0 / 2016-09-24
+===================
+
+  * Release 0.11.0: Add changelog
   * appearance: Avoid blocking when setting wallpaper
   * appearance: Do (not) change wallpaper with theme
   * all: Remove XdgIcon & XdgIconLoader usage

CMakeLists.txt

@@ -28,6 +28,11 @@ find_package(Qt5LinguistTools REQUIRED QUIET)
 find_package(lxqt REQUIRED QUIET)
 
 include(LXQtCompilerSettings NO_POLICY_SCOPE)
+
+if(NOT CMAKE_BUILD_TYPE)
+    set(CMAKE_BUILD_TYPE Release)
+endif()
+
 include(LXQtTranslate)
 
 add_subdirectory(src)
@@ -52,13 +57,3 @@ endif()
 if (WITH_LOCALE)
     add_subdirectory(lxqt-config-locale)
 endif()
-
-# building tarball with CPack -------------------------------------------------
-include(InstallRequiredSystemLibraries)
-set(CPACK_PACKAGE_VERSION_MAJOR ${LXQT_MAJOR_VERSION})
-set(CPACK_PACKAGE_VERSION_MINOR ${LXQT_MINOR_VERSION})
-set(CPACK_PACKAGE_VERSION_PATCH ${LXQT_PATCH_VERSION})
-set(CPACK_GENERATOR TBZ2)
-set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_SOURCE_IGNORE_FILES /build/;.gitignore;.*~;.git;.kdev4;temp)
-include(CPack)

README.md

@@ -55,7 +55,7 @@ The "Configuration Center" (binary `lxqt-config`) is summarizing and providing v
 
 ![Configuration Center (lxqt-config)](lxqt-config.png)
 
-First of all these are the ones belonging to repository lxqt-config described [above](https://github.com/pmattern/lxqt-config#configuration-gui-tools). Next, it is hosting counterparts of several other LXQt components like "Desktop Notifications" of [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd), "Shortcut Keys" of [lxqt-globalkeyshortcuts](https://github.com/lxde/lxqt-globalkeyshortcuts) or the tools provided by [lxqt-admin](https://github.com/lxde/lxqt-admin). Third-party applications can include their configuration tools in "Configuration Center", too. This applies e. g. to "Connman UI Setup" of [cmst](https://github.com/andrew-bibb/cmst) or "SDDM Configuration" of [sddm-config-editor](https://github.com/hagabaka/sddm-config-editor).
+First of all these are the ones belonging to repository lxqt-config described [above](https://github.com/lxde/lxqt-config#configuration-gui-tools). Next, it is hosting counterparts of several other LXQt components like "Desktop Notifications" of [lxqt-notificationd](https://github.com/lxde/lxqt-notificationd), "Shortcut Keys" of [lxqt-globalkeyshortcuts](https://github.com/lxde/lxqt-globalkeyshortcuts) or the tools provided by [lxqt-admin](https://github.com/lxde/lxqt-admin). Third-party applications can include their configuration tools in "Configuration Center", too. This applies e. g. to "Connman UI Setup" of [cmst](https://github.com/andrew-bibb/cmst) or "SDDM Configuration" of [sddm-config-editor](https://github.com/hagabaka/sddm-config-editor).
 
 ## Installation
 

liblxqt-config-cursor/CMakeLists.txt

@@ -1,9 +1,7 @@
 project(lxqt-config-cursor)
 find_package(X11 REQUIRED)
 
-find_package(PkgConfig REQUIRED)
+find_package(XCB REQUIRED xcb)
-
-pkg_check_modules(XCB REQUIRED xcb)
 include_directories(${XCB_INCLUDE_DIRS})
 link_libraries(${XCB_LIBRARIES})
 

liblxqt-config-cursor/xcr/xcrimg.cpp

@@ -59,9 +59,9 @@ void XCursorImage::convertARGB2PreMul (QImage &img) {
   switch (img.format()) {
     case QImage::Format_ARGB32_Premultiplied: return;
     case QImage::Format_ARGB32: break;
-    default: img.convertToFormat(QImage::Format_ARGB32/*_Premultiplied*/);
+    default: (void) img.convertToFormat(QImage::Format_ARGB32/*_Premultiplied*/);
   }
-  img.convertToFormat(QImage::Format_ARGB32_Premultiplied); // this shouldn't convert anything
+  (void) img.convertToFormat(QImage::Format_ARGB32_Premultiplied); // this shouldn't convert anything
   // so convert it!
   for (int y = img.height()-1; y >= 0; y--) {
     quint8 *line = (quint8 *)img.scanLine(y);
@@ -150,7 +150,7 @@ void XCursorImage::genXCursorImg (QByteArray &res) const {
   baPutDW(res, (quint32)mDelay);
   // now put the pixels
   QImage i = mImage->copy();
-  i.convertToFormat(QImage::Format_ARGB32_Premultiplied);
+  (void) i.convertToFormat(QImage::Format_ARGB32_Premultiplied);
   //i.convertToFormat(QImage::Format_ARGB32);
   for (int y = 0; y < i.height(); y++) {
     const uchar *sl = i.scanLine(y);

liblxqt-config-cursor/xcr/xcrxcur.cpp

@@ -84,7 +84,8 @@ XCursorImageXCur::~XCursorImageXCur () {
 
 void XCursorImageXCur::parseImgData (const void *aImgData) {
   mIsValid = false;
-  if (mImage) delete mImage; mImage = 0;
+  delete mImage; // It's fine to delete a null pointer
+  mImage = 0;
   const quint32 *data = (const quint32 *)aImgData;
   if (getDW(data) != 36) return; // header size
   if (getDW(data+1) != 0xfffd0002L) return; // magic

lxqt-config-appearance/iconthemeconfig.cpp

@@ -138,9 +138,12 @@ IconThemeConfig::~IconThemeConfig()
 void IconThemeConfig::iconThemeSelected(QTreeWidgetItem *item, int column)
 {
     Q_UNUSED(column);
-    QString theme = item->data(0, Qt::UserRole).toString();
+    const QString theme = item->data(0, Qt::UserRole).toString();
     if (!theme.isEmpty())
     {
+        // Ensure that this widget also updates it's own icons
+        QIcon::setThemeName(theme);
+
         m_settings->setValue("icon_theme",  theme);
         m_settings->sync();
     }

lxqt-config-appearance/translations/lxqt-config-appearance_da.desktop

@@ -1,4 +1,4 @@
 # Translations
-Comment[da]=Indstilling af LXQt udseende
+Name[da]=Udseende
-GenericName[da]=Indstilling af LXQt Udseende
+GenericName[da]=Udseendeindstillinger
-Name[da]=Indstilling af LXQt Udseende
+Comment[da]=Udseendeindstillinger for LXQt

lxqt-config-appearance/translations/lxqt-config-appearance_da_DK.desktop

@@ -1,4 +0,0 @@
-# Translations
-Comment[da_DK]=Indstil udseende på LXQt skrivebord
-GenericName[da_DK]=Indstilling af LXQt Udseende
-Name[da_DK]=Indstilling af LXQt Udseende

lxqt-config-appearance/translations/lxqt-config-appearance_fr.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[fr]=Apparence
+GenericName[fr]=Configurer l'apparence
+Comment[fr]=Configurer l'apparence de LXQt

lxqt-config-appearance/translations/lxqt-config-appearance_fr_FR.desktop

@@ -1,4 +0,0 @@
-# Translations
-Comment[fr_FR]=Configurer l'apparence du bureau LXQt
-GenericName[fr_FR]=Configuration de l'apparence de LXQt
-Name[fr_FR]=Configuration de l'apparence de LXQt

lxqt-config-brightness/CMakeLists.txt

@@ -3,16 +3,12 @@ project(lxqt-config-brightness)
 find_package(Qt5Widgets REQUIRED QUIET)
 find_package(Qt5X11Extras REQUIRED QUIET)
 
-find_package(PkgConfig)
+find_package(XCB REQUIRED xcb xcb-randr)
-
-pkg_check_modules(XRANDR xcb-randr)
-pkg_check_modules(XCB xcb)
 
 set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras)
 
 
 include_directories (
-    ${XRANDR_INCLUDE_DIRS}
     ${XCB_INCLUDE_DIRS}
 )
 
@@ -65,13 +61,12 @@ lxqt_app_translation_loader(QM_LOADER ${PROJECT_NAME})
 lxqt_translate_desktop(DESKTOP_FILES SOURCES "resources/${PROJECT_NAME}.desktop.in")
 
 
-add_executable(${PROJECT_NAME} ${CPP_FILES} ${UI_FILES} ${QM_FILES} ${DESKTOP_FILES})
+add_executable(${PROJECT_NAME} ${CPP_FILES} ${UI_FILES} ${QM_FILES} ${DESKTOP_FILES} ${QM_LOADER})
 
 target_link_libraries(
     ${PROJECT_NAME}
     ${QTX_LIBRARIES}
-    ${XRANDR_LDFLAGS}
+    ${XCB_LIBRARIES}
-    ${XCB_LDFLAGS}
     lxqt
 )
 

lxqt-config-brightness/outputwidget.ui

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

lxqt-config-brightness/resources/lxqt-config-brightness.desktop.in

@@ -1,5 +1,7 @@
 [Desktop Entry]
-Name=Brightness Settings
+Name=Brightness
+GenericName=Brightness Settings
+Comment=Configure brightness
 Exec=lxqt-config-brightness
 Terminal=false
 Type=Application
@@ -7,4 +9,4 @@ Icon=brightnesssettings
 Categories=Settings;DesktopSettings;Qt;LXQt;HardwareSettings;
 OnlyShowIn=LXQt;
 
-#TRANSLATIONS_DIR=translations
+#TRANSLATIONS_DIR=translations

lxqt-config-brightness/translations/lxqt-config-brightness_da.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[da]=Lysstyrke
+GenericName[da]=Lysstyrkeindstillinger
+Comment[da]=Konfigurér lysstyrke

lxqt-config-brightness/translations/lxqt-config-brightness_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Paramètres de luminosité
+GenericName[fr]=Paramètres de luminosité de l'écran
+Comment[fr]=Régler la luminosité et le contraste de l'écran

lxqt-config-brightness/translations/lxqt-config-brightness_it.desktop

@@ -0,0 +1,2 @@
+Name[it]=Luminosità
+Comment[it]=Permette di cambiare la luminosità e il contrasto dello schermo

lxqt-config-file-associations/translations/lxqt-config-file-associations_da.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[da]=Filtilknytninger
+GenericName[da]=Filtilknytningsindstillinger
+Comment[da]=Konfigurér programmer tilknyttet kendte filtyper

lxqt-config-file-associations/translations/lxqt-config-file-associations_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Association des fichiers
+GenericName[fr]=Paramètres d'association des fichiers
+Comment[fr]=Configurer les applications associées avec les types de fichier

lxqt-config-input/translations/lxqt-config-input_da.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[da]=Tastatur og mus
+GenericName[da]=Input-indstillinger
+Comment[da]=Konfigurér tastatur, mus og andre input-enheder

lxqt-config-input/translations/lxqt-config-input_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Clavier et Souris
+GenericName[fr]=Paramètres des périphériques d'entrée
+Comment[fr]=Configurer les claviers, souris et les autres périphériques d'entrée

lxqt-config-locale/translations/lxqt-config-locale_da.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[da]=Sprog
+GenericName[da]=Sprogindstillinger
+Comment[da]=Sprogindstillinger for LXQt

lxqt-config-locale/translations/lxqt-config-locale_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Région
+GenericName[fr]=Paramètres de la région
+Comment[fr]=Paramètres de la région pour LXQt

lxqt-config-monitor/fastmenu.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Form</string>
+   <string notr="true">Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>

lxqt-config-monitor/loadsettings.cpp

@@ -26,13 +26,11 @@
 #include <KScreen/SetConfigOperation>
 #include <LXQt/Settings>
 #include <KScreen/EDID>
-#include <QThread>
 #include <QCoreApplication>
 
 
 LoadSettings::LoadSettings(QObject *parent):QObject(parent)
 {
-    QThread::sleep(10); // KScreen is  slow loading screen modes
     KScreen::GetConfigOperation *operation  = new KScreen::GetConfigOperation();
     connect(operation, &KScreen::GetConfigOperation::finished, [this, operation] (KScreen::ConfigOperation *op) {
         KScreen::GetConfigOperation *configOp = qobject_cast<KScreen::GetConfigOperation *>(op);

lxqt-config-monitor/monitorpicture.ui

@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Dialog</string>
+   <string notr="true">Dialog</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>

lxqt-config-monitor/translations/lxqt-config-monitor_da.desktop

@@ -0,0 +1,4 @@
+# Translations
+Name[da]=Skærmindstillinger
+GenericName[da]=Skærmindstillinger
+Comment[da]=Konfigurér skærme

lxqt-config-monitor/translations/lxqt-config-monitor_fr.desktop

@@ -0,0 +1,3 @@
+Name[fr]=Paramètres de l'écran
+GenericName[fr]=Paramètres de l'écran
+Comment[fr]=Configurer les écrans

src/mainwindow.cpp

@@ -213,6 +213,7 @@ private:
 LXQtConfig::MainWindow::MainWindow() : QMainWindow()
 {
     setupUi(this);
+    view->installEventFilter(this);
 
     /* To always have the intended layout on startup,
        the listview should be shown after it's fully formed. */
@@ -225,7 +226,7 @@ LXQtConfig::MainWindow::MainWindow() : QMainWindow()
     view->setUniformItemSizes(true);
     view->setCategoryDrawer(new QCategoryDrawerV3(view));
 
-    connect(view, &QAbstractItemView::activated, this, &MainWindow::activateItem);
+    connect(view, &QAbstractItemView::activated, [this] (const QModelIndex & index) { pendingActivation = index; });
     view->setFocus();
 
     QTimer::singleShot(0, [this] { setSizing(); });
@@ -249,13 +250,50 @@ void LXQtConfig::MainWindow::load()
     QApplication::restoreOverrideCursor();
 }
 
-void LXQtConfig::MainWindow::activateItem(const QModelIndex &index)
+void LXQtConfig::MainWindow::activateItem()
 {
-    if (!index.isValid())
+    if (pendingActivation.isValid())
-        return;
+    {
+        model->activateItem(pendingActivation);
+        pendingActivation = QModelIndex{};
+    }
+}
 
-    QModelIndex orig = proxyModel->mapToSource(index);
+/*Note: all this delayed activation is here to workaround the auto-repeated
-    model->activateItem(orig);
+ * Enter/Return key activation -> if the user keeps pressing the enter/return
+ * we normaly will keep activating (spawning new processes) until the focus
+ * isn't stolen from our window. New process is not spawned until the
+ * (non-autorepeated) KeyRelease is delivered.
+ *
+ * ref https://github.com/lxde/lxqt/issues/965
+ */
+bool LXQtConfig::MainWindow::eventFilter(QObject * watched, QEvent * event)
+{
+    if (view != watched)
+        return false;
+    switch (event->type())
+    {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease:
+            {
+                QKeyEvent * ev = dynamic_cast<QKeyEvent *>(event);
+                switch (ev->key())
+                {
+                    case Qt::Key_Enter:
+                    case Qt::Key_Return:
+                        if (QEvent::KeyRelease == ev->type() && !ev->isAutoRepeat())
+                            activateItem();
+                }
+            }
+            break;
+        case QEvent::MouseButtonRelease:
+            activateItem();
+            break;
+        default:
+            //keep warnings quiet
+            break;
+    }
+    return false;
 }
 
 void LXQtConfig::MainWindow::setSizing()

src/mainwindow.h

@@ -52,18 +52,20 @@ public:
 
 protected:
     virtual bool event(QEvent * event) override;
+    virtual bool eventFilter(QObject * watched, QEvent * event) override;
 
 private:
     QCategorizedSortFilterProxyModel *proxyModel;
     ConfigPaneModel *model;
+    QPersistentModelIndex pendingActivation;
 
 private:
     void builGroup(const QDomElement& xml);
     void setSizing();
+    void activateItem();
 
 private slots:
     void load();
-    void activateItem(const QModelIndex &index);
 };
 
 }; // namespace

src/qcategorizedview/qcategorizedview.cpp

@@ -516,6 +516,7 @@ void QCategorizedView::Private::_k_slotCollapseOrExpandClicked(QModelIndex)
 QCategorizedView::QCategorizedView(QWidget *parent)
     : QListView(parent)
     , d(new Private(this))
+    , enterPressed(false)
 {
 }
 
@@ -1536,6 +1537,45 @@ void QCategorizedView::slotLayoutChanged()
     }
 }
 
+void QCategorizedView::keyPressEvent(QKeyEvent *event)
+{
+    // Don't emit activated() by pressing Enter! ...
+    switch (event->key()) {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+            if (state() != EditingState) {
+              event->ignore();
+              if (hasFocus() && !event->isAutoRepeat())
+                  enterPressed = true; // Pressed after getting focus.
+              return;
+            }
+            break;
+        default: break;
+    }
+    QAbstractItemView::keyPressEvent(event);
+}
+
+void QCategorizedView::keyReleaseEvent(QKeyEvent *event)
+{
+    // ... Emit activated() by releasing Enter instead!
+    switch (event->key()) {
+        case Qt::Key_Enter:
+        case Qt::Key_Return:
+            if (hasFocus() && state() != EditingState
+                && !event->isAutoRepeat() // No multiple signals.
+                && enterPressed // No signal if Enter is pressed before getting focus.
+                && currentIndex().isValid()) {
+                emit activated(currentIndex());
+                event->accept();
+                enterPressed = false;
+                return;
+            }
+            break;
+        default: break;
+    }
+    QAbstractItemView::keyReleaseEvent(event);
+}
+
 //END: Public part
 
 #include "moc_qcategorizedview.cpp"

src/qcategorizedview/qcategorizedview.h

@@ -318,6 +318,9 @@ protected:
                               int start,
                               int end);
 
+    void keyPressEvent(QKeyEvent *event);
+    void keyReleaseEvent(QKeyEvent *event);
+
 protected Q_SLOTS:
     /**
       * @internal
@@ -348,6 +351,11 @@ protected Q_SLOTS:
 private:
     class Private;
     Private *const d;
+    /**
+      * For knowing that Enter is pressed after
+      * the widget gets focus and not before that.
+      */
+    bool enterPressed;
 
     Q_PRIVATE_SLOT(d, void _k_slotCollapseOrExpandClicked(QModelIndex))
 };

src/translations/lxqt-config_da.desktop

@@ -1,4 +1,4 @@
 # Translations
-Comment[da]=Indstil LXQt moduler
+Name[da]=LXQt-konfigurationscenter
-GenericName[da]=LXQt Indstillingscenter
+GenericName[da]=Systemindstillinger
-Name[da]=LXQt Indstillingscenter
+Comment[da]=Konfigurér dit system

src/translations/lxqt-config_da_DK.desktop

@@ -1,4 +0,0 @@
-# Translations
-Comment[da_DK]=Indstil LXQt moduler
-GenericName[da_DK]=LXQt Indstillinger
-Name[da_DK]=LXQt Konfigurationsstyring

src/translations/lxqt-config_fr.desktop

@@ -0,0 +1,4 @@
+# Translations
+Comment[fr]=Configurer les modules de LXQt
+GenericName[fr]=Configuration de LXQt
+Name[fr]=Centre de configuration de LXQt

src/translations/lxqt-config_fr_FR.desktop

@@ -1,4 +0,0 @@
-# Translations
-Comment[fr_FR]=Configurer les modules de LXQt
-GenericName[fr_FR]=Configuration de LXQt
-Name[fr_FR]=Centre de configuration de LXQt