Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Mon Jul 16 18:19:38 CEST 2007. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-06-24 16:57:09.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-07-16 16:19:22.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 16 16:19:13 CEST 2007 - stbinner@suse.de + +- update to 0.52.3: several style drawing fixes, see ChangeLog + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.52.1.tar.gz New: ---- QtCurve-Gtk2-0.52.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.Tc2930/_old 2007-07-16 18:18:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Tc2930/_new 2007-07-16 18:18:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.52.1) +# spec file for package qtcurve-gtk2 (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-gtk2 BuildRequires: gtk2-devel kdelibs3 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/GNOME Summary: QtCurve style for Gtk2 -Version: 0.52.1 +Version: 0.52.3 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz @@ -74,6 +74,8 @@ %pref/share/themes/QtCurve %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.1: several style drawing fixes, see ChangeLog * Mon Jun 11 2007 - stbinner@suse.de ++++++ QtCurve-Gtk2-0.52.1.tar.gz -> QtCurve-Gtk2-0.52.3.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/ChangeLog new/QtCurve-Gtk2-0.52.3/ChangeLog --- old/QtCurve-Gtk2-0.52.1/ChangeLog 2007-06-20 23:05:56.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/ChangeLog 2007-07-11 20:53:28.000000000 +0200 @@ -1,3 +1,15 @@ +0.52.3 +------ +1. Fix 1st stripe on vertical progress bar. +2. Fix very small progress bar chunks. +3. Fix blanked out widgets in tovid. +4. Fix DeVeDe crash when 'fix parentless dialogs' is enabled. + +0.52.2 +------ +1. Don't lighten border of disabled check/radio buttons. +2. Lighten trough of disabled slider. + 0.52.1 ------ 1. Draw emphasis around menus when not lightening. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/configure new/QtCurve-Gtk2-0.52.3/configure --- old/QtCurve-Gtk2-0.52.1/configure 2007-06-20 23:13:29.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/configure 2007-07-11 20:53:54.000000000 +0200 @@ -1925,7 +1925,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.52.1 +VERSION=0.52.3 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/configure.in new/QtCurve-Gtk2-0.52.3/configure.in --- old/QtCurve-Gtk2-0.52.1/configure.in 2007-06-20 23:12:59.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/configure.in 2007-07-11 20:53:28.000000000 +0200 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.52.1 +VERSION=0.52.3 AC_SUBST(VERSION) AUTOMAKE_OPTIONS=no-dependencies AM_INIT_AUTOMAKE($PACKAGE, $VERSION) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/gtk2/common.h new/QtCurve-Gtk2-0.52.3/gtk2/common.h --- old/QtCurve-Gtk2-0.52.1/gtk2/common.h 2007-06-18 22:26:12.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/gtk2/common.h 2007-07-11 20:52:01.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 @@ -830,6 +823,10 @@ stdSidebarButtons, gtkScrollViews, gtkComboMenus, +/* +#else + setDialogButtonOrder, +*/ #endif borderMenuitems, colorMenubarMouseOver, @@ -865,7 +862,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-Gtk2-0.52.1/gtk2/config_file.c new/QtCurve-Gtk2-0.52.3/gtk2/config_file.c --- old/QtCurve-Gtk2-0.52.1/gtk2/config_file.c 2007-06-18 22:26:12.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/gtk2/config_file.c 2007-07-11 20:52:01.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 @@ -642,8 +644,12 @@ QTC_CFG_READ_BOOL(colorMenubarMouseOver) #ifdef __cplusplus QTC_CFG_READ_BOOL(stdSidebarButtons) - QTC_CFG_READ_BOOL(gtkScrollViews); - QTC_CFG_READ_BOOL(gtkComboMenus); + QTC_CFG_READ_BOOL(gtkScrollViews) + QTC_CFG_READ_BOOL(gtkComboMenus) +/* +#else + QTC_CFG_READ_BOOL(setDialogButtonOrder) +*/ #endif #ifndef QTC_COMMON_ONLY_COVERTERS @@ -770,6 +776,9 @@ opts->customMenuSelTextColor.setRgb(0, 0, 0); opts->customCheckRadioColor.setRgb(0, 0, 0); #else +/* + opts->setDialogButtonOrder=false; +*/ opts->customMenubarsColor.red=opts->customMenubarsColor.green=opts->customMenubarsColor.blue=0; opts->customSlidersColor.red=opts->customSlidersColor.green=opts->customSlidersColor.blue=0; opts->customMenuNormTextColor.red=opts->customMenuNormTextColor.green=opts->customMenuNormTextColor.blue=0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/gtk2/pixmaps.h new/QtCurve-Gtk2-0.52.3/gtk2/pixmaps.h --- old/QtCurve-Gtk2-0.52.1/gtk2/pixmaps.h 2007-05-30 22:04:56.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/gtk2/pixmaps.h 2007-06-25 22:00:32.000000000 +0200 @@ -212,27 +212,27 @@ "\0\0\0\0\0""6\0\0\0\360\0\0\0\25\0\0\0\263\0\0\0\227\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\227\0\0\0" - "t\0\0\0\325\0\0\0R\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\263\0\0\0\325\0\0\0R\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0O\0\0\0\325\0\0\0\377\0\0\0>\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0R\0\0\0\325\0\0\0\377\0\0\0>\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0>\0\0\0\377" "\0\0\0\325\0\0\0U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0P\0\0\0\325\0\0\0\263\0\0\0\235\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0U\0\0\0\325\0\0\0\263\0\0\0\235\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\234\0\0\0" - "t\0\0\0\25\0\0\0\363\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\235\0\0\0" + "\263\0\0\0\25\0\0\0\363\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0:\0\0\0\363\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\332\0\0\0" - "=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\331\0\0\0[\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\364\0\0\0\237\0\0\0S\0\0\0""9\0\0\0""9" - "\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0" - "O\0\0\0\235\0\0\0\365\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" - "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\325\0\0\0t\0\0" - "\0\25\0\0\0\0\0\0\0\0\0\0\0\0"}; + "\0\0\0\0\0\0\0\0\0\0\0:\0\0\0\363\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\332\0" + "\0\0=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\331\0\0\0[\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\364\0\0\0\237\0\0\0S\0\0\0""9\0\0" + "\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9" + "\0\0\0O\0\0\0\235\0\0\0\365\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0" + "\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\325\0\0" + "\0t\0\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0"}; /* GdkPixbuf RGBA C-Source image dump */ @@ -318,40 +318,40 @@ /* height (21) */ "\0\0\0\25" /* pixel_data: */ - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\325" - "\0\0\0t\0\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0" - "\363\0\0\0\235\0\0\0U\0\0\0>\0\0\0R\0\0\0\227\0\0\0\360\0\0\0[\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\332\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0:\0\0\0\322\0\0\0[\0\0\0\0\0\0\0\25\0\0\0\364\0" - "\0\0=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""8" - "\0\0\0\361\0\0\0\25\0\0\0t\0\0\0\237\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0t\0\0\0\325\0" - "\0\0S\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0J\0\0\0\325\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0" - "\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0" - "9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\25\0\0\0\263\0\0\0\325\0\0\0\377\0\0\0" + "\325\0\0\0\263\0\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "[\0\0\0\363\0\0\0\234\0\0\0P\0\0\0""9\0\0\0O\0\0\0\227\0\0\0\360\0\0" + "\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\332\0\0\0\77\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0:\0\0\0\322\0\0\0[\0\0\0\0\0\0\0\25\0\0" + "\0\364\0\0\0=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0""8\0\0\0\361\0\0\0\25\0\0\0t\0\0\0\237\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0t\0\0" + "\0\325\0\0\0S\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0J\0\0\0\325\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0" + "\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0" + "\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0" + "\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0" "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0" - "\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2" - "\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\325\0\0\0O" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0H\0\0\0\325\0\0\0t\0\0\0\235\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\224\0\0\0t\0\0\0\25" - "\0\0\0\365\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\0\0\0""4\0\0\0\362\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\331\0\0\0:\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""6\0\0\0\323\0\0\0[\0\0" - "\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\363\0\0\0\234\0\0\0P\0\0\0""9\0\0\0" - "O\0\0\0\227\0\0\0\360\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" - "\0\0\0\25\0\0\0\263\0\0\0\325\0\0\0\377\0\0\0\325\0\0\0\263\0\0\0\25" - "\0\0\0\0\0\0\0\0\0\0\0\0"}; + "\0\325\0\0\0O\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0H\0\0\0\325\0\0\0t\0\0\0\235\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\224\0\0" + "\0t\0\0\0\25\0\0\0\365\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0""4\0\0\0\362\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\331" + "\0\0\0:\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""6\0\0\0\323\0" + "\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\363\0\0\0\234\0\0\0P\0\0\0" + "9\0\0\0O\0\0\0\227\0\0\0\360\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\25\0\0\0\263\0\0\0\325\0\0\0\377\0\0\0\325\0\0\0\263\0\0" + "\0\25\0\0\0\0\0\0\0\0\0\0\0\0"}; /* GdkPixbuf RGBA C-Source image dump */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.52.1/gtk2/qtcurve.c new/QtCurve-Gtk2-0.52.3/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.52.1/gtk2/qtcurve.c 2007-06-20 23:05:56.000000000 +0200 +++ new/QtCurve-Gtk2-0.52.3/gtk2/qtcurve.c 2007-07-11 20:53:28.000000000 +0200 @@ -26,6 +26,7 @@ #include <string.h> #include <stdlib.h> #include <math.h> +#define QTC_COMMON_FUNCTIONS #include "qtcurve.h" #include "qt_settings.c" #include "animation.c" @@ -1866,7 +1867,7 @@ } } - if(flags&DF_DO_BORDER) + if(flags&DF_DO_BORDER && width>2 && height>2) drawBorder(style, window, state, area, region, x, y, width, height, bgnd, gcs, colors, round, borderProfile, widget, flags); @@ -2062,7 +2063,7 @@ #define QTC_GIMP_MAIN "GimpToolbox" /* Main GIMP toolbox */ #define QTC_GIMP_WINDOW "GimpDisplayShell" /* Image window */ -static void dialogSetTransient(GtkWidget *widget, gpointer user_data) +static GtkWidget * getParentWindow(GtkWidget *widget) { GtkWidget *top=NULL; GList *topWindows, @@ -2096,8 +2097,16 @@ } } + return top; +} + +static void dialogMapEvent(GtkWidget *widget, gpointer user_data) +{ + GtkWidget *top=getParentWindow(widget); + if(top) { + GTK_WINDOW(widget)->transient_parent=GTK_WINDOW(top); gdk_window_set_transient_for(widget->window, top->window); /*gtk_window_set_skip_taskbar_hint(GTK_WINDOW(widget), TRUE); gtk_window_set_skip_pager_hint(GTK_WINDOW(widget), TRUE); */ @@ -2113,9 +2122,30 @@ debugDisplayWidget(widget, 3); #endif -#define QTC_MODAL_HACK_NAME "--kgtk-modal-dialog-hack--" -#define QTC_MENU_HACK_NAME "--kgtk-menu-hack--" +#define QTC_MODAL_HACK_NAME "--kgtk-modal-dialog-hack--" +#define QTC_MENU_HACK_NAME "--kgtk-menu-hack--" +#if 0 +#define QTC_BUTTON_HACK_NAME "--kgtk-button-hack--" + +#if GTK_CHECK_VERSION(2, 6, 0) + if(opts.setDialogButtonOrder && GTK_IS_WINDOW(widget) && detail && 0==strcmp(detail, "base")) + { + GtkWidget *topLevel=gtk_widget_get_toplevel(widget); + + if(topLevel && GTK_IS_DIALOG(topLevel) && (!topLevel->name || 0==strcmp(topLevel->name, QTC_MODAL_HACK_NAME))) + { + gtk_dialog_set_alternative_button_order(GTK_DIALOG(topLevel), GTK_RESPONSE_HELP, + GTK_RESPONSE_OK, GTK_RESPONSE_YES, GTK_RESPONSE_ACCEPT, GTK_RESPONSE_APPLY, + GTK_RESPONSE_REJECT, GTK_RESPONSE_CLOSE, GTK_RESPONSE_NO, GTK_RESPONSE_CANCEL, -1); + if(!topLevel->name) + gtk_widget_set_name(topLevel, QTC_BUTTON_HACK_NAME); + else + gtk_widget_set_name(topLevel, QTC_BUTTON_HACK_NAME QTC_MODAL_HACK_NAME); + } + } +#endif +#endif if(widget && opts.fixParentlessDialogs && GTK_IS_WINDOW(widget) && detail && 0==strcmp(detail, "base")) { @@ -2136,22 +2166,34 @@ (GTK_APP_GIMP==qtSettings.app && strcmp(typename, QTC_GIMP_WINDOW) && strcmp(typename, QTC_GIMP_MAIN) ) ) && +#if 0 + (!topLevel->name || !strstr(topLevel->name, QTC_MODAL_HACK_NAME)) && +#else (!topLevel->name || strcmp(topLevel->name, QTC_MODAL_HACK_NAME)) && +#endif NULL==gtk_window_get_transient_for(GTK_WINDOW(topLevel))) { /* Give the widget a name so that we dont keep on performing this function... */ if(!topLevel->name) gtk_widget_set_name(topLevel, QTC_MODAL_HACK_NAME); - +#if 0 + else if(0==strcmp(topLevel->name, QTC_BUTTON_HACK_NAME)) + gtk_widget_set_name(topLevel, QTC_BUTTON_HACK_NAME QTC_MODAL_HACK_NAME); +#endif /* For non-modal dialogs we set the transient hint when the "map" event is received, this has the effect that the dialog is placed where it would've been without this hack, but it does not get a taskbar entry... This "fixes" gimp and its multitude of dialogs... */ if(!GTK_WINDOW(topLevel)->modal) - g_signal_connect(G_OBJECT(topLevel), "map", G_CALLBACK(dialogSetTransient), topLevel); + g_signal_connect(G_OBJECT(topLevel), "map", G_CALLBACK(dialogMapEvent), topLevel); else - dialogSetTransient(topLevel, NULL); + { + GtkWidget *top=getParentWindow(topLevel); + + if(top) + GTK_WINDOW(topLevel)->transient_parent=GTK_WINDOW(top); + } } } } @@ -2857,7 +2899,7 @@ GtkBorder indicator_spacing; int cx=x, cy=y, cheight=height, cwidth=width, ind_width=0, - darkLine=GTK_STATE_INSENSITIVE!=state ? QT_STD_BORDER : QT_DISABLED_BORDER; + darkLine=QT_BORDER(GTK_STATE_INSENSITIVE!=state); optionMenuGetProps(widget, &indicator_size, &indicator_spacing); @@ -2910,7 +2952,7 @@ { int vx=x+(width - (1 + (combo_entry ? 24 : 20))), vwidth=width-(vx-x), - darkLine=GTK_STATE_INSENSITIVE!=state ? QT_STD_BORDER : QT_DISABLED_BORDER; + darkLine=QT_BORDER(GTK_STATE_INSENSITIVE!=state); if(rev) { @@ -2966,7 +3008,7 @@ { gboolean pbar=GTK_IS_PROGRESS_BAR(widget), scale=!pbar && GTK_IS_SCALE(widget); - int border=GTK_STATE_INSENSITIVE!=state || !scale ? QT_STD_BORDER : QT_DISABLED_BORDER; + int border=QT_BORDER(GTK_STATE_INSENSITIVE!=state || !scale); GdkGC *bgnd=pbar ? qtcurveStyle->background_gc[ORIGINAL_SHADE] : qtcurveStyle->background_gc[2], *gcl =pbar ? qtcurveStyle->background_gc[0] : qtcurveStyle->background_gc[4]; GdkColor *bgndcol=&qtcurveStyle->background[2]; @@ -3013,6 +3055,8 @@ used_w=width; } + if(GTK_STATE_INSENSITIVE==state) + bgndcol=&qtcurveStyle->background[ORIGINAL_SHADE]; drawLightBevel(style, window, state, area, NULL, x, y, width, height, bgndcol, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, NULL, ROUNDED_ALL, WIDGET_SLIDER_TROUGH, @@ -3326,7 +3370,7 @@ GdkRectangle inner_rect={x+1, y+stripeOffset+animShift, width-2, PROGRESS_CHUNK_WIDTH}; - constrainRect(&inner_rect, area); + /*constrainRect(&inner_rect, area);*/ if(inner_rect.width>0 && inner_rect.height>0) { GdkRegion *inner_region=gdk_region_rectangle(&inner_rect); @@ -3372,13 +3416,24 @@ getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE, opts.menuitemAppearance), TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); else if(stdColors) - drawLightBevel(style, window, new_state, area, NULL, x, y, - width, height, &itemCols[ORIGINAL_SHADE], bgnd, - itemGcs, itemCols, - NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|(horiz ? 0 : DF_VERT)| - (border&&stdColors ? DF_DO_BORDER : 0)| - (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + { + if(pbar && (horizPbar ? width : height)<3) + { + if(area) + gdk_gc_set_clip_rectangle(itemGcs[ORIGINAL_SHADE], area); + gdk_draw_rectangle(window, itemGcs[ORIGINAL_SHADE], TRUE, x, y, width, height); + if(area) + gdk_gc_set_clip_rectangle(itemGcs[ORIGINAL_SHADE], NULL); + } + else + drawLightBevel(style, window, new_state, area, NULL, x, y, + width, height, &itemCols[ORIGINAL_SHADE], bgnd, + itemGcs, itemCols, + NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, + DF_LARGE_ARC|DF_DRAW_INSIDE|(horiz ? 0 : DF_VERT)| + (border&&stdColors ? DF_DO_BORDER : 0)| + (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + } else { if(width>2 && height>2) @@ -3392,8 +3447,7 @@ itemGcs, itemCols, round, BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 0); } - - if(pbar && opts.stripedProgress) + if(pbar && opts.stripedProgress && width>4 && height>4) drawLightBevel(style, window, new_state, NULL, region, x, y, width, height, &qtcurveStyle->menuitem[1], NULL, qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, @@ -3401,7 +3455,7 @@ DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|(horiz ? 0 : DF_VERT)| (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); - if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round) + if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round && width>4 && height>4) { midgc=QTC_SET_MID_COLOR(&qtcurveStyle->menuitem[2], &qtcurveStyle->background[ORIGINAL_SHADE]) @@ -3419,7 +3473,6 @@ if(!(round&CORNER_BL)) gdk_draw_point(window, midgc, x, y+height-1); } - if(area) gdk_gc_set_clip_rectangle(style->base_gc[state], NULL); @@ -3636,8 +3689,10 @@ FN_CHECK +/* gtk_style_apply_default_background(style, window, widget && !GTK_WIDGET_NO_WINDOW(widget), state, area, x, y, width, height); +*/ sanitizeSize(window, &width, &height); if(GTK_SHADOW_NONE!=shadow_type) Files old/QtCurve-Gtk2-0.52.1/gtk2/slider.png and new/QtCurve-Gtk2-0.52.3/gtk2/slider.png differ Files old/QtCurve-Gtk2-0.52.1/gtk2/slider_v.png and new/QtCurve-Gtk2-0.52.3/gtk2/slider_v.png differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org