Hello community,
here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory
checked in at Fri Sep 4 00:32:49 CEST 2009.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2009-08-14 14:24:08.000000000 +0200
+++ qtcurve-gtk2/qtcurve-gtk2.changes 2009-09-02 15:47:33.000000000 +0200
@@ -1,0 +2,21 @@
+Wed Sep 2 15:45:12 CEST 2009 - dimstar@opensuse.org
+
+- bnc#529607 - qtcurve-gtk2-0.67.1-1.1: badly sized array
+ Fixed with patch QtCurve-arraysize.patch.
+
+-------------------------------------------------------------------
+Thu Aug 27 16:43:27 CEST 2009 - vuntz@novell.com
+
+- Update to version 0.68.0:
+ + New options:
+ - Control whether icons are displayed in menus
+ - Force alternate colours in listviews
+ - Square selections in listviews
+- Changes from version 0.67.5:
+ + Use same shade for all menu item separators.
+ + Fix clipping of non-V style right arrow.
+ + Dont draw 3D border around poup menus when border has been
+ disabled, but shading set to 0%
+ + Offset sunken slider thumbs to improve appearance.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-Gtk2-0.67.4.tar.bz2
New:
----
QtCurve-Gtk2-0.68.0.tar.bz2
QtCurve-arraysize.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.h8GmiX/_old 2009-09-04 00:31:01.000000000 +0200
+++ /var/tmp/diff_new_pack.h8GmiX/_new 2009-09-04 00:31:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.67.4)
+# spec file for package qtcurve-gtk2 (Version 0.68.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,30 +15,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: qtcurve-gtk2
+Version: 0.68.0
+Release: 1
+License: GPL v2 or later
+Summary: QtCurve style for Gtk2
+Url: http://www.kde-look.org/content/show.php?content=40492
+Group: System/GUI/GNOME
+Source0: QtCurve-Gtk2-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM QtCurve-arraysize.patch bnc#529607 dimstar@opensuse.org -- Adjust array size
+Patch0: QtCurve-arraysize.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: gtk2-devel
BuildRequires: kdelibs3
BuildRequires: kdelibs4-core
-Url: http://www.kde-look.org/content/show.php?content=40492
-License: GPL v2 or later
-Group: System/GUI/GNOME
-Summary: QtCurve style for Gtk2
-Version: 0.67.4
-Release: 1
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: QtCurve-Gtk2-%{version}.tar.bz2
Recommends: qtcurve-kde
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
This is the QtCurve style. QtCurve is available for both Gtk2+ and Qt3.
%prep
%setup -q -n QtCurve-Gtk2-%{version}
+%patch0 -p1
%build
mkdir build
++++++ QtCurve-Gtk2-0.67.4.tar.bz2 -> QtCurve-Gtk2-0.68.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-0.67.4/CMakeLists.txt new/QtCurve-Gtk2-0.68.0/CMakeLists.txt
--- old/QtCurve-Gtk2-0.67.4/CMakeLists.txt 2009-08-12 08:17:19.000000000 +0200
+++ new/QtCurve-Gtk2-0.68.0/CMakeLists.txt 2009-08-27 00:00:08.000000000 +0200
@@ -7,8 +7,8 @@
set(DEBIAN_PACKAGE_SECTION "gtk")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "67")
-set(CPACK_PACKAGE_VERSION_PATCH "4")
+set(CPACK_PACKAGE_VERSION_MINOR "68")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_CONTACT "Craig Drummond ")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-0.67.4/ChangeLog new/QtCurve-Gtk2-0.68.0/ChangeLog
--- old/QtCurve-Gtk2-0.67.4/ChangeLog 2009-08-12 08:17:19.000000000 +0200
+++ new/QtCurve-Gtk2-0.68.0/ChangeLog 2009-08-27 00:00:08.000000000 +0200
@@ -1,3 +1,18 @@
+0.68.0
+------
+1. New options:
+ Control whether icons are displayed in menus
+ Force alternate colours in listviews
+ Square selections in listviews
+
+0.67.5
+------
+1. Use same shade for all menu item separators.
+2. Fix clipping of non-V style right arrow.
+3. Dont draw 3D border around poup menus when border has been disabled, but
+ shading set to 0%
+4. Offset sunken slider thumbs to improve appearance.
+
0.67.4
------
1. If drawing square scrollviews, give these a similar 3d effect to rounded ones.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-0.67.4/common/common.h new/QtCurve-Gtk2-0.68.0/common/common.h
--- old/QtCurve-Gtk2-0.67.4/common/common.h 2009-08-12 08:17:19.000000000 +0200
+++ new/QtCurve-Gtk2-0.68.0/common/common.h 2009-08-27 00:00:08.000000000 +0200
@@ -842,7 +842,11 @@
borderInactiveTab,
doubleGtkComboArrow,
menuIcons,
- forceAlternateLvCols;
+#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
+ stdBtnSizes,
+#endif
+ forceAlternateLvCols,
+ squareLvSelection;
ELvLines lvLines;
EGradType bgndGrad,
menuBgndGrad;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-0.67.4/common/config_file.c new/QtCurve-Gtk2-0.68.0/common/config_file.c
--- old/QtCurve-Gtk2-0.67.4/common/config_file.c 2009-08-12 08:17:19.000000000 +0200
+++ new/QtCurve-Gtk2-0.68.0/common/config_file.c 2009-08-27 00:00:08.000000000 +0200
@@ -1151,7 +1151,9 @@
QTC_CFG_READ_BOOL(colorSliderMouseOver)
QTC_CFG_READ_BOOL(menuIcons)
QTC_CFG_READ_BOOL(forceAlternateLvCols)
+ QTC_CFG_READ_BOOL(squareLvSelection)
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
+ QTC_CFG_READ_BOOL(stdBtnSizes)
QTC_CFG_READ_BOOL(titlebarBorder)
QTC_CFG_READ_INT(titlebarButtons)
QTC_CFG_READ_TB_ICON(titlebarIcon)
@@ -1761,7 +1763,9 @@
opts->colorSliderMouseOver=false;
opts->menuIcons=true;
opts->forceAlternateLvCols=false;
+ opts->squareLvSelection=false;
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
+ opts->stdBtnSizes=false;
opts->titlebarBorder=true;
opts->titlebarButtons=QTC_TITLEBAR_BUTTON_ROUND|QTC_TITLEBAR_BUTTON_HOVER_SYMBOL;
opts->titlebarIcon=TITLEBAR_ICON_NEXT_TO_TITLE;
@@ -2313,6 +2317,7 @@
CFG_WRITE_ENTRY(framelessGroupBoxes)
CFG_WRITE_ENTRY(groupBoxLine)
CFG_WRITE_ENTRY(fadeLines)
+ CFG_WRITE_ENTRY(colorMenubarMouseOver)
CFG_WRITE_ENTRY(crHighlight)
CFG_WRITE_ENTRY(crButton)
CFG_WRITE_ENTRY(fillProgress)
@@ -2331,7 +2336,9 @@
CFG_WRITE_ENTRY(colorSliderMouseOver)
CFG_WRITE_ENTRY(menuIcons)
CFG_WRITE_ENTRY(forceAlternateLvCols)
+ CFG_WRITE_ENTRY(squareLvSelection)
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
+ CFG_WRITE_ENTRY(stdBtnSizes)
CFG_WRITE_ENTRY(titlebarBorder)
CFG_WRITE_ENTRY_NUM(titlebarButtons)
CFG_WRITE_ENTRY(titlebarIcon)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-0.67.4/style/qtcurve.c new/QtCurve-Gtk2-0.68.0/style/qtcurve.c
--- old/QtCurve-Gtk2-0.67.4/style/qtcurve.c 2009-08-12 08:17:19.000000000 +0200
+++ new/QtCurve-Gtk2-0.68.0/style/qtcurve.c 2009-08-27 00:00:08.000000000 +0200
@@ -1857,7 +1857,7 @@
y2 = ry + rheight-1;
GdkColor *col1 = &cols[dark],
*col2 = &cols[0];
- cairo_pattern_t *pt1=(opts.fadeLines && (horiz ? rwidth : rheight)>16)
+ cairo_pattern_t *pt1=(opts.fadeLines && (horiz ? rwidth : rheight)>(16+etchedDisp))
? cairo_pattern_create_linear(rx, ry, horiz ? x2 : rx+1, horiz ? ry+1 : y2)
: NULL,
*pt2=(pt1 && LINE_FLAT!=type)
@@ -2246,43 +2246,40 @@
}
static void drawSelection(cairo_t *cr, GtkStyle *style, GtkStateType state, GdkRectangle *area, GtkWidget *widget,
- const gchar *detail, int x, int y, int width, int height, int round)
+ const gchar *detail, int x, int y, int width, int height, int round, gboolean isSelection)
{
- double radius=QTC_ROUNDED
- ? height>48 && width>48
- ? 3.0
- : height>24 && width>24
- ? QTC_FULL_OUTER_RADIUS
- : QTC_SLIGHT_OUTER_RADIUS
- : 0.0,
- xd=x+0.5,
- yd=y+0.5,
- alpha=GTK_STATE_PRELIGHT==state ? 0.20 : 1.0;
- int xo=x, yo=y, widtho=width;
+ double xd=x+0.5,
+ yd=y+0.5,
+ alpha=GTK_STATE_PRELIGHT==state ? 0.20 : 1.0;
+ int xo=x, yo=y, widtho=width, mod=isSelection && opts.squareLvSelection ? 0 : 1;
GdkColor *col=&style->base[GTK_WIDGET_HAS_FOCUS(widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
- if(detail && ROUNDED_ALL!=round)
- {
- if(!(round&ROUNDED_LEFT))
+ if(mod)
+ if(detail && ROUNDED_ALL!=round)
{
- x-=2;
- xd-=2;
- width+=2;
+ if(!(round&ROUNDED_LEFT))
+ {
+ x-=2;
+ xd-=2;
+ width+=2;
+ }
+ if(!(round&ROUNDED_RIGHT))
+ width+=2;
}
- if(!(round&ROUNDED_RIGHT))
- width+=2;
- }
- drawBevelGradientAlpha(cr, style, area, NULL, x+1, y+1, width-2, height-2, col,
+ drawBevelGradientAlpha(cr, style, area, NULL, x+mod, y+mod, width-(2*mod), height-(2*mod), col,
TRUE, FALSE, opts.selectionAppearance, WIDGET_SELECTION, alpha);
- cairo_save(cr);
- cairo_rectangle(cr, xo, yo, widtho, height);
- cairo_clip(cr);
- cairo_set_source_rgba(cr, QTC_CAIRO_COL(*col), alpha);
- createPath(cr, xd, yd, width-1, height-1, getRadius(&opts, widtho, height, WIDGET_OTHER, RADIUS_SELECTION), round);
- cairo_stroke(cr);
- cairo_restore(cr);
+ if(mod)
+ {
+ cairo_save(cr);
+ cairo_rectangle(cr, xo, yo, widtho, height);
+ cairo_clip(cr);
+ cairo_set_source_rgba(cr, QTC_CAIRO_COL(*col), alpha);
+ createPath(cr, xd, yd, width-1, height-1, getRadius(&opts, widtho, height, WIDGET_OTHER, RADIUS_SELECTION), round);
+ cairo_stroke(cr);
+ cairo_restore(cr);
+ }
}
static void gtkDrawSlider(GtkStyle *style, GdkWindow *window, GtkStateType state,
@@ -2407,7 +2404,7 @@
x, y, width, height);
if(GTK_STATE_SELECTED==state)
- drawSelection(cr, style, state, area, widget, detail, x, y, width, height, round);
+ drawSelection(cr, style, state, area, widget, detail, x, y, width, height, round, TRUE);
}
else if( ( GTK_STATE_PRELIGHT==state && (detail && (0==strcmp(detail, QTC_PANED) || 0==strcmp(detail, "expander") ||
(opts.crHighlight && 0==strcmp(detail, "checkbutton")))) ) )
@@ -2620,7 +2617,7 @@
}
case GTK_ARROW_RIGHT:
{
- GdkPoint a[]={{x-1,y-3}, {x+2,y}, {x-1,y+3}, {x-2,y+3}, {x-2, y+2}, {x,y}, {x-2, y-2}, {x-2,y-3}};
+ GdkPoint a[]={{x-1,y+3}, {x+2,y}, {x-1,y-3}, {x-2,y-3}, {x-2, y-2}, {x,y}, {x-2, y+2}, {x-2,y+3}};
drawPolygon(cr, col, area, a, opts.vArrows ? 8 : 3, fill);
break;
}
@@ -3017,7 +3014,7 @@
else if(isPathButton(widget))
{
if(GTK_STATE_PRELIGHT==state)
- drawSelection(cr, style, state, area, widget, NULL, x, y, width, height, ROUNDED_ALL);
+ drawSelection(cr, style, state, area, widget, NULL, x, y, width, height, ROUNDED_ALL, FALSE);
if(GTK_IS_TOGGLE_BUTTON(widget))
{
@@ -4042,13 +4039,6 @@
&qtcPalette.menu, GT_HORIZ==opts.menuBgndGrad, FALSE, opts.menuBgndAppearance, WIDGET_OTHER);
else if(USE_LIGHTER_POPUP_MENU)
drawAreaColor(cr, area, NULL, &qtcPalette.menu, x, y, width, height);
- else
- {
- drawHLine(cr, QTC_CAIRO_COL(qtcPalette.background[0]), 1.0, x+1, y+1, width-2);
- drawVLine(cr, QTC_CAIRO_COL(qtcPalette.background[0]), 1.0, x+1, y+1, height-2);
- drawHLine(cr, QTC_CAIRO_COL(qtcPalette.background[QT_FRAME_DARK_SHADOW]), 1.0, x+1, y+height-2, width-2);
- drawVLine(cr, QTC_CAIRO_COL(qtcPalette.background[QT_FRAME_DARK_SHADOW]), 1.0, x+width-2, y+1, height-2);
- }
if(opts.menuStripe && opts.gtkMenuStripe && !isComboMenu(widget))
{
@@ -4101,6 +4091,13 @@
cairo_set_source_rgb(cr, QTC_CAIRO_COL(qtcPalette.background[QT_STD_BORDER]));
cairo_rectangle(cr, x+0.5, y+0.5, width-1, height-1);
cairo_stroke(cr);
+ if(!USE_LIGHTER_POPUP_MENU)
+ {
+ drawHLine(cr, QTC_CAIRO_COL(qtcPalette.background[0]), 1.0, x+1, y+1, width-2);
+ drawVLine(cr, QTC_CAIRO_COL(qtcPalette.background[0]), 1.0, x+1, y+1, height-2);
+ drawHLine(cr, QTC_CAIRO_COL(qtcPalette.background[QT_FRAME_DARK_SHADOW]), 1.0, x+1, y+height-2, width-2);
+ drawVLine(cr, QTC_CAIRO_COL(qtcPalette.background[QT_FRAME_DARK_SHADOW]), 1.0, x+width-2, y+1, height-2);
+ }
}
}
else if(detail &&(!strcmp(detail, "paned") || !strcmp(detail+1, "paned")))
@@ -4120,10 +4117,13 @@
}
else if(DETAIL("hseparator"))
{
- int offset=opts.gtkMenuStripe && (isMozilla() || (widget && GTK_IS_MENU_ITEM(widget))) ? 20 : 0;
+ gboolean isMenuItem=widget && GTK_IS_MENU_ITEM(widget);
+
+ int offset=opts.gtkMenuStripe && (isMozilla() || isMenuItem) ? 20 : 0;
if(offset && (GTK_APP_OPEN_OFFICE==qtSettings.app || isMozilla()))
offset+=2;
- drawFadedLine(cr, x+1+offset, y+(height>>1), width-(1+offset), 1, &qtcPalette.background[QT_STD_BORDER], area, NULL,
+ drawFadedLine(cr, x+1+offset, y+(height>>1), width-(1+offset), 1,
+ &qtcPalette.background[isMenuItem ? QTC_MENU_SEP_SHADE : QT_STD_BORDER], area, NULL,
TRUE, TRUE, TRUE);
}
else if(DETAIL("vseparator"))
@@ -5771,9 +5771,15 @@
GdkColor *markers=/*opts.coloredMouseOver && GTK_STATE_PRELIGHT==state
? qtcPalette.mouseover
: */btn_colors;
+ gboolean horiz=GTK_ORIENTATION_HORIZONTAL==orientation;
- if(LINE_SUNKEN!=opts.sliderThumbs)
- if(GTK_ORIENTATION_HORIZONTAL==orientation)
+ if(LINE_SUNKEN==opts.sliderThumbs)
+ if(horiz)
+ y--, height++;
+ else
+ x--, width++;
+ else
+ if(horiz)
x++;
else
y++;
@@ -5784,17 +5790,14 @@
// drawDot(cr, x, y, width, height, markers);
// break;
case LINE_FLAT:
- drawLines(cr, x, y, width, height,
- GTK_ORIENTATION_HORIZONTAL!=orientation, 3, 5, markers, area, 5, opts.sliderThumbs);
+ drawLines(cr, x, y, width, height, !horiz, 3, 5, markers, area, 5, opts.sliderThumbs);
break;
case LINE_SUNKEN:
- drawLines(cr, x, y, width, height,
- GTK_ORIENTATION_HORIZONTAL!=orientation, 4, 3, markers, area, 3, opts.sliderThumbs);
+ drawLines(cr, x, y, width, height, !horiz, 4, 3, markers, area, 3, opts.sliderThumbs);
break;
default:
case LINE_DOTS:
- drawDots(cr, x, y, width, height,
- GTK_ORIENTATION_HORIZONTAL!=orientation, scale ? 3 : 5, scale ? 4 : 2, markers, area, 0, 5);
+ drawDots(cr, x, y, width, height, !horiz, scale ? 3 : 5, scale ? 4 : 2, markers, area, 0, 5);
}
}
}
++++++ QtCurve-arraysize.patch ++++++
diff -aurp QtCurve-Gtk2-0.68.0/style/qtcurve.c QtCurve-Gtk2-0.68.0.patched/style/qtcurve.c
--- QtCurve-Gtk2-0.68.0/style/qtcurve.c 2009-08-27 00:00:08.000000000 +0200
+++ QtCurve-Gtk2-0.68.0.patched/style/qtcurve.c 2009-09-02 15:27:41.000000000 +0200
@@ -4878,7 +4878,7 @@ static void gtkDrawLayout(GtkStyle *styl
GtkNotebook *nb=mb || isMenuItem || !GTK_IS_LABEL(widget) ||
!widget->parent || !GTK_IS_NOTEBOOK(widget->parent) ? NULL : GTK_NOTEBOOK(widget->parent);
#endif
- GdkGC *prevGcs[4];
+ GdkGC *prevGcs[5];
gboolean activeWindow=TRUE;
int i=0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org