Hello community,
here is the log from the commit of package qtcurve-gtk2
checked in at Sun Oct 15 13:17:41 CEST 2006.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-10-12 10:49:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-10-15 09:51:02.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Oct 15 09:50:45 CEST 2006 - stbinner@suse.de
+
+- update to 0.44.2:
+ * Restore 0.43 scrollbar trough shade.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-0.44.1.tar.gz
New:
----
QtCurve-Gtk2-0.44.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.xFvVs5/_old 2006-10-15 13:17:30.000000000 +0200
+++ /var/tmp/diff_new_pack.xFvVs5/_new 2006-10-15 13:17:30.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.44.1)
+# spec file for package qtcurve-gtk2 (Version 0.44.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
License: GPL
Group: System/GUI/KDE
Summary: QtCurve style for KDE
-Version: 0.44.1
+Version: 0.44.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-Gtk2-%{version}.tar.gz
@@ -60,6 +60,9 @@
/opt/gnome/share/themes/QtCurve
%changelog -n qtcurve-gtk2
+* Sun Oct 15 2006 - stbinner@suse.de
+- update to 0.44.2:
+ * Restore 0.43 scrollbar trough shade.
* Thu Oct 12 2006 - stbinner@suse.de
- reduce build requires
- recommend qtcurve-kde
++++++ QtCurve-Gtk2-0.44.1.tar.gz -> QtCurve-Gtk2-0.44.2.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.1/ChangeLog new/QtCurve-Gtk2-0.44.2/ChangeLog
--- old/QtCurve-Gtk2-0.44.1/ChangeLog 2006-10-10 23:46:56.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.2/ChangeLog 2006-10-12 09:42:36.000000000 +0200
@@ -1,3 +1,7 @@
+0.44.2
+------
+1. Restore 0.43 scrollbar trough shade.
+
0.44.1
------
1. Fix appearance of filled sliders.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.1/configure new/QtCurve-Gtk2-0.44.2/configure
--- old/QtCurve-Gtk2-0.44.1/configure 2006-10-10 23:03:52.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.2/configure 2006-10-12 10:13:48.000000000 +0200
@@ -1485,7 +1485,7 @@
PACKAGE=QtCurve-Gtk2
-VERSION=0.44.1
+VERSION=0.44.2
AUTOMAKE_OPTIONS=no-dependencies
am__api_version="1.9"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.1/configure.in new/QtCurve-Gtk2-0.44.2/configure.in
--- old/QtCurve-Gtk2-0.44.1/configure.in 2006-10-10 23:03:36.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.2/configure.in 2006-10-12 09:42:48.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(README)
PACKAGE=QtCurve-Gtk2
-VERSION=0.44.1
+VERSION=0.44.2
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.44.1/gtk2/common.h new/QtCurve-Gtk2-0.44.2/gtk2/common.h
--- old/QtCurve-Gtk2-0.44.1/gtk2/common.h 2006-10-09 21:24:49.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.2/gtk2/common.h 2006-10-12 11:41:52.000000000 +0200
@@ -46,6 +46,15 @@
#include
#endif
+#ifdef __cplusplus
+typedef QColor color;
+#else
+typedef gboolean bool;
+typedef GdkColor color;
+#define true TRUE
+#define false FALSE
+#endif
+
#define QTC_GROUP "Settings"
#define QTC_DESCR_GROUP "Description"
@@ -174,7 +183,9 @@
WIDGET_DEF_BUTTON,
WIDGET_LISTVIEW_HEADER,
WIDGET_SLIDER,
+ WIDGET_SLIDER_TROUGH,
WIDGET_SB_SLIDER,
+ WIDGET_SB_TROUGH,
WIDGET_CHECKBOX,
WIDGET_TOGGLE_BUTTON,
WIDGET_MENU_ITEM,
@@ -183,6 +194,30 @@
#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)
+{
+ switch(w)
+ {
+ case WIDGET_MENU_ITEM:
+ return light ? SHADE_BEVEL_MENU_ITEM_LIGHT : SHADE_BEVEL_MENU_ITEM_DARK;
+ case WIDGET_SB_TROUGH:
+ return light ? SHADE_SBAR_LIGHT : SHADE_SBAR_DARK;
+ case WIDGET_SLIDER_TROUGH:
+ return light ? SHADE_SLIDER_LIGHT : SHADE_SLIDER_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,
@@ -312,15 +347,6 @@
/*#define DEF_MENU_SHADE_STR "darken"*/
-#ifdef __cplusplus
-typedef QColor color;
-#else
-typedef gboolean bool;
-typedef GdkColor color;
-#define true TRUE
-#define false FALSE
-#endif
-
#ifndef QTC_COMMON_NO_FUNCTIONS
#ifndef QTC_COMMON_ONLY_COVERTERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.1/gtk2/qtcurve.c new/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.c
--- old/QtCurve-Gtk2-0.44.1/gtk2/qtcurve.c 2006-10-11 13:15:48.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.c 2006-10-12 11:40:48.000000000 +0200
@@ -58,7 +58,7 @@
#define GTK_IS_COMBO_BOX(x) 0
#endif
-#define SCALE_SIZE 5
+#define SLIDER_TROUGH_SIZE 6
#define LARGE_ARR_WIDTH 7
#define LARGE_ARR_HEIGHT (opts.vArrow ? 5 : 4)
#define SMALL_ARR_WIDTH 5
@@ -1712,12 +1712,7 @@
}
if(flags&DF_DO_FILL)
drawBevelGradient(style, window, area, region, bx, by, bw, bh, base,
- WIDGET_MENU_ITEM==widget
- ? SHADE_BEVEL_MENU_ITEM_LIGHT
- : sunken ? SHADE_BEVEL_GRAD_SEL_LIGHT : SHADE_BEVEL_GRAD_LIGHT,
- WIDGET_MENU_ITEM==widget
- ? SHADE_BEVEL_MENU_ITEM_DARK
- : sunken ? SHADE_BEVEL_GRAD_SEL_DARK : SHADE_BEVEL_GRAD_DARK,
+ getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
!(flags&DF_VERT), !sunken, sunken, opts.appearance,
widget);
@@ -2718,15 +2713,15 @@
if(horiz)
{
- y +=(height - SCALE_SIZE)>>1;
- height = SCALE_SIZE;
+ y +=(height - SLIDER_TROUGH_SIZE)>>1;
+ height = SLIDER_TROUGH_SIZE;
rest_y=used_y=y;
rest_h=used_h=height;
}
else
{
- x +=(width - SCALE_SIZE)>>1;
- width = SCALE_SIZE;
+ x +=(width - SLIDER_TROUGH_SIZE)>>1;
+ width = SLIDER_TROUGH_SIZE;
rest_x=used_x=x;
rest_w=used_w=width;
}
@@ -2760,8 +2755,6 @@
rest_y+=pos;
}
- used_x++; used_y++; used_h-=2; used_w-=2;
-
if(used_w>0 && used_h>0)
{
GdkGC *usedgc=SHADE_NONE!=opts.shadeSliders
@@ -2781,34 +2774,25 @@
GdkColor *usedcol=SHADE_NONE!=opts.shadeSliders
? &qtcurveStyle.slider[ORIGINAL_SHADE]
: &qtcurveStyle.menuitem[2];
- drawBevelGradient(style, window, area, NULL, used_x,
- used_y, used_w, used_h, usedcol, SHADE_SLIDER_LIGHT,
- SHADE_SLIDER_DARK, horiz, FALSE, FALSE, APPEARANCE_GRADIENT,
- WIDGET_OTHER);
+
+ drawLightBevel(style, window, state, area, NULL, used_x, used_y, used_w, used_h,
+ usedcol, qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
+ ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
+ BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
+ (horiz ? 0 : DF_VERT));
}
}
}
- rest_x++; rest_y++; rest_h-=2; rest_w-=2;
-
if(rest_w>0 && rest_h>0)
if(APPEARANCE_FLAT==opts.appearance)
gdk_draw_rectangle(window, bgnd, TRUE, rest_x, rest_y, rest_w, rest_h);
else
- drawBevelGradient(style, window, area, NULL, rest_x,
- rest_y, rest_w, rest_h, bgndcol, SHADE_SLIDER_LIGHT,
- SHADE_SLIDER_DARK, horiz, FALSE, FALSE, APPEARANCE_GRADIENT,
- WIDGET_OTHER);
- gdk_draw_rectangle(window, gcd, FALSE, x, y, width - 1, height - 1);
-
- if(QTC_ROUNDED)
- {
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[state])
- gdk_draw_point(window, midgc, x, y);
- gdk_draw_point(window, midgc, x+width-1, y);
- gdk_draw_point(window, midgc, x+width-1, y+height-1);
- gdk_draw_point(window, midgc, x, y+height-1);
- }
+ drawLightBevel(style, window, state, area, NULL, rest_x, rest_y, rest_w, rest_h,
+ bgndcol, qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
+ ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
+ BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
+ (horiz ? 0 : DF_VERT));
}
else if(GTK_IS_PROGRESS_BAR(widget))
{
@@ -2864,7 +2848,7 @@
drawLightBevel(style, window, state, area, NULL, x, y, width, height,
&qtcurveStyle.gray[2], qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
- sbarRound, WIDGET_OTHER,
+ sbarRound, WIDGET_SB_TROUGH,
BORDER_FLAT, DF_LARGE_ARC|DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org