Hello community, here is the log from the commit of package lxqt-config for openSUSE:Factory checked in at 2017-10-24 22:22:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lxqt-config (Old) and /work/SRC/openSUSE:Factory/.lxqt-config.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lxqt-config" Tue Oct 24 22:22:54 2017 rev:13 rq:535972 version:0.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/lxqt-config/lxqt-config.changes 2017-06-30 18:43:40.215091077 +0200 +++ /work/SRC/openSUSE:Factory/.lxqt-config.new/lxqt-config.changes 2017-10-24 22:23:04.489263974 +0200 @@ -1,0 +2,39 @@ +Mon Oct 23 10:44:41 UTC 2017 - [email protected] + +- Update to 0.12.0: + * Set patch version + * Use $XDG_CONFIG_HOME/mimeapps.list for mime data instead of $XDG_DATA_HOME/applications/mimeapps.list (#129) + * Don't export github templates + * Update monitorsettingsdialog.ui + * lxqt-config-locale: corrected/reworded Save Changed Settings dialog + * Add/update *lt.desktop files + * lxq-config-monitor: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-locale: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-input: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-file-ass.: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-brightness: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-appearance: set Qt::AA_UseHighDpiPixmaps to true + * liblxqt-config-cursor: set Qt::AA_UseHighDpiPixmaps to true + * Added QCommandLineParser and basic cli interface to lxqt-config-monitor + * Added QCommandLineParser and basic cli interface to lxqt-config-locale + * Added QCommandLineParser and basic cli interface to lxqt-config-input + * Added QCommandLineParser and basic cli interface to lxqt-config-file-associations + * Added version info to lxqt-config-brightness cli + * Added QCommandLineParser and basic cli interface to lxqt-config-appearance + * Added QCommandLineParser and basic cli interface to lxqt-config + * Added LXQT_CONFIG_PATCH_VERSION + * Fixed typo in appearance_pl_PL.desktop (#124) + * i18n: added some *.desktop for Polish language + * Fixes (#121) + * appearance: Fix typo from @aca544479 + * lxqt-config-file-associations: Sets the initial focus (#120) + * appearance: Add icon FollowColorScheme configuration (#119) + * Show non-primary screens in UI. (#116) + * Removes unneeded include_directories() entry + * Fixes a FTBFS with CMake v3.8 + * Use const iterators + * Update AUTHORS +- Remove post and postun +- Remove add-include-directory-for-uic-files.diff + +------------------------------------------------------------------- Old: ---- add-include-directory-for-uic-files.diff lxqt-config-0.11.1.tar.xz lxqt-config-0.11.1.tar.xz.asc New: ---- lxqt-config-0.12.0.tar.xz lxqt-config-0.12.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lxqt-config.spec ++++++ --- /var/tmp/diff_new_pack.xf3o1U/_old 2017-10-24 22:23:05.021239107 +0200 +++ /var/tmp/diff_new_pack.xf3o1U/_new 2017-10-24 22:23:05.025238920 +0200 @@ -17,17 +17,15 @@ Name: lxqt-config -Version: 0.11.1 +Version: 0.12.0 Release: 0 Summary: LXQt Control Center License: GPL-2.0+ and LGPL-2.1+ Group: System/GUI/LXQt Url: http://www.lxde.org -Source: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz -Source1: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz.asc +Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: lxqt-config.keyring -# PATCH-FIX-UPSTREAM add-include-directory-for-uic-files.diff -- Fix build by including the directory where uic files are generated -Patch0: add-include-directory-for-uic-files.diff BuildRequires: cmake >= 3.0.2 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -60,7 +58,6 @@ %prep %setup -q -%patch0 -p1 # Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings #find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} + @@ -80,12 +77,6 @@ install -Dm 0644 %{name}-appearance/man/%{name}-appearance.1 %{buildroot}%{_mandir}/man1/%{name}-appearance.1 %fdupes -s %{buildroot}/%{_datadir} -%post -%desktop_database_post - -%postun -%desktop_database_postun - %files %defattr(-,root,root) %doc AUTHORS LICENSE ++++++ lxqt-config-0.11.1.tar.xz -> lxqt-config-0.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/AUTHORS new/lxqt-config-0.12.0/AUTHORS --- old/lxqt-config-0.11.1/AUTHORS 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/AUTHORS 2017-10-21 21:10:53.000000000 +0200 @@ -4,7 +4,7 @@ Copyright: Copyright (c) 2010-2012 Razor team - Copyright (c) 2012-2016 LXQt team + Copyright (c) 2012-2017 LXQt team License: GPL-2 and LGPL-2.1+ The full text of the licenses can be found in the 'LICENSE' file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/CHANGELOG new/lxqt-config-0.12.0/CHANGELOG --- old/lxqt-config-0.11.1/CHANGELOG 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/CHANGELOG 2017-10-21 21:10:53.000000000 +0200 @@ -1,7 +1,44 @@ -lxqt-config-0.11.1 / 2017-01-01 +lxqt-config-0.12.0 / 2017-10-21 =============================== + * Set patch version + * Use $XDG_CONFIG_HOME/mimeapps.list for mime data instead of $XDG_DATA_HOME/applications/mimeapps.list (#129) + * Don't export github templates + * Update monitorsettingsdialog.ui + * lxqt-config-locale: corrected/reworded Save Changed Settings dialog + * Add/update *lt.desktop files + * lxq-config-monitor: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-locale: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-input: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-file-ass.: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-brightness: set Qt::AA_UseHighDpiPixmaps to true + * lxqt-config-appearance: set Qt::AA_UseHighDpiPixmaps to true + * liblxqt-config-cursor: set Qt::AA_UseHighDpiPixmaps to true + * Added QCommandLineParser and basic cli interface to lxqt-config-monitor + * Added QCommandLineParser and basic cli interface to lxqt-config-locale + * Added QCommandLineParser and basic cli interface to lxqt-config-input + * Added QCommandLineParser and basic cli interface to lxqt-config-file-associations + * Added version info to lxqt-config-brightness cli + * Added QCommandLineParser and basic cli interface to lxqt-config-appearance + * Added QCommandLineParser and basic cli interface to lxqt-config + * Added LXQT_CONFIG_PATCH_VERSION + * Fixed typo in appearance_pl_PL.desktop (#124) + * i18n: added some *.desktop for Polish language + * Fixes (#121) + * appearance: Fix typo from @aca544479 + * lxqt-config-file-associations: Sets the initial focus (#120) + * appearance: Add icon FollowColorScheme configuration (#119) + * Show non-primary screens in UI. (#116) + * Removes unneeded include_directories() entry + * Fixes a FTBFS with CMake v3.8 + * Use const iterators + * Update AUTHORS + +0.11.1 / 2017-01-01 +=================== + + * Release 0.11.1: Update changelog * 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/CMakeLists.txt new/lxqt-config-0.12.0/CMakeLists.txt --- old/lxqt-config-0.11.1/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/CMakeLists.txt 2017-10-21 21:10:53.000000000 +0200 @@ -19,13 +19,13 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -find_package(Qt5Widgets REQUIRED QUIET) -find_package(Qt5DBus REQUIRED QUIET) -find_package(Qt5Xml REQUIRED QUIET) -find_package(Qt5Concurrent REQUIRED QUIET) -find_package(Qt5X11Extras REQUIRED QUIET) -find_package(Qt5LinguistTools REQUIRED QUIET) -find_package(lxqt REQUIRED QUIET) +find_package(Qt5Widgets REQUIRED) +find_package(Qt5DBus REQUIRED) +find_package(Qt5Xml REQUIRED) +find_package(Qt5Concurrent REQUIRED) +find_package(Qt5X11Extras REQUIRED) +find_package(Qt5LinguistTools REQUIRED) +find_package(lxqt REQUIRED) include(LXQtCompilerSettings NO_POLICY_SCOPE) @@ -33,6 +33,12 @@ set(CMAKE_BUILD_TYPE Release) endif() +# Patch Version +set(LXQT_CONFIG_PATCH_VERSION 0) + +set(LXQT_CONFIG_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_CONFIG_PATCH_VERSION}) +add_definitions("-DLXQT_CONFIG_VERSION=\"${LXQT_CONFIG_VERSION}\"") + include(LXQtTranslate) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/liblxqt-config-cursor/main.cpp new/lxqt-config-0.12.0/liblxqt-config-cursor/main.cpp --- old/lxqt-config-0.11.1/liblxqt-config-cursor/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/liblxqt-config-cursor/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -31,6 +31,8 @@ //QTextCodec::setCodecForLocale(QTextCodec::codecForName("koi8-r")); LXQt::Application app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + TRANSLATE_APP; //qDebug() << findDefaultTheme() << getCurrentTheme(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/liblxqt-config-cursor/selectwnd.cpp new/lxqt-config-0.12.0/liblxqt-config-cursor/selectwnd.cpp --- old/lxqt-config-0.11.1/liblxqt-config-cursor/selectwnd.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/liblxqt-config-cursor/selectwnd.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -13,6 +13,7 @@ #include <QDebug> #include "selectwnd.h" +#include "ui_selectwnd.h" #include <QKeyEvent> #include <QMessageBox> @@ -37,22 +38,24 @@ #define HOME_ICON_DIR QDir::homePath() + "/.icons" -SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) : QWidget(parent), mSettings(settings) +SelectWnd::SelectWnd(LXQt::Settings* settings, QWidget *parent) + : QWidget(parent), + mSettings(settings), + ui(new Ui::SelectWnd) { - setupUi(this); - - warningLabel->hide(); + ui->setupUi(this); + ui->warningLabel->hide(); mModel = new XCursorThemeModel(this); int size = style()->pixelMetric(QStyle::PM_LargeIconSize); - lbThemes->setModel(mModel); - lbThemes->setItemDelegate(new ItemDelegate(this)); - lbThemes->setIconSize(QSize(size, size)); - lbThemes->setSelectionMode(QAbstractItemView::SingleSelection); + ui->lbThemes->setModel(mModel); + ui->lbThemes->setItemDelegate(new ItemDelegate(this)); + ui->lbThemes->setIconSize(QSize(size, size)); + ui->lbThemes->setSelectionMode(QAbstractItemView::SingleSelection); // Make sure we find out about selection changes - connect(lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), + connect(ui->lbThemes->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), SLOT(currentChanged(const QModelIndex &, const QModelIndex &))); // display/hide warning label connect(mModel, SIGNAL(modelReset()), @@ -62,15 +65,15 @@ connect(mModel, SIGNAL(rowsRemoved(const QModelIndex&, int, int)), this, SLOT(handleWarning())); - connect(warningLabel, SIGNAL(showDirInfo()), + connect(ui->warningLabel, SIGNAL(showDirInfo()), this, SLOT(showDirInfo())); // Disable the install button if we can't install new themes to ~/.icons, // or Xcursor isn't set up to look for cursor themes there - btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable()); + ui->btInstall->setEnabled(mModel->searchPaths().contains(HOME_ICON_DIR) && iconsIsWritable()); // TODO/FIXME: btInstall functionality - btInstall->hide(); - btRemove->hide(); + ui->btInstall->hide(); + ui->btRemove->hide(); //QTimer::singleShot(0, this, SLOT(setCurrent())); @@ -80,11 +83,12 @@ SelectWnd::~SelectWnd() { + delete ui; } void SelectWnd::setCurrent() { - lbThemes->selectionModel()->clear(); + ui->lbThemes->selectionModel()->clear(); QString ct = getCurrentTheme(); mAppliedIndex = mModel->defaultIndex(); @@ -97,9 +101,9 @@ const XCursorThemeData *theme = mModel->theme(mAppliedIndex); // Select the current theme selectRow(mAppliedIndex); - lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter); + ui->lbThemes->scrollTo(mAppliedIndex, QListView::PositionAtCenter); // Update the preview widget as well - if (theme) preview->setTheme(*theme);// else preview->clearTheme(); + if (theme) ui->preview->setTheme(*theme);// else ui->preview->clearTheme(); } } @@ -123,8 +127,8 @@ QModelIndex from = mModel->index(row, 0); QModelIndex to = mModel->index(row, mModel->columnCount()-1); QItemSelection selection(from, to); - lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select); - lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate); + ui->lbThemes->selectionModel()->select(selection, QItemSelectionModel::Select); + ui->lbThemes->selectionModel()->setCurrentIndex(mAppliedIndex, QItemSelectionModel::NoUpdate); } void SelectWnd::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) @@ -133,16 +137,16 @@ if (current.isValid()) { const XCursorThemeData *theme = mModel->theme(current); if (theme) { - preview->setTheme(*theme); - btRemove->setEnabled(theme->isWritable()); + ui->preview->setTheme(*theme); + ui->btRemove->setEnabled(theme->isWritable()); } else { - preview->clearTheme(); + ui->preview->clearTheme(); } // directly apply the current settings applyCurrent(); } else { - preview->clearTheme(); + ui->preview->clearTheme(); } //emit changed(mAppliedIndex != current); } @@ -155,7 +159,7 @@ void SelectWnd::applyCurrent() { //qDebug() << "'set' clicked"; - const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex()); + const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex()); if (!theme) return; applyTheme(*theme); fixXDefaults(theme->name()); @@ -200,7 +204,7 @@ void SelectWnd::on_btRemove_clicked() { qDebug() << "'remove' clicked"; - const XCursorThemeData *theme = mModel->theme(lbThemes->currentIndex()); + const XCursorThemeData *theme = mModel->theme(ui->lbThemes->currentIndex()); if (!theme) return; QString ct = getCurrentTheme(); if (ct == theme->name()) @@ -210,20 +214,20 @@ return; } QDir d(theme->path()); - preview->clearTheme(); - mModel->removeTheme(lbThemes->currentIndex()); + ui->preview->clearTheme(); + mModel->removeTheme(ui->lbThemes->currentIndex()); removeXCursorTheme(d); } void SelectWnd::handleWarning() { bool empty = mModel->rowCount(); - warningLabel->setVisible(!empty); - preview->setVisible(empty); - infoLabel->setVisible(empty); + ui->warningLabel->setVisible(!empty); + ui->preview->setVisible(empty); + ui->infoLabel->setVisible(empty); } void SelectWnd::showDirInfo() { - QToolTip::showText(mapToGlobal(warningLabel->buttonPos()), mModel->searchPaths().join("\n")); + QToolTip::showText(mapToGlobal(ui->warningLabel->buttonPos()), mModel->searchPaths().join("\n")); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/liblxqt-config-cursor/selectwnd.h new/lxqt-config-0.12.0/liblxqt-config-cursor/selectwnd.h --- old/lxqt-config-0.11.1/liblxqt-config-cursor/selectwnd.h 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/liblxqt-config-cursor/selectwnd.h 2017-10-21 21:10:53.000000000 +0200 @@ -15,16 +15,20 @@ #include <QObject> #include <QWidget> +#include <QPersistentModelIndex> #include <lxqtglobals.h> namespace LXQt { class Settings; } +namespace Ui { +class SelectWnd; +} + class XCursorThemeModel; -#include "ui_selectwnd.h" -class LXQT_API SelectWnd : public QWidget, private Ui_SelectWnd +class LXQT_API SelectWnd : public QWidget { Q_OBJECT @@ -55,6 +59,7 @@ XCursorThemeModel *mModel; QPersistentModelIndex mAppliedIndex; LXQt::Settings* mSettings; + Ui::SelectWnd *ui; }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/CMakeLists.txt new/lxqt-config-0.12.0/lxqt-config-appearance/CMakeLists.txt --- old/lxqt-config-0.11.1/lxqt-config-appearance/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/CMakeLists.txt 2017-10-21 21:10:53.000000000 +0200 @@ -3,7 +3,6 @@ include_directories( ${Qt5Gui_PRIVATE_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../liblxqt-config-cursor" - "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor" ) set(H_FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.cpp new/lxqt-config-0.12.0/lxqt-config-appearance/iconthemeconfig.cpp --- old/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/iconthemeconfig.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -42,6 +42,9 @@ initControls(); connect(iconThemeList, SIGNAL(itemClicked(QTreeWidgetItem*,int)), this, SLOT(iconThemeSelected(QTreeWidgetItem*,int))); + connect(iconFollowColorSchemeCB, &QAbstractButton::toggled, this, [this] (bool checked) { + m_settings->setValue("icon_follow_color_scheme", checked); + }); } @@ -126,6 +129,8 @@ ++it; } + iconFollowColorSchemeCB->setChecked(m_settings->value("icon_follow_color_scheme", true).toBool()); + update(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.ui new/lxqt-config-0.12.0/lxqt-config-appearance/iconthemeconfig.ui --- old/lxqt-config-0.11.1/lxqt-config-appearance/iconthemeconfig.ui 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/iconthemeconfig.ui 2017-10-21 21:10:53.000000000 +0200 @@ -81,6 +81,16 @@ </column> </widget> </item> + <item> + <widget class="QCheckBox" name="iconFollowColorSchemeCB"> + <property name="toolTip"> + <string>The KDE extension of XDG icon themes -> FollowsColorScheme</string> + </property> + <property name="text"> + <string>Colorize icons based on widget style (palette)</string> + </property> + </widget> + </item> </layout> </widget> <resources/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/lxqtthemeconfig.cpp new/lxqt-config-0.12.0/lxqt-config-appearance/lxqtthemeconfig.cpp --- old/lxqt-config-0.11.1/lxqt-config-appearance/lxqtthemeconfig.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/lxqtthemeconfig.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -87,8 +87,8 @@ }); - QList<LXQt::LXQtTheme> themes = LXQt::LXQtTheme::allThemes(); - foreach(LXQt::LXQtTheme theme, themes) + const QList<LXQt::LXQtTheme> themes = LXQt::LXQtTheme::allThemes(); + foreach(const LXQt::LXQtTheme &theme, themes) { QString themeName = theme.name(); themeName[0] = themeName[0].toTitleCase(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/main.cpp new/lxqt-config-0.12.0/lxqt-config-appearance/main.cpp --- old/lxqt-config-0.11.1/lxqt-config-appearance/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -29,6 +29,7 @@ #include <LXQt/Settings> #include <LXQt/ConfigDialog> +#include <QCommandLineParser> #include "iconthemeconfig.h" #include "lxqtthemeconfig.h" #include "styleconfig.h" @@ -39,6 +40,18 @@ int main (int argc, char **argv) { LXQt::SingleApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config Appearance")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); + LXQt::Settings* settings = new LXQt::Settings("lxqt"); LXQt::Settings* sessionSettings = new LXQt::Settings("session"); LXQt::ConfigDialog* dialog = new LXQt::ConfigDialog(QObject::tr("LXQt Appearance Configuration"), settings); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_lt.desktop new/lxqt-config-0.12.0/lxqt-config-appearance/translations/lxqt-config-appearance_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_lt.desktop 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/translations/lxqt-config-appearance_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -1,4 +1,4 @@ # Translations -Comment[lt]=Konfigūruoti LXQt darbalaukio išvaizdą -GenericName[lt]=LXQt išvaizdos konfigūravimas -Name[lt]=LXQt išvaizdos konfigūravimas +Comment[lt]=LXQt išvaizdos nustatymai +GenericName[lt]=Išvaizdos nustatymai +Name[lt]=Išvaizda diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_pl_PL.desktop new/lxqt-config-0.12.0/lxqt-config-appearance/translations/lxqt-config-appearance_pl_PL.desktop --- old/lxqt-config-0.11.1/lxqt-config-appearance/translations/lxqt-config-appearance_pl_PL.desktop 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-appearance/translations/lxqt-config-appearance_pl_PL.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -1,4 +1,4 @@ # Translations -Comment[pl_PL]=Konfiguruj wylgąd pulpitu LXQt +Comment[pl_PL]=Konfiguruj wygląd pulpitu LXQt GenericName[pl_PL]=Konfiguracja wyglądu LXQt Name[pl_PL]=Konfiguracja wyglądu LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-brightness/brightnesssettings.cpp new/lxqt-config-0.12.0/lxqt-config-brightness/brightnesssettings.cpp --- old/lxqt-config-0.11.1/lxqt-config-brightness/brightnesssettings.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-brightness/brightnesssettings.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -29,7 +29,7 @@ mBrightness = new XRandrBrightness(); mMonitors = mBrightness->getMonitorsInfo(); - for(MonitorInfo monitor: mMonitors) + for(const MonitorInfo &monitor: mMonitors) { OutputWidget *output = new OutputWidget(monitor, this); ui->layout->addWidget(output); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-brightness/main.cpp new/lxqt-config-0.12.0/lxqt-config-brightness/main.cpp --- old/lxqt-config-0.11.1/lxqt-config-brightness/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-brightness/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -1,16 +1,16 @@ /* Copyright (C) 2016 P.L. Lucas <[email protected]> - + This 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 @@ -25,9 +25,15 @@ int main(int argn, char* argv[]) { LXQt::SingleApplication app(argn, argv); - + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + // Command line options QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config Brightness")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); QCommandLineOption increaseOption(QStringList() << "i" << "icrease", app.tr("Increase brightness.")); parser.addOption(increaseOption); @@ -42,6 +48,7 @@ parser.addOption(decreaseOption); parser.addOption(setOption); parser.addOption(helpOption); + parser.addVersionOption(); parser.process(app); if( parser.isSet(increaseOption) || parser.isSet(decreaseOption) || parser.isSet(setOption) ) @@ -56,7 +63,6 @@ sign = 0.0; foreach(MonitorInfo monitor, monitors) { - if( monitor.isBacklightSupported() ) { long backlight = ( monitor.backlight() + sign*(monitor.backlightMax()/50 + 1) )*qAbs(sign) + brightness_value*monitor.backlightMax(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_lt.desktop new/lxqt-config-0.12.0/lxqt-config-brightness/translations/lxqt-config-brightness_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-brightness/translations/lxqt-config-brightness_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,4 @@ +# Translations +Comment[lt]=Konfigūruoti ryškumą +GenericName[lt]=Ryškumo nustatymai +Name[lt]=Ryškumas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_pl.desktop new/lxqt-config-0.12.0/lxqt-config-brightness/translations/lxqt-config-brightness_pl.desktop --- old/lxqt-config-0.11.1/lxqt-config-brightness/translations/lxqt-config-brightness_pl.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-brightness/translations/lxqt-config-brightness_pl.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,3 @@ +Name[pl]=Ustawienia jasności +GenericName[pl]=Ustawienia jasności wyświetlacza +Comment[pl]=Dostosuj jasność i kontrast wyświetlacza diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-brightness/xrandrbrightness.cpp new/lxqt-config-0.12.0/lxqt-config-brightness/xrandrbrightness.cpp --- old/lxqt-config-0.11.1/lxqt-config-brightness/xrandrbrightness.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-brightness/xrandrbrightness.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -394,7 +394,7 @@ float brightness_value = gamma_brightness_get(output); // Compare output info with settings and set it. - for(MonitorInfo monitor: monitors) + for(const MonitorInfo &monitor: monitors) { if(monitor.id() == (int)output && monitor.name() == name) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-file-associations/main.cpp new/lxqt-config-0.12.0/lxqt-config-file-associations/main.cpp --- old/lxqt-config-0.11.1/lxqt-config-file-associations/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-file-associations/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -32,6 +32,7 @@ #include <QIODevice> #include <QSettings> #include <QVariant> +#include <QCommandLineParser> #include <LXQt/Settings> #include <XdgDesktopFile> @@ -41,6 +42,17 @@ int main (int argc, char **argv) { LXQt::SingleApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config File Associations")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); MimetypeViewer mimetypeViewer; app.setActivationWindow(&mimetypeViewer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-file-associations/mimetypeviewer.cpp new/lxqt-config-0.12.0/lxqt-config-file-associations/mimetypeviewer.cpp --- old/lxqt-config-0.11.1/lxqt-config-file-associations/mimetypeviewer.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-file-associations/mimetypeviewer.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -107,12 +107,13 @@ connect(widget.chooseApplicationsButton, SIGNAL(clicked()), this, SLOT(chooseApplication())); connect(widget.dialogButtonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(dialogButtonBoxClicked(QAbstractButton*))); - QString mimeappsListPath(XdgDirs::dataHome(true) + "/applications/mimeapps.list"); + QString mimeappsListPath(XdgDirs::configHome(true) + "/mimeapps.list"); mDefaultsList = new QSettings(mimeappsListPath, XdgDesktopFileCache::desktopFileSettingsFormat(), this); mSettingsCache = new LXQt::SettingsCache(mDefaultsList); mSettingsCache->loadFromSettings(); initializeMimetypeTreeView(); loadAllMimeTypes(); + widget.searchTermLineEdit->setFocus(); connect(widget.mimetypeTreeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(currentMimetypeChanged())); @@ -146,7 +147,6 @@ { currentMimetypeChanged(); widget.mimetypeTreeWidget->setColumnCount(2); - widget.mimetypeTreeWidget->setFocus(); widget.searchTermLineEdit->setEnabled(true); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_lt.desktop new/lxqt-config-0.12.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-file-associations/translations/lxqt-config-file-associations_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-file-associations/translations/lxqt-config-file-associations_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,4 @@ +# Translations +Name[lt]=Failų susiejimai +GenericName[lt]=Failų susiejimų nustatymai +Comment[lt]=Konfigūruoti su žinomais failų tipais susietas programas diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-input/CMakeLists.txt new/lxqt-config-0.12.0/lxqt-config-input/CMakeLists.txt --- old/lxqt-config-0.11.1/lxqt-config-input/CMakeLists.txt 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-input/CMakeLists.txt 2017-10-21 21:10:53.000000000 +0200 @@ -4,7 +4,6 @@ include_directories( ${X11_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/../liblxqt-config-cursor" - "${CMAKE_CURRENT_BINARY_DIR}/../liblxqt-config-cursor" ) set(lxqt-config-input_HDRS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-input/keyboardlayoutconfig.cpp new/lxqt-config-0.12.0/lxqt-config-input/keyboardlayoutconfig.cpp --- old/lxqt-config-0.11.1/lxqt-config-input/keyboardlayoutconfig.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-input/keyboardlayoutconfig.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -65,8 +65,8 @@ variants = line.mid(8).trimmed().split(','); } else if(line.startsWith("options:")) { - QList<QByteArray> options = line.mid(9).trimmed().split(','); - Q_FOREACH(QByteArray option, options) { + const QList<QByteArray> options = line.mid(9).trimmed().split(','); + Q_FOREACH(const QByteArray &option, options) { if(option.startsWith("grp:")) switchKey_ = QString::fromLatin1(option); else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-input/lxqt-config-input.cpp new/lxqt-config-0.12.0/lxqt-config-input/lxqt-config-input.cpp --- old/lxqt-config-0.11.1/lxqt-config-input/lxqt-config-input.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-input/lxqt-config-input.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -19,6 +19,7 @@ #include <LXQt/SingleApplication> #include <LXQt/ConfigDialog> #include <LXQt/Settings> +#include <QCommandLineParser> #include "mouseconfig.h" #include "keyboardconfig.h" #include "../liblxqt-config-cursor/selectwnd.h" @@ -26,6 +27,17 @@ int main(int argc, char** argv) { LXQt::SingleApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config Input")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\n\nliblxqt: " LXQT_VERSION + "\nQt: " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); QByteArray configName = qgetenv("LXQT_SESSION_CONFIG"); if(configName.isEmpty()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-input/selectkeyboardlayoutdialog.cpp new/lxqt-config-0.12.0/lxqt-config-input/selectkeyboardlayoutdialog.cpp --- old/lxqt-config-0.11.1/lxqt-config-input/selectkeyboardlayoutdialog.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-input/selectkeyboardlayoutdialog.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -28,7 +28,7 @@ connect(ui.layouts, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), SLOT(onLayoutChanged())); QMap<QString, KeyboardLayoutInfo >::const_iterator it; - for(it = knownLayouts_.begin(); it != knownLayouts_.end(); ++it) { + for(it = knownLayouts_.constBegin(); it != knownLayouts_.constEnd(); ++it) { const QString& name = it.key(); const KeyboardLayoutInfo& info = *it; QListWidgetItem * item = new QListWidgetItem(info.description); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_lt.desktop new/lxqt-config-0.12.0/lxqt-config-input/translations/lxqt-config-input_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-input/translations/lxqt-config-input_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-input/translations/lxqt-config-input_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,4 @@ +# Translations +Name[lt]=Klaviatūra ir pelė +GenericName[lt]=Įvedimo nustatymai +Comment[lt]=Konfigūruoti klaviatūrą, pelę ir kitus įvedimo įrenginius diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-locale/localeconfig.cpp new/lxqt-config-0.12.0/lxqt-config-locale/localeconfig.cpp --- old/lxqt-config-0.11.1/lxqt-config-locale/localeconfig.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-locale/localeconfig.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -306,7 +306,7 @@ { QMessageBox msgBox; msgBox.setWindowTitle(tr("Format Settings Changed")); - msgBox.setText(tr("Save the settings ? (they will take effect the next time you log in)")); + msgBox.setText(tr("Do you want to save your changes? They will take effect the next time you log in.")); msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Cancel); msgBox.setDefaultButton(QMessageBox::Cancel); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-locale/main.cpp new/lxqt-config-0.12.0/lxqt-config-locale/main.cpp --- old/lxqt-config-0.11.1/lxqt-config-locale/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-locale/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -27,11 +27,24 @@ #include <LXQt/Settings> #include <LXQt/ConfigDialog> +#include <QCommandLineParser> #include "localeconfig.h" int main (int argc, char **argv) { LXQt::SingleApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config Locale")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); + LXQt::Settings settings("lxqt-config-locale"); LXQt::Settings session_settings("session"); LXQt::ConfigDialog* dialog = new LXQt::ConfigDialog(QObject::tr("LXQt Locale Configuration"), &settings); @@ -49,4 +62,3 @@ return app.exec(); } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_lt.desktop new/lxqt-config-0.12.0/lxqt-config-locale/translations/lxqt-config-locale_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-locale/translations/lxqt-config-locale_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,3 @@ +Name[lt]=Lokalė +GenericName[lt]=Lokalės nustatymai +Comment[lt]=LXQt lokalės nustatymai diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_pl.desktop new/lxqt-config-0.12.0/lxqt-config-locale/translations/lxqt-config-locale_pl.desktop --- old/lxqt-config-0.11.1/lxqt-config-locale/translations/lxqt-config-locale_pl.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-locale/translations/lxqt-config-locale_pl.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,3 @@ +Name[pl]=Region i język +GenericName[pl]=Ustawienia regionalne +Comment[pl]=Zmień region i język LXQt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-monitor/main.cpp new/lxqt-config-0.12.0/lxqt-config-monitor/main.cpp --- old/lxqt-config-0.11.1/lxqt-config-monitor/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-monitor/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -48,17 +48,24 @@ } LXQt::SingleApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); // Command line options QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config Monitor")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); QCommandLineOption loadOption(QStringList() << "l" << "loadlast", app.tr("Load last settings.")); parser.addOption(loadOption); QCommandLineOption helpOption = parser.addHelpOption(); parser.addOption(loadOption); - parser.addOption(helpOption); + parser.addVersionOption(); + parser.addHelpOption(); - //parser.process(app); + parser.process(app); //bool loadLastSettings = parser.isSet(loadOption); MonitorSettingsDialog dlg; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-monitor/monitorpicture.cpp new/lxqt-config-0.12.0/lxqt-config-monitor/monitorpicture.cpp --- old/lxqt-config-0.11.1/lxqt-config-monitor/monitorpicture.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-monitor/monitorpicture.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -35,8 +35,8 @@ int x = str.indexOf('x'); if (x > 0) { - width = str.left(x).toInt(); - height = str.mid(x + 1).toInt(); + width = str.leftRef(x).toInt(); + height = str.midRef(x + 1).toInt(); } return QSize(width, height); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-monitor/monitorsettingsdialog.ui new/lxqt-config-0.12.0/lxqt-config-monitor/monitorsettingsdialog.ui --- old/lxqt-config-0.11.1/lxqt-config-monitor/monitorsettingsdialog.ui 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-monitor/monitorsettingsdialog.ui 2017-10-21 21:10:53.000000000 +0200 @@ -56,7 +56,7 @@ </property> <property name="minimumSize"> <size> - <width>300</width> + <width>350</width> <height>0</height> </size> </property> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-monitor/monitorwidget.cpp new/lxqt-config-0.12.0/lxqt-config-monitor/monitorwidget.cpp --- old/lxqt-config-0.11.1/lxqt-config-monitor/monitorwidget.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-monitor/monitorwidget.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -154,6 +154,8 @@ // Behavior chooser if (output->isPrimary()) ui.behaviorCombo->setCurrentIndex(PrimaryDisplay); + else + ui.behaviorCombo->setCurrentIndex(ExtendDisplay); // Insert orientations ui.orientationCombo->addItem(tr("None"), KScreen::Output::None); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_lt.desktop new/lxqt-config-0.12.0/lxqt-config-monitor/translations/lxqt-config-monitor_lt.desktop --- old/lxqt-config-0.11.1/lxqt-config-monitor/translations/lxqt-config-monitor_lt.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/lxqt-config-0.12.0/lxqt-config-monitor/translations/lxqt-config-monitor_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -0,0 +1,4 @@ +# Translations +Name[lt]=Monitoriaus nustatymai +GenericName[lt]=Monitoriaus nustatymai +Comment[lt]=Konfigūruoti monitorius diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/src/main.cpp new/lxqt-config-0.12.0/src/main.cpp --- old/lxqt-config-0.11.1/src/main.cpp 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/src/main.cpp 2017-10-21 21:10:53.000000000 +0200 @@ -28,6 +28,7 @@ #include <LXQt/SingleApplication> #include <QSettings> #include "mainwindow.h" +#include "QCommandLineParser" int main(int argc, char **argv) @@ -37,6 +38,16 @@ app.setApplicationName(QStringLiteral("lxqt-config")); app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); + QCommandLineParser parser; + parser.setApplicationDescription(QStringLiteral("LXQt Config")); + const QString VERINFO = QStringLiteral(LXQT_CONFIG_VERSION + "\nliblxqt " LXQT_VERSION + "\nQt " QT_VERSION_STR); + app.setApplicationVersion(VERINFO); + parser.addVersionOption(); + parser.addHelpOption(); + parser.process(app); + // ensure that we use lxqt-config.menu file. qputenv("XDG_MENU_PREFIX", "lxqt-"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lxqt-config-0.11.1/src/translations/lxqt-config_lt.desktop new/lxqt-config-0.12.0/src/translations/lxqt-config_lt.desktop --- old/lxqt-config-0.11.1/src/translations/lxqt-config_lt.desktop 2017-01-01 23:03:41.000000000 +0100 +++ new/lxqt-config-0.12.0/src/translations/lxqt-config_lt.desktop 2017-10-21 21:10:53.000000000 +0200 @@ -1,4 +1,4 @@ # Translations -Comment[lt]=Konfigūruoti LXQt modulius -GenericName[lt]=LXQt konfigūracija Name[lt]=LXQt konfigūravimo centras +GenericName[lt]=Sistemos nustatymai +Comment[lt]=Konfigūruoti savo sistemą
