Hello community,
here is the log from the commit of package qtcurve-kde4
checked in at Mon Aug 4 12:34:14 CEST 2008.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2008-07-21 10:28:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2008-08-04 01:21:40.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 4 01:20:59 CEST 2008 - dmueller@suse.de
+
+- update to 0.59.6:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+ * Fix some drawing issues with menuitems and NVIDIA.
+ * 'Fix' Skype's menu buttons.
+ * Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE4-0.59.5.tar.bz2
New:
----
QtCurve-KDE4-0.59.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.S15128/_old 2008-08-04 12:34:09.000000000 +0200
+++ /var/tmp/diff_new_pack.S15128/_new 2008-08-04 12:34:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.59.5)
+# spec file for package qtcurve-kde4 (Version 0.59.6)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -17,7 +17,7 @@
License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE 4
-Version: 0.59.5
+Version: 0.59.6
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.bz2
@@ -59,6 +59,13 @@
%_kde_share_dir/apps/color-schemes/QtCurve.colors
%changelog
+* Mon Aug 04 2008 dmueller@suse.de
+- update to 0.59.6:
+ * In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+ * Fix some drawing issues with menuitems and NVIDIA.
+ * 'Fix' Skype's menu buttons.
+ * Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
* Mon Jul 21 2008 stbinner@suse.de
- update to 0.59.5:
* Fix corners of scrolbars in plasma 4.1's folderview.
++++++ QtCurve-KDE4-0.59.5.tar.bz2 -> QtCurve-KDE4-0.59.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/ChangeLog new/QtCurve-KDE4-0.59.6/ChangeLog
--- old/QtCurve-KDE4-0.59.5/ChangeLog 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/ChangeLog 2008-07-30 21:18:43.000000000 +0200
@@ -1,3 +1,11 @@
+0.59.6
+------
+1. In config dialog, rename the 'Fill' progressbar option to 'No border',
+ and place it on the 'Bar' line.
+2. Fix some drawing issues with menuitems and NVIDIA.
+3. 'Fix' Skype's menu buttons.
+4. Only do icon mapping for KDE apps. Fixes crash with qt-recordMyDesktop.
+
0.59.5
------
1. Fix corners of scrolbars in plasma 4.1's folderview.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/CMakeLists.txt new/QtCurve-KDE4-0.59.6/CMakeLists.txt
--- old/QtCurve-KDE4-0.59.5/CMakeLists.txt 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/CMakeLists.txt 2008-07-30 21:18:43.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "59")
-set(CPACK_PACKAGE_VERSION_PATCH "5")
+set(CPACK_PACKAGE_VERSION_PATCH "6")
set(CPACK_PACKAGE_CONTACT "Craig Drummond ")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/config/qtcurveconfigbase.ui new/QtCurve-KDE4-0.59.6/config/qtcurveconfigbase.ui
--- old/QtCurve-KDE4-0.59.5/config/qtcurveconfigbase.ui 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/config/qtcurveconfigbase.ui 2008-07-30 21:18:43.000000000 +0200
@@ -5,8 +5,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>704</width>
- <height>554</height>
+ <width>733</width>
+ <height>556</height>
</rect>
</property>
<property name="windowTitle" >
@@ -32,6 +32,33 @@
</property>
</widget>
</item>
+ <item row="1" column="0" >
+ <widget class="QTreeWidget" name="stackList" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="indentation" >
+ <number>0</number>
+ </property>
+ <property name="rootIsDecorated" >
+ <bool>false</bool>
+ </property>
+ <column>
+ <property name="text" >
+ <string>Category</string>
+ </property>
+ </column>
+ </widget>
+ </item>
<item rowspan="2" row="1" column="1" >
<widget class="QStackedWidget" name="stack" >
<property name="sizePolicy" >
@@ -44,6 +71,14 @@
<number>0</number>
</property>
<widget class="QWidget" name="page" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_7" >
@@ -70,7 +105,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -167,7 +202,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -178,6 +213,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_2" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_10" >
@@ -194,7 +237,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -207,7 +250,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -218,6 +261,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_3" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_11" >
@@ -265,7 +316,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -336,7 +387,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -347,7 +398,15 @@
</layout>
</widget>
<widget class="QWidget" name="page_4" >
- <layout class="QGridLayout" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_16" >
<property name="text" >
@@ -369,13 +428,23 @@
</widget>
</item>
<item row="0" column="4" >
- <spacer>
+ <widget class="QCheckBox" name="fillProgress" >
+ <property name="whatsThis" >
+ <string>Enable this option to remove the 1 pixel border around the filled element.</string>
+ </property>
+ <property name="text" >
+ <string>No border</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="5" >
+ <spacer name="horizontalSpacer" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
- <width>40</width>
+ <width>118</width>
<height>20</height>
</size>
</property>
@@ -394,19 +463,25 @@
<item row="1" column="2" >
<widget class="QComboBox" name="progressGrooveColor" />
</item>
- <item row="1" column="3" >
- <widget class="QCheckBox" name="fillProgress" >
- <property name="text" >
- <string>Fill</string>
+ <item row="1" column="3" colspan="3" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item row="2" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -417,6 +492,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_5" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>559</width>
+ <height>514</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="2" >
<widget class="QCheckBox" name="embolden" >
@@ -430,7 +513,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -453,7 +536,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -464,6 +547,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_6" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_18" >
@@ -480,7 +571,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -513,7 +604,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -524,6 +615,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_7" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_19" >
@@ -540,7 +639,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -576,7 +675,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -587,6 +686,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_15" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QCheckBox" name="gtkScrollViews" >
@@ -621,7 +728,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -632,6 +739,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_8" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_20" >
@@ -665,7 +780,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -688,7 +803,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -699,6 +814,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_9" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_22" >
@@ -722,7 +845,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -749,7 +872,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -760,6 +883,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_10" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_23" >
@@ -776,7 +907,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -789,7 +920,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>40</height>
@@ -800,6 +931,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_11" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_4" >
@@ -832,7 +971,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>342</width>
<height>24</height>
@@ -986,22 +1125,10 @@
<bool>true</bool>
</property>
<layout class="QGridLayout" >
- <property name="leftMargin" >
- <number>11</number>
- </property>
- <property name="topMargin" >
+ <property name="margin" >
<number>11</number>
</property>
- <property name="rightMargin" >
- <number>11</number>
- </property>
- <property name="bottomMargin" >
- <number>11</number>
- </property>
- <property name="horizontalSpacing" >
- <number>6</number>
- </property>
- <property name="verticalSpacing" >
+ <property name="spacing" >
<number>6</number>
</property>
<item row="0" column="4" >
@@ -1009,7 +1136,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -1054,7 +1181,7 @@
<property name="sizeType" >
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>83</width>
<height>21</height>
@@ -1065,6 +1192,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_12" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" colspan="4" >
<widget class="QCheckBox" name="gtkComboMenus" >
@@ -1146,7 +1281,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
@@ -1159,7 +1294,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>261</height>
@@ -1170,6 +1305,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_13" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QVBoxLayout" >
<item>
<widget class="QComboBox" name="gradCombo" />
@@ -1275,7 +1418,7 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>143</width>
<height>20</height>
@@ -1357,6 +1500,14 @@
</layout>
</widget>
<widget class="QWidget" name="page_14" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<layout class="QGridLayout" >
<item row="0" column="0" >
<widget class="QLabel" name="label_2" >
@@ -1478,7 +1629,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>16</height>
@@ -1494,7 +1645,7 @@
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeHint" >
+ <property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>104</height>
@@ -1513,33 +1664,6 @@
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QTreeWidget" name="stackList" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize" >
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <property name="indentation" >
- <number>0</number>
- </property>
- <property name="rootIsDecorated" >
- <bool>false</bool>
- </property>
- <column>
- <property name="text" >
- <string>Category</string>
- </property>
- </column>
- </widget>
- </item>
</layout>
</widget>
<layoutdefault spacing="6" margin="11" />
@@ -1588,9 +1712,9 @@
<tabstop>progressAppearance</tabstop>
<tabstop>stripedProgress</tabstop>
<tabstop>animatedProgress</tabstop>
+ <tabstop>fillProgress</tabstop>
<tabstop>progressGrooveAppearance</tabstop>
<tabstop>progressGrooveColor</tabstop>
- <tabstop>fillProgress</tabstop>
<tabstop>embolden</tabstop>
<tabstop>defBtnIndicator</tabstop>
<tabstop>coloredMouseOver</tabstop>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/style/qtcurve.cpp new/QtCurve-KDE4-0.59.6/style/qtcurve.cpp
--- old/QtCurve-KDE4-0.59.5/style/qtcurve.cpp 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/style/qtcurve.cpp 2008-07-30 21:18:43.000000000 +0200
@@ -31,6 +31,7 @@
#endif
#ifdef QTC_USE_KDE4
+#include
#include
#include
#include
@@ -41,6 +42,11 @@
static KComponentData *theKComponentData=0;
static int theInstanceCount=0;
+inline bool kdeApp()
+{
+ return kapp && !theKComponentData && !KGlobal::hasMainComponent();
+}
+
static void checkKComponentData()
{
if(!theKComponentData && !KGlobal::hasMainComponent())
@@ -264,6 +270,7 @@
APP_KRUNNER,
APP_KWIN,
APP_SYSTEMSETTINGS,
+ APP_SKYPE,
APP_OTHER
} theThemedApp=APP_OTHER;
@@ -929,6 +936,7 @@
#if !defined QTC_DISABLE_KDEFILEDIALOG_CALLS
setFileDialogs();
#endif
+ QTimer::singleShot(0, this, SLOT(setupKde4()));
#endif
QString rcFile;
@@ -1087,6 +1095,8 @@
theThemedApp=APP_PLASMA;
else if("krunner"==appName)
theThemedApp=APP_KRUNNER;
+ else if("skype"==appName)
+ theThemedApp=APP_SKYPE;
}
void QtCurveStyle::polish(QPalette &palette)
@@ -1870,8 +1880,7 @@
#endif
#ifdef QTC_USE_KDE4
case SH_DialogButtonBox_ButtonsHaveIcons:
- checkKComponentData();
- return KGlobalSettings::showIconsOnPushButtons();
+ return kdeApp() && KGlobalSettings::showIconsOnPushButtons();
case SH_ItemView_ActivateItemOnSingleClick:
checkKComponentData();
return KGlobalSettings::singleClick();
@@ -1891,142 +1900,143 @@
QPixmap QtCurveStyle::standardPixmap(StandardPixmap pix, const QStyleOption *option, const QWidget *widget) const
{
#ifdef QTC_USE_KDE4
- checkKComponentData();
-
- bool fd(widget && qobject_cast(widget));
-
- switch(pix)
+ if(kdeApp())
{
-// case SP_TitleBarMenuButton:
-// case SP_TitleBarMinButton:
-// case SP_TitleBarMaxButton:
-// case SP_TitleBarCloseButton:
-// case SP_TitleBarNormalButton:
-// case SP_TitleBarShadeButton:
-// case SP_TitleBarUnshadeButton:
-// case SP_TitleBarContextHelpButton:
-// case SP_DockWidgetCloseButton:
- case SP_MessageBoxInformation:
- return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
- case SP_MessageBoxWarning:
- return KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::Dialog, 32);
- case SP_MessageBoxCritical:
- return KIconLoader::global()->loadIcon("dialog-error", KIconLoader::Dialog, 32);
- case SP_MessageBoxQuestion:
- return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
-// case SP_DesktopIcon:
-// return KIconLoader::global()->loadIcon("user-desktop", KIconLoader::Small, 16);
-// case SP_TrashIcon:
-// return KIconLoader::global()->loadIcon("user-trash", KIconLoader::Small, 16);
-// case SP_ComputerIcon:
-// return KIconLoader::global()->loadIcon("computer", KIconLoader::Small, 16);
-// case SP_DriveFDIcon:
-// return KIconLoader::global()->loadIcon("media-floppy", KIconLoader::Small, 16);
-// case SP_DriveHDIcon:
-// return KIconLoader::global()->loadIcon("drive-harddisk", KIconLoader::Small, 16);
-// case SP_DriveCDIcon:
-// case SP_DriveDVDIcon:
-// return KIconLoader::global()->loadIcon("media-optical", KIconLoader::Small, 16);
-// case SP_DriveNetIcon:
-// return KIconLoader::global()->loadIcon("network-server", KIconLoader::Small, 16);
-// case SP_DirOpenIcon:
-// return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
-// case SP_DirIcon:
-// case SP_DirClosedIcon:
-// return KIconLoader::global()->loadIcon("folder", KIconLoader::Small, 16);
-// case SP_DirLinkIcon:
-// case SP_FileIcon:
-// return KIconLoader::global()->loadIcon("application-x-zerosize", KIconLoader::Small, 16);
-// case SP_FileLinkIcon:
-// case SP_ToolBarHorizontalExtensionButton:
-// case SP_ToolBarVerticalExtensionButton:
- case SP_FileDialogStart:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-edn" : "go-first", KIconLoader::Small, 16);
- case SP_FileDialogEnd:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-first" : "go-end", KIconLoader::Small, 16);
- case SP_FileDialogToParent:
- return KIconLoader::global()->loadIcon("go-up", KIconLoader::Small, 16);
- case SP_FileDialogNewFolder:
- return KIconLoader::global()->loadIcon("folder-new", KIconLoader::Small, 16);
- case SP_FileDialogDetailedView:
- return KIconLoader::global()->loadIcon("view-list-details", KIconLoader::Small, 16);
-// case SP_FileDialogInfoView:
-// return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
-// case SP_FileDialogContentsView:
-// return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_FileDialogListView:
- return KIconLoader::global()->loadIcon("view-list-icons", KIconLoader::Small, 16);
- case SP_FileDialogBack:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous", KIconLoader::Small, 16);
- case SP_DialogOkButton:
- return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_DialogCancelButton:
- return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_DialogHelpButton:
- return KIconLoader::global()->loadIcon("help-contents", KIconLoader::Small, 16);
- case SP_DialogOpenButton:
- return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
- case SP_DialogSaveButton:
- return KIconLoader::global()->loadIcon("document-save", KIconLoader::Small, 16);
- case SP_DialogCloseButton:
- return KIconLoader::global()->loadIcon("dialog-close", KIconLoader::Small, 16);
- case SP_DialogApplyButton:
- return KIconLoader::global()->loadIcon("dialog-ok-apply", KIconLoader::Small, 16);
- case SP_DialogResetButton:
- return KIconLoader::global()->loadIcon("document-revert", KIconLoader::Small, 16);
-// case SP_DialogDiscardButton:
-// return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_DialogYesButton:
- return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
- case SP_DialogNoButton:
- return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
- case SP_ArrowUp:
- return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Dialog, 32);
- case SP_ArrowDown:
- return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Dialog, 32);
- case SP_ArrowLeft:
- return KIconLoader::global()->loadIcon("arrow-left", KIconLoader::Dialog, 32);
- case SP_ArrowRight:
- return KIconLoader::global()->loadIcon("arrow-right", KIconLoader::Dialog, 32);
- case SP_ArrowBack:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? (fd ? "go-next" : "arrow-right")
- : (fd ? "go-previous" : "arrow-left"), KIconLoader::Dialog, 32);
- case SP_ArrowForward:
- return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? (fd ? "go-previous" : "arrow-left")
- : (fd ? "go-next" : "arrow-right"), KIconLoader::Dialog, 32);
-// case SP_DirHomeIcon:
-// return KIconLoader::global()->loadIcon("user-home", KIconLoader::Small, 16);
-// case SP_CommandLink:
-// case SP_VistaShield:
- case SP_BrowserReload:
- return KIconLoader::global()->loadIcon("view-refresh", KIconLoader::Small, 16);
- case SP_BrowserStop:
- return KIconLoader::global()->loadIcon("process-stop", KIconLoader::Small, 16);
- case SP_MediaPlay:
- return KIconLoader::global()->loadIcon("media-playback-start", KIconLoader::Small, 16);
- case SP_MediaStop:
- return KIconLoader::global()->loadIcon("media-playback-stop", KIconLoader::Small, 16);
- case SP_MediaPause:
- return KIconLoader::global()->loadIcon("media-playback-pause", KIconLoader::Small, 16);
- case SP_MediaSkipForward:
- return KIconLoader::global()->loadIcon("media-skip-forward", KIconLoader::Small, 16);
- case SP_MediaSkipBackward:
- return KIconLoader::global()->loadIcon("media-skip-backward", KIconLoader::Small, 16);
- case SP_MediaSeekForward:
- return KIconLoader::global()->loadIcon("media-seek-forward", KIconLoader::Small, 16);
- case SP_MediaSeekBackward:
- return KIconLoader::global()->loadIcon("media-seek-backward", KIconLoader::Small, 16);
- case SP_MediaVolume:
- return KIconLoader::global()->loadIcon("player-volume", KIconLoader::Small, 16);
- case SP_MediaVolumeMuted:
- return KIconLoader::global()->loadIcon("player-volume-muted", KIconLoader::Small, 16);
- default:
- break;
+ bool fd(widget && qobject_cast(widget));
+
+ switch(pix)
+ {
+ // case SP_TitleBarMenuButton:
+ // case SP_TitleBarMinButton:
+ // case SP_TitleBarMaxButton:
+ // case SP_TitleBarCloseButton:
+ // case SP_TitleBarNormalButton:
+ // case SP_TitleBarShadeButton:
+ // case SP_TitleBarUnshadeButton:
+ // case SP_TitleBarContextHelpButton:
+ // case SP_DockWidgetCloseButton:
+ case SP_MessageBoxInformation:
+ return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
+ case SP_MessageBoxWarning:
+ return KIconLoader::global()->loadIcon("dialog-warning", KIconLoader::Dialog, 32);
+ case SP_MessageBoxCritical:
+ return KIconLoader::global()->loadIcon("dialog-error", KIconLoader::Dialog, 32);
+ case SP_MessageBoxQuestion:
+ return KIconLoader::global()->loadIcon("dialog-information", KIconLoader::Dialog, 32);
+ // case SP_DesktopIcon:
+ // return KIconLoader::global()->loadIcon("user-desktop", KIconLoader::Small, 16);
+ // case SP_TrashIcon:
+ // return KIconLoader::global()->loadIcon("user-trash", KIconLoader::Small, 16);
+ // case SP_ComputerIcon:
+ // return KIconLoader::global()->loadIcon("computer", KIconLoader::Small, 16);
+ // case SP_DriveFDIcon:
+ // return KIconLoader::global()->loadIcon("media-floppy", KIconLoader::Small, 16);
+ // case SP_DriveHDIcon:
+ // return KIconLoader::global()->loadIcon("drive-harddisk", KIconLoader::Small, 16);
+ // case SP_DriveCDIcon:
+ // case SP_DriveDVDIcon:
+ // return KIconLoader::global()->loadIcon("media-optical", KIconLoader::Small, 16);
+ // case SP_DriveNetIcon:
+ // return KIconLoader::global()->loadIcon("network-server", KIconLoader::Small, 16);
+ // case SP_DirOpenIcon:
+ // return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
+ // case SP_DirIcon:
+ // case SP_DirClosedIcon:
+ // return KIconLoader::global()->loadIcon("folder", KIconLoader::Small, 16);
+ // case SP_DirLinkIcon:
+ // case SP_FileIcon:
+ // return KIconLoader::global()->loadIcon("application-x-zerosize", KIconLoader::Small, 16);
+ // case SP_FileLinkIcon:
+ // case SP_ToolBarHorizontalExtensionButton:
+ // case SP_ToolBarVerticalExtensionButton:
+ case SP_FileDialogStart:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-edn" : "go-first", KIconLoader::Small, 16);
+ case SP_FileDialogEnd:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-first" : "go-end", KIconLoader::Small, 16);
+ case SP_FileDialogToParent:
+ return KIconLoader::global()->loadIcon("go-up", KIconLoader::Small, 16);
+ case SP_FileDialogNewFolder:
+ return KIconLoader::global()->loadIcon("folder-new", KIconLoader::Small, 16);
+ case SP_FileDialogDetailedView:
+ return KIconLoader::global()->loadIcon("view-list-details", KIconLoader::Small, 16);
+ // case SP_FileDialogInfoView:
+ // return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ // case SP_FileDialogContentsView:
+ // return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_FileDialogListView:
+ return KIconLoader::global()->loadIcon("view-list-icons", KIconLoader::Small, 16);
+ case SP_FileDialogBack:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous", KIconLoader::Small, 16);
+ case SP_DialogOkButton:
+ return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_DialogCancelButton:
+ return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_DialogHelpButton:
+ return KIconLoader::global()->loadIcon("help-contents", KIconLoader::Small, 16);
+ case SP_DialogOpenButton:
+ return KIconLoader::global()->loadIcon("document-open", KIconLoader::Small, 16);
+ case SP_DialogSaveButton:
+ return KIconLoader::global()->loadIcon("document-save", KIconLoader::Small, 16);
+ case SP_DialogCloseButton:
+ return KIconLoader::global()->loadIcon("dialog-close", KIconLoader::Small, 16);
+ case SP_DialogApplyButton:
+ return KIconLoader::global()->loadIcon("dialog-ok-apply", KIconLoader::Small, 16);
+ case SP_DialogResetButton:
+ return KIconLoader::global()->loadIcon("document-revert", KIconLoader::Small, 16);
+ // case SP_DialogDiscardButton:
+ // return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_DialogYesButton:
+ return KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Small, 16);
+ case SP_DialogNoButton:
+ return KIconLoader::global()->loadIcon("dialog-cancel", KIconLoader::Small, 16);
+ case SP_ArrowUp:
+ return KIconLoader::global()->loadIcon("arrow-up", KIconLoader::Dialog, 32);
+ case SP_ArrowDown:
+ return KIconLoader::global()->loadIcon("arrow-down", KIconLoader::Dialog, 32);
+ case SP_ArrowLeft:
+ return KIconLoader::global()->loadIcon("arrow-left", KIconLoader::Dialog, 32);
+ case SP_ArrowRight:
+ return KIconLoader::global()->loadIcon("arrow-right", KIconLoader::Dialog, 32);
+ case SP_ArrowBack:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? (fd ? "go-next" : "arrow-right")
+ : (fd ? "go-previous" : "arrow-left"), KIconLoader::Dialog, 32);
+ case SP_ArrowForward:
+ return KIconLoader::global()->loadIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? (fd ? "go-previous" : "arrow-left")
+ : (fd ? "go-next" : "arrow-right"), KIconLoader::Dialog, 32);
+ // case SP_DirHomeIcon:
+ // return KIconLoader::global()->loadIcon("user-home", KIconLoader::Small, 16);
+ // case SP_CommandLink:
+ // case SP_VistaShield:
+ case SP_BrowserReload:
+ return KIconLoader::global()->loadIcon("view-refresh", KIconLoader::Small, 16);
+ case SP_BrowserStop:
+ return KIconLoader::global()->loadIcon("process-stop", KIconLoader::Small, 16);
+ case SP_MediaPlay:
+ return KIconLoader::global()->loadIcon("media-playback-start", KIconLoader::Small, 16);
+ case SP_MediaStop:
+ return KIconLoader::global()->loadIcon("media-playback-stop", KIconLoader::Small, 16);
+ case SP_MediaPause:
+ return KIconLoader::global()->loadIcon("media-playback-pause", KIconLoader::Small, 16);
+ case SP_MediaSkipForward:
+ return KIconLoader::global()->loadIcon("media-skip-forward", KIconLoader::Small, 16);
+ case SP_MediaSkipBackward:
+ return KIconLoader::global()->loadIcon("media-skip-backward", KIconLoader::Small, 16);
+ case SP_MediaSeekForward:
+ return KIconLoader::global()->loadIcon("media-seek-forward", KIconLoader::Small, 16);
+ case SP_MediaSeekBackward:
+ return KIconLoader::global()->loadIcon("media-seek-backward", KIconLoader::Small, 16);
+ case SP_MediaVolume:
+ return KIconLoader::global()->loadIcon("player-volume", KIconLoader::Small, 16);
+ case SP_MediaVolumeMuted:
+ return KIconLoader::global()->loadIcon("player-volume-muted", KIconLoader::Small, 16);
+ default:
+ break;
+ }
}
#endif
return QTC_BASE_STYLE::standardPixmap(pix, option, widget);
@@ -2035,139 +2045,140 @@
QIcon QtCurveStyle::standardIconImplementation(StandardPixmap pix, const QStyleOption *option, const QWidget *widget) const
{
#ifdef QTC_USE_KDE4
- checkKComponentData();
-
- switch(pix)
+ if(kdeApp())
{
-// case SP_TitleBarMenuButton:
-// case SP_TitleBarMinButton:
-// case SP_TitleBarMaxButton:
-// case SP_TitleBarCloseButton:
-// case SP_TitleBarNormalButton:
-// case SP_TitleBarShadeButton:
-// case SP_TitleBarUnshadeButton:
-// case SP_TitleBarContextHelpButton:
-// case SP_DockWidgetCloseButton:
- case SP_MessageBoxInformation:
- return KIcon("dialog-information");
- case SP_MessageBoxWarning:
- return KIcon("dialog-warning");
- case SP_MessageBoxCritical:
- return KIcon("dialog-error");
- case SP_MessageBoxQuestion:
- return KIcon("dialog-information");
-// case SP_DesktopIcon:
-// return KIcon("user-desktop");
-// case SP_TrashIcon:
-// return KIcon("user-trash");
-// case SP_ComputerIcon:
-// return KIcon("computer");
-// case SP_DriveFDIcon:
-// return KIcon("media-floppy");
-// case SP_DriveHDIcon:
-// return KIcon("drive-harddisk");
-// case SP_DriveCDIcon:
-// case SP_DriveDVDIcon:
-// return KIcon("media-optical");
-// case SP_DriveNetIcon:
-// return KIcon("network-server");
-// case SP_DirOpenIcon:
-// return KIcon("document-open");
-// case SP_DirIcon:
-// case SP_DirClosedIcon:
-// return KIcon("folder");
-// case SP_DirLinkIcon:
-// case SP_FileIcon:
-// return KIcon("application-x-zerosize");
-// case SP_FileLinkIcon:
-// case SP_ToolBarHorizontalExtensionButton:
-// case SP_ToolBarVerticalExtensionButton:
- case SP_FileDialogStart:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-edn" : "go-first");
- case SP_FileDialogEnd:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-first" : "go-end");
- case SP_FileDialogToParent:
- return KIcon("go-up");
- case SP_FileDialogNewFolder:
- return KIcon("folder-new");
- case SP_FileDialogDetailedView:
- return KIcon("view-list-details");
-// case SP_FileDialogInfoView:
-// return KIcon("dialog-ok");
-// case SP_FileDialogContentsView:
-// return KIcon("dialog-ok");
- case SP_FileDialogListView:
- return KIcon("view-list-icons");
- case SP_FileDialogBack:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous");
- case SP_DialogOkButton:
- return KIcon("dialog-ok");
- case SP_DialogCancelButton:
- return KIcon("dialog-cancel");
- case SP_DialogHelpButton:
- return KIcon("help-contents");
- case SP_DialogOpenButton:
- return KIcon("document-open");
- case SP_DialogSaveButton:
- return KIcon("document-save");
- case SP_DialogCloseButton:
- return KIcon("dialog-close");
- case SP_DialogApplyButton:
- return KIcon("dialog-ok-apply");
- case SP_DialogResetButton:
- return KIcon("document-revert");
-// case SP_DialogDiscardButton:
-// return KIcon("dialog-cancel");
- case SP_DialogYesButton:
- return KIcon("dialog-ok");
- case SP_DialogNoButton:
- return KIcon("dialog-cancel");
- case SP_ArrowUp:
- return KIcon("arrow-up");
- case SP_ArrowDown:
- return KIcon("arrow-down");
- case SP_ArrowLeft:
- return KIcon("arrow-left");
- case SP_ArrowRight:
- return KIcon("arrow-right");
- case SP_ArrowBack:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-next" : "go-previous");
- case SP_ArrowForward:
- return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
- ? "go-previous"
- : "go-next");
-// case SP_DirHomeIcon:
-// return KIcon("user-home");
-// case SP_CommandLink:
-// case SP_VistaShield:
- case SP_BrowserReload:
- return KIcon("view-refresh");
- case SP_BrowserStop:
- return KIcon("process-stop");
- case SP_MediaPlay:
- return KIcon("media-playback-start");
- case SP_MediaStop:
- return KIcon("media-playback-stop");
- case SP_MediaPause:
- return KIcon("media-playback-pause");
- case SP_MediaSkipForward:
- return KIcon("media-skip-forward");
- case SP_MediaSkipBackward:
- return KIcon("media-skip-backward");
- case SP_MediaSeekForward:
- return KIcon("media-seek-forward");
- case SP_MediaSeekBackward:
- return KIcon("media-seek-backward");
- case SP_MediaVolume:
- return KIcon("player-volume");
- case SP_MediaVolumeMuted:
- return KIcon("player-volume-muted");
- default:
- break;
+ switch(pix)
+ {
+ // case SP_TitleBarMenuButton:
+ // case SP_TitleBarMinButton:
+ // case SP_TitleBarMaxButton:
+ // case SP_TitleBarCloseButton:
+ // case SP_TitleBarNormalButton:
+ // case SP_TitleBarShadeButton:
+ // case SP_TitleBarUnshadeButton:
+ // case SP_TitleBarContextHelpButton:
+ // case SP_DockWidgetCloseButton:
+ case SP_MessageBoxInformation:
+ return KIcon("dialog-information");
+ case SP_MessageBoxWarning:
+ return KIcon("dialog-warning");
+ case SP_MessageBoxCritical:
+ return KIcon("dialog-error");
+ case SP_MessageBoxQuestion:
+ return KIcon("dialog-information");
+ // case SP_DesktopIcon:
+ // return KIcon("user-desktop");
+ // case SP_TrashIcon:
+ // return KIcon("user-trash");
+ // case SP_ComputerIcon:
+ // return KIcon("computer");
+ // case SP_DriveFDIcon:
+ // return KIcon("media-floppy");
+ // case SP_DriveHDIcon:
+ // return KIcon("drive-harddisk");
+ // case SP_DriveCDIcon:
+ // case SP_DriveDVDIcon:
+ // return KIcon("media-optical");
+ // case SP_DriveNetIcon:
+ // return KIcon("network-server");
+ // case SP_DirOpenIcon:
+ // return KIcon("document-open");
+ // case SP_DirIcon:
+ // case SP_DirClosedIcon:
+ // return KIcon("folder");
+ // case SP_DirLinkIcon:
+ // case SP_FileIcon:
+ // return KIcon("application-x-zerosize");
+ // case SP_FileLinkIcon:
+ // case SP_ToolBarHorizontalExtensionButton:
+ // case SP_ToolBarVerticalExtensionButton:
+ case SP_FileDialogStart:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-edn" : "go-first");
+ case SP_FileDialogEnd:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-first" : "go-end");
+ case SP_FileDialogToParent:
+ return KIcon("go-up");
+ case SP_FileDialogNewFolder:
+ return KIcon("folder-new");
+ case SP_FileDialogDetailedView:
+ return KIcon("view-list-details");
+ // case SP_FileDialogInfoView:
+ // return KIcon("dialog-ok");
+ // case SP_FileDialogContentsView:
+ // return KIcon("dialog-ok");
+ case SP_FileDialogListView:
+ return KIcon("view-list-icons");
+ case SP_FileDialogBack:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous");
+ case SP_DialogOkButton:
+ return KIcon("dialog-ok");
+ case SP_DialogCancelButton:
+ return KIcon("dialog-cancel");
+ case SP_DialogHelpButton:
+ return KIcon("help-contents");
+ case SP_DialogOpenButton:
+ return KIcon("document-open");
+ case SP_DialogSaveButton:
+ return KIcon("document-save");
+ case SP_DialogCloseButton:
+ return KIcon("dialog-close");
+ case SP_DialogApplyButton:
+ return KIcon("dialog-ok-apply");
+ case SP_DialogResetButton:
+ return KIcon("document-revert");
+ // case SP_DialogDiscardButton:
+ // return KIcon("dialog-cancel");
+ case SP_DialogYesButton:
+ return KIcon("dialog-ok");
+ case SP_DialogNoButton:
+ return KIcon("dialog-cancel");
+ case SP_ArrowUp:
+ return KIcon("arrow-up");
+ case SP_ArrowDown:
+ return KIcon("arrow-down");
+ case SP_ArrowLeft:
+ return KIcon("arrow-left");
+ case SP_ArrowRight:
+ return KIcon("arrow-right");
+ case SP_ArrowBack:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-next" : "go-previous");
+ case SP_ArrowForward:
+ return KIcon(Qt::RightToLeft==QApplication::layoutDirection()
+ ? "go-previous"
+ : "go-next");
+ // case SP_DirHomeIcon:
+ // return KIcon("user-home");
+ // case SP_CommandLink:
+ // case SP_VistaShield:
+ case SP_BrowserReload:
+ return KIcon("view-refresh");
+ case SP_BrowserStop:
+ return KIcon("process-stop");
+ case SP_MediaPlay:
+ return KIcon("media-playback-start");
+ case SP_MediaStop:
+ return KIcon("media-playback-stop");
+ case SP_MediaPause:
+ return KIcon("media-playback-pause");
+ case SP_MediaSkipForward:
+ return KIcon("media-skip-forward");
+ case SP_MediaSkipBackward:
+ return KIcon("media-skip-backward");
+ case SP_MediaSeekForward:
+ return KIcon("media-seek-forward");
+ case SP_MediaSeekBackward:
+ return KIcon("media-seek-backward");
+ case SP_MediaVolume:
+ return KIcon("player-volume");
+ case SP_MediaVolumeMuted:
+ return KIcon("player-volume-muted");
+ default:
+ break;
+ }
}
#endif
return QTC_BASE_STYLE::standardIconImplementation(pix, option, widget);
@@ -4114,15 +4125,19 @@
tmpBtn.rect = r;
drawPrimitive(PE_PanelButtonCommand, &tmpBtn, painter, widget);
}
-// if (btn->features & QStyleOptionButton::HasMenu)
-// {
-// int mbi(pixelMetric(PM_MenuButtonIndicator, btn, widget));
-// QRect ir(btn->rect);
-// QStyleOptionButton newBtn(*btn);
-//
-// newBtn.rect = QRect(ir.right() - mbi + 2, ir.height()/2 - mbi/2 + 3, mbi - 6, mbi - 6);
-// drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
-// }
+ if (btn->features & QStyleOptionButton::HasMenu)
+ {
+ int mbi(pixelMetric(PM_MenuButtonIndicator, btn, widget));
+ QRect ir(btn->rect);
+ QStyleOptionButton newBtn(*btn);
+
+ newBtn.rect = QRect(Qt::LeftToRight==btn->direction
+ ? ir.right() - mbi
+ : ir.x() + 6,
+ ((ir.height() - mbi)/2),
+ mbi - 6, mbi);
+ drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
+ }
}
break;
case CE_PushButtonLabel:
@@ -4183,23 +4198,36 @@
if (button->features&QStyleOptionButton::HasMenu)
{
- int indicatorHeight(pixelMetric(PM_MenuButtonIndicator, button, widget)),
- indicatorWidth=indicatorHeight;
+ int mbi(pixelMetric(PM_MenuButtonIndicator, button, widget));
if (Qt::LeftToRight==button->direction)
- r = r.adjusted(0, 0, -indicatorWidth, 0);
+ r = r.adjusted(0, 0, -mbi, 0);
else
- r = r.adjusted(indicatorWidth, 0, 0, 0);
+ r = r.adjusted(mbi, 0, 0, 0);
- QRect ir(button->rect);
- QStyleOptionButton newBtn(*button);
+ if(APP_SKYPE==theThemedApp)
+ {
+ // Skype seems to draw a blurry arrow in the lower right corner,
+ // ...draw over this with a nicer sharper arrow...
+ QRect ar(button->rect.x()+(button->rect.width()-(LARGE_ARR_WIDTH+3)),
+ button->rect.y()+(button->rect.height()-(LARGE_ARR_HEIGHT+2)),
+ LARGE_ARR_WIDTH,
+ LARGE_ARR_HEIGHT);
- newBtn.rect = QRect(Qt::LeftToRight==button->direction
- ? ir.right() - indicatorWidth + 2
- : ir.x() + 6,
- ((ir.height() - indicatorHeight)/2) + 2,
- indicatorWidth - 6, indicatorHeight);
- drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
+ if(option->state &(State_On | State_Sunken))
+ ar.adjust(1, 1, 1, 1);
+ drawArrow(painter, ar, option, PE_IndicatorArrowDown);
+ }
+
+// QRect ir(button->rect);
+// QStyleOptionButton newBtn(*button);
+//
+// newBtn.rect = QRect(Qt::LeftToRight==button->direction
+// ? ir.right() - mbi + 2
+// : ir.x() + 6,
+// ((ir.height() - mbi)/2) + 2,
+// mbi - 6, mbi);
+// drawPrimitive(PE_IndicatorArrowDown, &newBtn, painter, widget);
}
int num(opts.embolden && button->features&QStyleOptionButton::DefaultButton ? 2 : 1);
@@ -7107,6 +7135,7 @@
else if(colouredMouseOver || WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w ||
(!IS_GLASS(app) && !sunken && option->state&State_Raised))
{
+ p->setRenderHint(QPainter::Antialiasing, true);
if(colouredMouseOver)
p->setPen(border[QTC_MO_STD_LIGHT(w, sunken)]);
else
@@ -7114,30 +7143,31 @@
if(colouredMouseOver || bevelledButton || APPEARANCE_RAISED==app)
{
//Left & top
- p->drawLine(br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-3);
- p->drawLine(br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
+ drawAaLine(p, br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-3);
+ drawAaLine(p, br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
if(colouredMouseOver)
p->setPen(border[QTC_MO_STD_DARK(w)]);
else
p->setPen(border[sunken ? 0 : dark]);
//Right & bottom
- p->drawLine(br.x()+br.width()-2, br.y()+1, br.x()+br.width()-2, br.y()+br.height()-3);
- p->drawLine(br.x()+1, br.y()+br.height()-2, br.x()+br.width()-2, br.y()+br.height()-2);
+ drawAaLine(p, br.x()+br.width()-2, br.y()+1, br.x()+br.width()-2, br.y()+br.height()-3);
+ drawAaLine(p, br.x()+1, br.y()+br.height()-2, br.x()+br.width()-2, br.y()+br.height()-2);
br.adjust(2, 2,-2,-2);
}
else
{
//Left & top
- p->drawLine(br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-(WIDGET_MDI_WINDOW_TITLE==w ? 1 : 2));
+ drawAaLine(p, br.x()+1, br.y()+2, br.x()+1, br.y()+br.height()-(WIDGET_MDI_WINDOW_TITLE==w ? 1 : 2));
if((WIDGET_MDI_WINDOW==w || WIDGET_MDI_WINDOW_TITLE==w) && APPEARANCE_SHINY_GLASS==app)
br.adjust(2, 1, -1, -1);
else
{
- p->drawLine(br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
+ drawAaLine(p, br.x()+1, br.y()+1, br.x()+br.width()-2, br.y()+1);
br.adjust(2, 2,-1,-1);
}
}
+ p->setRenderHint(QPainter::Antialiasing, false);
}
else
br.adjust(1, 1,-1,-1);
@@ -8598,5 +8628,12 @@
theNoEtchWidgets.remove(static_cast(o));
}
+void QtCurveStyle::setupKde4()
+{
+#ifdef QTC_USE_KDE4
+ checkKComponentData();
+#endif
+}
+
#include "qtcurve.moc"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.59.5/style/qtcurve.h new/QtCurve-KDE4-0.59.6/style/qtcurve.h
--- old/QtCurve-KDE4-0.59.5/style/qtcurve.h 2008-07-18 00:11:11.000000000 +0200
+++ new/QtCurve-KDE4-0.59.6/style/qtcurve.h 2008-07-30 21:18:43.000000000 +0200
@@ -139,6 +139,7 @@
private Q_SLOTS:
void widgetDestroyed(QObject *o);
+ void setupKde4();
QIcon standardIconImplementation(StandardPixmap pix, const QStyleOption *option=0, const QWidget *widget=0) const;
private:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org