Hello community, here is the log from the commit of package lxqt-config for openSUSE:Factory checked in at 2017-03-12 19:58:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-config (Old) and /work/SRC/openSUSE:Factory/.lxqt-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-config" Sun Mar 12 19:58:59 2017 rev:11 rq:460122 version:0.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-config/lxqt-config.changes 2016-10-06 12:43:29.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-config.new/lxqt-config.changes 2017-03-12 19:59:00.520133138 +0100 @@ -1,0 +2,21 @@ +Thu Feb 23 17:58:59 UTC 2017 - [email protected] + +- Update to 0.11.1: + * 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 + +------------------------------------------------------------------- Old: ---- lxqt-config-0.11.0.tar.xz lxqt-config-0.11.0.tar.xz.asc New: ---- lxqt-config-0.11.1.tar.xz lxqt-config-0.11.1.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-config.spec ++++++ --- /var/tmp/diff_new_pack.qei7Gt/_old 2017-03-12 19:59:01.228032973 +0100 +++ /var/tmp/diff_new_pack.qei7Gt/_new 2017-03-12 19:59:01.232032407 +0100 @@ -17,7 +17,7 @@ Name: lxqt-config -Version: 0.11.0 +Version: 0.11.1 Release: 0 Summary: LXQt Control Center License: GPL-2.0+ and LGPL-2.1+ @@ -29,6 +29,7 @@ BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: lxqt-build-tools-devel BuildRequires: libQt5Gui-private-headers-devel BuildRequires: pkgconfig BuildRequires: cmake(KF5Screen) ++++++ lxqt-config-0.11.0.tar.xz -> lxqt-config-0.11.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/.gitignore new/lxqt-config-0.11.1/.gitignore --- old/lxqt-config-0.11.0/.gitignore 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -build -lxqt-config.kdev4 -*/translations/lxqt-config diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/CHANGELOG new/lxqt-config-0.11.1/CHANGELOG --- old/lxqt-config-0.11.0/CHANGELOG 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/CHANGELOG 2017-01-01 23:03:41.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/CMakeLists.txt new/lxqt-config-0.11.1/CMakeLists.txt --- old/lxqt-config-0.11.0/CMakeLists.txt 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 @@ -28,6 +28,11 @@ 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 @@ 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/README.md new/lxqt-config-0.11.1/README.md --- old/lxqt-config-0.11.0/README.md 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/README.md 2017-01-01 23:03:41.000000000 +0100 @@ -55,7 +55,7 @@  -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/liblxqt-config-cursor/CMakeLists.txt new/lxqt-config-0.11.1/liblxqt-config-cursor/CMakeLists.txt --- old/lxqt-config-0.11.0/liblxqt-config-cursor/CMakeLists.txt 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/liblxqt-config-cursor/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 @@ -1,9 +1,7 @@ project(lxqt-config-cursor) find_package(X11 REQUIRED) -find_package(PkgConfig REQUIRED) - -pkg_check_modules(XCB REQUIRED xcb) +find_package(XCB REQUIRED xcb) include_directories(${XCB_INCLUDE_DIRS}) link_libraries(${XCB_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/liblxqt-config-cursor/xcr/xcrimg.cpp new/lxqt-config-0.11.1/liblxqt-config-cursor/xcr/xcrimg.cpp --- old/lxqt-config-0.11.0/liblxqt-config-cursor/xcr/xcrimg.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/liblxqt-config-cursor/xcr/xcrimg.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -59,9 +59,9 @@ 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 @@ 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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/liblxqt-config-cursor/xcr/xcrxcur.cpp new/lxqt-config-0.11.1/liblxqt-config-cursor/xcr/xcrxcur.cpp --- old/lxqt-config-0.11.0/liblxqt-config-cursor/xcr/xcrxcur.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/liblxqt-config-cursor/xcr/xcrxcur.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -84,7 +84,8 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-appearance/iconthemeconfig.cpp new/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.cpp --- old/lxqt-config-0.11.0/lxqt-config-appearance/iconthemeconfig.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -138,9 +138,12 @@ 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(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_da.desktop new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_da.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -1,4 +1,4 @@ # Translations -Comment[da]=Indstilling af LXQt udseende -GenericName[da]=Indstilling af LXQt Udseende -Name[da]=Indstilling af LXQt Udseende +Name[da]=Udseende +GenericName[da]=Udseendeindstillinger +Comment[da]=Udseendeindstillinger for LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_da_DK.desktop new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_da_DK.desktop --- old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_da_DK.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_da_DK.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_fr.desktop new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[fr]=Apparence +GenericName[fr]=Configurer l'apparence +Comment[fr]=Configurer l'apparence de LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_fr_FR.desktop new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_fr_FR.desktop --- old/lxqt-config-0.11.0/lxqt-config-appearance/translations/lxqt-config-appearance_fr_FR.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_fr_FR.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/CMakeLists.txt new/lxqt-config-0.11.1/lxqt-config-brightness/CMakeLists.txt --- old/lxqt-config-0.11.0/lxqt-config-brightness/CMakeLists.txt 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 @@ -3,16 +3,12 @@ find_package(Qt5Widgets REQUIRED QUIET) find_package(Qt5X11Extras REQUIRED QUIET) -find_package(PkgConfig) - -pkg_check_modules(XRANDR xcb-randr) -pkg_check_modules(XCB xcb) +find_package(XCB REQUIRED xcb xcb-randr) set(QTX_LIBRARIES Qt5::Widgets Qt5::X11Extras) include_directories ( - ${XRANDR_INCLUDE_DIRS} ${XCB_INCLUDE_DIRS} ) @@ -65,13 +61,12 @@ 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_LDFLAGS} + ${XCB_LIBRARIES} lxqt ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/outputwidget.ui new/lxqt-config-0.11.1/lxqt-config-brightness/outputwidget.ui --- old/lxqt-config-0.11.0/lxqt-config-brightness/outputwidget.ui 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/outputwidget.ui 2017-01-01 23:03:41.000000000 +0100 @@ -17,7 +17,7 @@ </sizepolicy> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/resources/lxqt-config-brightness.desktop.in new/lxqt-config-0.11.1/lxqt-config-brightness/resources/lxqt-config-brightness.desktop.in --- old/lxqt-config-0.11.0/lxqt-config-brightness/resources/lxqt-config-brightness.desktop.in 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/resources/lxqt-config-brightness.desktop.in 2017-01-01 23:03:41.000000000 +0100 @@ -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 @@ Categories=Settings;DesktopSettings;Qt;LXQt;HardwareSettings; OnlyShowIn=LXQt; -#TRANSLATIONS_DIR=translations \ No newline at end of file +#TRANSLATIONS_DIR=translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_da.desktop new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[da]=Lysstyrke +GenericName[da]=Lysstyrkeindstillinger +Comment[da]=Konfigurér lysstyrke diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_fr.desktop new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_it.desktop new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_it.desktop --- old/lxqt-config-0.11.0/lxqt-config-brightness/translations/lxqt-config-brightness_it.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_it.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,2 @@ +Name[it]=Luminosità +Comment[it]=Permette di cambiare la luminosità e il contrasto dello schermo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_da.desktop new/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[da]=Filtilknytninger +GenericName[da]=Filtilknytningsindstillinger +Comment[da]=Konfigurér programmer tilknyttet kendte filtyper diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_fr.desktop new/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-input/translations/lxqt-config-input_da.desktop new/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-input/translations/lxqt-config-input_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[da]=Tastatur og mus +GenericName[da]=Input-indstillinger +Comment[da]=Konfigurér tastatur, mus og andre input-enheder diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-input/translations/lxqt-config-input_fr.desktop new/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-input/translations/lxqt-config-input_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-locale/translations/lxqt-config-locale_da.desktop new/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-locale/translations/lxqt-config-locale_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[da]=Sprog +GenericName[da]=Sprogindstillinger +Comment[da]=Sprogindstillinger for LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-locale/translations/lxqt-config-locale_fr.desktop new/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-locale/translations/lxqt-config-locale_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-monitor/fastmenu.ui new/lxqt-config-0.11.1/lxqt-config-monitor/fastmenu.ui --- old/lxqt-config-0.11.0/lxqt-config-monitor/fastmenu.ui 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-monitor/fastmenu.ui 2017-01-01 23:03:41.000000000 +0100 @@ -11,7 +11,7 @@ </rect> </property> <property name="windowTitle"> - <string>Form</string> + <string notr="true">Form</string> </property> <layout class="QVBoxLayout" name="verticalLayout"> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-monitor/loadsettings.cpp new/lxqt-config-0.11.1/lxqt-config-monitor/loadsettings.cpp --- old/lxqt-config-0.11.0/lxqt-config-monitor/loadsettings.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-monitor/loadsettings.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -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); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-monitor/monitorpicture.ui new/lxqt-config-0.11.1/lxqt-config-monitor/monitorpicture.ui --- old/lxqt-config-0.11.0/lxqt-config-monitor/monitorpicture.ui 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/lxqt-config-monitor/monitorpicture.ui 2017-01-01 23:03:41.000000000 +0100 @@ -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> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-monitor/translations/lxqt-config-monitor_da.desktop new/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_da.desktop --- old/lxqt-config-0.11.0/lxqt-config-monitor/translations/lxqt-config-monitor_da.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Name[da]=Skærmindstillinger +GenericName[da]=Skærmindstillinger +Comment[da]=Konfigurér skærme diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/lxqt-config-monitor/translations/lxqt-config-monitor_fr.desktop new/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_fr.desktop --- old/lxqt-config-0.11.0/lxqt-config-monitor/translations/lxqt-config-monitor_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,3 @@ +Name[fr]=Paramètres de l'écran +GenericName[fr]=Paramètres de l'écran +Comment[fr]=Configurer les écrans diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/mainwindow.cpp new/lxqt-config-0.11.1/src/mainwindow.cpp --- old/lxqt-config-0.11.0/src/mainwindow.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/mainwindow.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -213,6 +213,7 @@ 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 @@ 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 @@ QApplication::restoreOverrideCursor(); } -void LXQtConfig::MainWindow::activateItem(const QModelIndex &index) +void LXQtConfig::MainWindow::activateItem() { - if (!index.isValid()) - return; + if (pendingActivation.isValid()) + { + model->activateItem(pendingActivation); + pendingActivation = QModelIndex{}; + } +} - QModelIndex orig = proxyModel->mapToSource(index); - model->activateItem(orig); +/*Note: all this delayed activation is here to workaround the auto-repeated + * 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() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/mainwindow.h new/lxqt-config-0.11.1/src/mainwindow.h --- old/lxqt-config-0.11.0/src/mainwindow.h 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/mainwindow.h 2017-01-01 23:03:41.000000000 +0100 @@ -52,18 +52,20 @@ 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/qcategorizedview/qcategorizedview.cpp new/lxqt-config-0.11.1/src/qcategorizedview/qcategorizedview.cpp --- old/lxqt-config-0.11.0/src/qcategorizedview/qcategorizedview.cpp 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/qcategorizedview/qcategorizedview.cpp 2017-01-01 23:03:41.000000000 +0100 @@ -516,6 +516,7 @@ QCategorizedView::QCategorizedView(QWidget *parent) : QListView(parent) , d(new Private(this)) + , enterPressed(false) { } @@ -1536,6 +1537,45 @@ } } +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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/qcategorizedview/qcategorizedview.h new/lxqt-config-0.11.1/src/qcategorizedview/qcategorizedview.h --- old/lxqt-config-0.11.0/src/qcategorizedview/qcategorizedview.h 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/qcategorizedview/qcategorizedview.h 2017-01-01 23:03:41.000000000 +0100 @@ -318,6 +318,9 @@ int start, int end); + void keyPressEvent(QKeyEvent *event); + void keyReleaseEvent(QKeyEvent *event); + protected Q_SLOTS: /** * @internal @@ -348,6 +351,11 @@ 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)) }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/translations/lxqt-config_da.desktop new/lxqt-config-0.11.1/src/translations/lxqt-config_da.desktop --- old/lxqt-config-0.11.0/src/translations/lxqt-config_da.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/translations/lxqt-config_da.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -1,4 +1,4 @@ # Translations -Comment[da]=Indstil LXQt moduler -GenericName[da]=LXQt Indstillingscenter -Name[da]=LXQt Indstillingscenter +Name[da]=LXQt-konfigurationscenter +GenericName[da]=Systemindstillinger +Comment[da]=Konfigurér dit system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/translations/lxqt-config_da_DK.desktop new/lxqt-config-0.11.1/src/translations/lxqt-config_da_DK.desktop --- old/lxqt-config-0.11.0/src/translations/lxqt-config_da_DK.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/translations/lxqt-config_da_DK.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,4 +0,0 @@ -# Translations -Comment[da_DK]=Indstil LXQt moduler -GenericName[da_DK]=LXQt Indstillinger -Name[da_DK]=LXQt Konfigurationsstyring diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/translations/lxqt-config_fr.desktop new/lxqt-config-0.11.1/src/translations/lxqt-config_fr.desktop --- old/lxqt-config-0.11.0/src/translations/lxqt-config_fr.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.11.1/src/translations/lxqt-config_fr.desktop 2017-01-01 23:03:41.000000000 +0100 @@ -0,0 +1,4 @@ +# Translations +Comment[fr]=Configurer les modules de LXQt +GenericName[fr]=Configuration de LXQt +Name[fr]=Centre de configuration de LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.0/src/translations/lxqt-config_fr_FR.desktop new/lxqt-config-0.11.1/src/translations/lxqt-config_fr_FR.desktop --- old/lxqt-config-0.11.0/src/translations/lxqt-config_fr_FR.desktop 2016-09-24 00:44:36.000000000 +0200 +++ new/lxqt-config-0.11.1/src/translations/lxqt-config_fr_FR.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -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
