Hello community,
here is the log from the commit of package qtcurve-gtk2
checked in at Fri May 25 17:21:35 CEST 2007.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-05-15 13:17:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-05-25 15:22:52.000000000 +0200
@@ -1,0 +2,17 @@
+Fri May 25 15:21:38 CEST 2007 - stbinner@suse.de
+
+- update to 0.50:
+ - Add settings for: Fill used slider, Round menubar item top only,
+ Menuitem appearance, Border menuitems, Progressbar appearance,
+ Gradient progressbar groove, Check/radio colour, Plastik mouse-over
+ - Dont colour menubar items on mouse over if not colouring menubars.
+ - When drawing menubar borders, only draw bottom line.
+ - When drawing toolbar borders, only draw top/bottom or left/right
+ depending upon orientation.
+ - Draw checks/radios within listviews the same as standard.
+ - If run under KDE4, then draw checks in menus same as standard checks.
+ - Move upper spin button down 1 pixel.
+ - Default to KDE3/Qt3 settings when not run under KDE.
+ - Improve (slightly) appearance of java apps.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-0.49.tar.gz
New:
----
QtCurve-Gtk2-0.50.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.H19956/_old 2007-05-25 17:21:23.000000000 +0200
+++ /var/tmp/diff_new_pack.H19956/_new 2007-05-25 17:21:23.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.49)
+# spec file for package qtcurve-gtk2 (Version 0.50)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -16,7 +16,7 @@
License: GNU General Public License (GPL)
Group: System/GUI/GNOME
Summary: QtCurve style for Gtk2
-Version: 0.49
+Version: 0.50
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-Gtk2-%{version}.tar.gz
@@ -74,6 +74,20 @@
%pref/share/themes/QtCurve
%changelog
+* Fri May 25 2007 - stbinner@suse.de
+- update to 0.50:
+ - Add settings for: Fill used slider, Round menubar item top only,
+ Menuitem appearance, Border menuitems, Progressbar appearance,
+ Gradient progressbar groove, Check/radio colour, Plastik mouse-over
+ - Dont colour menubar items on mouse over if not colouring menubars.
+ - When drawing menubar borders, only draw bottom line.
+ - When drawing toolbar borders, only draw top/bottom or left/right
+ depending upon orientation.
+ - Draw checks/radios within listviews the same as standard.
+ - If run under KDE4, then draw checks in menus same as standard checks.
+ - Move upper spin button down 1 pixel.
+ - Default to KDE3/Qt3 settings when not run under KDE.
+ - Improve (slightly) appearance of java apps.
* Tue May 15 2007 - stbinner@suse.de
- update to 0.49:
- Add settings for Tab, Listview and Slider appearance
++++++ QtCurve-Gtk2-0.49.tar.gz -> QtCurve-Gtk2-0.50.tar.gz ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/ChangeLog new/QtCurve-Gtk2-0.50/ChangeLog
--- old/QtCurve-Gtk2-0.49/ChangeLog 2007-05-12 23:12:18.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/ChangeLog 2007-05-24 21:31:14.000000000 +0200
@@ -1,3 +1,25 @@
+0.50
+----
+1. Add settings for:
+ Fill used slider
+ Round menubar item top only
+ Menuitem appearance
+ Border menuitems
+ Progressbar appearance
+ Gradient progressbar groove
+ Check/radio colour
+ Plastik style mouse-over
+2. Dont colour menubar items on mouse over if not colouring menubars.
+3. When drawing menubar borders, only draw bottom line.
+4. When drawing toolbar borders, only draw top/bottom or left/right
+ - depending upon orientation.
+5. Draw checks/radios within listviews the same as standard.
+6. If run under KDE4, then draw checks in menus the same as standard
+ checks.
+7. Move upper spin button down 1 pixel.
+8. Default to KDE3/Qt3 settings when not run under KDE.
+9. Improve (slightly) appearance of java apps.
+
0.49
----
1. Add settings for:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/configure new/QtCurve-Gtk2-0.50/configure
--- old/QtCurve-Gtk2-0.49/configure 2007-05-13 23:27:49.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/configure 2007-05-24 00:23:11.000000000 +0200
@@ -1925,7 +1925,7 @@
PACKAGE=QtCurve-Gtk2
-VERSION=0.49
+VERSION=0.50
AUTOMAKE_OPTIONS=no-dependencies
am__api_version="1.9"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/configure.in new/QtCurve-Gtk2-0.50/configure.in
--- old/QtCurve-Gtk2-0.49/configure.in 2007-05-12 23:12:18.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/configure.in 2007-05-24 00:22:58.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(README)
PACKAGE=QtCurve-Gtk2
-VERSION=0.49
+VERSION=0.50
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.49/gtk2/common.h new/QtCurve-Gtk2-0.50/gtk2/common.h
--- old/QtCurve-Gtk2-0.49/gtk2/common.h 2007-05-14 23:01:58.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/gtk2/common.h 2007-05-24 00:22:31.000000000 +0200
@@ -53,6 +53,11 @@
*/
#define QTC_INCREASE_SB_SLIDER
+/*
+ Enable this to do focus highlighting for scrollviews... NOTE: Gtk2 currently does not do this.
+#define QTC_HIGHLIGHT_SCROLVIEWS
+*/
+
#ifdef __cplusplus
#include
#ifdef QTC_CONFIG_DIALOG
@@ -197,6 +202,15 @@
#define QTC_NORM_TAB_APP (APPEARANCE_BEVELLED==opts.tabAppearance ? APPEARANCE_GRADIENT : opts.tabAppearance)
#define QTC_SEL_TAB_APP (APPEARANCE_INVERTED==opts.tabAppearance ? APPEARANCE_FLAT : (QTC_NORM_TAB_APP))
+#define QTC_SLIDER_MO_SHADE (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 0 : 2)
+#define QTC_SLIDER_MO_LEN (SHADE_SELECTED==opts.shadeSliders || SHADE_BLEND_SELECTED==opts.shadeSliders ? 4 : 3)
+#define QTC_SB_SLIDER_MO_LEN(A) ((A)>31 ? 6 : 4)
+
+#define QTC_MO_PLASTIK_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : 1)
+#define QTC_MO_PLASTIK_LIGHT(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : 0)
+
+#define QTC_MO_STD_DARK(W) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 4 : 1)
+#define QTC_MO_STD_LIGHT(W, S) (WIDGET_DEF_BUTTON==W && IND_COLORED==opts.defBtnIndicator ? 2 : (S ? 1 : 0))
typedef enum
{
@@ -220,7 +234,8 @@
WIDGET_SLIDER,
WIDGET_SLIDER_TROUGH,
WIDGET_SB_SLIDER,
- WIDGET_SB_TROUGH,
+ WIDGET_SB_BUTTON,
+ WIDGET_TROUGH,
WIDGET_CHECKBOX,
WIDGET_TOGGLE_BUTTON,
WIDGET_MENU_ITEM,
@@ -239,13 +254,16 @@
WIDGET_OTHER
} EWidget;
-#define WAPPEARANCE(W) \
- (WIDGET_LISTVIEW_HEADER==W ? opts.lvAppearance \
- : WIDGET_SLIDER==W || WIDGET_SB_SLIDER==W \
- ? opts.sliderAppearance \
- : WIDGET_TAB_TOP==W || WIDGET_TAB_BOT==W \
- ? opts.tabAppearance \
- : opts.appearance)
+typedef enum
+{
+ APPEARANCE_FLAT,
+ APPEARANCE_DULL_GLASS,
+ APPEARANCE_SHINY_GLASS,
+ APPEARANCE_GRADIENT,
+ APPEARANCE_INVERTED,
+ APPEARANCE_RAISED,
+ APPEARANCE_BEVELLED
+} EAppearance;
#define IS_SLIDER(W) (WIDGET_SLIDER==W || WIDGET_SB_SLIDER==W)
#define IS_TOGGLE_BUTTON(W) (WIDGET_TOGGLE_BUTTON==W || WIDGET_CHECKBOX==W)
@@ -257,7 +275,7 @@
{
case WIDGET_MENU_ITEM:
return light ? SHADE_BEVEL_MENU_ITEM_LIGHT : SHADE_BEVEL_MENU_ITEM_DARK;
- case WIDGET_SB_TROUGH:
+ case WIDGET_TROUGH:
return light ? SHADE_SBAR_LIGHT : SHADE_SBAR_DARK;
case WIDGET_SLIDER_TROUGH:
return light ? SHADE_SLIDER_LIGHT : SHADE_SLIDER_DARK;
@@ -323,24 +341,18 @@
BORDER_SUNKEN
} EBorder;
-typedef enum
-{
- APPEARANCE_FLAT,
- APPEARANCE_DULL_GLASS,
- APPEARANCE_SHINY_GLASS,
- APPEARANCE_GRADIENT,
- APPEARANCE_INVERTED,
- APPEARANCE_RAISED,
- APPEARANCE_BEVELLED
-} EAppearance;
-
+/*
+ This whole EShade enum is a complete mess!
+ For menubars, we dont blend - so blend is selected, and selected is darken
+ For check/radios - we dont blend, so blend is selected, and we dont allow darken
+*/
typedef enum
{
SHADE_NONE,
- SHADE_BLEND_SELECTED,
- SHADE_SELECTED,
- SHADE_DARKEN = SHADE_SELECTED , /* For menubar only! */
- SHADE_CUSTOM
+ SHADE_CUSTOM,
+ SHADE_BLEND_SELECTED, /* In the case of check/radios this is SHADE_SELECTED */
+ SHADE_SELECTED,
+ SHADE_DARKEN = SHADE_SELECTED , /* For menubar only! */
} EShade;
typedef enum
@@ -359,6 +371,13 @@
SCROLLBAR_NONE
} EScrollbar;
+typedef enum
+{
+ MO_NONE,
+ MO_COLORED,
+ MO_PLASTIK
+} EMouseOver;
+
#define DEF_IND_STR "fontcolor"
#define DEF_LINE_STR "dots"
#define DEF_TB_BORDER "none"
@@ -450,7 +469,6 @@
animatedProgress,
fixParentlessDialogs,
customMenuTextColor,
- coloredMouseOver,
menubarMouseOver,
shadeMenubarOnlyWhenActive,
thinnerMenuItems,
@@ -459,7 +477,16 @@
stdFocus,
#endif
lvLines,
- drawStatusBarFrames;
+ drawStatusBarFrames,
+ fillSlider,
+ roundMbTopOnly,
+ gradientPbGroove,
+#ifdef __cplusplus
+ stdSidebarButtons,
+#endif
+ borderMenuitems,
+ colorMenubarMouseOver;
+ EMouseOver coloredMouseOver;
ETBarBorder toolbarBorders;
EDefBtnIndicator defBtnIndicator;
ELine sliderThumbs,
@@ -468,23 +495,55 @@
splitters;
EAppearance appearance,
menubarAppearance,
+ menuitemAppearance,
toolbarAppearance,
lvAppearance,
tabAppearance,
- sliderAppearance;
+ sliderAppearance,
+ progressAppearance;
EShade shadeSliders,
- shadeMenubars;
+ shadeMenubars,
+ shadeCheckRadio;
EScrollbar scrollbarType;
color customMenubarsColor,
customSlidersColor,
customMenuNormTextColor,
- customMenuSelTextColor;
+ customMenuSelTextColor,
+ customCheckRadioColor;
#ifndef __cplusplus
} Options;
#else
};
#endif
+#ifndef QTC_CONFIG_DIALOG
+static EAppearance widgetApp(EWidget w, const Options *opts)
+{
+ switch(w)
+ {
+ case WIDGET_LISTVIEW_HEADER:
+ return opts->lvAppearance;
+ case WIDGET_SB_BUTTON:
+ case WIDGET_SLIDER:
+ case WIDGET_SB_SLIDER:
+ return opts->sliderAppearance;
+ case WIDGET_TAB_TOP:
+ case WIDGET_TAB_BOT:
+ return opts->tabAppearance;
+ case WIDGET_MENU_ITEM:
+ return opts->menuitemAppearance;
+ case WIDGET_PROGRESSBAR:
+ return opts->progressAppearance;
+ case WIDGET_SLIDER_TROUGH:
+ return APPEARANCE_FLAT==opts->appearance || APPEARANCE_RAISED==opts->appearance
+ ? APPEARANCE_FLAT : APPEARANCE_GRADIENT;
+ default:
+ break;
+ }
+
+ return opts->appearance;
+};
+#endif
#endif
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/config_file.c new/QtCurve-Gtk2-0.50/gtk2/config_file.c
--- old/QtCurve-Gtk2-0.49/gtk2/config_file.c 2007-05-14 23:01:58.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/gtk2/config_file.c 2007-05-24 21:29:28.000000000 +0200
@@ -103,6 +103,20 @@
return def;
}
+static EMouseOver toMouseOver(const char *str, EMouseOver def)
+{
+ if(str)
+ {
+ if(0==memcmp(str, "true", 4) || 0==memcmp(str, "colored", 7))
+ return MO_COLORED;
+ if(0==memcmp(str, "plastik", 7))
+ return MO_PLASTIK;
+ if(0==memcmp(str, "false", 4) || 0==memcmp(str, "none", 4))
+ return MO_NONE;
+ }
+ return def;
+}
+
static EAppearance toAppearance(const char *str, EAppearance def)
{
if(str)
@@ -480,6 +494,9 @@
#define QTC_CFG_READ_TB_BORDER(ENTRY) \
opts->ENTRY=toTBarBorder(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), def->ENTRY);
+#define QTC_CFG_READ_MOUSE_OVER(ENTRY) \
+ opts->ENTRY=toMouseOver(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), def->ENTRY);
+
#define QTC_CFG_READ_APPEARANCE(ENTRY, DEF) \
opts->ENTRY=toAppearance(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), DEF);
@@ -556,12 +573,14 @@
QTC_CFG_READ_BOOL(highlightTab)
QTC_CFG_READ_SHADE(shadeSliders, false)
QTC_CFG_READ_SHADE(shadeMenubars, true)
+ QTC_CFG_READ_SHADE(shadeCheckRadio, false)
QTC_CFG_READ_APPEARANCE(menubarAppearance, def->menubarAppearance)
+ QTC_CFG_READ_APPEARANCE(menuitemAppearance, opts->appearance)
QTC_CFG_READ_APPEARANCE(toolbarAppearance, def->toolbarAppearance)
QTC_CFG_READ_LINE(toolbarSeparators)
QTC_CFG_READ_LINE(splitters)
QTC_CFG_READ_BOOL(customMenuTextColor)
- QTC_CFG_READ_BOOL(coloredMouseOver)
+ QTC_CFG_READ_MOUSE_OVER(coloredMouseOver)
QTC_CFG_READ_BOOL(menubarMouseOver)
QTC_CFG_READ_BOOL(shadeMenubarOnlyWhenActive)
QTC_CFG_READ_BOOL(thinnerMenuItems)
@@ -569,22 +588,36 @@
QTC_CFG_READ_COLOR(customMenubarsColor)
QTC_CFG_READ_COLOR(customMenuSelTextColor)
QTC_CFG_READ_COLOR(customMenuNormTextColor)
+ QTC_CFG_READ_COLOR(customCheckRadioColor)
QTC_CFG_READ_SCROLLBAR(scrollbarType)
QTC_CFG_READ_BOOL(shadowButtons)
QTC_CFG_READ_APPEARANCE(lvAppearance, opts->appearance)
QTC_CFG_READ_APPEARANCE(tabAppearance, opts->appearance)
QTC_CFG_READ_APPEARANCE(sliderAppearance, opts->appearance)
+ QTC_CFG_READ_APPEARANCE(progressAppearance, opts->appearance)
#ifndef QTC_PLAIN_FOCUS_ONLY
QTC_CFG_READ_BOOL(stdFocus)
#endif
QTC_CFG_READ_BOOL(lvLines)
QTC_CFG_READ_BOOL(drawStatusBarFrames)
+ QTC_CFG_READ_BOOL(fillSlider)
+ QTC_CFG_READ_BOOL(roundMbTopOnly)
+ QTC_CFG_READ_BOOL(borderMenuitems)
+ QTC_CFG_READ_BOOL(gradientPbGroove)
+#ifdef __cplusplus
+ QTC_CFG_READ_BOOL(stdSidebarButtons)
+ QTC_CFG_READ_BOOL(colorMenubarMouseOver)
+#endif
#ifndef __cplusplus
releaseConfig(cfg);
#endif
+ if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio)
+ opts->shadeCheckRadio=SHADE_SELECTED;
+
checkColor(&opts->shadeMenubars, &opts->customMenubarsColor);
checkColor(&opts->shadeSliders, &opts->customSlidersColor);
+ checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor);
if(APPEARANCE_BEVELLED==opts->toolbarAppearance)
opts->toolbarAppearance=APPEARANCE_GRADIENT;
@@ -609,6 +642,9 @@
if(opts->animatedProgress && !opts->stripedProgress)
opts->animatedProgress=false;
+ if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems)
+ opts->colorMenubarMouseOver=true;
+
return true;
}
}
@@ -647,22 +683,25 @@
opts->highlightTab=true;
opts->embolden=false;
opts->appearance=APPEARANCE_BEVELLED;
- opts->lvAppearance=APPEARANCE_BEVELLED;
+ opts->lvAppearance=opts->appearance;
opts->tabAppearance=APPEARANCE_GRADIENT;
opts->sliderAppearance=APPEARANCE_GRADIENT;
opts->menubarAppearance=APPEARANCE_GRADIENT;
+ opts->menuitemAppearance=opts->appearance;
opts->toolbarAppearance=APPEARANCE_GRADIENT;
+ opts->progressAppearance=opts->appearance;
opts->defBtnIndicator=IND_COLORED;
opts->sliderThumbs=LINE_DOTS;
opts->handles=LINE_DOTS;
opts->shadeSliders=SHADE_BLEND_SELECTED;
opts->shadeMenubars=SHADE_DARKEN;
+ opts->shadeCheckRadio=SHADE_NONE;
opts->toolbarBorders=TB_NONE;
opts->toolbarSeparators=LINE_DOTS;
opts->splitters=LINE_DOTS;
opts->fixParentlessDialogs=false;
opts->customMenuTextColor=false;
- opts->coloredMouseOver=true;
+ opts->coloredMouseOver=MO_PLASTIK;
opts->menubarMouseOver=true;
opts->shadeMenubarOnlyWhenActive=true;
opts->thinnerMenuItems=false;
@@ -673,16 +712,24 @@
#endif
opts->lvLines=false;
opts->drawStatusBarFrames=false;
+ opts->fillSlider=true;
+ opts->roundMbTopOnly=true;
+ opts->borderMenuitems=true;
+ opts->gradientPbGroove=true;
+ opts->colorMenubarMouseOver=false;
#ifdef __cplusplus
+ opts->stdSidebarButtons=false;
opts->customMenubarsColor.setRgb(0, 0, 0);
opts->customSlidersColor.setRgb(0, 0, 0);
opts->customMenuNormTextColor.setRgb(0, 0, 0);
opts->customMenuSelTextColor.setRgb(0, 0, 0);
+ opts->customCheckRadioColor.setRgb(0, 0, 0);
#else
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;
opts->customMenuSelTextColor.red=opts->customMenuSelTextColor.green=opts->customMenuSelTextColor.blue=0;
+ opts->customCheckRadioColor.red=opts->customCheckRadioColor.green=opts->customCheckRadioColor.blue=0;
#endif
/* Read system config file... */
@@ -741,6 +788,19 @@
}
}
+static const char *toStr(EMouseOver mo)
+{
+ switch(mo)
+ {
+ case MO_COLORED:
+ return "colored";
+ case MO_NONE:
+ return "none";
+ default:
+ return "plastik";
+ }
+}
+
static const char *toStr(EAppearance exp)
{
switch(exp)
@@ -762,7 +822,7 @@
}
}
-static const char *toStr(EShade exp, bool dark)
+static const char *toStr(EShade exp, bool dark, bool convertBlendSelToSel)
{
switch(exp)
{
@@ -770,9 +830,10 @@
case SHADE_NONE:
return "none";
case SHADE_BLEND_SELECTED:
- return "selected";
+ return dark || !convertBlendSelToSel ? "selected" : "origselected";
case SHADE_CUSTOM:
return "custom";
+ /* case SHADE_SELECTED */
case SHADE_DARKEN:
return dark ? "darken" : "origselected";
}
@@ -841,6 +902,12 @@
else \
CFG.writeEntry(#ENTRY, toStr(opts.ENTRY, B));
+#define CFG_WRITE_ENTRY_SHADE(ENTRY, DARK, CONVERT_SHADE) \
+ if (!exportingStyle && def.ENTRY==opts.ENTRY) \
+ CFG.deleteEntry(#ENTRY); \
+ else \
+ CFG.writeEntry(#ENTRY, toStr(opts.ENTRY, DARK, CONVERT_SHADE));
+
#define CFG_WRITE_ENTRY_D(ENTRY) \
if (!exportingStyle && def.ENTRY==opts.ENTRY) \
CFG.deleteEntry(#ENTRY); \
@@ -888,9 +955,11 @@
CFG_WRITE_ENTRY_B(sliderThumbs, true)
CFG_WRITE_ENTRY_B(handles, false)
CFG_WRITE_ENTRY(highlightTab)
- CFG_WRITE_ENTRY_B(shadeSliders, false)
- CFG_WRITE_ENTRY_B(shadeMenubars, true)
+ CFG_WRITE_ENTRY_SHADE(shadeSliders, false, false)
+ CFG_WRITE_ENTRY_SHADE(shadeMenubars, true, false)
+ CFG_WRITE_ENTRY_SHADE(shadeCheckRadio, false, true)
CFG_WRITE_ENTRY(menubarAppearance)
+ CFG_WRITE_ENTRY_FORCE(menuitemAppearance)
CFG_WRITE_ENTRY(toolbarAppearance)
CFG_WRITE_ENTRY_B(toolbarSeparators, true)
CFG_WRITE_ENTRY_B(splitters, false)
@@ -903,17 +972,25 @@
CFG_WRITE_ENTRY(customMenubarsColor)
CFG_WRITE_ENTRY(customMenuSelTextColor)
CFG_WRITE_ENTRY(customMenuNormTextColor)
+ CFG_WRITE_ENTRY(customCheckRadioColor)
CFG_WRITE_ENTRY(scrollbarType)
CFG_WRITE_ENTRY(shadowButtons)
CFG_WRITE_ENTRY_FORCE(lvAppearance)
CFG_WRITE_ENTRY_FORCE(tabAppearance)
CFG_WRITE_ENTRY_FORCE(sliderAppearance)
+ CFG_WRITE_ENTRY_FORCE(progressAppearance)
#ifndef QTC_PLAIN_FOCUS_ONLY
CFG_WRITE_ENTRY(stdFocus)
#endif
CFG_WRITE_ENTRY(lvLines)
CFG_WRITE_ENTRY(drawStatusBarFrames)
-
+ CFG_WRITE_ENTRY(fillSlider)
+ CFG_WRITE_ENTRY(roundMbTopOnly)
+ CFG_WRITE_ENTRY(borderMenuitems)
+ CFG_WRITE_ENTRY(gradientPbGroove)
+#ifdef __cplusplus
+ CFG_WRITE_ENTRY(stdSidebarButtons)
+#endif
cfg->sync();
return true;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qtcurve.c new/QtCurve-Gtk2-0.50/gtk2/qtcurve.c
--- old/QtCurve-Gtk2-0.49/gtk2/qtcurve.c 2007-05-14 23:01:10.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/gtk2/qtcurve.c 2007-05-24 21:31:14.000000000 +0200
@@ -43,7 +43,7 @@
/*
* Disabled, for the moment, due to not working very well...
* 1. Seems to mouse over for the whole toolbar
- * 2. When a toolbar is made floating, the mouse over efect does not turn "off" :-(
+ * 2. When a toolbar is made floating, the mouse over effect does not turn "off" :-(
#define QTC_MOUSEOVER_HANDLES
*/
@@ -1478,9 +1478,8 @@
DF_BLEND = 0x004,
DF_DO_CORNERS = 0x008,
DF_SUNKEN = 0x010,
- DF_DO_FILL = 0x020,
- DF_DO_BORDER = 0x040,
- DF_VERT = 0x080
+ DF_DO_BORDER = 0x020,
+ DF_VERT = 0x040
} EDrawFlags;
#define drawBorder(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) \
@@ -1491,7 +1490,7 @@
GdkColor *bgnd, GdkGC **c_gcs, GdkColor *c_colors, int round,
EBorder borderProfile, EWidget widget, int flags, int borderVal)
{
- EAppearance app=WAPPEARANCE(widget);
+ EAppearance app=widgetApp(widget, &opts);
QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style;
gboolean useText=WIDGET_DEF_BUTTON==widget && IND_FONT_COLOR==opts.defBtnIndicator &&
GTK_STATE_INSENSITIVE!=state;
@@ -1712,15 +1711,19 @@
GdkGC **inside_gcs, int round, EWidget widget, EBorder borderProfile,
int flags)
{
- EAppearance app=WAPPEARANCE(widget);
+ EAppearance app=widgetApp(widget, &opts);
QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style;
gboolean sunken=flags&DF_SUNKEN,
- colouredMouseOver=opts.coloredMouseOver && qtcurveStyle->mouseover_gc[0] &&
+ doColouredMouseOver=opts.coloredMouseOver && qtcurveStyle->mouseover_gc[0] &&
GTK_STATE_PRELIGHT==state &&
- !IS_SLIDER(widget) && (IS_TOGGLE_BUTTON(widget) || !sunken),
+ (!IS_SLIDER(widget) || (WIDGET_SB_SLIDER==widget && MO_PLASTIK==opts.coloredMouseOver)) &&
+ (IS_TOGGLE_BUTTON(widget) || !sunken),
+ plastikMouseOver=doColouredMouseOver && MO_PLASTIK==opts.coloredMouseOver,
+ colouredMouseOver=doColouredMouseOver && MO_COLORED==opts.coloredMouseOver,
lightBorder=QTC_DRAW_LIGHT_BORDER(sunken, widget, app),
bevelledButton=WIDGET_BUTTON(widget) && APPEARANCE_BEVELLED==app,
- doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget) && ROUND_FULL==opts.round;
+ doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget) && ROUND_FULL==opts.round,
+ horiz=!(flags&DF_VERT);
int bx=x, by=y, bw=width, bh=height;
if(doEtch)
@@ -1748,7 +1751,7 @@
{
by+=2; bx+=2; bw-=4; bh-=4;
}
- else if(flags&DF_VERT)
+ else if(!horiz)
{
by+=2; bx++; bw-=3; bh-=4;
}
@@ -1761,9 +1764,9 @@
{
int dark=bevelledButton ? 2 : 4;
GdkGC **ingcs=inside_gcs ? inside_gcs : gcs,
- *gc1=colouredMouseOver ? qtcurveStyle->mouseover_gc[sunken ? 1 : 0]
+ *gc1=colouredMouseOver ? qtcurveStyle->mouseover_gc[QTC_MO_STD_LIGHT(widget, sunken)]
: ingcs[sunken ? dark : 0],
- *gc2=colouredMouseOver ? qtcurveStyle->mouseover_gc[1]
+ *gc2=colouredMouseOver ? qtcurveStyle->mouseover_gc[QTC_MO_STD_DARK(widget)]
: ingcs[sunken ? 0 : dark];
setClipping(gc1, area, region);
@@ -1802,12 +1805,88 @@
unsetClipping(lbGc, area, region);
}
- if(flags&DF_DO_FILL && bw>0 && bh>0)
+ if(bw>0 && bh>0)
+ {
drawBevelGradient(style, window, area, region, bx, by, bw, bh, base,
getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
- !(flags&DF_VERT), !sunken, sunken, app,
+ horiz, !sunken, sunken, app,
widget);
+ if(plastikMouseOver)
+ {
+ if(WIDGET_SB_SLIDER==widget)
+ {
+ int len=QTC_SB_SLIDER_MO_LEN(horiz ? width : height),
+ so=lightBorder ? 2 : 1,
+ eo=len+so,
+ col=QTC_SLIDER_MO_SHADE;
+
+ if(horiz)
+ {
+ drawBevelGradient(style, window, area, region, x+so, y, len, height, &qtcurveStyle->mouseover[col],
+ getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
+ horiz, !sunken, sunken, app,
+ widget);
+ drawBevelGradient(style, window, area, region, x+width-eo, y, len, height, &qtcurveStyle->mouseover[col],
+ getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
+ horiz, !sunken, sunken, app,
+ widget);
+ }
+ else
+ {
+ drawBevelGradient(style, window, area, region, x, y+so, width, len, &qtcurveStyle->mouseover[col],
+ getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
+ horiz, !sunken, sunken, app,
+ widget);
+ drawBevelGradient(style, window, area, region, x, y+height-eo, width, len, &qtcurveStyle->mouseover[col],
+ getWidgetShade(widget, TRUE, sunken), getWidgetShade(widget, FALSE, sunken),
+ horiz, !sunken, sunken, app,
+ widget);
+ }
+ }
+ else
+ {
+ int mh=height;
+ GdkGC *gc=qtcurveStyle->mouseover_gc[QTC_MO_PLASTIK_DARK(widget)];
+ bool horizontal=(horiz && !(WIDGET_SB_BUTTON==widget || WIDGET_SB_SLIDER==widget))||
+ (!horiz && (WIDGET_SB_BUTTON==widget || WIDGET_SB_SLIDER==widget)),
+ thin=WIDGET_SB_BUTTON==widget || WIDGET_SPIN_UP==widget || WIDGET_SPIN_DOWN==widget ||
+ ((horiz ? height : width)<16);
+
+ if(WIDGET_SPIN_UP==widget && horiz)
+ mh--;
+ setClipping(gc, area, region);
+ if(horizontal)
+ {
+ gdk_draw_line(window, gc, x+1, y+1, x+width-2, y+1);
+ gdk_draw_line(window, gc, x+1, y+mh-2, x+width-2, y+mh-2);
+ }
+ else
+ {
+ gdk_draw_line(window, gc, x+1, y+1, x+1, y+mh-2);
+ gdk_draw_line(window, gc, x+width-2, y+1, x+width-2, y+mh-2);
+ }
+ unsetClipping(gc, area, region);
+ if(!thin)
+ {
+ gc=qtcurveStyle->mouseover_gc[QTC_MO_PLASTIK_LIGHT(widget)];
+ setClipping(gc, area, region);
+ if(horizontal)
+ {
+ gdk_draw_line(window, gc, x+1, y+2, x+width-2, y+2);
+ gdk_draw_line(window, gc, x+1, y+mh-3, x+width-2, y+mh-3);
+ }
+ else
+ {
+ gdk_draw_line(window, gc, x+2, y+1, x+2, y+mh-2);
+ gdk_draw_line(window, gc, x+width-3, y+1, x+width-3, y+mh-2);
+ }
+ unsetClipping(gc, area, region);
+ }
+ }
+ }
+ }
+
if(flags&DF_DO_BORDER)
drawBorder(style, window, state, area, region, x, y, width, height, bgnd, gcs, colors,
round, borderProfile, widget, flags);
@@ -1925,7 +2004,7 @@
gint height, int round, gboolean isCombo)
{
QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style;
- gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget),
+ gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget) && GTK_APP_JAVA!=qtSettings.app,
doEtch=ROUND_FULL==opts.round;
GdkGC **gcs=highlight ? qtcurveStyle->menuitem_gc : qtcurveStyle->background_gc,
*bgnd_gc=style->bg_gc[state],
@@ -2099,7 +2178,7 @@
}
if( ( GTK_STATE_PRELIGHT==state && (detail && 0==strcmp(detail, QTC_PANED) ) ) )
drawAreaMod(style, window, GTK_STATE_PRELIGHT, area, NULL, opts.highlightFactor, x, y, width, height);
- else
+ else if(!(GTK_APP_JAVA==qtSettings.app && widget && GTK_IS_LABEL(widget)))
{
parent_class->draw_flat_box(style, window, state, shadow_type, area, widget, detail, x, y,
width, height);
@@ -2225,46 +2304,6 @@
}
}
-static void drawArrowHLine(GdkWindow *window, GdkGC *gc, int x1, int x2, int y, gboolean last)
-{
- if(x2 - x1 < 7 && !last) /* 7 to get garretts pixels, otherwise 6 */
- gdk_draw_line(window, gc, x1, y, x2, y);
- else if(last)
- {
- if(x2 - x1 <= 7)
- {
- gdk_draw_line(window, gc, x1+1, y, x1+1, y);
- gdk_draw_line(window, gc, x2-1, y, x2-1, y);
- }
- else
- {
- gdk_draw_line(window, gc, x1+2, y, x1+2, y);
- gdk_draw_line(window, gc, x2-2, y, x2-2, y);
- }
- }
- else
- {
- gdk_draw_line(window, gc, x1, y, x1+2, y);
- gdk_draw_line(window, gc, x2-2, y, x2, y);
- }
-}
-
-static void drawArrowVLine(GdkWindow *window, GdkGC *gc, int y1, int y2, int x, gboolean last)
-{
- if(y2 - y1 < 7 && !last) /* 7 to get garretts pixels */
- gdk_draw_line(window, gc, x, y1, x, y2);
- else if(last)
- {
- gdk_draw_line(window, gc, x, y1+2, x, y1+2);
- gdk_draw_line(window, gc, x, y2-2, x, y2-2);
- }
- else
- {
- gdk_draw_line(window, gc, x, y1, x, y1+2);
- gdk_draw_line(window, gc, x, y2-2, x, y2);
- }
-}
-
static void drawArrow(GdkWindow *window, GdkGC *gc, GdkRectangle *area, GtkArrowType arrow_type,
gint x, gint y, gint width, gint height)
{
@@ -2345,9 +2384,9 @@
if(isSpinButton)
{
- if(GTK_ARROW_UP==arrow_type)
+ /*if(GTK_ARROW_UP==arrow_type)
y-=1;
- else if(GTK_ARROW_DOWN==arrow_type)
+ else*/ if(GTK_ARROW_DOWN==arrow_type)
y+=1;
}
@@ -2490,7 +2529,7 @@
else if(-1==height)
gdk_window_get_size(window, NULL, &height);
- if(menubar && GTK_APP_MOZILLA!=qtSettings.app &&
+ if(menubar && GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app &&
(opts.menubarMouseOver || opts.shadeMenubarOnlyWhenActive))
{
GtkWidget **mbHash=lookupMenubarHash(widget, FALSE);
@@ -2527,7 +2566,7 @@
drawLightBevel(style, window, state, area, NULL, x, y, width, height, &btn_colors[bgnd],
NULL, btn_gcs, btn_colors, NULL, round, wid, BORDER_FLAT,
- DF_LARGE_ARC|DF_DO_CORNERS|DF_DO_BORDER|DF_DO_FILL|
+ DF_LARGE_ARC|DF_DO_CORNERS|DF_DO_BORDER|
(sunken ? DF_SUNKEN : 0));
}
else if(DETAIL("spinbutton"))
@@ -2596,7 +2635,7 @@
EStepper step=getStepper(widget, x, y);
EWidget widgetType=slider
? WIDGET_SB_SLIDER
- : hscale||vscale||sbar
+ : hscale||vscale
? WIDGET_SLIDER
: lvh
? WIDGET_LISTVIEW_HEADER
@@ -2610,7 +2649,9 @@
? defBtn
? WIDGET_DEF_BUTTON
: WIDGET_STD_BUTTON
- : WIDGET_OTHER;
+ : stepper || sbar
+ ? WIDGET_SB_BUTTON
+ : WIDGET_OTHER;
if(GTK_APP_MOZILLA!=qtSettings.app)
{
@@ -2708,7 +2749,7 @@
BORDER_FLAT, (!checkbox && width>=QTC_MIN_BTN_SIZE &&
height>=QTC_MIN_BTN_SIZE ? DF_LARGE_ARC : 0)|
(slider ? 0 : DF_DO_CORNERS)|(sunken ? DF_SUNKEN : 0)|
- DF_DO_FILL|(lvh ? 0 : DF_DO_BORDER)|
+ (lvh ? 0 : DF_DO_BORDER)|
(horiz ? 0 : DF_VERT));
#ifndef QTC_SIMPLE_SCROLLBARS
@@ -2770,7 +2811,7 @@
BORDER_FLAT, DF_LARGE_ARC|
/*(draw_inside ? DF_DRAW_INSIDE : 0) |*/
DF_DO_CORNERS|(sunken ? DF_SUNKEN : 0)|
- DF_DO_FILL|DF_DO_BORDER|(horiz ? 0 : DF_VERT));
+ DF_DO_BORDER|(horiz ? 0 : DF_VERT));
gdk_region_destroy(inner_region);
gdk_region_destroy(outer_region);
@@ -2930,10 +2971,10 @@
drawLightBevel(style, window, state, area, NULL, x, y, width, height,
bgndcol, NULL, qtcurveStyle->background_gc, qtcurveStyle->background, NULL,
ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
- BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
+ BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
- if(adjustment->upper!=adjustment->lower && state!=GTK_STATE_INSENSITIVE)
+ if(opts.fillSlider && adjustment->upper!=adjustment->lower && state!=GTK_STATE_INSENSITIVE)
{
if(horiz)
{
@@ -2969,16 +3010,22 @@
drawLightBevel(style, window, state, area, NULL, used_x, used_y, used_w, used_h,
usedcol, NULL, qtcurveStyle->background_gc, qtcurveStyle->background,
NULL, ROUNDED_ALL, WIDGET_SLIDER_TROUGH,
- BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_FILL|DF_DO_BORDER|
+ BORDER_FLAT, DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
}
}
}
- else if(GTK_IS_PROGRESS_BAR(widget))
+ else if(pbar)
{
gdk_draw_rectangle(window, bgnd, TRUE, x, y, width, height);
- if(GTK_STATE_INSENSITIVE!=state)
+ if(opts.gradientPbGroove)
+ drawBevelGradient(style, window, area, NULL, x+1, y+1, width-2, height-2,
+ GTK_STATE_INSENSITIVE==state ? &(qtcurveStyle->background[ORIGINAL_SHADE])
+ : &(style->base[state]),
+ getWidgetShade(WIDGET_TROUGH, TRUE, FALSE), getWidgetShade(WIDGET_TROUGH, FALSE, FALSE),
+ horiz, FALSE, FALSE, APPEARANCE_GRADIENT, WIDGET_TROUGH);
+ else if(GTK_STATE_INSENSITIVE!=state)
{
if(area)
gdk_gc_set_clip_rectangle(style->base_gc[state], area);
@@ -3014,8 +3061,8 @@
drawLightBevel(style, window, state, area, NULL, x, y, width, height,
&qtcurveStyle->background[2], NULL, 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|
+ qtcurveStyle->background, NULL, sbarRound, WIDGET_TROUGH,
+ BORDER_FLAT, DF_LARGE_ARC|DF_DO_CORNERS|DF_SUNKEN|DF_DO_BORDER|
(horiz ? 0 : DF_VERT));
}
@@ -3098,10 +3145,10 @@
if(TB_NONE!=opts.toolbarBorders)
{
gboolean top=FALSE,
- bottom=FALSE,
- left=FALSE,
- right=FALSE;
- int border=TB_DARK==opts.toolbarBorders ? 5 : 3;
+ bottom=FALSE,
+ left=FALSE,
+ right=FALSE;
+ int border=TB_DARK==opts.toolbarBorders ? 3 : 4;
GdkGC **gcs=activeWindow && menubar && USE_SHADED_MENU_BAR_COLORS
? qtcurveStyle->menubar_gc : qtcurveStyle->background_gc;
@@ -3112,31 +3159,22 @@
}
if(menubar)
- top=bottom=left=right=TRUE;
- else if(0==strcmp(detail,"toolbar")) /* && (GTK_IS_TOOLBAR(widget) ||
+ bottom=TRUE;
+ else if(0==strcmp(detail,"toolbar") || /* && (GTK_IS_TOOLBAR(widget) ||
WIDGET_TYPE_NAME("BonoboUIToolbar"))) */
- {
- if(!GTK_IS_TOOLBAR(widget))
- if(width>height)
- top=bottom=right=TRUE;
- else /* MUST have a handle */
- left=right=bottom=TRUE;
- else
- top=bottom=left=right=TRUE;
- }
- else if(0==strcmp(detail,"dockitem_bin") || /* CPD: bit risky - what if only 1 item ??? */
+ 0==strcmp(detail,"dockitem_bin") ||
0==strcmp(detail, "handlebox_bin"))
{
- if(widthheight)
+ top=bottom=TRUE;
else
- top=bottom=right=TRUE;
+ left=right=TRUE;
}
else /* handle */
- if(widthheight) /* on vertical toolbar */
+ left=right=TRUE;
else
- left=right=top=TRUE;
+ top=bottom=TRUE;
if(top)
gdk_draw_line(window, gcs[0], x, y, x + width-1, y);
@@ -3144,7 +3182,7 @@
gdk_draw_line(window, gcs[0], x, y, x, y+height-1);
if(bottom)
gdk_draw_line(window, gcs[border], x, y + height - 1, x + width-1,
- y + height - 1);
+ y + height - 1);
if(right)
gdk_draw_line(window, gcs[border], x+width-1, y, x + width-1, y + height - 1);
@@ -3214,11 +3252,13 @@
}
{
- GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app
+ GdkColor *itemCols=!opts.colorMenubarMouseOver && mb && !active_mb ? qtcurveStyle->background : qtcurveStyle->menuitem;
+ GdkGC **itemGcs=!opts.colorMenubarMouseOver && mb && !active_mb ? qtcurveStyle->background_gc : qtcurveStyle->menuitem_gc;
+ GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app
? &qtcurveStyle->menubar[ORIGINAL_SHADE] : NULL;
int round=pbar ? progressbarRound(widget, rev)
: mb
- ? active_mb
+ ? active_mb && opts.roundMbTopOnly
? ROUNDED_TOP
: ROUNDED_ALL
: ROUNDED_ALL,
@@ -3239,25 +3279,31 @@
x--; y--; width+=2, height+=2;
}
- if(stdColors)
+ if(!opts.borderMenuitems && (mb || menuitem))
+ drawBevelGradient(style, window, area, region, x, y, width, height,
+ &itemCols[ORIGINAL_SHADE],
+ getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE),
+ getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE),
+ TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM);
+ else if(stdColors)
drawLightBevel(style, window, new_state, area, NULL, x, y,
- width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd,
- qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem,
+ 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)|DF_DO_FILL|
+ (border&&stdColors ? DF_DO_BORDER : 0)|
(activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS));
else
{
if(width>2 && height>2)
drawBevelGradient(style, window, area, region, x+1, y+1, width-2, height-2,
- &qtcurveStyle->menuitem[ORIGINAL_SHADE],
+ &itemCols[ORIGINAL_SHADE],
getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE),
getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE),
- TRUE, TRUE, FALSE, opts.appearance, WIDGET_MENU_ITEM);
+ TRUE, TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM);
realDrawBorder(style, window, state, area, NULL, x, y, width, height, bgnd,
- qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, round, BORDER_FLAT,
+ itemGcs, itemCols, round, BORDER_FLAT,
WIDGET_OTHER, DF_LARGE_ARC, 0);
}
@@ -3266,7 +3312,7 @@
width, height, &qtcurveStyle->menuitem[1], NULL,
qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem,
NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT,
- DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|DF_DO_FILL|(horiz ? 0 : DF_VERT)|
+ 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)
@@ -3379,7 +3425,7 @@
{
gboolean frame=!detail || 0==strcmp(detail, "frame"),
profiledFrame=DETAIL("scrolled_window"),
- statusBar=GTK_APP_MOZILLA==qtSettings.app
+ statusBar=GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app
? frame : isStatusBarFrame(widget);
#ifdef QTC_DEBUG
@@ -3393,7 +3439,7 @@
if(!statusBar && (frame || profiledFrame) && QTC_ROUNDED)
{
if(GTK_SHADOW_NONE!=shadow_type &&
- (!frame || opts.drawStatusBarFrames || GTK_APP_MOZILLA!=qtSettings.app))
+ (!frame || opts.drawStatusBarFrames || (GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app)))
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);
@@ -3507,7 +3553,7 @@
GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget,
const gchar *detail, gint x, gint y, gint width, gint height)
{
- if(GTK_STATE_PRELIGHT==state && GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_STATE_PRELIGHT==state && (GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app))
state=GTK_STATE_NORMAL;
{
@@ -3543,7 +3589,7 @@
if(mnu)
{
y+=2;
- if(GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)
x+=2;
else
x-=2;
@@ -3554,6 +3600,7 @@
debugDisplayWidget(widget, 3);
#endif
+#if 0
if(list)
{
if(area)
@@ -3566,7 +3613,9 @@
if(area)
gdk_gc_set_clip_rectangle(style->text_gc[state], NULL);
}
- else if(!mnu)
+ else
+#endif
+ if(!mnu || qtSettings.qt4)
{
gboolean coloredMouseOver=GTK_STATE_PRELIGHT==state && opts.coloredMouseOver;
GdkGC **gcs=coloredMouseOver
@@ -3584,19 +3633,29 @@
if(area)
gdk_gc_set_clip_rectangle(bgndGc, area);
+ if(mnu)
+ {
+ x--; y--; width=QTC_CHECK_SIZE; height=QTC_CHECK_SIZE;
+ }
+ else if(list)
+ {
+ y++; width=QTC_CHECK_SIZE; height=QTC_CHECK_SIZE;
+ }
+
gdk_draw_rectangle(window, bgndGc, TRUE, x+1, y+1, QTC_CHECK_SIZE-2,
QTC_CHECK_SIZE-2);
if(area)
gdk_gc_set_clip_rectangle(bgndGc, NULL);
drawBorder(style, window, state, area, NULL, x, y, width, height,
- NULL, gcs, colors, ROUNDED_ALL, BORDER_SUNKEN, WIDGET_CHECKBOX, DF_BLEND|DF_DO_CORNERS);
+ NULL, gcs, colors, ROUNDED_ALL, BORDER_SUNKEN, WIDGET_CHECKBOX,
+ (list || mnu ? 0 : DF_DO_CORNERS));
}
if(area && (on || tri))
{
gdk_gc_set_clip_rectangle(style->text_gc[ind_state], area);
- if(mnu)
+ if(!qtSettings.qt4 && mnu)
{
gdk_gc_set_clip_rectangle(btn_gcs[0], area);
gdk_gc_set_clip_rectangle(btn_gcs[5], area);
@@ -3606,7 +3665,9 @@
if(on)
{
- GdkPixbuf *pix=getPixbuf(&style->text[ind_state], PIX_CHECK, 1.0);
+ GdkPixbuf *pix=getPixbuf(GTK_STATE_INSENSITIVE==state /* || (list && (GTK_STATE_SELECTED==state || GTK_STATE_ACTIVE==state)) */
+ ? &style->text[ind_state]
+ : qtcurveStyle->check_radio, PIX_CHECK, 1.0);
int pw=gdk_pixbuf_get_width(pix),
ph=gdk_pixbuf_get_height(pix),
dx=(x+(QTC_CHECK_SIZE/2))-(pw/2),
@@ -3615,7 +3676,7 @@
gdk_draw_pixbuf(window, style->text_gc[ind_state], pix, 0, 0, dx, dy, pw,
ph, GDK_RGB_DITHER_MAX, 0, 0);
- if(mnu)
+ if(!qtSettings.qt4 && mnu)
{
gint x_mnu=x-1, y_mnu=y-1, width_mnu=QTC_CHECK_SIZE+2, height_mnu=QTC_CHECK_SIZE+2;
@@ -3663,7 +3724,7 @@
GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget,
const gchar *detail, gint x, gint y, gint width, gint height)
{
- if(GTK_STATE_PRELIGHT==state && GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_STATE_PRELIGHT==state && (GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app))
state=GTK_STATE_NORMAL;
{
@@ -3683,24 +3744,17 @@
x+=(width-QTC_RADIO_SIZE)>>1;
y+=(height-QTC_RADIO_SIZE)>>1;
+/*
if(list)
{
-#if GTK_MAJOR_VERSION>1
GdkPixbuf *border=getPixbuf(&style->text[state], PIX_RADIO_BORDER, 0.8);
gdk_draw_pixbuf(window, style->text_gc[state], border, 0, 0, x, y,
gdk_pixbuf_get_width(border),
gdk_pixbuf_get_height(border), GDK_RGB_DITHER_MAX, 0, 0);
-#else
- if(area)
- gdk_gc_set_clip_rectangle(style->text_gc[state], area);
- gdk_draw_lines(window, style->text_gc[state], outer, 24);
-
- if(area)
- gdk_gc_set_clip_rectangle(style->text_gc[state], NULL);
-#endif
}
else
+*/
{
GdkGC *new_gcs[TOTAL_SHADES+1],
**btn_gcs=NULL;
@@ -3793,7 +3847,9 @@
if(on)
{
- GdkPixbuf *pix=getPixbuf(&style->text[ind_state], PIX_RADIO_ON, 1.0);
+ GdkPixbuf *pix=getPixbuf(GTK_STATE_INSENSITIVE==state /* || (list && (GTK_STATE_SELECTED==state || GTK_STATE_ACTIVE==state))*/
+ ? &style->text[ind_state]
+ : qtcurveStyle->check_radio, PIX_RADIO_ON, 1.0);
gdk_draw_pixbuf(window, style->text_gc[ind_state], pix, 0, 0, x, y, gdk_pixbuf_get_width(pix),
gdk_pixbuf_get_height(pix), GDK_RGB_DITHER_MAX, 0, 0);
@@ -3820,15 +3876,23 @@
parent_class->draw_layout(style, window, state, use_text, area, widget, detail, x, y, layout);
else
{
- gboolean isMenuItem=QTC_IS_MENU_ITEM(widget),
- isMenuBarItem=isMenuItem && NULL!=isMenubar(widget, 0),
- selectedText=isMenuItem && GTK_STATE_PRELIGHT==state,
- but=FALSE,
- def_but=FALSE,
- swap_gc=FALSE;
+ gboolean isMenuItem=QTC_IS_MENU_ITEM(widget);
+ GtkMenuBar *mb=isMenuItem ? isMenubar(widget, 0) : NULL;
+ gboolean activeMb=mb ? GTK_MENU_SHELL(mb)->active : FALSE,
+ selectedText=isMenuItem &&
+ (opts.colorMenubarMouseOver
+ ? GTK_STATE_PRELIGHT==state
+ : ((!mb || activeMb) && GTK_STATE_PRELIGHT==state)),
+ but=FALSE,
+ def_but=FALSE,
+ swap_gc=FALSE;
+
+ if(!opts.colorMenubarMouseOver && mb && !activeMb && GTK_STATE_PRELIGHT==state)
+ state=GTK_STATE_NORMAL;
+
#if GTK_CHECK_VERSION(2, 10, 0) && !GTK_CHECK_VERSION(2, 10, 11)
- GtkNotebook *nb=isMenuBarItem || isMenuItem || !GTK_IS_LABEL(widget) ||
- !widget->parent || !GTK_IS_NOTEBOOK(widget->parent)? NULL : GTK_NOTEBOOK(widget->parent);
+ GtkNotebook *nb=mb || isMenuItem || !GTK_IS_LABEL(widget) ||
+ !widget->parent || !GTK_IS_NOTEBOOK(widget->parent) ? NULL : GTK_NOTEBOOK(widget->parent);
#endif
GdkGC *prevGcs[4];
gboolean activeWindow=TRUE;
@@ -3871,7 +3935,7 @@
}
else if(isMenuItem)
{
- if(isMenuBarItem && activeWindow)
+ if(mb && activeWindow)
{
if(opts.customMenuTextColor && qtcurveStyle->menutext_gc[0])
{
@@ -4151,7 +4215,7 @@
/* f'in mozilla apps dont really use Gtk widgets - they just paint to a pixmap. So, no way of knowing
the position of a tab! The 'best' look seems to be to round both corners. Not nice, but... */
- if(GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)
firstTab=lastTab=TRUE;
else if(notebook)
{
@@ -4213,7 +4277,7 @@
debugDisplayWidget(widget, 3);
#endif
- if(GTK_APP_MOZILLA!=qtSettings.app && !highlightTab && highlightingEnabled)
+ if(GTK_APP_MOZILLA!=qtSettings.app && GTK_APP_JAVA!=qtSettings.app && !highlightTab && highlightingEnabled)
{
lookupTabHash(widget, TRUE); /* Create hash entry... */
gtk_widget_add_events(widget, GDK_LEAVE_NOTIFY_MASK|GDK_POINTER_MOTION_MASK);
@@ -4273,7 +4337,7 @@
drawBorder(style, window, state, area, NULL, x, y-4, width, height+4, NULL,
qtcurveStyle->background_gc, qtcurveStyle->background,
- active
+ active || (firstTab && lastTab)
? ROUNDED_BOTTOM
: firstTab
? ROUNDED_BOTTOMLEFT
@@ -4316,7 +4380,7 @@
drawBorder(style, window, state, area, NULL, x, y, width, height+4, NULL,
qtcurveStyle->background_gc, qtcurveStyle->background,
- active
+ active || (firstTab && lastTab)
? ROUNDED_TOP
: firstTab
? ROUNDED_TOPLEFT
@@ -4355,7 +4419,7 @@
drawBorder(style, window, state, area, NULL, x-4, y, width+4, height, NULL,
qtcurveStyle->background_gc, qtcurveStyle->background,
- active
+ active || (firstTab && lastTab)
? ROUNDED_RIGHT
: firstTab
? ROUNDED_TOPRIGHT
@@ -4399,7 +4463,7 @@
drawBorder(style, window, state, area, NULL, x, y, width+4, height, NULL,
qtcurveStyle->background_gc, qtcurveStyle->background,
- active
+ active || (firstTab && lastTab)
? ROUNDED_LEFT
: firstTab
? ROUNDED_TOPLEFT
@@ -4537,24 +4601,74 @@
gdk_gc_set_clip_region(gcs[bgnd], region);
gdk_draw_rectangle(window, gcs[bgnd], TRUE, x+1, y+1, width-2, height-2);
gdk_gc_set_clip_region(gcs[bgnd], NULL);
+
+ if(MO_PLASTIK==opts.coloredMouseOver && coloredMouseOver)
+ {
+ int col=QTC_SLIDER_MO_SHADE,
+ len=QTC_SLIDER_MO_LEN;
+
+ gdk_gc_set_clip_region(qtcurveStyle->mouseover_gc[col], region);
+ if(horiz)
+ {
+ gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+1, len, height-2);
+ gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+width-(1+len), y+1, len, height-2);
+ }
+ else
+ {
+ gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+1, width-2, len);
+ gdk_draw_rectangle(window, qtcurveStyle->mouseover_gc[col], TRUE, x+1, y+height-(1+len), width-2, len);
+ }
+ gdk_gc_set_clip_region(qtcurveStyle->mouseover_gc[col], NULL);
+ }
}
else
+ {
drawBevelGradient(style, window, NULL, region, x+1, y+1, width-2, height-2, &colors[bgnd],
SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK,
horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER);
+ if(MO_PLASTIK==opts.coloredMouseOver && coloredMouseOver)
+ {
+ int col=QTC_SLIDER_MO_SHADE,
+ len=QTC_SLIDER_MO_LEN;
+
+ if(horiz)
+ {
+ drawBevelGradient(style, window, NULL, region, x+1, y+1, len, height-2, &qtcurveStyle->mouseover[col],
+ SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK,
+ horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER);
+ drawBevelGradient(style, window, NULL, region, x+width-(1+len), y+1, len, height-2, &qtcurveStyle->mouseover[col],
+ SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK,
+ horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER);
+ }
+ else
+ {
+ drawBevelGradient(style, window, NULL, region, x+1, y+1, width-2, len, &qtcurveStyle->mouseover[col],
+ SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK,
+ horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER);
+ drawBevelGradient(style, window, NULL, region, x+1, y+height-(1+len), width-2, len, &qtcurveStyle->mouseover[col],
+ SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK,
+ horiz, TRUE, FALSE, opts.sliderAppearance, WIDGET_OTHER);
+ }
+ }
+ }
+
gdk_region_destroy(region);
{
GdkPixbuf *border=getPixbuf(&colors[coloredMouseOver ? 4 : 5],
- horiz ? PIX_SLIDER : PIX_SLIDER_V, 0.8),
- *light=getPixbuf(&colors[0], horiz ? PIX_SLIDER_LIGHT : PIX_SLIDER_LIGHT_V, 1.0);
+ horiz ? PIX_SLIDER : PIX_SLIDER_V, 0.8);
gdk_draw_pixbuf(window, btn_gcs[bgnd], border, 0, 0, x, y, gdk_pixbuf_get_width(border),
gdk_pixbuf_get_height(border), GDK_RGB_DITHER_MAX, 0, 0);
- gdk_draw_pixbuf(window, btn_gcs[0], light, 0, 0, x, y, gdk_pixbuf_get_width(light),
- gdk_pixbuf_get_height(light), GDK_RGB_DITHER_MAX, 0, 0);
+ if(MO_PLASTIK!=opts.coloredMouseOver || !coloredMouseOver)
+ {
+ GdkPixbuf *light=getPixbuf(&colors[0], horiz ? PIX_SLIDER_LIGHT : PIX_SLIDER_LIGHT_V, 1.0);
+
+ gdk_draw_pixbuf(window, btn_gcs[0], light, 0, 0, x, y, gdk_pixbuf_get_width(light),
+ gdk_pixbuf_get_height(light), GDK_RGB_DITHER_MAX, 0, 0);
+ }
}
}
@@ -4973,13 +5087,18 @@
else
qtcurveStyle->menubar_gc[0]=NULL;
- if(SHADE_SELECTED==opts.shadeSliders)
- memcpy(qtcurveStyle->slider_gc, qtcurveStyle->menuitem_gc,
- sizeof(GdkGC *)*(TOTAL_SHADES+1));
- else if(SHADE_NONE!=opts.shadeSliders)
- QTC_GEN_GCS(style, qtcurveStyle->slider, qtcurveStyle->slider_gc)
- else
- qtcurveStyle->slider_gc[0]=NULL;
+ switch(opts.shadeSliders)
+ {
+ case SHADE_SELECTED:
+ memcpy(qtcurveStyle->slider_gc, qtcurveStyle->menuitem_gc,
+ sizeof(GdkGC *)*(TOTAL_SHADES+1));
+ break;
+ case SHADE_NONE:
+ qtcurveStyle->slider_gc[0]=NULL;
+ break;
+ default:
+ QTC_GEN_GCS(style, qtcurveStyle->slider, qtcurveStyle->slider_gc)
+ }
qtcurveStyle->defbtn_gc[0]=NULL;
if(IND_COLORED==opts.defBtnIndicator)
@@ -5082,17 +5201,24 @@
shadeColors(&color, qtcurveStyle->menubar);
}
- if(SHADE_SELECTED==opts.shadeSliders)
- memcpy(qtcurveStyle->slider, qtcurveStyle->menuitem, sizeof(GdkColor)*(TOTAL_SHADES+1));
- if(SHADE_CUSTOM==opts.shadeSliders)
- shadeColors(&opts.customSlidersColor, qtcurveStyle->slider);
- else if(SHADE_BLEND_SELECTED==opts.shadeSliders)
- {
- GdkColor mid;
-
- generateMidColor(&qtcurveStyle->menuitem[ORIGINAL_SHADE],
- &qtcurveStyle->button[ORIGINAL_SHADE], &mid, 1.0);
- shadeColors(&mid, qtcurveStyle->slider);
+ switch(opts.shadeSliders)
+ {
+ case SHADE_SELECTED:
+ memcpy(qtcurveStyle->slider, qtcurveStyle->menuitem, sizeof(GdkColor)*(TOTAL_SHADES+1));
+ break;
+ case SHADE_CUSTOM:
+ shadeColors(&opts.customSlidersColor, qtcurveStyle->slider);
+ break;
+ case SHADE_BLEND_SELECTED:
+ {
+ GdkColor mid;
+
+ generateMidColor(&qtcurveStyle->menuitem[ORIGINAL_SHADE],
+ &qtcurveStyle->button[ORIGINAL_SHADE], &mid, 1.0);
+ shadeColors(&mid, qtcurveStyle->slider);
+ }
+ default:
+ break;
}
if(IND_COLORED==opts.defBtnIndicator)
@@ -5124,6 +5250,19 @@
shadeColors(&mid, qtcurveStyle->mouseover);
}
}
+
+ switch(opts.shadeCheckRadio)
+ {
+ default:
+ qtcurveStyle->check_radio=&qtSettings.colors[COLOR_BUTTON_TEXT];
+ break;
+ case SHADE_BLEND_SELECTED:
+ case SHADE_SELECTED:
+ qtcurveStyle->check_radio=&qtSettings.colors[COLOR_SELECTED];
+ break;
+ case SHADE_CUSTOM:
+ qtcurveStyle->check_radio=&opts.customCheckRadioColor;
+ }
}
static void qtcurve_style_init_from_rc(GtkStyle *style, GtkRcStyle *rc_style)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qtcurve.h new/QtCurve-Gtk2-0.50/gtk2/qtcurve.h
--- old/QtCurve-Gtk2-0.49/gtk2/qtcurve.h 2007-03-06 23:18:50.000000000 +0100
+++ new/QtCurve-Gtk2-0.50/gtk2/qtcurve.h 2007-05-24 00:22:58.000000000 +0200
@@ -77,7 +77,8 @@
defbtn[TOTAL_SHADES+1],
mouseover[TOTAL_SHADES+1],
menubar[TOTAL_SHADES+1],
- menuitem[TOTAL_SHADES+1];
+ menuitem[TOTAL_SHADES+1],
+ *check_radio;
GdkGC *background_gc[TOTAL_SHADES+1],
*button_gc[TOTAL_SHADES+1],
*slider_gc[TOTAL_SHADES+1],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.49/gtk2/qt_settings.c new/QtCurve-Gtk2-0.50/gtk2/qt_settings.c
--- old/QtCurve-Gtk2-0.49/gtk2/qt_settings.c 2007-05-12 23:12:18.000000000 +0200
+++ new/QtCurve-Gtk2-0.50/gtk2/qt_settings.c 2007-05-24 21:31:14.000000000 +0200
@@ -24,6 +24,8 @@
#include
#include
+#define QTC_DEFAULT_TO_KDE3 /* Should we default to KDE3, or KDE4 settings when not running under KDE? */
+
/*
#define QTC_DEBUG
*/
@@ -80,7 +82,8 @@
GTK_APP_OPEN_OFFICE,
GTK_APP_VMPLAYER,
GTK_APP_GIMP,
- GTK_APP_GIMP_PLUGIN
+ GTK_APP_GIMP_PLUGIN,
+ GTK_APP_JAVA
/*GTK_APP_GAIM*/
} EGtkApp;
@@ -125,7 +128,11 @@
if(full && !vers)
vers=getenv("KDE_SESSION_VERSION");
+#ifdef QTC_DEFAULT_TO_KDE3
+ return !full || (!vers || atoi(vers)<4);
+#else
return full && (!vers || atoi(vers)<4);
+#endif
}
#ifdef QTC_DO_ICON_MAPPING
@@ -1218,11 +1225,13 @@
qtSettings.app=GTK_APP_GIMP_PLUGIN;
else if(app==strstr(app, "gimp"))
qtSettings.app=GTK_APP_GIMP;
+ else if(0==strcmp(app, "java"))
+ qtSettings.app=GTK_APP_JAVA;
/*else if(app==strstr(app, "gaim"))
qtSettings.app=GTK_APP_GAIM;*/
}
- if(GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)
{
/* KDE's "apply colors to non-KDE apps" messes up firefox! so need to fix this! */
char *kdehome=getKdeHome();
@@ -1416,7 +1425,7 @@
gtk_rc_parse_string("style \"QtCMi\" {xthickness = 1 ythickness = 2 } "
"class \"*MenuItem\" style \"QtCMi\"");
- if(GTK_APP_MOZILLA==qtSettings.app)
+ if(GTK_APP_MOZILLA==qtSettings.app || GTK_APP_JAVA==qtSettings.app)
opts->scrollbarType=SCROLLBAR_WINDOWS;
else
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org