Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Fri Mar 23 11:38:39 CET 2007. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-03-19 14:08:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-03-23 10:25:20.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Mar 23 10:24:06 CET 2007 - stbinner@suse.de + +- update to 0.48.2: + 1. Modified the glass variants. Dull is a bit 'duller' in the + top 1/2, and fades away at the bottom. Shiny is now more like + dull, but with more pronounced gradients. + 2. Fix borders of selected menubar item when colouring menubar. + 3. Only darken menubar colour when using selected backgound + colour, if using glass gradients. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.48.1.tar.gz New: ---- QtCurve-Gtk2-0.48.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.E29706/_old 2007-03-23 11:37:22.000000000 +0100 +++ /var/tmp/diff_new_pack.E29706/_new 2007-03-23 11:37:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.48.1) +# spec file for package qtcurve-gtk2 (Version 0.48.2) # # 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/KDE Summary: QtCurve style for KDE -Version: 0.48.1 +Version: 0.48.2 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz @@ -74,6 +74,14 @@ %pref/share/themes/QtCurve %changelog +* Fri Mar 23 2007 - stbinner@suse.de +- update to 0.48.2: + 1. Modified the glass variants. Dull is a bit 'duller' in the + top 1/2, and fades away at the bottom. Shiny is now more like + dull, but with more pronounced gradients. + 2. Fix borders of selected menubar item when colouring menubar. + 3. Only darken menubar colour when using selected backgound + colour, if using glass gradients. * Mon Mar 19 2007 - stbinner@suse.de - update to 0.48.1: 1. Draw light border around all of progressbar. ++++++ QtCurve-Gtk2-0.48.1.tar.gz -> QtCurve-Gtk2-0.48.2.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.48.1/ChangeLog new/QtCurve-Gtk2-0.48.2/ChangeLog --- old/QtCurve-Gtk2-0.48.1/ChangeLog 2007-03-18 01:16:05.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/ChangeLog 2007-03-21 21:37:23.000000000 +0100 @@ -1,3 +1,12 @@ +0.48.2 +------ +1. Modifed the glass variants. Dull is a bit 'duller' in the top 1/2, and + fades away at the bottom. Shiny is now more like dull, but with more + pronounced gradients. +2. Fix borders of selected menubar item when colouring menubar. +3. Only darken menubar colour when using selcted backgound colour, if + using glass gradients. + 0.48.1 ------ 1. Draw light border around all of progressbar. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.48.1/configure new/QtCurve-Gtk2-0.48.2/configure --- old/QtCurve-Gtk2-0.48.1/configure 2007-03-18 23:06:37.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/configure 2007-03-21 23:05:05.000000000 +0100 @@ -1902,7 +1902,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.48.1 +VERSION=0.48.2 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.48.1/configure.in new/QtCurve-Gtk2-0.48.2/configure.in --- old/QtCurve-Gtk2-0.48.1/configure.in 2007-03-18 01:16:05.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/configure.in 2007-03-21 21:37:23.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.48.1 +VERSION=0.48.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.48.1/gtk2/common.h new/QtCurve-Gtk2-0.48.2/gtk2/common.h --- old/QtCurve-Gtk2-0.48.1/gtk2/common.h 2007-03-13 23:50:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/gtk2/common.h 2007-03-21 21:40:07.000000000 +0100 @@ -125,11 +125,11 @@ #define SHADE_BOTTOM_TAB_SEL_DARK 0.96 #define SHADE_GLASS_TOP_A(A, W) (APPEARANCE_DULL_GLASS==A \ - ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.20) \ + ? (WIDGET_DEF_BUTTON==W ? 1.05 : 1.05) \ : (WIDGET_DEF_BUTTON==W ? 1.08 : 1.7)) #define SHADE_GLASS_TOP_B(A, W) 0.96 #define SHADE_GLASS_BOT_A(A) 0.99 -#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.05 : 1.16) +#define SHADE_GLASS_BOT_B(A) (APPEARANCE_DULL_GLASS==A ? 1.08 : 1.16) #define IS_GLASS(A) (APPEARANCE_DULL_GLASS==A || APPEARANCE_SHINY_GLASS==A) #define IS_FLAT(A) (APPEARANCE_FLAT==A || APPEARANCE_RAISED==A) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.48.1/gtk2/config_file.c new/QtCurve-Gtk2-0.48.2/gtk2/config_file.c --- old/QtCurve-Gtk2-0.48.1/gtk2/config_file.c 2007-03-09 00:40:06.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/gtk2/config_file.c 2007-03-21 21:40:07.000000000 +0100 @@ -294,8 +294,8 @@ QtCConfig(const QString &filename); - bool ok() const { return values.count()>0; } - QString readEntry(const char *key, const QString &def=QString::null); + bool ok() const { return values.count()>0; } + const QString & readEntry(const char *key, const QString &def=QString::null); private: @@ -322,7 +322,7 @@ } } -inline QString QtCConfig::readEntry(const char *key, const QString &def) +inline const QString & QtCConfig::readEntry(const char *key, const QString &def) { return values.contains(key) ? values[key] : def; } @@ -334,14 +334,14 @@ static int readNumEntry(QtCConfig &cfg, const char *key, int def) { - QString val(readStringEntry(cfg, key)); + const QString &val(readStringEntry(cfg, key)); return val.isEmpty() ? def : val.toInt(); } static bool readBoolEntry(QtCConfig &cfg, const char *key, bool def) { - QString val(readStringEntry(cfg, key)); + const QString &val(readStringEntry(cfg, key)); return val.isEmpty() ? def : (val=="true" ? true : false); } @@ -431,7 +431,7 @@ { char *str=readStringEntry(cfg, key); - return str ? (0==memcmp(str, "true", 4) ? TRUE : FALSE) : def; + return str ? (0==memcmp(str, "true", 4) ? true : false) : def; } #define QTC_LATIN1(A) A @@ -624,13 +624,13 @@ opts->customMenuTextColor=false; opts->coloredMouseOver=true; opts->menubarMouseOver=true; - opts->shadeMenubarOnlyWhenActive=true; + opts->shadeMenubarOnlyWhenActive=false; opts->thinnerMenuItems=false; opts->scrollbarType=SCROLLBAR_KDE; - opts->shadowButtons=FALSE; - opts->stdFocus=FALSE; - opts->lvLines=FALSE; - opts->drawStatusBarFrames=FALSE; + opts->shadowButtons=false; + opts->stdFocus=false; + opts->lvLines=false; + opts->drawStatusBarFrames=false; #ifdef __cplusplus opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); @@ -779,15 +779,24 @@ } #define CFG_WRITE_ENTRY(ENTRY) \ - cfg->writeEntry(#ENTRY, toStr(opts.ENTRY)) + if (!exportingStyle && def.ENTRY==opts.ENTRY) \ + cfg->deleteEntry(#ENTRY); \ + else \ + cfg->writeEntry(#ENTRY, toStr(opts.ENTRY)); #define CFG_WRITE_ENTRY_B(ENTRY, B) \ - cfg->writeEntry(#ENTRY, toStr(opts.ENTRY, B)) + if (!exportingStyle && def.ENTRY==opts.ENTRY) \ + cfg->deleteEntry(#ENTRY); \ + else \ + cfg->writeEntry(#ENTRY, toStr(opts.ENTRY, B)); #define CFG_WRITE_ENTRY_D(ENTRY) \ - cfg->writeEntry(#ENTRY, ((int)(opts.ENTRY*100))-100) + if (!exportingStyle && def.ENTRY==opts.ENTRY) \ + cfg->deleteEntry(#ENTRY); \ + else \ + cfg->writeEntry(#ENTRY, ((int)(opts.ENTRY*100))-100); -bool static writeConfig(KConfig *cfg, const Options &opts) +bool static writeConfig(KConfig *cfg, const Options &opts, const Options &def, bool exportingStyle=false) { if(!cfg) { @@ -801,45 +810,45 @@ KConfig defCfg(filename, false, false); - return writeConfig(&defCfg, opts); + return writeConfig(&defCfg, opts, def, exportingStyle); } } else { cfg->setGroup(QTC_GROUP); - CFG_WRITE_ENTRY(round); - CFG_WRITE_ENTRY_D(highlightFactor); - CFG_WRITE_ENTRY(toolbarBorders); - CFG_WRITE_ENTRY(appearance); - CFG_WRITE_ENTRY(fixParentlessDialogs); - CFG_WRITE_ENTRY(stripedProgress); - CFG_WRITE_ENTRY(animatedProgress); - CFG_WRITE_ENTRY(lighterPopupMenuBgnd); - CFG_WRITE_ENTRY(embolden); - CFG_WRITE_ENTRY(defBtnIndicator); - 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(menubarAppearance); - CFG_WRITE_ENTRY(toolbarAppearance); - CFG_WRITE_ENTRY_B(toolbarSeparators, true); - CFG_WRITE_ENTRY_B(splitters, false); - CFG_WRITE_ENTRY(customMenuTextColor); - CFG_WRITE_ENTRY(coloredMouseOver); - CFG_WRITE_ENTRY(menubarMouseOver); - CFG_WRITE_ENTRY(shadeMenubarOnlyWhenActive); - CFG_WRITE_ENTRY(thinnerMenuItems); - CFG_WRITE_ENTRY(customSlidersColor); - CFG_WRITE_ENTRY(customMenubarsColor); - CFG_WRITE_ENTRY(customMenuSelTextColor); - CFG_WRITE_ENTRY(customMenuNormTextColor); - CFG_WRITE_ENTRY(scrollbarType); - CFG_WRITE_ENTRY(shadowButtons); - CFG_WRITE_ENTRY(stdFocus); - CFG_WRITE_ENTRY(lvLines); - CFG_WRITE_ENTRY(drawStatusBarFrames); + CFG_WRITE_ENTRY(round) + CFG_WRITE_ENTRY_D(highlightFactor) + CFG_WRITE_ENTRY(toolbarBorders) + CFG_WRITE_ENTRY(appearance) + CFG_WRITE_ENTRY(fixParentlessDialogs) + CFG_WRITE_ENTRY(stripedProgress) + CFG_WRITE_ENTRY(animatedProgress) + CFG_WRITE_ENTRY(lighterPopupMenuBgnd) + CFG_WRITE_ENTRY(embolden) + CFG_WRITE_ENTRY(defBtnIndicator) + 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(menubarAppearance) + CFG_WRITE_ENTRY(toolbarAppearance) + CFG_WRITE_ENTRY_B(toolbarSeparators, true) + CFG_WRITE_ENTRY_B(splitters, false) + CFG_WRITE_ENTRY(customMenuTextColor) + CFG_WRITE_ENTRY(coloredMouseOver) + CFG_WRITE_ENTRY(menubarMouseOver) + CFG_WRITE_ENTRY(shadeMenubarOnlyWhenActive) + CFG_WRITE_ENTRY(thinnerMenuItems) + CFG_WRITE_ENTRY(customSlidersColor) + CFG_WRITE_ENTRY(customMenubarsColor) + CFG_WRITE_ENTRY(customMenuSelTextColor) + CFG_WRITE_ENTRY(customMenuNormTextColor) + CFG_WRITE_ENTRY(scrollbarType) + CFG_WRITE_ENTRY(shadowButtons) + CFG_WRITE_ENTRY(stdFocus) + CFG_WRITE_ENTRY(lvLines) + CFG_WRITE_ENTRY(drawStatusBarFrames) cfg->sync(); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.48.1/gtk2/qtcurve.c new/QtCurve-Gtk2-0.48.2/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.48.1/gtk2/qtcurve.c 2007-03-18 01:16:05.000000000 +0100 +++ new/QtCurve-Gtk2-0.48.2/gtk2/qtcurve.c 2007-03-21 21:37:23.000000000 +0100 @@ -1351,52 +1351,23 @@ shade(base, &botA, shadeBotA); shade(base, &botB, shadeBotB); - if(APPEARANCE_SHINY_GLASS==app) + if(horiz) { - int shadeBorder=(int)(((horiz ? height : width)*GLASS_BORDER)+0.5); - - if(horiz) - { - height1=height3=shadeBorder; - height2=height-(height1+height3); - y2=y+height1; - y3=y2+height2; - } - else - { - width1=width3=shadeBorder; - width2=width-(width1+width3); - x2=x+width1; - x3=x2+width2; - } - - drawGradient(window, style, area, region, x1, y1, width1, height1, &topA, &topB, - horiz, TRUE); - drawAreaColor(style, window, area, region, WIDGET_TAB_BOT==w ? &topA : &botA, x2, y2, - width2, height2); - drawGradient(window, style, area, region, x3, y3, width3, height3, &botA, &botB, - horiz, TRUE); + height1/=2; + y2+=height1; + height2-=height1; } else { - if(horiz) - { - height1/=2; - y2+=height1; - height2-=height1; - } - else - { - width1/=2; - x2+=width1; - width2-=width1; - } - - drawGradient(window, style, area, region, x1, y1, width1, height1, &topA, &topB, - horiz, increase); - drawGradient(window, style, area, region, x2, y2, width2, height2, &botA, &botB, - horiz, increase); + width1/=2; + x2+=width1; + width2-=width1; } + + drawGradient(window, style, area, region, x1, y1, width1, height1, &topA, &topB, + horiz, increase); + drawGradient(window, style, area, region, x2, y2, width2, height2, &botA, &botB, + horiz, increase); } } else if(!sel && APPEARANCE_BEVELLED==app && @@ -3238,18 +3209,27 @@ x--; y--; width+=2, height+=2; } - drawLightBevel(style, window, new_state, area, NULL, x, y, - width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd, - qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, - 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| - (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + if(stdColors) + drawLightBevel(style, window, new_state, area, NULL, x, y, + width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, + 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| + (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], + getWidgetShade(WIDGET_MENU_ITEM, TRUE, FALSE), + getWidgetShade(WIDGET_MENU_ITEM, FALSE, FALSE), + TRUE, TRUE, FALSE, opts.appearance, WIDGET_MENU_ITEM); - if(mb && !stdColors) realDrawBorder(style, window, state, area, NULL, x, y, width, height, bgnd, qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, round, BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 0); + } if(pbar && opts.stripedProgress) drawLightBevel(style, window, new_state, NULL, region, x, y, @@ -5059,7 +5039,11 @@ { GdkColor color; - shade(&qtcurveStyle->menuitem[ORIGINAL_SHADE], &color, MENUBAR_GLASS_SELECTED_DARK_FACTOR); + if(IS_GLASS(opts.appearance)) + shade(&qtcurveStyle->menuitem[ORIGINAL_SHADE], &color, MENUBAR_GLASS_SELECTED_DARK_FACTOR); + else + color=qtcurveStyle->menuitem[ORIGINAL_SHADE]; + shadeColors(&color, qtcurveStyle->menubar); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org