Mailinglist Archive: opensuse-commit (1423 mails)
| < Previous | Next > |
commit qtcurve-kde4 for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 03 May 2012 11:00:23 +0200
- Message-id: <20120503090023.6AC702020D@hilbert.suse.de>
Hello community,
here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory
checked in at 2012-05-03 11:00:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old)
and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4", Maintainer is "kde-maintainers@xxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes
2012-03-20 11:34:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes
2012-05-03 11:00:21.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 25 09:42:56 UTC 2012 - mlin@xxxxxxxx
+
+- Update to version 1.8.12
+ * Dont setup KDE4 fonts/colours in constructor - seems to mess things up
when using
+ proxy styles. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE4-1.8.11.tar.bz2
New:
----
QtCurve-KDE4-1.8.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.yS6UZe/_old 2012-05-03 11:00:23.000000000 +0200
+++ /var/tmp/diff_new_pack.yS6UZe/_new 2012-05-03 11:00:23.000000000 +0200
@@ -17,7 +17,7 @@
Name: qtcurve-kde4
-Version: 1.8.11
+Version: 1.8.12
Release: 0
Summary: QtCurve style for KDE 4
License: GPL-2.0+
++++++ QtCurve-KDE4-1.8.11.tar.bz2 -> QtCurve-KDE4-1.8.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/CMakeLists.txt
new/QtCurve-KDE4-1.8.12/CMakeLists.txt
--- old/QtCurve-KDE4-1.8.11/CMakeLists.txt 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/CMakeLists.txt 2012-04-24 23:20:01.000000000
+0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "11")
+set(CPACK_PACKAGE_VERSION_PATCH "12")
set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond@xxxxxxxxx>")
set(QTCURVE_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -75,7 +75,7 @@
endif (NOT QTC_QT_ONLY)
find_package(Qt4 REQUIRED)
-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h @ONLY)
if (NOT QTC_QT_ONLY)
find_package(KDE4 REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/ChangeLog
new/QtCurve-KDE4-1.8.12/ChangeLog
--- old/QtCurve-KDE4-1.8.11/ChangeLog 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/ChangeLog 2012-04-24 23:20:01.000000000 +0200
@@ -1,3 +1,9 @@
+1.8.12
+------
+1. Dont setup KDE4 fonts/colours in constructor - seems to mess things up when
+ using proxy styles.
+ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+
1.8.11
------
1. Fix flashing of clementine's position slider tooltip.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/config/qtcurveconfigbase.ui
new/QtCurve-KDE4-1.8.12/config/qtcurveconfigbase.ui
--- old/QtCurve-KDE4-1.8.11/config/qtcurveconfigbase.ui 2012-02-28
22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/config/qtcurveconfigbase.ui 2012-04-24
23:20:01.000000000 +0200
@@ -2361,7 +2361,7 @@
<item row="7" column="1">
<widget class="QCheckBox" name="titlebarButtons_custom">
<property name="toolTip">
- <string><p>If enabled, the titlebar buttons will be drawn
using the cusom colors defined in the next page.</string>
+ <string><p>If enabled, the titlebar buttons will be drawn
using the custom colors defined in the next page.</string>
</property>
<property name="text">
<string>Use custom background colors</string>
@@ -3702,7 +3702,7 @@
<widget class="QCheckBox" name="fixParentlessDialogs">
<property name="toolTip">
<string><p><b>Warning: Experimental!</b></p>
-<p>Some applications - such as Kate, Kaffeine, and GIMP - produce
dialogs that have no 'parent'. This causes the dialog to recieve an entry in
the taskbar, and allows the dialog to be minimised independantly of the main
application window.</p>
+<p>Some applications - such as Kate, Kaffeine, and GIMP - produce
dialogs that have no 'parent'. This causes the dialog to receive an entry in
the taskbar, and allows the dialog to be minimised independantly of the main
application window.</p>
<p>If you enable this option, QtCurve will try to 'fix' this by
assigning the dialogs a parent. </p>
@@ -4398,7 +4398,7 @@
</sizepolicy>
</property>
<property name="text">
- <string><i><p>QtCurve uses dark/light borders to
create etch and shadow effects. By default QtCurve tries to lighten (or darken)
the parent's background to achieve this - if no parent can be found, then
white/black is used with an alpha value set. This behaviour maybe overriden,
and alpha values always used, by checking the option above.</p></string>
+ <string><i><p>QtCurve uses dark/light borders to
create etch and shadow effects. By default QtCurve tries to lighten (or darken)
the parent's background to achieve this - if no parent can be found, then
white/black is used with an alpha value set. This behaviour maybe overridden,
and alpha values always used, by checking the option above.</p></string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/qtcurve.pot
new/QtCurve-KDE4-1.8.12/po/qtcurve.pot
--- old/QtCurve-KDE4-1.8.11/po/qtcurve.pot 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/po/qtcurve.pot 2012-04-24 23:20:01.000000000
+0200
@@ -3100,7 +3100,7 @@
#. i18n: ectx: property (toolTip), widget (QCheckBox, titlebarButtons_custom)
#: po/rc.cpp:908 rc.cpp:908
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
@@ -4029,7 +4029,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4425,7 +4425,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/tr.po
new/QtCurve-KDE4-1.8.12/po/tr.po
--- old/QtCurve-KDE4-1.8.11/po/tr.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/tr.po 2012-04-24 23:20:01.000000000 +0200
@@ -3255,7 +3255,7 @@
#: po/rc.cpp:908 rc.cpp:908
#, fuzzy
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
"Bu ayar fare üzerlerine geldiğinde gereçlerin yüzde kaç oranda "
@@ -4242,7 +4242,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4654,7 +4654,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
@@ -5653,7 +5653,7 @@
#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Some applications - "
#~ "such as Kate, Kaffeine, and GIMP - produce dialogs that have no 'parent'. "
-#~ "This causes the dialog to recieve an entry in the taskbar, and allows the "
+#~ "This causes the dialog to receive an entry in the taskbar, and allows the "
#~ "dialog to be minimised independantly of the main application window. </"
#~ "p>\n"
#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/uk.po
new/QtCurve-KDE4-1.8.12/po/uk.po
--- old/QtCurve-KDE4-1.8.11/po/uk.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/uk.po 2012-04-24 23:20:01.000000000 +0200
@@ -3387,7 +3387,7 @@
#. i18n: ectx: property (toolTip), widget (QCheckBox, titlebarButtons_custom)
#: po/rc.cpp:908 rc.cpp:908
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
"<p>Якщо буде позначено цей пункт, кнопки смужки заголовка буде намальовано "
@@ -4442,7 +4442,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4948,7 +4948,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve використовує для створення ефектів краю та тіні темні/світлі "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_CN.po
new/QtCurve-KDE4-1.8.12/po/zh_CN.po
--- old/QtCurve-KDE4-1.8.11/po/zh_CN.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_CN.po 2012-04-24 23:20:01.000000000 +0200
@@ -1438,7 +1438,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果启用该项，标题栏按钮会用下一页中的自定义颜色绘制。"
@@ -2127,7 +2127,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2491,7 +2491,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”边框来实现蚀刻和阴影效果。默认情况下，QtCurve会视"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_HK.po
new/QtCurve-KDE4-1.8.12/po/zh_HK.po
--- old/QtCurve-KDE4-1.8.11/po/zh_HK.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_HK.po 2012-04-24 23:20:01.000000000 +0200
@@ -1439,7 +1439,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果啓用該項，標題欄按鈕會用下一頁中的自訂顔色繪制。"
@@ -2128,7 +2128,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2492,7 +2492,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”邊框來實現蝕刻和陰影效果。默認情況下，QtCurve會試"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_TW.po
new/QtCurve-KDE4-1.8.12/po/zh_TW.po
--- old/QtCurve-KDE4-1.8.11/po/zh_TW.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_TW.po 2012-04-24 23:20:01.000000000 +0200
@@ -1440,7 +1440,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果啓用該項，標題列按鈕會用下一頁中的自訂顔色繪制。"
@@ -2129,7 +2129,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2493,7 +2493,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”邊框來實現蝕刻和陰影效果。默認情況下，QtCurve會試"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/style/qtcurve.cpp
new/QtCurve-KDE4-1.8.12/style/qtcurve.cpp
--- old/QtCurve-KDE4-1.8.11/style/qtcurve.cpp 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/style/qtcurve.cpp 2012-04-24 23:20:01.000000000
+0200
@@ -1100,9 +1100,11 @@
// Set defaults for Hover and Focus, these will be changed when KDE4
palette is applied...
shadeColors(QApplication::palette().color(QPalette::Active,
QPalette::Highlight), itsFocusCols);
shadeColors(QApplication::palette().color(QPalette::Active,
QPalette::Highlight), itsMouseOverCols);
-#if !defined QTC_QT_ONLY
- setupKde4();
-#endif
+// Dont setup KDE4 fonts/colours here - seems to mess things up when using
proxy styles.
+// See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+//#if !defined QTC_QT_ONLY
+// setupKde4();
+//#endif
itsWindowManager->initialize(opts.windowDrag,
opts.windowDragWhiteList.toList(), opts.windowDragBlackList.toList());
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
here is the log from the commit of package qtcurve-kde4 for openSUSE:Factory
checked in at 2012-05-03 11:00:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtcurve-kde4 (Old)
and /work/SRC/openSUSE:Factory/.qtcurve-kde4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-kde4", Maintainer is "kde-maintainers@xxxxxxx"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtcurve-kde4/qtcurve-kde4.changes
2012-03-20 11:34:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtcurve-kde4.new/qtcurve-kde4.changes
2012-05-03 11:00:21.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 25 09:42:56 UTC 2012 - mlin@xxxxxxxx
+
+- Update to version 1.8.12
+ * Dont setup KDE4 fonts/colours in constructor - seems to mess things up
when using
+ proxy styles. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE4-1.8.11.tar.bz2
New:
----
QtCurve-KDE4-1.8.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.yS6UZe/_old 2012-05-03 11:00:23.000000000 +0200
+++ /var/tmp/diff_new_pack.yS6UZe/_new 2012-05-03 11:00:23.000000000 +0200
@@ -17,7 +17,7 @@
Name: qtcurve-kde4
-Version: 1.8.11
+Version: 1.8.12
Release: 0
Summary: QtCurve style for KDE 4
License: GPL-2.0+
++++++ QtCurve-KDE4-1.8.11.tar.bz2 -> QtCurve-KDE4-1.8.12.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/CMakeLists.txt
new/QtCurve-KDE4-1.8.12/CMakeLists.txt
--- old/QtCurve-KDE4-1.8.11/CMakeLists.txt 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/CMakeLists.txt 2012-04-24 23:20:01.000000000
+0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "11")
+set(CPACK_PACKAGE_VERSION_PATCH "12")
set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond@xxxxxxxxx>")
set(QTCURVE_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
@@ -75,7 +75,7 @@
endif (NOT QTC_QT_ONLY)
find_package(Qt4 REQUIRED)
-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h @ONLY)
if (NOT QTC_QT_ONLY)
find_package(KDE4 REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/ChangeLog
new/QtCurve-KDE4-1.8.12/ChangeLog
--- old/QtCurve-KDE4-1.8.11/ChangeLog 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/ChangeLog 2012-04-24 23:20:01.000000000 +0200
@@ -1,3 +1,9 @@
+1.8.12
+------
+1. Dont setup KDE4 fonts/colours in constructor - seems to mess things up when
+ using proxy styles.
+ See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+
1.8.11
------
1. Fix flashing of clementine's position slider tooltip.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/config/qtcurveconfigbase.ui
new/QtCurve-KDE4-1.8.12/config/qtcurveconfigbase.ui
--- old/QtCurve-KDE4-1.8.11/config/qtcurveconfigbase.ui 2012-02-28
22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/config/qtcurveconfigbase.ui 2012-04-24
23:20:01.000000000 +0200
@@ -2361,7 +2361,7 @@
<item row="7" column="1">
<widget class="QCheckBox" name="titlebarButtons_custom">
<property name="toolTip">
- <string><p>If enabled, the titlebar buttons will be drawn
using the cusom colors defined in the next page.</string>
+ <string><p>If enabled, the titlebar buttons will be drawn
using the custom colors defined in the next page.</string>
</property>
<property name="text">
<string>Use custom background colors</string>
@@ -3702,7 +3702,7 @@
<widget class="QCheckBox" name="fixParentlessDialogs">
<property name="toolTip">
<string><p><b>Warning: Experimental!</b></p>
-<p>Some applications - such as Kate, Kaffeine, and GIMP - produce
dialogs that have no 'parent'. This causes the dialog to recieve an entry in
the taskbar, and allows the dialog to be minimised independantly of the main
application window.</p>
+<p>Some applications - such as Kate, Kaffeine, and GIMP - produce
dialogs that have no 'parent'. This causes the dialog to receive an entry in
the taskbar, and allows the dialog to be minimised independantly of the main
application window.</p>
<p>If you enable this option, QtCurve will try to 'fix' this by
assigning the dialogs a parent. </p>
@@ -4398,7 +4398,7 @@
</sizepolicy>
</property>
<property name="text">
- <string><i><p>QtCurve uses dark/light borders to
create etch and shadow effects. By default QtCurve tries to lighten (or darken)
the parent's background to achieve this - if no parent can be found, then
white/black is used with an alpha value set. This behaviour maybe overriden,
and alpha values always used, by checking the option above.</p></string>
+ <string><i><p>QtCurve uses dark/light borders to
create etch and shadow effects. By default QtCurve tries to lighten (or darken)
the parent's background to achieve this - if no parent can be found, then
white/black is used with an alpha value set. This behaviour maybe overridden,
and alpha values always used, by checking the option above.</p></string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/qtcurve.pot
new/QtCurve-KDE4-1.8.12/po/qtcurve.pot
--- old/QtCurve-KDE4-1.8.11/po/qtcurve.pot 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/po/qtcurve.pot 2012-04-24 23:20:01.000000000
+0200
@@ -3100,7 +3100,7 @@
#. i18n: ectx: property (toolTip), widget (QCheckBox, titlebarButtons_custom)
#: po/rc.cpp:908 rc.cpp:908
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
@@ -4029,7 +4029,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4425,7 +4425,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/tr.po
new/QtCurve-KDE4-1.8.12/po/tr.po
--- old/QtCurve-KDE4-1.8.11/po/tr.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/tr.po 2012-04-24 23:20:01.000000000 +0200
@@ -3255,7 +3255,7 @@
#: po/rc.cpp:908 rc.cpp:908
#, fuzzy
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
"Bu ayar fare üzerlerine geldiğinde gereçlerin yüzde kaç oranda "
@@ -4242,7 +4242,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4654,7 +4654,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
@@ -5653,7 +5653,7 @@
#~ "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
#~ "right:0px; -qt-block-indent:0; text-indent:0px;\">Some applications - "
#~ "such as Kate, Kaffeine, and GIMP - produce dialogs that have no 'parent'. "
-#~ "This causes the dialog to recieve an entry in the taskbar, and allows the "
+#~ "This causes the dialog to receive an entry in the taskbar, and allows the "
#~ "dialog to be minimised independantly of the main application window. </"
#~ "p>\n"
#~ "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/uk.po
new/QtCurve-KDE4-1.8.12/po/uk.po
--- old/QtCurve-KDE4-1.8.11/po/uk.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/uk.po 2012-04-24 23:20:01.000000000 +0200
@@ -3387,7 +3387,7 @@
#. i18n: ectx: property (toolTip), widget (QCheckBox, titlebarButtons_custom)
#: po/rc.cpp:908 rc.cpp:908
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr ""
"<p>Якщо буде позначено цей пункт, кнопки смужки заголовка буде намальовано "
@@ -4442,7 +4442,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -4948,7 +4948,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve використовує для створення ефектів краю та тіні темні/світлі "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_CN.po
new/QtCurve-KDE4-1.8.12/po/zh_CN.po
--- old/QtCurve-KDE4-1.8.11/po/zh_CN.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_CN.po 2012-04-24 23:20:01.000000000 +0200
@@ -1438,7 +1438,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果启用该项，标题栏按钮会用下一页中的自定义颜色绘制。"
@@ -2127,7 +2127,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2491,7 +2491,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”边框来实现蚀刻和阴影效果。默认情况下，QtCurve会视"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_HK.po
new/QtCurve-KDE4-1.8.12/po/zh_HK.po
--- old/QtCurve-KDE4-1.8.11/po/zh_HK.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_HK.po 2012-04-24 23:20:01.000000000 +0200
@@ -1439,7 +1439,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果啓用該項，標題欄按鈕會用下一頁中的自訂顔色繪制。"
@@ -2128,7 +2128,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2492,7 +2492,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”邊框來實現蝕刻和陰影效果。默認情況下，QtCurve會試"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/po/zh_TW.po
new/QtCurve-KDE4-1.8.12/po/zh_TW.po
--- old/QtCurve-KDE4-1.8.11/po/zh_TW.po 2012-02-28 22:29:57.000000000 +0100
+++ new/QtCurve-KDE4-1.8.12/po/zh_TW.po 2012-04-24 23:20:01.000000000 +0200
@@ -1440,7 +1440,7 @@
#: build/config/ui_qtcurveconfigbase.h:4190
msgid ""
-"<p>If enabled, the titlebar buttons will be drawn using the cusom colors "
+"<p>If enabled, the titlebar buttons will be drawn using the custom colors "
"defined in the next page."
msgstr "<p>如果啓用該項，標題列按鈕會用下一頁中的自訂顔色繪制。"
@@ -2129,7 +2129,7 @@
msgid ""
"<p><b>Warning: Experimental!</b></p>\n"
"<p>Some applications - such as Kate, Kaffeine, and GIMP - produce dialogs "
-"that have no 'parent'. This causes the dialog to recieve an entry in the "
+"that have no 'parent'. This causes the dialog to receive an entry in the "
"taskbar, and allows the dialog to be minimised independantly of the main "
"application window.</p>\n"
"\n"
@@ -2493,7 +2493,7 @@
"<i><p>QtCurve uses dark/light borders to create etch and shadow effects. By "
"default QtCurve tries to lighten (or darken) the parent's background to "
"achieve this - if no parent can be found, then white/black is used with an "
-"alpha value set. This behaviour maybe overriden, and alpha values always "
+"alpha value set. This behaviour maybe overridden, and alpha values always "
"used, by checking the option above.</p>"
msgstr ""
"<i><p>QtCurve使用“深暗/光亮”邊框來實現蝕刻和陰影效果。默認情況下，QtCurve會試"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/QtCurve-KDE4-1.8.11/style/qtcurve.cpp
new/QtCurve-KDE4-1.8.12/style/qtcurve.cpp
--- old/QtCurve-KDE4-1.8.11/style/qtcurve.cpp 2012-02-28 22:29:57.000000000
+0100
+++ new/QtCurve-KDE4-1.8.12/style/qtcurve.cpp 2012-04-24 23:20:01.000000000
+0200
@@ -1100,9 +1100,11 @@
// Set defaults for Hover and Focus, these will be changed when KDE4
palette is applied...
shadeColors(QApplication::palette().color(QPalette::Active,
QPalette::Highlight), itsFocusCols);
shadeColors(QApplication::palette().color(QPalette::Active,
QPalette::Highlight), itsMouseOverCols);
-#if !defined QTC_QT_ONLY
- setupKde4();
-#endif
+// Dont setup KDE4 fonts/colours here - seems to mess things up when using
proxy styles.
+// See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=638629
+//#if !defined QTC_QT_ONLY
+// setupKde4();
+//#endif
itsWindowManager->initialize(opts.windowDrag,
opts.windowDragWhiteList.toList(), opts.windowDragBlackList.toList());
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |