Mailinglist Archive: opensuse-commit (1670 mails)
| < Previous | Next > |
commit qtcurve-gtk2
- From: root@xxxxxxx (h_root)
- Date: Fri, 20 Oct 2006 12:48:58 +0200 (CEST)
- Message-id: <20061020104858.CCFD6847EE@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package qtcurve-gtk2
checked in at Fri Oct 20 12:48:58 CEST 2006.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-10-15 09:51:02.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2006-10-20 11:15:54.000000000 +0200
@@ -1,0 +2,9 @@
+Fri Oct 20 11:15:26 CEST 2006 - stbinner@xxxxxxx
+
+- update to 0.44.3:
+ * Dont colour sliders when disabled/maxed-out.
+ * When drawing light slider border, draw around all 4 sides.
+ * Fix Firefox 2.x toolbar buttons.
+ * Evolution fix
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-0.44.2.tar.gz
New:
----
QtCurve-Gtk2-0.44.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.yXy0BH/_old 2006-10-20 12:48:51.000000000 +0200
+++ /var/tmp/diff_new_pack.yXy0BH/_new 2006-10-20 12:48:51.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.44.2)
+# spec file for package qtcurve-gtk2 (Version 0.44.3)
#
# Copyright (c) 2006 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
URL: http://www.kde-look.org/content/show.php?content=40492
-License: GPL
+License: Other License(s), see package
Group: System/GUI/KDE
Summary: QtCurve style for KDE
-Version: 0.44.2
+Version: 0.44.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-Gtk2-%{version}.tar.gz
@@ -60,6 +60,12 @@
/opt/gnome/share/themes/QtCurve
%changelog -n qtcurve-gtk2
+* Fri Oct 20 2006 - stbinner@xxxxxxx
+- update to 0.44.3:
+ * Dont colour sliders when disabled/maxed-out.
+ * When drawing light slider border, draw around all 4 sides.
+ * Fix Firefox 2.x toolbar buttons.
+ * Evolution fix
* Sun Oct 15 2006 - stbinner@xxxxxxx
- update to 0.44.2:
* Restore 0.43 scrollbar trough shade.
++++++ QtCurve-Gtk2-0.44.2.tar.gz -> QtCurve-Gtk2-0.44.3.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/ChangeLog new/QtCurve-Gtk2-0.44.3/ChangeLog
--- old/QtCurve-Gtk2-0.44.2/ChangeLog 2006-10-12 09:42:36.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/ChangeLog 2006-10-19 21:31:56.000000000 +0200
@@ -1,3 +1,10 @@
+0.44.3
+------
+1. Dont colour sliders when disabled/maxed-out.
+2. When drawing light slider border, draw around all 4 sides.
+3. Fix Firefox 2.x toolbar buttons.
+4. Evolution fix - thanks to Thomas Siegmund
+
0.44.2
------
1. Restore 0.43 scrollbar trough shade.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/configure new/QtCurve-Gtk2-0.44.3/configure
--- old/QtCurve-Gtk2-0.44.2/configure 2006-10-12 10:13:48.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/configure 2006-10-19 21:39:13.000000000 +0200
@@ -1485,7 +1485,7 @@
PACKAGE=QtCurve-Gtk2
-VERSION=0.44.2
+VERSION=0.44.3
AUTOMAKE_OPTIONS=no-dependencies
am__api_version="1.9"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/configure.in new/QtCurve-Gtk2-0.44.3/configure.in
--- old/QtCurve-Gtk2-0.44.2/configure.in 2006-10-12 09:42:48.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/configure.in 2006-10-19 21:31:56.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(README)
PACKAGE=QtCurve-Gtk2
-VERSION=0.44.2
+VERSION=0.44.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.44.2/gtk2/Makefile.am new/QtCurve-Gtk2-0.44.3/gtk2/Makefile.am
--- old/QtCurve-Gtk2-0.44.2/gtk2/Makefile.am 2006-09-24 23:04:55.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/Makefile.am 2006-10-19 21:31:56.000000000 +0200
@@ -31,7 +31,7 @@
if build_icons
gtkrc: gtkrc-top icons create_gtkrc.pl
- cat gtkrc-top > gtkrc && perl create_gtkrc.pl $(KDE_PREFIX)/share/icons >> gtkrc
+ echo "# Version $(VERSION)" > gtkrc && cat gtkrc-top >> gtkrc && perl create_gtkrc.pl $(KDE_PREFIX)/share/icons >> gtkrc
else
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/gtk2/Makefile.in new/QtCurve-Gtk2-0.44.3/gtk2/Makefile.in
--- old/QtCurve-Gtk2-0.44.2/gtk2/Makefile.in 2006-10-12 10:17:54.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/Makefile.in 2006-10-19 21:39:12.000000000 +0200
@@ -520,7 +520,7 @@
qtcurve.lo: pixmaps.h
@build_icons_TRUE@gtkrc: gtkrc-top icons create_gtkrc.pl
-@build_icons_TRUE@ cat gtkrc-top > gtkrc && perl create_gtkrc.pl $(KDE_PREFIX)/share/icons >> gtkrc
+@build_icons_TRUE@ echo "# Version $(VERSION)" > gtkrc && cat gtkrc-top >> gtkrc && perl create_gtkrc.pl $(KDE_PREFIX)/share/icons >> gtkrc
@build_icons_FALSE@gtkrc: gtkrc-top
@build_icons_FALSE@ cat gtkrc-top > gtkrc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/gtk2/QtCurve.css.in new/QtCurve-Gtk2-0.44.3/gtk2/QtCurve.css.in
--- old/QtCurve-Gtk2-0.44.2/gtk2/QtCurve.css.in 2006-04-15 00:42:58.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/QtCurve.css.in 2006-10-19 21:31:56.000000000 +0200
@@ -41,6 +41,10 @@
}
/* Buttons */
+/* The following are commented-out, becuase they cause errors with FireFox 2.x :-( To re-eanble,
+ delete all lines with COMMENT_OUT on */
+
+/* COMMENT_OUT
button label,
button image,
toolbarbutton label,
@@ -67,3 +71,4 @@
padding-bottom: 0px;
}
+COMMENT_OUT */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/gtk2/common.h new/QtCurve-Gtk2-0.44.3/gtk2/common.h
--- old/QtCurve-Gtk2-0.44.2/gtk2/common.h 2006-10-12 11:41:52.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/common.h 2006-10-19 21:31:16.000000000 +0200
@@ -39,6 +39,7 @@
#ifdef __cplusplus
#include <qstring.h>
#include <qsettings.h>
+#include <qconfig.h>
#ifdef QTC_CONFIG_DIALOG
#include <qapplication.h>
#endif
@@ -63,7 +64,7 @@
#define QTC_MIN_BTN_SIZE 8
#define QTC_LV_SIZE(X) LV_EXP_ARR==(X) ? 7 : 5
-#define NUM_STD_SHADES 7
+#define NUM_STD_SHADES 6
#define NUM_EXTRA_SHADES 3
#define TOTAL_SHADES NUM_STD_SHADES+NUM_EXTRA_SHADES
@@ -77,17 +78,17 @@
#define QTC_SHADES \
static const double shades[11][NUM_STD_SHADES]=\
{ \
- { 1.08, 1.03, 0.91, 0.780, 0.832, 0.74, 1.8 }, \
- { 1.09, 1.03, 0.91, 0.781, 0.833, 0.72, 1.8 }, \
- { 1.10, 1.03, 0.91, 0.782, 0.834, 0.70, 1.8 }, \
- { 1.11, 1.04, 0.91, 0.783, 0.835, 0.68, 1.8 }, \
- { 1.12, 1.04, 0.91, 0.784, 0.836, 0.66, 1.8 }, \
- { 1.13, 1.05, 0.91, 0.785, 0.838, 0.64, 1.8 }, \
- { 1.14, 1.05, 0.91, 0.786, 0.840, 0.62, 1.8 }, \
- { 1.15, 1.06, 0.91, 0.787, 0.842, 0.60, 1.8 }, /* default */ \
- { 1.17, 1.06, 0.91, 0.788, 0.844, 0.45, 1.8 }, \
- { 1.19, 1.07, 0.91, 0.789, 0.846, 0.40, 1.8 }, \
- { 1.21, 1.07, 0.91, 0.790, 0.848, 0.35, 1.8 } \
+ { 1.08, 1.03, 0.91, 0.780, 0.832, 0.74 }, \
+ { 1.09, 1.03, 0.91, 0.781, 0.833, 0.72 }, \
+ { 1.10, 1.03, 0.91, 0.782, 0.834, 0.70 }, \
+ { 1.11, 1.04, 0.91, 0.783, 0.835, 0.68 }, \
+ { 1.12, 1.04, 0.91, 0.784, 0.836, 0.66 }, \
+ { 1.13, 1.05, 0.91, 0.785, 0.838, 0.64 }, \
+ { 1.14, 1.05, 0.91, 0.786, 0.840, 0.62 }, \
+ { 1.15, 1.06, 0.91, 0.787, 0.842, 0.60 }, /* default */ \
+ { 1.17, 1.06, 0.91, 0.788, 0.844, 0.45 }, \
+ { 1.19, 1.07, 0.91, 0.789, 0.846, 0.40 }, \
+ { 1.21, 1.07, 0.91, 0.790, 0.848, 0.35 } \
};
#define QTC_SHADE(c, s) \
@@ -512,7 +513,7 @@
int source=(int)data[offset+column+1];
#if defined __cplusplus
-#ifdef WORDS_BIGENDIAN
+#if Q_BYTE_ORDER == Q_BIG_ENDIAN
/* ARGB */
data[offset+column+1] = checkBounds(r-source);
data[offset+column+2] = checkBounds(g-source);
@@ -637,3 +638,4 @@
#endif
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.c new/QtCurve-Gtk2-0.44.3/gtk2/qtcurve.c
--- old/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.c 2006-10-12 11:40:48.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/qtcurve.c 2006-10-19 21:31:56.000000000 +0200
@@ -731,10 +731,9 @@
: NULL;
}
-#if !GTK_CHECK_VERSION(2, 10, 0)
static void setState(GtkWidget *widget, GtkStateType *state, gboolean *btn_down, int x, int y)
{
- if(GTK_APP_MOZILLA!=qtSettings.app && (GTK_STATE_ACTIVE==*state || GTK_STATE_PRELIGHT==*state))
+ if(GTK_APP_MOZILLA!=qtSettings.app && GTK_STATE_INSENSITIVE!=*state)
{
GtkRange *range=GTK_RANGE(widget);
@@ -778,22 +777,24 @@
if(range->slider_end+rightBtns==max)
disableRight=TRUE;
- if(disableLeft || disableRight)
- {
- EStepper s=getStepper(widget, x, y);
-
- if( (disableLeft && (QTC_STEPPER_A==s || QTC_STEPPER_C==s)) ||
- (disableRight && (QTC_STEPPER_B==s || QTC_STEPPER_D==s)) )
+ if(disableLeft && disableRight)
+ *state=GTK_STATE_INSENSITIVE;
+ else
+ if(disableLeft || disableRight)
{
- *state=GTK_STATE_NORMAL;
- if(btn_down)
- *btn_down=FALSE;
+ EStepper s=getStepper(widget, x, y);
+
+ if( (disableLeft && (QTC_STEPPER_A==s || QTC_STEPPER_C==s)) ||
+ (disableRight && (QTC_STEPPER_B==s || QTC_STEPPER_D==s)) )
+ {
+ *state=GTK_STATE_NORMAL;
+ if(btn_down)
+ *btn_down=FALSE;
+ }
}
- }
}
}
}
-#endif
static void drawBgnd(GdkWindow *window, GdkGC *gc, GtkWidget *widget,
GdkRectangle *area, int x, int y, int width, int height)
@@ -1518,10 +1519,10 @@
{
gboolean useText=WIDGET_DEF_BUTTON==widget && IND_FONT_COLOR==opts.defBtnIndicator &&
GTK_STATE_INSENSITIVE!=state;
- GdkColor *colors=c_colors ? c_colors : qtcurveStyle.gray,
+ GdkColor *colors=c_colors ? c_colors : qtcurveStyle.background,
*border_col= useText ? &style->text[GTK_STATE_NORMAL] : &colors[5];
GdkGC *midgc=NULL,
- **gcs=c_gcs ? c_gcs : qtcurveStyle.gray_gc,
+ **gcs=c_gcs ? c_gcs : qtcurveStyle.background_gc,
*border_gc=useText ? style->text_gc[GTK_STATE_NORMAL] : gcs[5];
if(area || region)
@@ -1719,6 +1720,7 @@
if(lightBorder)
{
setClipping(gcs[0], area, region);
+/*
gdk_draw_line(window, gcs[0], (x+1)+(width-2)-1, (y+1), (x+1)+(width-2)-1, (y+1)+(height-2)-1);
gdk_draw_line(window, gcs[0], (x+1), (y+1)+(height-2)-1, (x+1)+(width-2)-1, (y+1)+(height-2)-1);
@@ -1726,6 +1728,8 @@
gdk_draw_line(window, gcs[0], (x+1), (y+1), (x+1)+(width-2)-1, (y+1));
else
gdk_draw_line(window, gcs[0], (x+1), (y+1), (x+1), (y+1)+(height-2)-1);
+*/
+ gdk_draw_rectangle(window, gcs[0], FALSE, x+1, y+1, width-3, height-3);
unsetClipping(gcs[0], area, region);
}
@@ -1762,7 +1766,7 @@
for(i=1; i<space; i+=step)
gdk_draw_line(window, gc2, x+offset+displacement, y+i, x2-offset, y+i);
- }
+ }
else
{
for(i=0; i<space; i+=step)
@@ -1843,12 +1847,12 @@
GtkWidget *widget, GdkRectangle *area, gint x, gint y, gint width,
gint height, int round)
{
- gboolean highlight= opts.highlightEdits && GTK_WIDGET_HAS_FOCUS(widget);
- GdkGC **gcs=highlight ? qtcurveStyle.menuitem_gc : qtcurveStyle.gray_gc,
+ gboolean highlight=widget && opts.highlightEdits && GTK_WIDGET_HAS_FOCUS(widget);
+ GdkGC **gcs=highlight ? qtcurveStyle.menuitem_gc : qtcurveStyle.background_gc,
*bgnd_gc=style->bg_gc[state],
*gc=NULL,
*midgc=NULL;
- GdkColor *colors=highlight ? qtcurveStyle.menuitem : qtcurveStyle.gray;
+ GdkColor *colors=highlight ? qtcurveStyle.menuitem : qtcurveStyle.background;
#ifdef QTC_DEBUG
printf("Draw entry_field %d %d %d %d %d %d ", state, x, y, width, height, round);
@@ -1868,7 +1872,7 @@
gdk_draw_line(window, midgc, x+1, y+1, x+1, y+height-2);
gdk_draw_line(window, midgc, x+1, y+1, x+width-1, y+1);
- if(GTK_STATE_INSENSITIVE==state || !GTK_WIDGET_IS_SENSITIVE(widget))
+ if(GTK_STATE_INSENSITIVE==state || (widget && !GTK_WIDGET_IS_SENSITIVE(widget)))
gc=style->bg_gc[state];
else
{
@@ -2010,7 +2014,7 @@
{
GdkGC **gcs=opts.coloredMouseOver && GTK_STATE_PRELIGHT==state
? qtcurveStyle.mouseover_gc
- : qtcurveStyle.gray_gc;
+ : qtcurveStyle.background_gc;
gtkDrawFlatBox(style, window, state, shadow_type, area, widget, QTC_PANED, x, y, width,
height);
@@ -2072,7 +2076,7 @@
opts.coloredMouseOver && handleHash && *handleHash
? qtcurveStyle.mouseover_gc :
#endif
- qtcurveStyle.gray_gc;
+ qtcurveStyle.background_gc;
switch(opts.handles)
{
@@ -2217,13 +2221,17 @@
gboolean sbar=detail && ( 0==strcmp(detail, "hscrollbar") || 0==strcmp(detail, "vscrollbar") ||
0==strcmp(detail, "stepper"));
+/*
#if GTK_CHECK_VERSION(2, 10, 0)
if(sbar && GTK_STATE_INSENSITIVE==state)
state=GTK_STATE_NORMAL;
#else
+*/
if(GTK_IS_RANGE(widget))
setState(widget, &state, NULL, x, y);
+/*
#endif
+*/
sanitizeSize(window, &width, &height);
if(isSpinButton)
@@ -2272,13 +2280,17 @@
gboolean sbar=detail && ( 0==strcmp(detail, "hscrollbar") || 0==strcmp(detail, "vscrollbar") ||
0==strcmp(detail, "stepper"));
+/*
#if GTK_CHECK_VERSION(2, 10, 0)
if(GTK_STATE_INSENSITIVE==state && sbar)
state=GTK_STATE_NORMAL;
#else
+*/
if(GTK_IS_RANGE(widget))
setState(widget, &state, &btn_down, x, y);
+/*
#endif
+*/
{
gboolean custom_c = FALSE,
@@ -2322,7 +2334,12 @@
sanitizeSize(window, &width, &height);
if(useButtonColor(detail))
- if(QT_CUSTOM_COLOR_BUTTON(style))
+ if(slider|hscale|vscale && GTK_STATE_INSENSITIVE==state)
+ {
+ btn_gcs=qtcurveStyle.background_gc;
+ btn_colors=qtcurveStyle.background;
+ }
+ else if(QT_CUSTOM_COLOR_BUTTON(style))
{
custom_c=TRUE;
shadeColors(&(style->bg[state]), new_cols);
@@ -2514,22 +2531,22 @@
if(GTK_APP_MOZILLA!=qtSettings.app && slider && SCROLLBAR_NONE==opts.scrollbarType &&
ROUND_FULL==opts.round)
{
- setClipping(qtcurveStyle.gray_gc[5], area, NULL);
+ setClipping(qtcurveStyle.background_gc[5], area, NULL);
if(horiz)
{
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+1, y);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+1, y+height-1);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+width-2, y);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+width-2, y+height-1);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+1, y);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+1, y+height-1);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+width-2, y);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+width-2, y+height-1);
}
else
{
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x, y+1);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+width-1, y+1);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x, y+height-2);
- gdk_draw_point(window, qtcurveStyle.gray_gc[5], x+width-1, y+height-2);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x, y+1);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+width-1, y+1);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x, y+height-2);
+ gdk_draw_point(window, qtcurveStyle.background_gc[5], x+width-1, y+height-2);
}
- unsetClipping(qtcurveStyle.gray_gc[5], area, NULL);
+ unsetClipping(qtcurveStyle.background_gc[5], area, NULL);
}
}
@@ -2677,10 +2694,10 @@
else if(widget && DETAIL("trough"))
{
gboolean pbar=GTK_IS_PROGRESS_BAR(widget);
- GdkGC *bgnd=pbar ? qtcurveStyle.gray_gc[ORIGINAL_SHADE] : qtcurveStyle.gray_gc[2],
- *gcl =pbar ? qtcurveStyle.gray_gc[0] : qtcurveStyle.gray_gc[4],
- *gcd =/*pbar ? qtcurveStyle.gray_gc[5] : */qtcurveStyle.gray_gc[5];
- GdkColor *bgndcol=&qtcurveStyle.gray[2];
+ GdkGC *bgnd=pbar ? qtcurveStyle.background_gc[ORIGINAL_SHADE] : qtcurveStyle.background_gc[2],
+ *gcl =pbar ? qtcurveStyle.background_gc[0] : qtcurveStyle.background_gc[4],
+ *gcd =/*pbar ? qtcurveStyle.background_gc[5] : */qtcurveStyle.background_gc[5];
+ GdkColor *bgndcol=&qtcurveStyle.background[2];
gboolean horiz=GTK_IS_RANGE(widget)
? GTK_ORIENTATION_HORIZONTAL==GTK_RANGE(widget)->orientation
: width>height;
@@ -2776,7 +2793,7 @@
: &qtcurveStyle.menuitem[2];
drawLightBevel(style, window, state, area, NULL, used_x, used_y, used_w, used_h,
- usedcol, qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
+ usedcol, qtcurveStyle.background_gc, qtcurveStyle.background, NULL,
ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
@@ -2789,7 +2806,7 @@
gdk_draw_rectangle(window, bgnd, TRUE, rest_x, rest_y, rest_w, rest_h);
else
drawLightBevel(style, window, state, area, NULL, rest_x, rest_y, rest_w, rest_h,
- bgndcol, qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
+ bgndcol, qtcurveStyle.background_gc, qtcurveStyle.background, NULL,
ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
@@ -2847,7 +2864,7 @@
}
drawLightBevel(style, window, state, area, NULL, x, y, width, height,
- &qtcurveStyle.gray[2], qtcurveStyle.gray_gc, qtcurveStyle.gray, NULL,
+ &qtcurveStyle.background[2], qtcurveStyle.background_gc, qtcurveStyle.background, NULL,
sbarRound, WIDGET_SB_TROUGH,
BORDER_FLAT, DF_LARGE_ARC|DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
@@ -2937,7 +2954,7 @@
right=FALSE;
int border=TB_DARK==opts.toolbarBorders ? 5 : 3;
GdkGC **gcs=menubar && USE_SHADED_MENU_BAR_COLORS
- ? qtcurveStyle.menubar_gc : qtcurveStyle.gray_gc;
+ ? qtcurveStyle.menubar_gc : qtcurveStyle.background_gc;
if(area)
{
@@ -3101,7 +3118,7 @@
if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round)
{
midgc=QTC_SET_MID_COLOR(&qtcurveStyle.menuitem[2],
- &qtcurveStyle.gray[ORIGINAL_SHADE])
+ &qtcurveStyle.background[ORIGINAL_SHADE])
/*if(GTK_APP_MOZILLA!=qt_settings.app)
{
@@ -3149,10 +3166,10 @@
{
drawAreaMod(style, window, state, area, NULL, POPUPMENU_LIGHT_FACTOR, x, y, width, height);
if(area)
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], area);
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[5], FALSE, x, y, width-1, height-1);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], area);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[5], FALSE, x, y, width-1, height-1);
if(area)
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], NULL);
}
else if(detail &&(!strcmp(detail, "paned") || !strcmp(detail+1, "paned")))
{
@@ -3170,22 +3187,22 @@
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[0], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[0], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], area);
gdk_gc_set_clip_rectangle(style->bg_gc[state], area);
}
gdk_draw_rectangle(window, style->bg_gc[state], TRUE, x, y, width-1, height-1);
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[5], FALSE, x, y, width-1, height-1);
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], x+1, y+1, x+width-3, y+1);
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], x+1, y+1, x+1, y+height-3);
- gdk_draw_line(window, qtcurveStyle.gray_gc[dark], x+1, y+height-2, x+width-2, y+height-2);
- gdk_draw_line(window, qtcurveStyle.gray_gc[dark], x+width-2, y+1, x+width-2, y+height-2);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[5], FALSE, x, y, width-1, height-1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], x+1, y+1, x+width-3, y+1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], x+1, y+1, x+1, y+height-3);
+ gdk_draw_line(window, qtcurveStyle.background_gc[dark], x+1, y+height-2, x+width-2, y+height-2);
+ gdk_draw_line(window, qtcurveStyle.background_gc[dark], x+width-2, y+1, x+width-2, y+height-2);
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[0], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[0], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], NULL);
gdk_gc_set_clip_rectangle(style->bg_gc[state], NULL);
}
}
@@ -3235,7 +3252,7 @@
{
if(GTK_SHADOW_NONE!=shadow_type &&
(!frame || opts.drawStatusBarFrames || GTK_APP_MOZILLA!=qtSettings.app))
- drawBorder(style, window, state, area, NULL, x, y, width, height, NULL, /*&(qtcurveStyle.gray[5]),*/
+ drawBorder(style, window, state, area, NULL, x, y, width, height, NULL,
NULL, NULL, ROUNDED_ALL, profiledFrame ? BORDER_SUNKEN : BORDER_FLAT,
WIDGET_OTHER, DF_LARGE_ARC|DF_BLEND|DF_DO_CORNERS);
}
@@ -3250,13 +3267,13 @@
return;
case GTK_SHADOW_IN:
case GTK_SHADOW_ETCHED_IN:
- gc1 = qtcurveStyle.gray_gc[0];
- gc2 = qtcurveStyle.gray_gc[5];
+ gc1 = qtcurveStyle.background_gc[0];
+ gc2 = qtcurveStyle.background_gc[5];
break;
case GTK_SHADOW_OUT:
case GTK_SHADOW_ETCHED_OUT:
- gc1 = qtcurveStyle.gray_gc[5];
- gc2 = qtcurveStyle.gray_gc[0];
+ gc1 = qtcurveStyle.background_gc[5];
+ gc2 = qtcurveStyle.background_gc[0];
break;
}
@@ -3315,9 +3332,9 @@
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[0], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[0], area);
}
switch(shadow_type)
@@ -3325,36 +3342,36 @@
case GTK_SHADOW_NONE:
return;
case GTK_SHADOW_ETCHED_IN:
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[0], FALSE, x+1, y+1, width-2, height-2);
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[5], FALSE, x, y, width-2, height-2);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[0], FALSE, x+1, y+1, width-2, height-2);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[5], FALSE, x, y, width-2, height-2);
break;
case GTK_SHADOW_ETCHED_OUT:
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[0], FALSE, x, y, width-2, height-2);
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[5], FALSE, x+1, y+1, width-2, height-2);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[0], FALSE, x, y, width-2, height-2);
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[5], FALSE, x+1, y+1, width-2, height-2);
break;
case GTK_SHADOW_IN:
case GTK_SHADOW_OUT:
- gdk_draw_rectangle(window, qtcurveStyle.gray_gc[5], FALSE, x, y, width-1, height-1);
- gdk_draw_line(window, qtcurveStyle.gray_gc[GTK_SHADOW_ETCHED_IN==shadow_type
+ gdk_draw_rectangle(window, qtcurveStyle.background_gc[5], FALSE, x, y, width-1, height-1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[GTK_SHADOW_ETCHED_IN==shadow_type
? dark : 0],
x+1, y+1, x+1, y+height-2);
- gdk_draw_line(window, qtcurveStyle.gray_gc[GTK_SHADOW_ETCHED_IN==shadow_type
+ gdk_draw_line(window, qtcurveStyle.background_gc[GTK_SHADOW_ETCHED_IN==shadow_type
? dark : 0],
x+1, y+1, x+width-2, y+1);
- gdk_draw_line(window, qtcurveStyle.gray_gc[GTK_SHADOW_ETCHED_IN==shadow_type
+ gdk_draw_line(window, qtcurveStyle.background_gc[GTK_SHADOW_ETCHED_IN==shadow_type
? 0 : dark],
x+1, y+height-2, x+width-2, y+height-2);
- gdk_draw_line(window, qtcurveStyle.gray_gc[GTK_SHADOW_ETCHED_IN==shadow_type
+ gdk_draw_line(window, qtcurveStyle.background_gc[GTK_SHADOW_ETCHED_IN==shadow_type
? 0 : dark],
x+width-2, y+1, x+width-2, y+height-2);
}
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[5], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[0], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[5], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[0], NULL);
}
}
@@ -3850,9 +3867,9 @@
const gchar *detail, gint x, gint y, gint width,
gint height, GtkPositionType gap_side, gint gap_x, gint gap_width)
{
- GdkGC *gc1 = qtcurveStyle.gray_gc[0],
- *gc2 = qtcurveStyle.gray_gc[APPEARANCE_FLAT==opts.appearance ? ORIGINAL_SHADE : 4],
- *outer = qtcurveStyle.gray_gc[5];
+ GdkGC *gc1 = qtcurveStyle.background_gc[0],
+ *gc2 = qtcurveStyle.background_gc[APPEARANCE_FLAT==opts.appearance ? ORIGINAL_SHADE : 4],
+ *outer = qtcurveStyle.background_gc[5];
gboolean rev = reverseLayout(widget);
int rightPos=(width -(gap_x + gap_width));
@@ -3994,8 +4011,8 @@
GdkGC *gc1 = NULL,
*gc2 = NULL,
*fill = GTK_STATE_NORMAL==state
- ? style->bg_gc[GTK_STATE_NORMAL] : qtcurveStyle.gray_gc[2],
- *outer = qtcurveStyle.gray_gc[5],
+ ? style->bg_gc[GTK_STATE_NORMAL] : qtcurveStyle.background_gc[2],
+ *outer = qtcurveStyle.background_gc[5],
*selGc1= qtcurveStyle.menuitem_gc[0],
*selGc2= qtcurveStyle.menuitem_gc[IS_FLAT(opts.appearance) ? 0 : 3],
*midgc=NULL;
@@ -4007,7 +4024,7 @@
rev=(GTK_POS_TOP==gap_side || GTK_POS_BOTTOM==gap_side) &&
reverseLayout(widget->parent);
GdkColor *col=active
- ? &(style->bg[GTK_STATE_NORMAL]) : &(qtcurveStyle.gray[2]);
+ ? &(style->bg[GTK_STATE_NORMAL]) : &(qtcurveStyle.background[2]);
FN_CHECK
if(QTC_ROUNDED)
@@ -4057,8 +4074,8 @@
if(highlightTab && pos==highlightTab->id && !active)
{
highlight=TRUE;
- fill=qtcurveStyle.gray_gc[SHADE_2_HIGHLIGHT];
- col=&(qtcurveStyle.gray[SHADE_2_HIGHLIGHT]);
+ fill=qtcurveStyle.background_gc[SHADE_2_HIGHLIGHT];
+ col=&(qtcurveStyle.background[SHADE_2_HIGHLIGHT]);
}
}
}
@@ -4095,13 +4112,13 @@
return;
case GTK_SHADOW_IN:
case GTK_SHADOW_ETCHED_IN:
- gc1 = qtcurveStyle.gray_gc[dark];
- gc2 = qtcurveStyle.gray_gc[0];
+ gc1 = qtcurveStyle.background_gc[dark];
+ gc2 = qtcurveStyle.background_gc[0];
break;
case GTK_SHADOW_OUT:
case GTK_SHADOW_ETCHED_OUT:
- gc1 = qtcurveStyle.gray_gc[0];
- gc2 = qtcurveStyle.gray_gc[dark];
+ gc1 = qtcurveStyle.background_gc[0];
+ gc2 = qtcurveStyle.background_gc[dark];
break;
}
@@ -4184,14 +4201,14 @@
if(firstTab)
{
gdk_draw_point(window, outer, x+1, y+height-2);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x, y+height-2);
gdk_draw_point(window, midgc, x+1, y+height-1);
}
if(lastTab)
{
gdk_draw_point(window, outer, x+width-2, y+height-2);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x+width-1, y+height-2);
gdk_draw_point(window, midgc, x+width-2, y+height-1);
}
@@ -4199,7 +4216,7 @@
if(ROUND_SLIGHT==opts.round && (active || firstTab || lastTab))
{
GdkColor *col=active && opts.highlightTab ? &qtcurveStyle.menuitem[3]
- : &qtcurveStyle.gray[3];
+ : &qtcurveStyle.background[3];
midgc=QTC_SET_MID_COLOR(col, &style->bg[GTK_STATE_NORMAL])
@@ -4270,14 +4287,14 @@
if(firstTab)
{
gdk_draw_point(window, outer, x+1, y+1);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x, y+1);
gdk_draw_point(window, midgc, x+1, y);
}
if(lastTab)
{
gdk_draw_point(window, outer, x+width-2, y+1);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x+width-1, y+1);
gdk_draw_point(window, midgc, x+width-2, y);
}
@@ -4285,7 +4302,7 @@
if(ROUND_SLIGHT==opts.round && (active || firstTab || lastTab))
{
GdkColor *col=active && opts.highlightTab ? &qtcurveStyle.menuitem[3]
- : &qtcurveStyle.gray[3];
+ : &qtcurveStyle.background[3];
midgc=QTC_SET_MID_COLOR(col, &style->bg[GTK_STATE_NORMAL])
@@ -4363,14 +4380,14 @@
if(firstTab)
{
gdk_draw_point(window, outer, x+width-2, y+1);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x+width-1, y+1);
gdk_draw_point(window, midgc, x+width-2, y);
}
if(lastTab)
{
gdk_draw_point(window, outer, x+width-2, y+height-2);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x+width-1, y+height-2);
gdk_draw_point(window, midgc, x+width-2, y+height-1);
}
@@ -4378,7 +4395,7 @@
if(ROUND_SLIGHT==opts.round && (active || firstTab || lastTab))
{
GdkColor *col=active && opts.highlightTab ? &qtcurveStyle.menuitem[3]
- : &qtcurveStyle.gray[3];
+ : &qtcurveStyle.background[3];
midgc=QTC_SET_MID_COLOR(col, &style->bg[GTK_STATE_NORMAL])
@@ -4448,14 +4465,14 @@
if(firstTab)
{
gdk_draw_point(window, outer, x+1, y+1);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x, y+1);
gdk_draw_point(window, midgc, x+1, y);
}
if(lastTab)
{
gdk_draw_point(window, outer, x+1, y+height-2);
- midgc=QTC_SET_MID_COLOR(&qtcurveStyle.gray[5], &style->bg[GTK_STATE_NORMAL])
+ midgc=QTC_SET_MID_COLOR(&qtcurveStyle.background[5], &style->bg[GTK_STATE_NORMAL])
gdk_draw_point(window, midgc, x, y+height-2);
gdk_draw_point(window, midgc, x+1, y+height-1);
}
@@ -4463,7 +4480,7 @@
if(ROUND_SLIGHT==opts.round && (active || firstTab || lastTab))
{
GdkColor *col=active && opts.highlightTab ? &qtcurveStyle.menuitem[3]
- : &qtcurveStyle.gray[3];
+ : &qtcurveStyle.background[3];
midgc=QTC_SET_MID_COLOR(col, &style->bg[GTK_STATE_NORMAL])
@@ -4505,8 +4522,22 @@
**btn_gcs;
int min=MIN_SLIDER_SIZE(thumbs);
+/*
+#if GTK_CHECK_VERSION(2, 10, 0)
+ if(sbar && GTK_STATE_INSENSITIVE==state)
+ state=GTK_STATE_NORMAL;
+#else
+*/
+ if(GTK_IS_RANGE(widget))
+ setState(widget, &state, NULL, x, y);
+/*
+#endif
+*/
+
if(useButtonColor(detail))
- if(QT_CUSTOM_COLOR_BUTTON(style))
+ if(scrollbar|hscale|vscale && GTK_STATE_INSENSITIVE==state)
+ btn_gcs=qtcurveStyle.background_gc;
+ else if(QT_CUSTOM_COLOR_BUTTON(style))
{
GdkColor new_colors[TOTAL_SHADES+1];
custom_c=TRUE;
@@ -4522,8 +4553,8 @@
gtk_paint_box(style, window, state, shadow_type, area, widget, detail, x, y, width, height);
- /* Orientation is always vertical with Mozilla, why? Anyway this hack should be OK - as we only draw dashes when
- slider is larger than 'min' pixels... */
+ /* Orientation is always vertical with Mozilla, why? Anyway this hack should be OK - as we only draw
+ dashes when slider is larger than 'min' pixels... */
orientation=width<height ? GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL;
if(detail &&(scrollbar || hscale || vscale) && LINE_NONE!=thumbs &&
(((hscale || GTK_ORIENTATION_HORIZONTAL==orientation) && width>=min) || height>=min))
@@ -4531,7 +4562,7 @@
EShade shade=scrollbar ? opts.shadeSbSliders : opts.shadeSliders;
GdkGC **gcs=opts.coloredMouseOver && GTK_STATE_PRELIGHT==state
? SHADE_NONE==shade && !custom_c
- ? qtcurveStyle.mouseover_gc : qtcurveStyle.gray_gc
+ ? qtcurveStyle.mouseover_gc : qtcurveStyle.background_gc
: btn_gcs;
switch(thumbs)
@@ -4594,7 +4625,7 @@
case LINE_DOTS:
case LINE_LARGE_DOTS:
drawDots(window, x1, y, x2-x1, 2, FALSE, (((x2-x1)/3.0)+0.5), 0,
- qtcurveStyle.gray_gc, area, 0, 5, LINE_LARGE_DOTS==opts.toolbarSeparators);
+ qtcurveStyle.background_gc, area, 0, 5, LINE_LARGE_DOTS==opts.toolbarSeparators);
return;
case LINE_NONE:
return;
@@ -4603,27 +4634,27 @@
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[light], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[light], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], area);
}
if(DETAIL("label"))
{
if(state == GTK_STATE_INSENSITIVE)
- gdk_draw_line(window, qtcurveStyle.gray_gc[light], x1 + 1, y + 1, x2 + 1, y + 1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[light], x1 + 1, y + 1, x2 + 1, y + 1);
gdk_draw_line(window, style->text_gc[state], x1, y, x2, y);
}
else
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[dark], x1, y, x2, y);
+ gdk_draw_line(window, qtcurveStyle.background_gc[dark], x1, y, x2, y);
if(tbar || DETAIL("menuitem"))
- gdk_draw_line(window, qtcurveStyle.gray_gc[light], x1, y+1, x2, y+1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[light], x1, y+1, x2, y+1);
}
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[light], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[light], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], NULL);
}
}
@@ -4656,7 +4687,7 @@
case LINE_LARGE_DOTS:
case LINE_DOTS:
drawDots(window, x, y1, 2, y2-y1, TRUE, (((y2-y1)/3.0)+0.5), 0,
- qtcurveStyle.gray_gc, area, 0, 5, LINE_LARGE_DOTS==opts.toolbarSeparators);
+ qtcurveStyle.background_gc, area, 0, 5, LINE_LARGE_DOTS==opts.toolbarSeparators);
return;
case LINE_NONE:
return;
@@ -4665,19 +4696,19 @@
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], area);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[light], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], area);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[light], area);
}
- gdk_draw_line(window, qtcurveStyle.gray_gc[dark], x, y1, x, y2 - 1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[dark], x, y1, x, y2 - 1);
if(tbar)
- gdk_draw_line(window, qtcurveStyle.gray_gc[light], x+1, y1, x+1, y2 - 1);
+ gdk_draw_line(window, qtcurveStyle.background_gc[light], x+1, y1, x+1, y2 - 1);
if(area)
{
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[dark], NULL);
- gdk_gc_set_clip_rectangle(qtcurveStyle.gray_gc[light], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[dark], NULL);
+ gdk_gc_set_clip_rectangle(qtcurveStyle.background_gc[light], NULL);
}
}
}
@@ -4820,9 +4851,9 @@
while(xi < x + width)
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], xi, y, xi, y + height);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], xi, y, xi, y + height);
xi++;
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], xi, y, xi, y + height);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], xi, y, xi, y + height);
xi += 2;
}
break;
@@ -4834,9 +4865,9 @@
while(yi < y + height)
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], x, yi, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], x, yi, x + width, yi);
yi++;
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], x, yi, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], x, yi, x + width, yi);
yi+= 2;
}
break;
@@ -4848,10 +4879,10 @@
while(xi > x + 3)
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], xi, y, x, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], xi, y, x, yi);
--xi;
--yi;
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], xi, y, x, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], xi, y, x, yi);
xi -= 3;
yi -= 3;
}
@@ -4864,10 +4895,10 @@
while(xi <(x + width - 3))
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], xi, y, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], xi, y, x + width, yi);
++xi;
--yi;
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], xi, y, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], xi, y, x + width, yi);
xi += 3;
yi -= 3;
}
@@ -4880,10 +4911,10 @@
while(xi > x + 3)
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], x, yi, xi, y + height);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], x, yi, xi, y + height);
--xi;
++yi;
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], x, yi, xi, y + height);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], x, yi, xi, y + height);
xi -= 3;
yi += 3;
}
@@ -4896,10 +4927,10 @@
while(xi <(x + width - 3))
{
- gdk_draw_line(window, qtcurveStyle.gray_gc[0], xi, y + height, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[0], xi, y + height, x + width, yi);
++xi;
++yi;
- gdk_draw_line(window, qtcurveStyle.gray_gc[5], xi, y + height, x + width, yi);
+ gdk_draw_line(window, qtcurveStyle.background_gc[5], xi, y + height, x + width, yi);
xi += 3;
yi += 3;
}
@@ -4988,7 +5019,7 @@
if(0==qtcurveStyleRef++)
{
qtcurveStyle.button_text_gc=realizeColors(style, &qtSettings.colors[COLOR_BUTTON_TEXT]);
- QTC_GEN_GCS(style, qtcurveStyle.gray, qtcurveStyle.gray_gc);
+ QTC_GEN_GCS(style, qtcurveStyle.background, qtcurveStyle.background_gc);
QTC_GEN_GCS(style, qtcurveStyle.button, qtcurveStyle.button_gc);
QTC_GEN_GCS(style, qtcurveStyle.menuitem, qtcurveStyle.menuitem_gc);
@@ -5038,7 +5069,7 @@
{
default:
case HEADER_COLOR_BGND:
- memcpy(qtcurveStyle.listview_gc, qtcurveStyle.gray_gc,
+ memcpy(qtcurveStyle.listview_gc, qtcurveStyle.background_gc,
sizeof(GdkGC *)*(TOTAL_SHADES+1));
break;
case HEADER_COLOR_BTN:
@@ -5091,7 +5122,7 @@
if(qtcurveStyle.slider_gc[0])
QTC_RELEASE_GCS(qtcurveStyle.slider_gc);
- if(qtcurveStyle.listview_gc[0] && qtcurveStyle.listview_gc[0]!=qtcurveStyle.gray_gc[0] &&
+ if(qtcurveStyle.listview_gc[0] && qtcurveStyle.listview_gc[0]!=qtcurveStyle.background_gc[0] &&
qtcurveStyle.listview_gc[0]!=qtcurveStyle.button_gc[0])
QTC_RELEASE_GCS(qtcurveStyle.listview_gc);
@@ -5112,7 +5143,7 @@
qtcurveStyle.menutext_gc[0]=qtcurveStyle.menutext_gc[1]=NULL;
}
- QTC_RELEASE_GCS(qtcurveStyle.gray_gc);
+ QTC_RELEASE_GCS(qtcurveStyle.background_gc);
QTC_RELEASE_GCS(qtcurveStyle.button_gc);
QTC_RELEASE_GCS(qtcurveStyle.menuitem_gc);
}
@@ -5120,7 +5151,7 @@
static void generateColors()
{
- shadeColors(&qtSettings.colors[COLOR_WINDOW], qtcurveStyle.gray);
+ shadeColors(&qtSettings.colors[COLOR_WINDOW], qtcurveStyle.background);
shadeColors(&qtSettings.colors[COLOR_BUTTON], qtcurveStyle.button);
shadeColors(&qtSettings.colors[COLOR_SELECTED], qtcurveStyle.menuitem);
@@ -5196,7 +5227,7 @@
{
default:
case HEADER_COLOR_BGND:
- memcpy(qtcurveStyle.listview, qtcurveStyle.gray, sizeof(GdkColor)*(TOTAL_SHADES+1));
+ memcpy(qtcurveStyle.listview, qtcurveStyle.background, sizeof(GdkColor)*(TOTAL_SHADES+1));
break;
case HEADER_COLOR_BTN:
memcpy(qtcurveStyle.listview, qtcurveStyle.button,
@@ -5207,7 +5238,7 @@
}
if(FOCUS_COLORED==opts.focus)
- generateMidColor(&qtcurveStyle.menuitem[ORIGINAL_SHADE], &qtcurveStyle.gray[ORIGINAL_SHADE],
+ generateMidColor(&qtcurveStyle.menuitem[ORIGINAL_SHADE], &qtcurveStyle.background[ORIGINAL_SHADE],
&qtcurveStyle.focus, 1.0);
switch(opts.shadeCheckRadio)
@@ -5223,7 +5254,7 @@
}
}
-static void qtcurveStyle_init_from_rc(GtkStyle *style, GtkRcStyle *rc_style)
+static void qtcurve_style_init_from_rc(GtkStyle *style, GtkRcStyle *rc_style)
{
parent_class->init_from_rc(style, rc_style);
}
@@ -5236,7 +5267,7 @@
style_class->realize = styleRealize;
style_class->unrealize = styleUnrealize;
- style_class->init_from_rc = qtcurveStyle_init_from_rc;
+ style_class->init_from_rc = qtcurve_style_init_from_rc;
style_class->draw_resize_grip = gtkDrawResizeGrip;
style_class->draw_expander = gtkDrawExpander;
style_class->draw_arrow = gtkDrawArrow;
@@ -5332,7 +5363,7 @@
GtkStyle parent_instance;
};
-void qtcurveStyle_register_type(GTypeModule *module)
+void qtcurve_style_register_type(GTypeModule *module)
{
static const GTypeInfo object_info =
{
@@ -5404,7 +5435,7 @@
G_MODULE_EXPORT void theme_init(GTypeModule *module)
{
qtcurve_rc_style_register_type(module);
- qtcurveStyle_register_type(module);
+ qtcurve_style_register_type(module);
}
G_MODULE_EXPORT void theme_exit()
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.h new/QtCurve-Gtk2-0.44.3/gtk2/qtcurve.h
--- old/QtCurve-Gtk2-0.44.2/gtk2/qtcurve.h 2006-09-29 21:18:14.000000000 +0200
+++ new/QtCurve-Gtk2-0.44.3/gtk2/qtcurve.h 2006-10-19 21:31:56.000000000 +0200
@@ -69,7 +69,7 @@
typedef struct
{
- GdkColor gray[TOTAL_SHADES+1],
+ GdkColor background[TOTAL_SHADES+1],
button[TOTAL_SHADES+1],
slider[TOTAL_SHADES+1],
sbslider[TOTAL_SHADES+1],
@@ -80,7 +80,7 @@
menuitem[TOTAL_SHADES+1],
focus,
*check_radio;
- GdkGC *gray_gc[TOTAL_SHADES+1],
+ GdkGC *background_gc[TOTAL_SHADES+1],
*button_gc[TOTAL_SHADES+1],
*button_gc2[TOTAL_SHADES+1],
*slider_gc[TOTAL_SHADES+1],
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |