Hello community, here is the log from the commit of package qt5ct for openSUSE:Factory checked in at 2016-04-28 16:57:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt5ct (Old) and /work/SRC/openSUSE:Factory/.qt5ct.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt5ct" Changes: -------- --- /work/SRC/openSUSE:Factory/qt5ct/qt5ct.changes 2016-04-07 13:27:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt5ct.new/qt5ct.changes 2016-04-28 17:02:31.000000000 +0200 @@ -1,0 +2,8 @@ +Wed Apr 27 08:23:43 UTC 2016 - [email protected] + +- Update to version 0.23: + * Add support for single line comments in the style sheets. + * Fix issue with overriding application palette. + * Update Bulgarian translation. + +------------------------------------------------------------------- Old: ---- qt5ct-0.22.tar.bz2 New: ---- qt5ct-0.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt5ct.spec ++++++ --- /var/tmp/diff_new_pack.fEJeaD/_old 2016-04-28 17:02:33.000000000 +0200 +++ /var/tmp/diff_new_pack.fEJeaD/_new 2016-04-28 17:02:33.000000000 +0200 @@ -17,7 +17,7 @@ Name: qt5ct -Version: 0.22 +Version: 0.23 Release: 0 Summary: Qt5 Configuration Tool License: BSD-2-Clause @@ -31,8 +31,8 @@ BuildRequires: pkgconfig(Qt5Svg) >= 5.4.0 BuildRequires: pkgconfig(Qt5Widgets) >= 5.4.0 # libqt5-qtct was last used in openSUSE Leap 42.1. -Provides: libqt5-qtct = %{version}-%{release} -Obsoletes: libqt5-qtct < %{version}-%{release} +Provides: libqt5-qtct = %{version} +Obsoletes: libqt5-qtct < %{version} %description This applications allows users to configure Qt5 settings (theme, ++++++ qt5ct-0.22.tar.bz2 -> qt5ct-0.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/COPYING new/qt5ct-0.23/COPYING --- old/qt5ct-0.22/COPYING 2016-03-06 10:42:03.000000000 +0100 +++ new/qt5ct-0.23/COPYING 2016-04-26 09:00:46.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2014-2015, Ilya Kotov <[email protected]> +Copyright (c) 2014-2016, Ilya Kotov <[email protected]> All rights reserved. Redistribution and use in source and binary forms, with or without diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/ChangeLog new/qt5ct-0.23/ChangeLog --- old/qt5ct-0.22/ChangeLog 2016-03-06 10:42:03.000000000 +0100 +++ new/qt5ct-0.23/ChangeLog 2016-04-26 09:00:46.000000000 +0200 @@ -132,7 +132,12 @@ Version 0.22 * disabled html mode in the qss editor -* fixed issue with overriding stylesheets +* fixed issue with overriding style sheets * added Hebrew translation (Genghis Khan) * updated Italian translation (Luigi Baldoni) * updated documentation + +Version 0.23 +* added support for single line comments in the style sheets +* fixed issue with overriding application palette +* updated Bulgarian translation (Kiril Kirilov) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/ChangeLog.svn new/qt5ct-0.23/ChangeLog.svn --- old/qt5ct-0.22/ChangeLog.svn 2016-03-06 10:42:03.000000000 +0100 +++ new/qt5ct-0.23/ChangeLog.svn 2016-04-26 09:00:46.000000000 +0200 @@ -1,4 +1,35 @@ ------------------------------------------------------------------------ +r288 | trialuser02 | 2016-04-26 09:51:10 +0300 (Вт., 26 апр. 2016) | 1 line + +updated changelog +------------------------------------------------------------------------ +r287 | trialuser02 | 2016-04-26 09:46:17 +0300 (Вт., 26 апр. 2016) | 1 line + +updated copyright +------------------------------------------------------------------------ +r286 | trialuser02 | 2016-04-26 09:44:03 +0300 (Вт., 26 апр. 2016) | 1 line + +qss: added support for single line comments +------------------------------------------------------------------------ +r285 | trialuser02 | 2016-04-24 14:47:23 +0300 (Вс., 24 апр. 2016) | 2 lines + +updated .ts files, fixed script + +------------------------------------------------------------------------ +r284 | trialuser02 | 2016-04-24 14:46:27 +0300 (Вс., 24 апр. 2016) | 2 lines + +updated Bulgarian translation (Kiril Kirilov) + +------------------------------------------------------------------------ +r282 | trialuser02 | 2016-04-24 14:37:14 +0300 (Вс., 24 апр. 2016) | 2 lines + +do not override application palette (#18) + +------------------------------------------------------------------------ +r281 | trialuser02 | 2016-03-06 13:58:51 +0300 (Вс., 06 марта 2016) | 1 line + +version bump +------------------------------------------------------------------------ r279 | trialuser02 | 2016-03-06 12:40:44 +0300 (Вс., 06 марта 2016) | 1 line updated changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in new/qt5ct-0.23/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in --- old/qt5ct-0.22/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct/desktop-translations/qt5ct_bg.desktop.in 2016-04-26 09:00:44.000000000 +0200 @@ -16,6 +16,7 @@ + Exec=qt5ct Icon=preferences-desktop-theme Terminal=false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct/qt5ct.h new/qt5ct-0.23/src/qt5ct/qt5ct.h --- old/qt5ct-0.22/src/qt5ct/qt5ct.h 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct/qt5ct.h 2016-04-26 09:00:44.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2016, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -30,7 +30,7 @@ #define QT5CT_H #define QT5CT_VERSION_MAJOR 0 -#define QT5CT_VERSION_MINOR 22 +#define QT5CT_VERSION_MINOR 23 #define QT5CT_TOSTRING(s) #s #define QT5CT_STRINGIFY(s) QT5CT_TOSTRING(s) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct/translations/qt5ct_bg.ts new/qt5ct-0.23/src/qt5ct/translations/qt5ct_bg.ts --- old/qt5ct-0.22/src/qt5ct/translations/qt5ct_bg.ts 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct/translations/qt5ct_bg.ts 2016-04-26 09:00:44.000000000 +0200 @@ -340,7 +340,7 @@ <message> <location filename="../interfacepage.ui" line="209"/> <source>Activate item on single-click</source> - <translation type="unfinished"></translation> + <translation>Активиране на елемент с еднократно кликване</translation> </message> </context> <context> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct/translations/qt5ct_he.ts new/qt5ct-0.23/src/qt5ct/translations/qt5ct_he.ts --- old/qt5ct-0.22/src/qt5ct/translations/qt5ct_he.ts 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct/translations/qt5ct_he.ts 2016-04-26 09:00:44.000000000 +0200 @@ -1,4 +1,6 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1"> +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="he"> <context> <name>AppearancePage</name> <message> @@ -44,12 +46,12 @@ <message> <location filename="../appearancepage.ui" line="139"/> <source>Color scheme:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.ui" line="162"/> <source>...</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.cpp" line="64"/> @@ -81,7 +83,7 @@ <location filename="../appearancepage.cpp" line="189"/> <location filename="../appearancepage.cpp" line="224"/> <source>Enter Color Scheme Name</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.cpp" line="116"/> @@ -102,7 +104,7 @@ <location filename="../appearancepage.cpp" line="200"/> <location filename="../appearancepage.cpp" line="234"/> <source>The color scheme "%1" already exists</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.cpp" line="143"/> @@ -116,7 +118,7 @@ <location filename="../appearancepage.cpp" line="165"/> <location filename="../appearancepage.cpp" line="219"/> <source>The color scheme "%1" is read only</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.cpp" line="170"/> @@ -126,7 +128,7 @@ <message> <location filename="../appearancepage.cpp" line="171"/> <source>Are you sure you want to remove color scheme "%1"?</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../appearancepage.cpp" line="191"/> @@ -145,12 +147,12 @@ <message> <location filename="../fontconfigdialog.ui" line="29"/> <source>Disable automatic hinting for bold fonts</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../fontconfigdialog.ui" line="36"/> <source>LCD filter:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../fontconfigdialog.ui" line="43"/> @@ -175,7 +177,7 @@ <message> <location filename="../fontconfigdialog.ui" line="83"/> <source>Subpixel geometry:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../fontconfigdialog.ui" line="90"/> @@ -222,7 +224,7 @@ <location filename="../fontspage.ui" line="80"/> <location filename="../fontspage.ui" line="87"/> <source>...</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../fontspage.ui" line="57"/> @@ -265,12 +267,12 @@ <message> <location filename="../interfacepage.ui" line="42"/> <source>Cursor flash time:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../interfacepage.ui" line="49"/> <source>ComboBox effect:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../interfacepage.ui" line="56"/> @@ -280,13 +282,13 @@ <message> <location filename="../interfacepage.ui" line="63"/> <source>ToolBox effect:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../interfacepage.ui" line="70"/> <location filename="../interfacepage.ui" line="80"/> <source> ms</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../interfacepage.ui" line="94"/> @@ -323,7 +325,7 @@ <message> <location filename="../interfacepage.ui" line="182"/> <source>Dialog buttons layout:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../interfacepage.ui" line="192"/> @@ -338,7 +340,7 @@ <message> <location filename="../interfacepage.ui" line="209"/> <source>Activate item on single-click</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> </context> <context> @@ -361,7 +363,7 @@ <message> <location filename="../mainwindow.cpp" line="47"/> <source>Icon Theme</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../mainwindow.cpp" line="48"/> @@ -371,7 +373,7 @@ <message> <location filename="../mainwindow.cpp" line="50"/> <source>Style Sheets</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../mainwindow.cpp" line="58"/> @@ -479,17 +481,17 @@ <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Highlight</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Highlighted text</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="93"/> <source>Visited link</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../paletteeditdialog.cpp" line="94"/> @@ -560,12 +562,12 @@ <message> <location filename="../qsseditordialog.cpp" line="45"/> <source>%1 - Style Sheet Editor</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsseditordialog.ui" line="14"/> <source>Style Sheet Editor</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> </context> <context> @@ -601,7 +603,7 @@ <message> <location filename="../qsspage.cpp" line="97"/> <source>Enter Style Sheet Name</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsspage.cpp" line="108"/> @@ -623,22 +625,22 @@ <message> <location filename="../qsspage.cpp" line="143"/> <source>Are you sure you want to remove style sheet "%1"?</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsspage.cpp" line="193"/> <source>Rename Style Sheet</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsspage.cpp" line="193"/> <source>Style sheet name:</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsspage.cpp" line="200"/> <source>The style sheet "%1" already exists</source> - <translation type="unfinished"/> + <translation type="unfinished"></translation> </message> <message> <location filename="../qsspage.cpp" line="211"/> @@ -646,4 +648,4 @@ <translation>לא מסוגל לשנות שם קובץ</translation> </message> </context> -</TS> \ No newline at end of file +</TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp new/qt5ct-0.23/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp --- old/qt5ct-0.22/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2016-04-26 09:00:44.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2016, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -35,6 +35,7 @@ #include <QPalette> #include <QTimer> #include <QIcon> +#include <QRegExp> #ifdef QT_WIDGETS_LIB #include <QStyle> #include <QApplication> @@ -52,6 +53,8 @@ Qt5CTPlatformTheme::Qt5CTPlatformTheme() { m_customPalette = 0; + m_update = false; + m_usePalette = true; readSettings(); QMetaObject::invokeMethod(this, "applySettings", Qt::QueuedConnection); #ifdef QT_WIDGETS_LIB @@ -72,7 +75,7 @@ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const { - if(m_customPalette) + if(m_customPalette && m_usePalette) return m_customPalette; return QPlatformTheme::palette(type); } @@ -109,6 +112,17 @@ void Qt5CTPlatformTheme::applySettings() { + if(!m_update) + { + //do not override application palette + if(QCoreApplication::testAttribute(Qt::AA_SetPalette)) + { + m_usePalette = false; + qDebug("qt5ct: palette support is disabled"); + } + m_update = true; + } + #ifdef QT_WIDGETS_LIB if(hasWidgets()) { @@ -116,11 +130,16 @@ QProxyStyle *proxyStyle = qobject_cast<QProxyStyle *>(qApp->style()); proxyStyle ? proxyStyle->setBaseStyle(0) : qApp->setStyle(new Qt5CTProxyStyle(m_style)); qApp->setFont(m_generalFont); - if(m_customPalette) - qApp->setPalette(*m_customPalette); - else - qApp->setPalette(qApp->style()->standardPalette()); + if(m_usePalette) + { + if(m_customPalette) + qApp->setPalette(*m_customPalette); + else + qApp->setPalette(qApp->style()->standardPalette()); + } + + //do not override application style if(m_prevStyleSheet == qApp->styleSheet()) qApp->setStyleSheet(m_userStyleSheet); else @@ -130,7 +149,7 @@ #endif QGuiApplication::setFont(m_generalFont); //apply font QIcon::setThemeName(m_iconTheme); //apply icons - if(m_customPalette) + if(m_customPalette && m_usePalette) QGuiApplication::setPalette(*m_customPalette); //apply palette #ifdef QT_WIDGETS_LIB @@ -249,6 +268,9 @@ file.open(QIODevice::ReadOnly); content.append(file.readAll()); } + QRegExp regExp("//.*(\\n|$)"); + regExp.setMinimal(true); + content.remove(regExp); return content; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/src/qt5ct-qtplugin/qt5ctplatformtheme.h new/qt5ct-0.23/src/qt5ct-qtplugin/qt5ctplatformtheme.h --- old/qt5ct-0.22/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2016-03-06 10:42:02.000000000 +0100 +++ new/qt5ct-0.23/src/qt5ct-qtplugin/qt5ctplatformtheme.h 2016-04-26 09:00:44.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, Ilya Kotov <[email protected]> + * Copyright (c) 2014-2016, Ilya Kotov <[email protected]> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -83,6 +83,8 @@ int m_cursorFlashTime; int m_uiEffects; int m_buttonBoxLayout; + bool m_update; + bool m_usePalette; }; #endif // QT5CTPLATFORMTHEME_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qt5ct-0.22/utils/update_ts.sh new/qt5ct-0.23/utils/update_ts.sh --- old/qt5ct-0.22/utils/update_ts.sh 2016-03-06 10:42:03.000000000 +0100 +++ new/qt5ct-0.23/utils/update_ts.sh 2016-04-26 09:00:46.000000000 +0200 @@ -24,7 +24,7 @@ qrc_file="${tr_dir}/translations.qrc" - /opt/qt55/bin/lupdate -no-obsolete -silent -extensions "cpp,ui" ${tr_dir}/../ -ts ${ts_files} + /opt/qt56/bin/lupdate -no-obsolete -silent -extensions "cpp,ui" ${tr_dir}/../ -ts ${ts_files}
