Hello community,
here is the log from the commit of package libqt5-qtct for openSUSE:Factory
checked in at 2015-09-08 17:43:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtct (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtct.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtct"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtct/libqt5-qtct.changes 2015-08-25
08:51:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtct.new/libqt5-qtct.changes
2015-09-08 17:58:16.000000000 +0200
@@ -1,0 +2,11 @@
+Sun Sep 6 10:32:23 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 0.15 (changes since 0.13):
+ * Add option "Dialog buttons have icons".
+ * Add option "Menus have icons".
+ * Fix style and palette initialisation.
+ * Fix problem with qtcurve style.
+ * Update Russian, German, Dutch (Netherlands), Chinese (Taiwan),
+ Czech translations.
+
+-------------------------------------------------------------------
Old:
----
qt5ct-0.13.tar.bz2
New:
----
qt5ct-0.15.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtct.spec ++++++
--- /var/tmp/diff_new_pack.vmzj8N/_old 2015-09-08 17:58:17.000000000 +0200
+++ /var/tmp/diff_new_pack.vmzj8N/_new 2015-09-08 17:58:17.000000000 +0200
@@ -18,7 +18,7 @@
%define _name qt5ct
Name: libqt5-qtct
-Version: 0.13
+Version: 0.15
Release: 0
Summary: Qt5 Configuration Tool
License: BSD-2-Clause
++++++ qt5ct-0.13.tar.bz2 -> qt5ct-0.15.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/ChangeLog new/qt5ct-0.15/ChangeLog
--- old/qt5ct-0.13/ChangeLog 2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/ChangeLog 2015-09-05 21:35:18.000000000 +0200
@@ -77,3 +77,16 @@
Version 0.13
* added $XDG_DATA_HOME support
* added Italian translation (Luigi Baldoni)
+
+Version 0.14
+* added option "Dialog buttons have icons"
+* added option "Menus have icons"
+* fixed style and palette initialization
+* updated Russian translation
+* updated German translation (Ettore Atalan)
+* updated Dutch (Netherlands) translation (Heimen Stoffels)
+* updated Chinese (Taiwan) translation (Jeff Huang)
+
+Version 0.15
+* fixed problem with qtcurve style
+* updated Czech translation (fri)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/ChangeLog.svn new/qt5ct-0.15/ChangeLog.svn
--- old/qt5ct-0.13/ChangeLog.svn 2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/ChangeLog.svn 2015-09-05 21:35:18.000000000 +0200
@@ -1,4 +1,83 @@
------------------------------------------------------------------------
+r196 | trialuser02 | 2015-09-05 22:32:11 +0300 (Сб., 05 сент. 2015) | 1 line
+
+fixed changelog
+------------------------------------------------------------------------
+r195 | trialuser02 | 2015-09-05 22:29:34 +0300 (Сб., 05 сент. 2015) | 2 lines
+
+added comment
+
+------------------------------------------------------------------------
+r194 | trialuser02 | 2015-09-05 22:16:36 +0300 (Сб., 05 сент. 2015) | 1 line
+
+updated Czech translation (Fri)
+------------------------------------------------------------------------
+r193 | trialuser02 | 2015-09-05 22:15:19 +0300 (Сб., 05 сент. 2015) | 2 lines
+
+fixed qtcurve style support
+
+------------------------------------------------------------------------
+r192 | trialuser02 | 2015-09-04 14:02:04 +0300 (Пт., 04 сент. 2015) | 1 line
+
+version bump
+------------------------------------------------------------------------
+r190 | trialuser02 | 2015-09-02 00:42:51 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated changelog
+------------------------------------------------------------------------
+r189 | trialuser02 | 2015-09-02 00:38:46 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated .ts files
+------------------------------------------------------------------------
+r188 | trialuser02 | 2015-09-02 00:38:11 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated Chinese (Taiwan) translation (Jeff Huang)
+------------------------------------------------------------------------
+r187 | trialuser02 | 2015-09-02 00:36:10 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated Dutch (Netherlands) translation (Heimen Stoffels)
+------------------------------------------------------------------------
+r186 | trialuser02 | 2015-09-02 00:33:29 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated German translation (Ettore Atalan)
+------------------------------------------------------------------------
+r185 | trialuser02 | 2015-09-02 00:28:46 +0300 (Ср., 02 сент. 2015) | 1 line
+
+updated Russian translation
+------------------------------------------------------------------------
+r184 | trialuser02 | 2015-09-02 00:25:20 +0300 (Ср., 02 сент. 2015) | 2 lines
+
+fixed feauture to hide dialog buttons icons
+
+------------------------------------------------------------------------
+r183 | trialuser02 | 2015-09-01 00:21:15 +0300 (Вт., 01 сент. 2015) | 1 line
+
+updated .ts files
+------------------------------------------------------------------------
+r182 | trialuser02 | 2015-09-01 00:20:10 +0300 (Вт., 01 сент. 2015) | 2 lines
+
+added options "Dialog buttons have icons" and "Menus have icons"
+
+------------------------------------------------------------------------
+r181 | trialuser02 | 2015-08-31 23:32:06 +0300 (Пн., 31 авг. 2015) | 2 lines
+
+added proxy style
+
+------------------------------------------------------------------------
+r180 | trialuser02 | 2015-08-31 19:58:26 +0300 (Пн., 31 авг. 2015) | 2 lines
+
+fixed style & palette initialization
+
+------------------------------------------------------------------------
+r179 | trialuser02 | 2015-08-27 21:34:22 +0300 (Чт., 27 авг. 2015) | 2 lines
+
+fixed typo
+
+------------------------------------------------------------------------
+r178 | trialuser02 | 2015-08-22 19:00:57 +0300 (Сб., 22 авг. 2015) | 1 line
+
+version bump
+------------------------------------------------------------------------
r177 | trialuser02 | 2015-08-22 18:57:21 +0300 (Сб., 22 авг. 2015) | 1 line
fixed desktop file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/qt5ct.pro new/qt5ct-0.15/qt5ct.pro
--- old/qt5ct-0.13/qt5ct.pro 2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/qt5ct.pro 2015-09-05 21:35:18.000000000 +0200
@@ -34,4 +34,4 @@
message (BINDIR=$$BINDIR)
message (DATADIR=$$DATADIR)
message (PLUGINDIR=$$PLUGINDIR)
-equals (DISABLE_WIDGETS,1):message ("QtWidgets is disabled!")
+equals (DISABLE_WIDGETS,1):message ("QtWidgets are disabled!")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_de.desktop.in
new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_de.desktop.in
--- old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_de.desktop.in
2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_de.desktop.in
2015-09-05 21:35:18.000000000 +0200
@@ -9,6 +9,13 @@
+
+
+
+
+
+
+
Exec=qt5ct
Icon=preferences-desktop-theme
Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_nl_NL.desktop.in
new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_nl_NL.desktop.in
--- old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_nl_NL.desktop.in
2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_nl_NL.desktop.in
2015-09-05 21:35:18.000000000 +0200
@@ -9,6 +9,13 @@
+
+
+
+
+
+
+
Exec=qt5ct
Icon=preferences-desktop-theme
Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_zh_TW.desktop.in
new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_zh_TW.desktop.in
--- old/qt5ct-0.13/src/qt5ct/desktop-translations/qt5ct_zh_TW.desktop.in
2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/desktop-translations/qt5ct_zh_TW.desktop.in
2015-09-05 21:35:18.000000000 +0200
@@ -9,6 +9,13 @@
+
+
+
+
+
+
+
Exec=qt5ct
Icon=preferences-desktop-theme
Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/interfacepage.cpp
new/qt5ct-0.15/src/qt5ct/interfacepage.cpp
--- old/qt5ct-0.13/src/qt5ct/interfacepage.cpp 2015-08-22 17:58:53.000000000
+0200
+++ new/qt5ct-0.15/src/qt5ct/interfacepage.cpp 2015-09-05 21:35:18.000000000
+0200
@@ -59,6 +59,8 @@
settings.setValue("double_click_interval",
m_ui->doubleClickIntervalSpinBox->value());
settings.setValue("cursor_flash_time",
m_ui->cursorFlashTimeSpinBox->value());
settings.setValue("buttonbox_layout",
m_ui->buttonLayoutComboBox->currentData());
+ settings.setValue("menus_have_icons",
m_ui->menuIconsCheckBox->isChecked());
+ settings.setValue("dialog_buttons_have_icons",
m_ui->dialogIconsCheckBox->checkState());
QStringList effects;
if(m_ui->guiEffectsCheckBox->isChecked())
@@ -69,7 +71,7 @@
else if(m_ui->menuEffectComboBox->currentIndex() == 2)
effects << "FadeMenu";
- if(m_ui->coboBoxEffectComboBox->currentIndex() == 1)
+ if(m_ui->comboBoxEffectComboBox->currentIndex() == 1)
effects << "AnimateCombo";
if(m_ui->toolTipEffectComboBox->currentIndex() == 1)
@@ -104,7 +106,7 @@
m_ui->menuEffectComboBox->setCurrentIndex(2);
if(qApp->isEffectEnabled(Qt::UI_AnimateCombo))
- m_ui->coboBoxEffectComboBox->setCurrentIndex(1);
+ m_ui->comboBoxEffectComboBox->setCurrentIndex(1);
if(qApp->isEffectEnabled(Qt::UI_AnimateTooltip))
m_ui->toolTipEffectComboBox->setCurrentIndex(1);
@@ -114,5 +116,8 @@
if(qApp->isEffectEnabled(Qt::UI_AnimateToolBox))
m_ui->toolBoxEffectComboBox->setCurrentIndex(1);
+
m_ui->dialogIconsCheckBox->setCheckState((Qt::CheckState)settings.value("dialog_buttons_have_icons",
Qt::PartiallyChecked).toInt());
+
m_ui->menuIconsCheckBox->setChecked(!qApp->testAttribute(Qt::AA_DontShowIconsInMenus));
+
settings.endGroup();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/interfacepage.ui
new/qt5ct-0.15/src/qt5ct/interfacepage.ui
--- old/qt5ct-0.13/src/qt5ct/interfacepage.ui 2015-08-22 17:58:53.000000000
+0200
+++ new/qt5ct-0.15/src/qt5ct/interfacepage.ui 2015-09-05 21:35:18.000000000
+0200
@@ -72,7 +72,7 @@
</widget>
</item>
<item row="4" column="1">
- <widget class="QComboBox" name="coboBoxEffectComboBox">
+ <widget class="QComboBox" name="comboBoxEffectComboBox">
<property name="enabled">
<bool>false</bool>
</property>
@@ -173,6 +173,23 @@
<item row="7" column="1">
<widget class="QComboBox" name="buttonLayoutComboBox"/>
</item>
+ <item row="9" column="0" colspan="2">
+ <widget class="QCheckBox" name="menuIconsCheckBox">
+ <property name="text">
+ <string>Menus have icons</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="0" colspan="2">
+ <widget class="QCheckBox" name="dialogIconsCheckBox">
+ <property name="text">
+ <string>Dialog buttons have icons</string>
+ </property>
+ <property name="tristate">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
<item row="0" column="1">
@@ -224,7 +241,7 @@
<connection>
<sender>guiEffectsCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>coboBoxEffectComboBox</receiver>
+ <receiver>comboBoxEffectComboBox</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/qt5ct.desktop
new/qt5ct-0.15/src/qt5ct/qt5ct.desktop
--- old/qt5ct-0.13/src/qt5ct/qt5ct.desktop 2015-08-22 17:58:53.000000000
+0200
+++ new/qt5ct-0.15/src/qt5ct/qt5ct.desktop 2015-09-05 21:35:18.000000000
+0200
@@ -22,9 +22,6 @@
Comment[cs]=Nástroj na nastavení Qt5
Name[cs]=Nastavení Qt5
-Comment[it_IT]=Strumento di configurazione Qt5
-Name[it_IT]=Impostazioni Qt5
-
Comment[nl_NL]=Qt5-instellingengereedschap
Name[nl_NL]=Qt5-instellingen
@@ -37,6 +34,8 @@
Comment[zh_TW]=Qt5 設定工具
Name[zh_TW]=Qt5 設定
+
+
Exec=qt5ct
Icon=preferences-desktop-theme
Terminal=false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/qt5ct.h
new/qt5ct-0.15/src/qt5ct/qt5ct.h
--- old/qt5ct-0.13/src/qt5ct/qt5ct.h 2015-08-22 17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/qt5ct.h 2015-09-05 21:35:18.000000000 +0200
@@ -30,7 +30,7 @@
#define QT5CT_H
#define QT5CT_VERSION_MAJOR 0
-#define QT5CT_VERSION_MINOR 13
+#define QT5CT_VERSION_MINOR 15
#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.13/src/qt5ct/translations/qt5ct_bg.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_bg.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_bg.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_bg.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Подредба на диалоговите бутони:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_cs.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_cs.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_cs.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_cs.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Rozvržení tlačítek dialogu:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation>Nabídky mají ikony</translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation>Dialogová tlačítka mají ikony</translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_de.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_de.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_de.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_de.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Anordnung der Dialogschaltflächen:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation>Menüs haben Symbole</translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation>Dialogschaltflächen haben Symbole</translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_el.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_el.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_el.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_el.ts 2015-09-05
21:35:18.000000000 +0200
@@ -241,6 +241,16 @@
<source>Dialog buttons layout:</source>
<translation>Διάταξη κουμπιών διαλόγου:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_en.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_en.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_en.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_en.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_es.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_es.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_es.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_es.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_fr.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_fr.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_fr.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_fr.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_gl_ES.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_gl_ES.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_gl_ES.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_gl_ES.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_he.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_he.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_he.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_he.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_hu.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_hu.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_hu.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_hu.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_it.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_it.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_it.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_it.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_it_IT.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_it_IT.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_it_IT.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_it_IT.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Disposizione pulsanti finestre dialogo:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_ja.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_ja.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_ja.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_ja.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_kk.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_kk.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_kk.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_kk.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_lt.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_lt.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_lt.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_lt.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_nl.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_nl.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_nl.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_nl.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_nl_NL.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_nl_NL.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_nl_NL.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_nl_NL.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Volgorde van dialoogvensterknoppen:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation>Menu's voorzien van pictogrammen</translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation>Dialoogvensterknoppen voorzien van
pictogrammen</translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pl.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pl.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pl.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pl.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pt.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pt.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pt.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pt.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pt_BR.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pt_BR.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_pt_BR.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_pt_BR.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_ru.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_ru.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_ru.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_ru.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>Расположение кнопок диалога:</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation>Показывать значки в меню</translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation>Показывать значки на кнопках диалогов</translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sk.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sk.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sk.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sk.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sr_BA.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sr_BA.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sr_BA.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sr_BA.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sr_RS.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sr_RS.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_sr_RS.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_sr_RS.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_tr.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_tr.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_tr.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_tr.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_uk_UA.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_uk_UA.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_uk_UA.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_uk_UA.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_zh_CN.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_zh_CN.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_zh_CN.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_zh_CN.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>对话框按钮布局：</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct/translations/qt5ct_zh_TW.ts
new/qt5ct-0.15/src/qt5ct/translations/qt5ct_zh_TW.ts
--- old/qt5ct-0.13/src/qt5ct/translations/qt5ct_zh_TW.ts 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct/translations/qt5ct_zh_TW.ts 2015-09-05
21:35:18.000000000 +0200
@@ -240,6 +240,16 @@
<source>Dialog buttons layout:</source>
<translation>對話框按鈕佈局：</translation>
</message>
+ <message>
+ <location filename="../interfacepage.ui" line="179"/>
+ <source>Menus have icons</source>
+ <translation>有圖示的選單</translation>
+ </message>
+ <message>
+ <location filename="../interfacepage.ui" line="186"/>
+ <source>Dialog buttons have icons</source>
+ <translation>有圖示的對話框按鈕</translation>
+ </message>
</context>
<context>
<name>MainWindow</name>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
--- old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ct-qtplugin.pro 2015-09-05
21:35:18.000000000 +0200
@@ -9,7 +9,8 @@
SOURCES += \
main.cpp \
qt5ctplatformtheme.cpp \
- ../qt5ct/qt5ct.cpp
+ ../qt5ct/qt5ct.cpp \
+ qt5ctproxystyle.cpp
!equals (DISABLE_WIDGETS,1) {
QT += widgets
@@ -21,7 +22,8 @@
HEADERS += \
qt5ctplatformtheme.h \
- ../qt5ct/qt5ct.h
+ ../qt5ct/qt5ct.h \
+ qt5ctproxystyle.h
target.path = $$PLUGINDIR
INSTALLS += target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
--- old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2015-08-22
17:58:53.000000000 +0200
+++ new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp 2015-09-05
21:35:18.000000000 +0200
@@ -44,6 +44,7 @@
#include <QFileSystemWatcher>
#include <qt5ct/qt5ct.h>
+#include "qt5ctproxystyle.h"
#include "qt5ctplatformtheme.h"
//QT_QPA_PLATFORMTHEME=qt5ct
@@ -55,7 +56,11 @@
QMetaObject::invokeMethod(this, "applySettings", Qt::QueuedConnection);
#ifdef QT_WIDGETS_LIB
QMetaObject::invokeMethod(this, "cteateFSWatcher", Qt::QueuedConnection);
+ //apply custom style hints before creating QApplication
+ //using Fusion style should avoid problems with some styles like qtcurve
+ QApplication::setStyle(new Qt5CTProxyStyle("Fusion"));
#endif
+ QGuiApplication::setFont(m_generalFont);
qDebug("using qt5ct plugin");
}
@@ -107,13 +112,14 @@
#ifdef QT_WIDGETS_LIB
if(hasWidgets())
{
- qApp->setStyle(m_style);
- qApp->setStyleSheet(m_userStyleSheet);
+ qApp->setStyle(new Qt5CTProxyStyle(m_style));
qApp->setFont(m_generalFont);
if(m_customPalette)
qApp->setPalette(*m_customPalette);
else
qApp->setPalette(qApp->style()->standardPalette());
+
+ qApp->setStyleSheet(m_userStyleSheet);
}
#endif
QGuiApplication::setFont(m_generalFont); //apply font
@@ -200,6 +206,7 @@
m_cursorFlashTime = settings.value("cursor_flash_time",
m_cursorFlashTime).toInt();
m_buttonBoxLayout =
QPlatformTheme::themeHint(QPlatformTheme::DialogButtonBoxLayout).toInt();
m_buttonBoxLayout = settings.value("buttonbox_layout",
m_buttonBoxLayout).toInt();
+ QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus,
!settings.value("menus_have_icons", true).toBool());
//load effects
m_uiEffects = QPlatformTheme::themeHint(QPlatformTheme::UiEffects).toInt();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctproxystyle.cpp
new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctproxystyle.cpp
--- old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctproxystyle.cpp 1970-01-01
01:00:00.000000000 +0100
+++ new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctproxystyle.cpp 2015-09-05
21:35:18.000000000 +0200
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014-2015, Ilya Kotov <forkoto...@hotmail.ru>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifdef QT_WIDGETS_LIB
+
+#include <QSettings>
+#include <qt5ct/qt5ct.h>
+#include "qt5ctproxystyle.h"
+
+Qt5CTProxyStyle::Qt5CTProxyStyle(const QString &key) :
+ QProxyStyle(key)
+{
+ QSettings settings(Qt5CT::configFile(), QSettings::IniFormat);
+ m_dialogButtonsHaveIcons =
settings.value("Interface/dialog_buttons_have_icons",
Qt::PartiallyChecked).toInt();
+}
+
+Qt5CTProxyStyle::~Qt5CTProxyStyle()
+{
+ //qDebug("%s", Q_FUNC_INFO);
+}
+
+int Qt5CTProxyStyle::styleHint(QStyle::StyleHint hint, const QStyleOption
*option, const QWidget *widget, QStyleHintReturn *returnData) const
+{
+ if(hint == QStyle::SH_DialogButtonBox_ButtonsHaveIcons)
+ {
+ if(m_dialogButtonsHaveIcons == Qt::Unchecked)
+ return 0;
+ else if(m_dialogButtonsHaveIcons == Qt::Checked)
+ return 1;
+ }
+ return QProxyStyle::styleHint(hint, option, widget, returnData);
+}
+
+#endif //QT_WIDGETS_LIB
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctproxystyle.h
new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctproxystyle.h
--- old/qt5ct-0.13/src/qt5ct-qtplugin/qt5ctproxystyle.h 1970-01-01
01:00:00.000000000 +0100
+++ new/qt5ct-0.15/src/qt5ct-qtplugin/qt5ctproxystyle.h 2015-09-05
21:35:18.000000000 +0200
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2014-2015, Ilya Kotov <forkoto...@hotmail.ru>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef QT5CTPROXYSTYLE_H
+#define QT5CTPROXYSTYLE_H
+
+#ifdef QT_WIDGETS_LIB
+
+#include <QProxyStyle>
+
+class Qt5CTProxyStyle : public QProxyStyle
+{
+ Q_OBJECT
+public:
+ explicit Qt5CTProxyStyle(const QString &key);
+
+ virtual ~Qt5CTProxyStyle();
+
+ int styleHint(StyleHint hint, const QStyleOption *option, const QWidget
*widget, QStyleHintReturn *returnData) const;
+
+private:
+ int m_dialogButtonsHaveIcons;
+
+};
+
+#endif //QT_WIDGETS_LIB
+
+#endif // QT5CTPROXYSTYLE_H
