Hello community,
here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory checked in at 2012-03-02 13:50:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qtcurve-gtk2 (Old)
and /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qtcurve-gtk2", Maintainer is "gnome-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/qtcurve-gtk2/qtcurve-gtk2.changes 2012-02-20 16:17:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.qtcurve-gtk2.new/qtcurve-gtk2.changes 2012-03-02 13:50:04.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Feb 29 07:07:42 UTC 2012 - vuntz@opensuse.org
+
+- Update to version 1.8.14:
+ + Fix reading of KDE settings.
+ + Fix button on editable combos with Gtk 2.24
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-1.8.13.tar.bz2
New:
----
QtCurve-Gtk2-1.8.14.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.HlWTIZ/_old 2012-03-02 13:50:05.000000000 +0100
+++ /var/tmp/diff_new_pack.HlWTIZ/_new 2012-03-02 13:50:05.000000000 +0100
@@ -17,7 +17,7 @@
Name: qtcurve-gtk2
-Version: 1.8.13
+Version: 1.8.14
Release: 0
Summary: QtCurve style for GTK+ 2
License: GPL-2.0+
++++++ QtCurve-Gtk2-1.8.13.tar.bz2 -> QtCurve-Gtk2-1.8.14.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/CMakeLists.txt new/QtCurve-Gtk2-1.8.14/CMakeLists.txt
--- old/QtCurve-Gtk2-1.8.13/CMakeLists.txt 2012-02-15 23:04:53.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.14/CMakeLists.txt 2012-02-28 21:18:36.000000000 +0100
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
set(CPACK_PACKAGE_VERSION_MINOR "8")
-set(CPACK_PACKAGE_VERSION_PATCH "13")
+set(CPACK_PACKAGE_VERSION_PATCH "14")
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-1.8.13/ChangeLog new/QtCurve-Gtk2-1.8.14/ChangeLog
--- old/QtCurve-Gtk2-1.8.13/ChangeLog 2012-02-15 23:04:53.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.14/ChangeLog 2012-02-28 21:18:36.000000000 +0100
@@ -1,3 +1,8 @@
+1.8.14
+------
+1. Fix reading of KDE settings.
+2. Fix button on editable combos with Gtk 2.24
+
1.8.13
------
1. Fix builing with newer glibs - only glib.h itself can be included.
@@ -131,7 +136,7 @@
1. Allow editable combo-box popup to be rounded.
2. Fix initial treeview highlight.
3. Fix rounded popup border when using compositing.
- 4. Add vmware, vmplayer, and gtk to list of app to exclude from opacity settings.
+ 4. Add vmware, vmplayer, and gtk to list of app to exclude from opacity settings.
This also prevents using RGBA for rounded tooltips and popup menus.
5. Fix opacity setting of squared popup menus.
6. Improve group-box label positioning.
@@ -396,7 +401,7 @@
17. Fix calculation of alpha values for square rings.
18. Fix progressbar glow central position.
19. Draw more frames.
-20. Fix image/gradient background issues with wxWidgets applications.
+20. Fix image/gradient background issues with wxWidgets applications.
(Use gtk_widget_translate_coordinates to translate widgets coordinates
relative to window.)
@@ -474,7 +479,7 @@
bgndImage.file=/path/to/svg/file.svg
bgndImage.width=120
bgndImage.height=160
-
+
(Use menuBgndImage for menus)
28. Added option to add a 'glow' to progressbars.
@@ -836,7 +841,7 @@
3. Improve appearance GtkCombo poup menu (even though this is actually
a deprecated widget!)
4. When menubars have a border, adjust the menubar items accordingly.
-5. When filling the used part of a slider groove, use the slider colour
+5. When filling the used part of a slider groove, use the slider colour
if set, otherwise use the highlight colour.
0.62.2
@@ -844,7 +849,7 @@
1. Improve appearance of progressbars in listviews (such as in d4x)
2. Call kde-config (KDE3) / kde4-config (KDE4) to determine location
of system icons for creating icon map.
-
+
0.62.1
------
1. Use highlight colour for unselected focused view items.
@@ -876,7 +881,7 @@
Line focus
Extra rounded (only applies to Gtk2 and KDE4 variants)
5. Allow all bar flat and raised tabs to bol coloured.
- 6. Only save appearance settings if different from default.
+ 6. Only save appearance settings if different from default.
7. If a gradient does not define the values for positions 0 and 100, then add these.
8. Better colouring of selected tab.
9. Added new focus options - full and line.
@@ -910,7 +915,7 @@
------
1. Allow QtCurve's colours to be overriden if the style name
starts with the application name. Fixes Pidgin's tab labels.
-
+
0.61.2
------
1. Fix setting of options if no qtcurvestylerc is found!
@@ -1321,7 +1326,7 @@
2. If KDE_SESSION_VERSION is set to >=4, then read settings from
$XDG_CONFIG_HOME/Trolltech.conf
3. Lighten focus rectangle.
-4. Fixed tab shift for GTK 2.10.11. Possibly should be applied to an earlier
+4. Fixed tab shift for GTK 2.10.11. Possibly should be applied to an earlier
version, but not sure.
5. When run under KDE4, allow radio buttons in menus.
6. Add /usr/share/icons into icon search path
@@ -1522,7 +1527,7 @@
4. Seperate specification of scollbar slider, and range slider, settings.
5. Option to specify menubar text colours.
6. New 'flat' appearance.
- 7. Dont create custom gcs per widget class, use globals instead - should
+ 7. Dont create custom gcs per widget class, use globals instead - should
use less resources.
8. Options to use a coloured border for mouse-over.
9. Mouse over for tabs!
@@ -1536,7 +1541,7 @@
3. Fix firefox menu colours when C locale indicates to use a comma
as decimal separator - patch supplied by Valentine Sinitsyn
4. Fix striped progressbar bleeding in Mozilla apps.
-5. More GIMP dialog hackery if --enable-parentless-dialogs-fix is
+5. More GIMP dialog hackery if --enable-parentless-dialogs-fix is
specified.
6. Treat SiftFox the same as FireFox
@@ -2066,7 +2071,7 @@
0.13
----
1. ALL: New V3 style - has rounded buttons, and uses gradient effect on buttons, tabs,
- scrollbars, etc.
+ scrollbars, etc.
2. ALL: Code clean-up.
0.12
@@ -2112,7 +2117,7 @@
0.06
----
1. GTK: Make combo-boxes thinner.
-2. GTK: Allow ussage of GTK1 font substitution file, either
+2. GTK: Allow ussage of GTK1 font substitution file, either
/etc/X11/qt_gtk_fnt2fntrc or ~/.qt/gtk_fnt2fntrc, and format:
<replace from> <with>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/helpers.h new/QtCurve-Gtk2-1.8.14/style/helpers.h
--- old/QtCurve-Gtk2-1.8.13/style/helpers.h 2012-02-15 23:04:53.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.14/style/helpers.h 2012-02-28 21:18:36.000000000 +0100
@@ -41,6 +41,9 @@
#if GTK_CHECK_VERSION(2, 90, 0)
#define QTC_IS_COMBO(X) GTK_IS_COMBO_BOX_TEXT(X)
#define QTC_COMBO_ENTRY(X) GTK_IS_COMBO_BOX_TEXT(X)
+#elif GTK_CHECK_VERSION(2, 24, 0)
+ #define QTC_IS_COMBO(X) (GTK_IS_COMBO(X) || GTK_IS_COMBO_BOX_TEXT(X))
+ #define QTC_COMBO_ENTRY(X) (GTK_IS_COMBO_BOX_ENTRY(X) || GTK_IS_COMBO_BOX_TEXT(X))
#else
#define QTC_IS_COMBO(X) GTK_IS_COMBO(X)
#define QTC_COMBO_ENTRY(X) GTK_IS_COMBO_BOX_ENTRY(X)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/qt_settings.c new/QtCurve-Gtk2-1.8.14/style/qt_settings.c
--- old/QtCurve-Gtk2-1.8.13/style/qt_settings.c 2012-02-15 23:04:53.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.14/style/qt_settings.c 2012-02-28 21:18:36.000000000 +0100
@@ -52,8 +52,9 @@
#define MAX_APP_NAME_LEN 32
#define KDE_CFG_DIR "/share/config/"
-#define KDEGLOBALS_FILE KDE_CFG_DIR"kdeglobals"
-#define KDEGLOBALS_SYS_FILE KDE_CFG_DIR"system.kdeglobals"
+#define KDE4_SYS_CFG_DIR "/share/kde4/config/"
+#define KDEGLOBALS_FILE "kdeglobals"
+#define KDEGLOBALS_SYS_FILE "system.kdeglobals"
static char * getKdeHome()
{
@@ -2027,8 +2028,8 @@
"/etc/kderc",
qtSettings.qt4 ? "/etc/kde4/kdeglobals" : "/etc/kde3/kdeglobals",
qtSettings.qt4 ? "/etc/kde4rc" : "/etc/kde3rc",
- qtSettings.qt4 ? KDE4PREFIX KDEGLOBALS_FILE : KDE3PREFIX KDEGLOBALS_FILE,
- qtSettings.qt4 ? KDE4PREFIX KDEGLOBALS_SYS_FILE : KDE3PREFIX KDEGLOBALS_SYS_FILE,
+ qtSettings.qt4 ? KDE4PREFIX KDE4_SYS_CFG_DIR KDEGLOBALS_FILE : KDE3PREFIX KDE_CFG_DIR KDEGLOBALS_FILE,
+ qtSettings.qt4 ? KDE4PREFIX KDE4_SYS_CFG_DIR KDEGLOBALS_SYS_FILE : KDE3PREFIX KDE_CFG_DIR KDEGLOBALS_SYS_FILE,
kdeGlobals(),
0L};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.8.13/style/qtcurve.c new/QtCurve-Gtk2-1.8.14/style/qtcurve.c
--- old/QtCurve-Gtk2-1.8.13/style/qtcurve.c 2012-02-15 23:04:53.000000000 +0100
+++ new/QtCurve-Gtk2-1.8.14/style/qtcurve.c 2012-02-28 21:18:36.000000000 +0100
@@ -125,7 +125,7 @@
// so register ur own error handler, and then unregister afterwards...
guint id=g_log_set_handler("Gtk", G_LOG_LEVEL_CRITICAL, qtcLogHandler, NULL);
g_object_set_data(G_OBJECT(topLevel), BUTTON_HACK, (gpointer)1);
-
+
gtk_dialog_set_alternative_button_order(GTK_DIALOG(topLevel), GTK_RESPONSE_HELP,
GTK_RESPONSE_OK, GTK_RESPONSE_YES, GTK_RESPONSE_ACCEPT, GTK_RESPONSE_APPLY,
GTK_RESPONSE_REJECT, GTK_RESPONSE_CLOSE, GTK_RESPONSE_NO, GTK_RESPONSE_CANCEL, -1);
@@ -177,11 +177,11 @@
if(opts.windowDrag>WM_DRAG_MENU_AND_TOOLBAR && (DETAIL("base") || DETAIL("eventbox") || DETAIL("viewportbin")))
qtcWMMoveSetup(widget);
-
+
if(widget && ((100!=opts.bgndOpacity && GTK_IS_WINDOW(widget)) || (100!=opts.dlgOpacity && GTK_IS_DIALOG(widget))) &&
!isFixedWidget(widget) && isRgbaWidget(widget))
enableBlurBehind(widget, TRUE);
-
+
if ((opts.menubarHiding || opts.statusbarHiding || BLEND_TITLEBAR || opts.windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR) &&
widget && GTK_IS_WINDOW(widget) && !isFixedWidget(widget) && !isGimpDockable(widget) && !isMenuOrToolTipWindow)
{
@@ -200,7 +200,7 @@
if(BLEND_TITLEBAR || opts.menubarHiding&HIDE_KWIN || opts.windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR)
qtcMenuEmitSize(menuBar, hiddenMenubar ? 0 : alloc.height);
-
+
if(opts.menubarHiding&HIDE_KWIN)
qtcWindowMenuBarDBus(widget, hiddenMenubar ? 0 : alloc.height);
}
@@ -212,7 +212,7 @@
if(statusBar && gtk_statusbar_get_has_resize_grip(GTK_STATUSBAR(statusBar)))
gtk_statusbar_set_has_resize_grip(GTK_STATUSBAR(statusBar), FALSE);
#endif
-
+
if(opts.statusbarHiding && statusBar)
{
gboolean hiddenStatusBar=qtcStatusBarHidden(qtSettings.appName);
@@ -490,7 +490,7 @@
{
if (GTK_STATE_ACTIVE==state)
state=GTK_STATE_PRELIGHT;
-
+
{
GdkColor *arrowColor=MO_ARROW(false, &qtSettings.colors[GTK_STATE_INSENSITIVE==state
? PAL_DISABLED : PAL_ACTIVE]
@@ -630,7 +630,7 @@
if(opts.unifySpin && isSpinButton && !opts.vArrows && GTK_ARROW_DOWN==arrow_type)
y--;
-
+
if(GTK_STATE_ACTIVE==state && (sbar || isSpinButton) && MO_GLOW==opts.coloredMouseOver)
state=GTK_STATE_PRELIGHT;
@@ -649,7 +649,7 @@
col=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER_TEXT];
else if(opts.customMenuTextColor)
col=&opts.customMenuNormTextColor;
- else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars ||
+ else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars ||
(SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(qtcPalette.menubar[ORIGINAL_SHADE])))
col=&style->text[GTK_STATE_SELECTED];
}
@@ -717,7 +717,7 @@
if(menubar && !isFakeGtk() && opts.shadeMenubarOnlyWhenActive)
{
GtkWindow *topLevel=GTK_WINDOW(gtk_widget_get_toplevel(widget));
-
+
if(topLevel && GTK_IS_WINDOW(topLevel))
{
#define SHADE_ACTIVE_MB_HACK_SET "QTC_SHADE_ACTIVE_MB_HACK_SET"
@@ -818,7 +818,7 @@
#endif
{
GdkRectangle a;
-
+
a.x=x+2, a.y=y, a.width=width-2, a.height=height;
setCairoClipping(cr, &a);
}
@@ -894,7 +894,7 @@
bgnd=4;
}
#endif
-
+
if(tbar_button && TBTN_JOINED==opts.tbarBtns)
{
adjustToolbarButtons(widget, &xAdjust, &yAdjust, &wAdjust, &hAdjust, &round, horiz_tbar);
@@ -1295,7 +1295,7 @@
int bg=SHADE_DARKEN==opts.comboBtn ||
(GTK_STATE_INSENSITIVE==state && SHADE_NONE!=opts.comboBtn)
? getFillReal(state, btnDown, true) : bgnd;
-
+
btn.x=vx+(rev ? LARGE_ARR_WIDTH+4 : 0),
btn.y=y, btn.width=20+3, btn.height=height;
@@ -1376,7 +1376,7 @@
if((menubar && opts.windowDrag || (opts.windowDrag>WM_DRAG_MENUBAR)))
qtcWMMoveSetup(widget);
-
+
if(menubar && BLEND_TITLEBAR)
{
menuBarAdjust=qtcGetWindowBorderSize(FALSE).titleHeight;
@@ -1386,7 +1386,7 @@
if(widget && (opacity!=100 || CUSTOM_BGND))
drawWindowBgnd(cr, style, area, window, widget, x, y, width, height);
-
+
if(drawGradient)
{
drawBevelGradientAlpha(cr, area, x, y-menuBarAdjust, width, height+menuBarAdjust, col,
@@ -1460,11 +1460,11 @@
drawWindowBgnd(cr, style, area, window, widget, x, y, width, height);
}
unsetCairoClipping(cr);
-
+
if(WIDGET_PBAR_TROUGH==wt)
drawProgressGroove(cr, style, state, window, widget, area, x, y, width, height, TRUE, TRUE);
else
- drawBorder(cr, style, state, area, x, y, width, height, NULL,
+ drawBorder(cr, style, state, area, x, y, width, height, NULL,
menuScroll || opts.square&SQUARE_FRAME ? ROUNDED_NONE : ROUNDED_ALL, shadowToBorder(shadow), wt, STD_BORDER);
}
CAIRO_END
@@ -1498,7 +1498,7 @@
composActive=!nonGtk && compositingActive(widget),
isAlphaWidget=!nonGtk && composActive && isRgbaWidget(widget),
useAlpha=!nonGtk && qtSettings.useAlpha && isAlphaWidget;
-
+
if(/*(composActive && !useAlpha) || */(opts.popupBorder && square))
{
drawAreaColor(cr, area, &style->base[state], x, y, width, height);
@@ -1567,7 +1567,7 @@
}
if(mapped && GTK_STATE_INSENSITIVE!=qtcWidgetGetState(widget))
gtk_widget_queue_draw(mapped);
-
+
qtcWidgetMapSetup(parent, widget, 1);
qtcComboBoxSetup(widget, parent);
}
@@ -1586,7 +1586,7 @@
rev=reverseLayout(widget) || (combo && parent && reverseLayout(parent));
GtkWidget *btn=NULL;
GtkStateType savedState=state;
-
+
#if GTK_CHECK_VERSION(2, 16, 0)
#if !GTK_CHECK_VERSION(2, 90, 0) /* Gtk3:TODO !!! */
if(isSpin && widget && width==qtcWidgetGetAllocation(widget).width)
@@ -1827,20 +1827,20 @@
// static gboolean isHoveredCell(GtkWidget *widget, int x, int y, int width, int height)
// {
// gboolean hovered=FALSE;
-//
+//
// if(widget && GTK_IS_TREE_VIEW(widget))
// {
// GtkTreePath *path=NULL;
// GtkTreeViewColumn *column=NULL;
-//
+//
// qtcTreeViewSetup(widget);
// qtcTreeViewGetCell(GTK_TREE_VIEW(widget), &path, &column, x, y, width, height);
// hovered=path && qtcTreeViewIsCellHovered(widget, path, column);
// }
-//
+//
// return hovered;
// }
-
+
static void gtkDrawCheck(GtkStyle *style, GdkWindow *window, GtkStateType state, GtkShadowType shadow, GdkRectangle *area, GtkWidget *widget,
const gchar *detail, gint x, gint y, gint width, gint height)
{
@@ -1899,7 +1899,7 @@
if(DETAIL("cellrenderertext") && widget && GTK_STATE_INSENSITIVE==qtcWidgetGetState(widget))
state=GTK_STATE_INSENSITIVE;
-
+
#ifndef READ_INACTIVE_PAL /* If we reead the inactive palette, then there is no need for the following... */
/* The following fixes the text in list views... if not used, when an item is selected it
gets the selected text color - but when the window changes focus it gets the normal
@@ -1907,7 +1907,7 @@
if(DETAIL("cellrenderertext") && GTK_STATE_ACTIVE==state)
state=GTK_STATE_SELECTED;
#endif
-
+
if(!isMenuItem && GTK_STATE_PRELIGHT==state)
state=GTK_STATE_NORMAL;
@@ -1928,7 +1928,7 @@
if(req.height