Hello community,
here is the log from the commit of package qtcurve-kde4
checked in at Mon Jul 16 18:20:54 CEST 2007.
--------
--- KDE/qtcurve-kde4/qtcurve-kde4.changes 2007-06-24 16:59:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-kde4/qtcurve-kde4.changes 2007-07-16 16:21:19.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 16 16:21:14 CEST 2007 - stbinner@suse.de
+
+- update to 0.52.3: several style drawing fixes, see ChangeLog
+
+-------------------------------------------------------------------
Old:
----
QtCurve-KDE4-0.52.2.tar.gz
New:
----
QtCurve-KDE4-0.52.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-kde4.spec ++++++
--- /var/tmp/diff_new_pack.YU7383/_old 2007-07-16 18:20:38.000000000 +0200
+++ /var/tmp/diff_new_pack.YU7383/_new 2007-07-16 18:20:38.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-kde4 (Version 0.52.2)
+# spec file for package qtcurve-kde4 (Version 0.52.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,10 +13,10 @@
Name: qtcurve-kde4
BuildRequires: libkde4-devel
URL: http://www.kde-look.org/content/show.php?content=40492
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/GUI/KDE
Summary: QtCurve style for KDE 4
-Version: 0.52.2
+Version: 0.52.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-KDE4-%{version}.tar.gz
@@ -60,6 +60,8 @@
%_kde_share_dir/apps/kstyle/themes/qtcurve.themerc
%changelog
+* Mon Jul 16 2007 - stbinner@suse.de
+- update to 0.52.3: several style drawing fixes, see ChangeLog
* Sun Jun 24 2007 - stbinner@suse.de
- update to 0.52.2: several style drawing fixes, see ChangeLog
* Mon Jun 11 2007 - stbinner@suse.de
++++++ QtCurve-KDE4-0.52.2.tar.gz -> QtCurve-KDE4-0.52.3.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/ChangeLog new/QtCurve-KDE4-0.52.3/ChangeLog
--- old/QtCurve-KDE4-0.52.2/ChangeLog 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/ChangeLog 2007-07-02 10:53:02.000000000 +0200
@@ -1,3 +1,12 @@
+0.52.3
+------
+1. Don't lighten border of disabled check/radio buttons.
+2. Lighten trough of disabled slider.
+3. Store no etch widgets in a set, to speed up checking.
+4. When building for Qt4 only, you *must* build from within
+ the qt4 folder. This is due to the different ways qmake
+ and cmake create moc files.
+
0.52.2
------
1. Fix crash when slider colour == button.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/config.h new/QtCurve-KDE4-0.52.3/config.h
--- old/QtCurve-KDE4-0.52.2/config.h 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/config.h 2007-07-02 10:53:02.000000000 +0200
@@ -1 +1 @@
-#define VERSION "0.52.2"
+#define VERSION "0.52.3"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/INSTALL new/QtCurve-KDE4-0.52.3/INSTALL
--- old/QtCurve-KDE4-0.52.2/INSTALL 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/INSTALL 2007-07-02 10:53:02.000000000 +0200
@@ -17,11 +17,13 @@
Qt Only
-------
To aid use pre-KDE4, QtCurve can use the qmake tool to generate makefiles.
-If building for Qt only, then the style config dialog will not be built.
+On KUbuntu, qmake for Qt4 is called qmake-qt4. If building for Qt only, then
+the style config dialog will not be built - however, then settings can be
+controlled via the control panel for the KDE3 version of QtCurve.
To build and install:
-1) qmake
-2) make
-3) make install
-
+1. cd qt4
+2. qmake
+3. make
+4. make install
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/kde4/common.h new/QtCurve-KDE4-0.52.3/kde4/common.h
--- old/QtCurve-KDE4-0.52.2/kde4/common.h 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/kde4/common.h 2007-07-02 10:53:02.000000000 +0200
@@ -145,8 +145,8 @@
#define QTC_SIMPLE_SHADING (!shading)
#define QT_STD_BORDER 5
-#define QT_DISABLED_BORDER 3
-#define QT_BORDER(E) ((E) ? QT_STD_BORDER : QT_DISABLED_BORDER)
+#define QT_DISABLED_BORDER QT_STD_BORDER /*3*/
+#define QT_BORDER(E) (/*(E) ?*/ QT_STD_BORDER/* : QT_DISABLED_BORDER*/)
#define QT_FRAME_DARK_SHADOW 2
#define QT_FOCUS 3
@@ -340,30 +340,6 @@
#define IS_SLIDER(W) (WIDGET_SLIDER==W || WIDGET_SB_SLIDER==W)
#define IS_TOGGLE_BUTTON(W) (WIDGET_TOGGLE_BUTTON==W || WIDGET_CHECKBOX==W)
-#ifndef QTC_CONFIG_DIALOG
-static double getWidgetShade(EWidget w, bool light, bool sunken, EAppearance app)
-{
- switch(w)
- {
- case WIDGET_TROUGH:
- return light ? SHADE_SBAR_LIGHT : SHADE_SBAR_DARK;
- case WIDGET_SLIDER_TROUGH:
- return light ? SHADE_SLIDER_LIGHT : SHADE_SLIDER_DARK;
- case WIDGET_MENU_ITEM:
- if(APPEARANCE_DULL_GLASS!=app && APPEARANCE_SHINY_GLASS!=app)
- return light ? SHADE_BEVEL_MENU_ITEM_LIGHT : SHADE_BEVEL_MENU_ITEM_DARK;
- default:
- return light
- ? sunken
- ? SHADE_BEVEL_GRAD_SEL_LIGHT
- : SHADE_BEVEL_GRAD_LIGHT
- : sunken
- ? SHADE_BEVEL_GRAD_SEL_DARK
- : SHADE_BEVEL_GRAD_DARK;
- }
-}
-#endif
-
typedef enum
{
CORNER_TL = 0x1,
@@ -464,9 +440,29 @@
#define DEF_COLOR_STR "background"
#define DEF_TOOLBAR_SHADE_STR "none"
-#ifndef QTC_COMMON_NO_FUNCTIONS
+#ifdef QTC_COMMON_FUNCTIONS
+static double getWidgetShade(EWidget w, bool light, bool sunken, EAppearance app)
+{
+ switch(w)
+ {
+ case WIDGET_TROUGH:
+ return light ? SHADE_SBAR_LIGHT : SHADE_SBAR_DARK;
+ case WIDGET_SLIDER_TROUGH:
+ return light ? SHADE_SLIDER_LIGHT : SHADE_SLIDER_DARK;
+ case WIDGET_MENU_ITEM:
+ if(APPEARANCE_DULL_GLASS!=app && APPEARANCE_SHINY_GLASS!=app)
+ return light ? SHADE_BEVEL_MENU_ITEM_LIGHT : SHADE_BEVEL_MENU_ITEM_DARK;
+ default:
+ return light
+ ? sunken
+ ? SHADE_BEVEL_GRAD_SEL_LIGHT
+ : SHADE_BEVEL_GRAD_LIGHT
+ : sunken
+ ? SHADE_BEVEL_GRAD_SEL_DARK
+ : SHADE_BEVEL_GRAD_DARK;
+ }
+}
-#ifndef QTC_COMMON_ONLY_COVERTERS
#define QTC_MIN(a, b) ((a) < (b) ? (a) : (b))
#define QTC_MAX(a, b) ((b) < (a) ? (a) : (b))
@@ -793,9 +789,6 @@
offset+=stride;
}
}
-
-#endif /* QTC_COMMON_ONLY_COVERTERS */
-
#endif /* QTC_COMMON_NO_FUNCTIONS */
#ifdef __cplusplus
@@ -865,7 +858,7 @@
};
#endif
-#ifndef QTC_CONFIG_DIALOG
+#if defined QTC_COMMON_FUNCTIONS && !defined QTC_CONFIG_DIALOG
static EAppearance widgetApp(EWidget w, const Options *opts)
{
switch(w)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/kde4/config_file.c new/QtCurve-KDE4-0.52.3/kde4/config_file.c
--- old/QtCurve-KDE4-0.52.2/kde4/config_file.c 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/kde4/config_file.c 2007-07-02 10:53:02.000000000 +0200
@@ -204,6 +204,7 @@
return def;
}
+#ifndef QTC_CONFIG_DIALOG
static EShading toShading(const char * str, EShading def)
{
if(str)
@@ -218,6 +219,7 @@
return def;
}
+#endif
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/kde4/pixmaps.h new/QtCurve-KDE4-0.52.3/kde4/pixmaps.h
--- old/QtCurve-KDE4-0.52.2/kde4/pixmaps.h 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/kde4/pixmaps.h 2007-07-02 10:53:02.000000000 +0200
@@ -94,27 +94,31 @@
0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
};
-static const unsigned int slider_png_len = 254;
+static const unsigned int slider_png_len = 311;
static const unsigned char slider_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x15,0x00,0x00,0x00,0x0d,0x08,0x06,0x00,0x00,
- 0x00,0x46,0x92,0x25,0x60,0x00,0x00,0x00,0xc5,0x49,0x44,0x41,0x54,0x38,
- 0xcb,0xad,0xd3,0x31,0x6a,0x02,0x41,0x18,0x06,0xd0,0x87,0xf1,0x0a,0x1b,
- 0xbb,0x78,0x09,0x09,0x46,0x88,0x69,0x53,0x88,0x82,0x55,0x20,0xbd,0x90,
- 0x3e,0x5e,0x45,0xd2,0xa5,0xd1,0x42,0xd2,0x06,0x72,0x03,0x0f,0xa0,0x28,
- 0x28,0x68,0xa7,0x58,0x06,0x3c,0xc0,0xda,0xcc,0xca,0x6a,0x13,0xc9,0xce,
- 0x07,0x03,0x53,0x0c,0x0f,0x66,0xe6,0xff,0x38,0x4f,0x82,0x77,0xcc,0x91,
- 0x5e,0xb1,0xe6,0xe1,0x7c,0x92,0x47,0xca,0xb9,0xfd,0x2b,0x06,0x18,0xa2,
- 0x8f,0xbd,0xbf,0x73,0x8b,0x16,0xd6,0x78,0xc3,0xc8,0x05,0x38,0x45,0xdd,
- 0xff,0x52,0xc3,0x2c,0x38,0xa7,0x2b,0xff,0xa2,0xa1,0x58,0xee,0x83,0x93,
- 0xdc,0x60,0x8c,0x09,0x3e,0x0a,0xa2,0x5b,0x54,0x71,0x27,0x3c,0x76,0x57,
- 0x9c,0x74,0x82,0x27,0x45,0x33,0x12,0xfa,0x80,0xb4,0x84,0x05,0x2a,0x91,
- 0xd0,0x0a,0x16,0x25,0x6c,0xf0,0x1c,0x09,0x6d,0xe1,0x33,0xfb,0xfd,0x03,
- 0x9e,0x0a,0x82,0x8d,0xe0,0x24,0xf9,0x39,0x5d,0xe1,0xb1,0xc0,0x5b,0x2e,
- 0xb3,0x39,0xcd,0x1a,0x95,0x35,0xe1,0x07,0x5f,0xf8,0xc6,0xee,0xca,0x46,
- 0xb5,0xf1,0x82,0xde,0x65,0xa3,0xa2,0x76,0xff,0x08,0x9a,0x71,0x38,0x9a,
- 0x80,0xac,0x2c,0x14,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,
- 0x60,0x82
+ 0x00,0x46,0x92,0x25,0x60,0x00,0x00,0x00,0x06,0x62,0x4b,0x47,0x44,0x00,
+ 0xff,0x00,0xff,0x00,0xff,0xa0,0xbd,0xa7,0x93,0x00,0x00,0x00,0x09,0x70,
+ 0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01,0x00,0x9a,
+ 0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd7,0x06,0x19,
+ 0x0b,0x21,0x06,0x08,0x17,0x34,0xb5,0x00,0x00,0x00,0xc4,0x49,0x44,0x41,
+ 0x54,0x38,0xcb,0xad,0xd3,0x31,0x6a,0x02,0x41,0x18,0x40,0xe1,0xcf,0xc5,
+ 0x2b,0x4c,0x6c,0xac,0x2c,0xad,0x83,0x44,0x41,0x6c,0x2d,0x24,0xb5,0x90,
+ 0x3e,0x90,0xde,0x5c,0x25,0x5e,0xc0,0x54,0x29,0x13,0xb0,0xf0,0x16,0x8a,
+ 0x82,0x42,0xac,0x44,0x52,0x58,0x08,0x39,0x40,0xd2,0xcc,0x86,0x8d,0x8d,
+ 0xe2,0xce,0x83,0x81,0x29,0x7e,0x1e,0x33,0xf0,0x3f,0xfe,0x13,0x30,0xc2,
+ 0x12,0x3f,0x17,0x9c,0x65,0x9c,0x0f,0x45,0x49,0xb5,0x70,0x7f,0xc0,0x0b,
+ 0x26,0x78,0xc6,0x97,0xf3,0xdc,0x60,0x80,0x4f,0x3c,0xe1,0xd5,0x89,0x70,
+ 0x8e,0x3b,0xd7,0x71,0x8b,0x45,0xf4,0xfc,0x7d,0xf9,0x88,0x8e,0x72,0xb4,
+ 0xa2,0x27,0x54,0xf0,0x8e,0x5d,0x7c,0x7e,0x59,0xc6,0xa8,0x67,0x68,0x60,
+ 0x26,0x0d,0x33,0x34,0x32,0x34,0x71,0x48,0x24,0x3d,0xa0,0x99,0x61,0x85,
+ 0x5a,0x22,0x69,0x0d,0xab,0x0c,0x5b,0xf4,0x13,0x49,0xfb,0xd1,0x27,0xe0,
+ 0x1b,0xbd,0x92,0xc2,0x4e,0xf4,0x84,0xe2,0x9e,0x6e,0xd0,0xbd,0x52,0xd8,
+ 0xc6,0x3a,0xdf,0xd3,0xbc,0xa8,0xbc,0x84,0x29,0xde,0xf0,0x81,0xfd,0x85,
+ 0x45,0xdd,0x63,0x88,0xc7,0xd3,0xa2,0x92,0xb6,0xff,0x0b,0xa5,0xee,0x37,
+ 0x87,0x80,0xd0,0x1f,0x2b,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,
+ 0x42,0x60,0x82
};
static const unsigned int slider_light_png_len = 199;
@@ -136,26 +140,31 @@
0x42,0x60,0x82
};
-static const unsigned int slider_v_png_len = 252;
+static const unsigned int slider_v_png_len = 310;
static const unsigned char slider_v_png_data[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,
0x44,0x52,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x15,0x08,0x06,0x00,0x00,
- 0x00,0x9d,0x6e,0x64,0x8a,0x00,0x00,0x00,0xc3,0x49,0x44,0x41,0x54,0x38,
- 0xcb,0xed,0xd4,0x3d,0x6a,0x42,0x41,0x14,0x86,0xe1,0x87,0xd8,0xd9,0x5f,
- 0xbb,0xe0,0x1e,0x44,0x24,0x86,0xa8,0xbd,0x4d,0x44,0xb1,0x72,0x07,0x56,
- 0x29,0x5c,0x49,0x9a,0x34,0xba,0x09,0xdd,0x80,0x6b,0x50,0x14,0x4c,0x6d,
- 0x67,0x93,0x68,0xac,0x6f,0x9a,0x11,0x6e,0xfc,0xcb,0x60,0x93,0x26,0x6f,
- 0x33,0x30,0x73,0xde,0x19,0x06,0xce,0x77,0xf8,0x49,0x82,0x01,0x16,0x48,
- 0xc3,0x3a,0x08,0xfb,0x67,0xe9,0x61,0x87,0x11,0xba,0xa8,0xa3,0x8d,0x37,
- 0x7c,0x84,0xf3,0x13,0xe1,0x1d,0x8d,0x0b,0x17,0x3e,0x62,0x96,0x15,0x13,
- 0x7c,0xa1,0xe6,0x3a,0x0f,0xf8,0x44,0x92,0x43,0x1f,0x1b,0xbc,0xfe,0x22,
- 0xad,0x71,0x8f,0xa2,0xf0,0xd9,0x8e,0x38,0x9a,0xa1,0x5e,0x8a,0x6a,0xa4,
- 0x54,0x42,0x7a,0xe7,0x06,0xfe,0xa5,0x3f,0x91,0x96,0x28,0x44,0xd6,0x17,
- 0xb0,0xcc,0x21,0x8f,0x27,0x8c,0x23,0xa4,0x17,0x4c,0x0f,0x5d,0xbe,0x8f,
- 0x68,0xa5,0x32,0xb6,0xd9,0x40,0xf6,0xb0,0x0a,0xb9,0x39,0x47,0x05,0xf3,
- 0x4b,0x41,0xdc,0x61,0x88,0x56,0x78,0xf9,0xf9,0x5a,0x72,0xb3,0x81,0x9c,
- 0x1c,0xcd,0x88,0xc9,0xf1,0x8c,0xf8,0x06,0x07,0x13,0x27,0xc9,0xd0,0x4f,
- 0x71,0x06,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82
+ 0x00,0x9d,0x6e,0x64,0x8a,0x00,0x00,0x00,0x06,0x62,0x4b,0x47,0x44,0x00,
+ 0xff,0x00,0xff,0x00,0xff,0xa0,0xbd,0xa7,0x93,0x00,0x00,0x00,0x09,0x70,
+ 0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,0x13,0x01,0x00,0x9a,
+ 0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd7,0x06,0x19,
+ 0x0b,0x21,0x3b,0x50,0x7f,0x78,0xa4,0x00,0x00,0x00,0xc3,0x49,0x44,0x41,
+ 0x54,0x38,0xcb,0xed,0xd4,0x31,0x4e,0x02,0x41,0x14,0x87,0xf1,0x5f,0xa0,
+ 0xa3,0x5f,0x3a,0xc2,0x1d,0x0c,0x21,0x48,0x24,0xf4,0x36,0x9a,0x58,0xee,
+ 0x0d,0xa8,0xac,0xe1,0x16,0x36,0x34,0x9e,0x02,0x2e,0xc0,0x19,0x30,0x6e,
+ 0xa2,0x26,0x54,0x34,0xc6,0x06,0x05,0xeb,0xa5,0x19,0xc8,0x92,0x2c,0x32,
+ 0xda,0xd8,0xf0,0x35,0x33,0x99,0x79,0x5f,0x5e,0x26,0x79,0xff,0xe1,0x90,
+ 0x04,0x53,0x3c,0x23,0x0f,0xeb,0x34,0x9c,0xef,0xa9,0x14,0xf6,0x29,0x16,
+ 0x78,0xc7,0x08,0x5d,0x0c,0xb1,0xc4,0x5b,0xb8,0x3f,0x20,0xc5,0x2b,0xfa,
+ 0xca,0xe9,0x62,0x5e,0x14,0x13,0x6c,0xd0,0xf3,0x33,0x1d,0x7c,0x22,0xa9,
+ 0x62,0x80,0x0f,0x3c,0x9c,0x90,0x96,0x68,0xa0,0x29,0x3c,0xf6,0x4e,0x1c,
+ 0xd7,0xa1,0x5e,0x8e,0xcb,0x48,0xe9,0x02,0x79,0xc5,0x1f,0x38,0x4b,0xff,
+ 0x22,0x65,0xa8,0x47,0xd6,0xd7,0x91,0x55,0x51,0xc3,0x15,0x26,0x11,0xd2,
+ 0x3d,0x66,0xbb,0x29,0xff,0x8e,0x18,0xa5,0x16,0xbe,0x8a,0x81,0x4c,0xf1,
+ 0x12,0x72,0x53,0x46,0x1b,0x4f,0xc7,0x82,0xb8,0xc6,0x23,0x6e,0x43,0xe7,
+ 0x1b,0x8c,0xb1,0x2a,0x13,0x7e,0xf5,0x47,0x6c,0x01,0x0f,0x64,0x29,0x02,
+ 0xd4,0x3b,0x9e,0x77,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,
+ 0x60,0x82
};
static const unsigned int slider_light_v_png_len = 204;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-KDE4-0.52.2/kde4/qtcurve.cpp new/QtCurve-KDE4-0.52.3/kde4/qtcurve.cpp
--- old/QtCurve-KDE4-0.52.2/kde4/qtcurve.cpp 2007-06-21 10:44:44.000000000 +0200
+++ new/QtCurve-KDE4-0.52.3/kde4/qtcurve.cpp 2007-07-02 10:53:02.000000000 +0200
@@ -20,6 +20,7 @@
#include <QtGui>
#include <QX11Info>
+#define QTC_COMMON_FUNCTIONS
#include "qtcurve.h"
#include "pixmaps.h"
#define CONFIG_READ
@@ -35,6 +36,8 @@
APP_OTHER
} theThemedApp=APP_OTHER;
+static QSet