Hello community,
here is the log from the commit of package qtcurve-gtk2
checked in at Fri Oct 24 17:17:49 CEST 2008.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2008-05-23 22:04:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2008-10-19 03:49:22.000000000 +0200
@@ -1,0 +2,16 @@
+Sun Oct 19 12:41:02 EST 2008 - mboman@suse.de
+
+- Update to version 0.59.7:
+ + Read tooltip colours from qt config file.
+ + Improve appearance of SWT scrollbars.
+ + Fix colour of tri-state checkboxes.
+ + Draw disabled icons desaturated - more KDE like.
+ + 'Fix' pixelation of firefox dialog icons. They look
+ slightly blurry, due to being scaled, but this is nicer
+ than the previous pixelated icons.
+ + Removed KDE event filter (QTC_ADD_EVENT_FILTER cmake option)
+ - causes way too many errors.
+ + Fix reading in of lightBorder for custom gradients.
+ + Icon path fix by Ilya Paramonov.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-Gtk2-0.59.3.tar.bz2
New:
----
QtCurve-Gtk2-0.59.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.rZ8394/_old 2008-10-24 17:17:32.000000000 +0200
+++ /var/tmp/diff_new_pack.rZ8394/_new 2008-10-24 17:17:32.000000000 +0200
@@ -1,10 +1,17 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.59.3)
+# spec file for package qtcurve-gtk2 (Version 0.59.7)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -17,7 +24,7 @@
License: GPL v2 or later
Group: System/GUI/GNOME
Summary: QtCurve style for Gtk2
-Version: 0.59.3
+Version: 0.59.7
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-Gtk2-%{version}.tar.bz2
@@ -74,7 +81,20 @@
%pref/share/themes/QtCurve
%changelog
-* Sat May 24 2008 jpr@suse.de
+* Sun Oct 19 2008 mboman@suse.de
+- Update to version 0.59.7:
+ + Read tooltip colours from qt config file.
+ + Improve appearance of SWT scrollbars.
+ + Fix colour of tri-state checkboxes.
+ + Draw disabled icons desaturated - more KDE like.
+ + 'Fix' pixelation of firefox dialog icons. They look
+ slightly blurry, due to being scaled, but this is nicer
+ than the previous pixelated icons.
+ + Removed KDE event filter (QTC_ADD_EVENT_FILTER cmake option)
+ - causes way too many errors.
+ + Fix reading in of lightBorder for custom gradients.
+ + Icon path fix by Ilya Paramonov.
+* Fri May 23 2008 jpr@suse.de
- Update to 0.59.3
* Also check in share/kde4/apps/kstyle/themes for qtc_*.themerc files.
* Fix evolution calendar crash. (bnc #390346)
@@ -87,7 +107,7 @@
- Remove buffer-overflow-fix.diff, it was upstreamed
* Tue May 06 2008 aj@suse.de
- Fix missing return value.
-* Sat Apr 26 2008 dmueller@suse.de
+* Fri Apr 25 2008 dmueller@suse.de
- fix stack buffer overflow
* Thu Apr 24 2008 stbinner@suse.de
- update to 0.59:
++++++ QtCurve-Gtk2-0.59.3.tar.bz2 -> QtCurve-Gtk2-0.59.7.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.59.3/ChangeLog new/QtCurve-Gtk2-0.59.7/ChangeLog
--- old/QtCurve-Gtk2-0.59.3/ChangeLog 2008-05-12 21:29:16.000000000 +0200
+++ new/QtCurve-Gtk2-0.59.7/ChangeLog 2008-07-30 21:17:37.000000000 +0200
@@ -1,3 +1,26 @@
+0.59.7
+------
+1. Read tooltip colours from qt config file.
+
+0.59.6
+------
+1. Improve appearance of SWT scrollbars.
+2. Fix colour of tri-state checkboxes.
+
+0.59.5
+------
+1. Draw disabled icons desaturated - more KDE like.
+2. 'Fix' pixelation of firefox dialog icons. They look
+ slightly blurry, due to being scaled, but this is nicer
+ than the previous pixelated icons.
+3. Removed KDE event filter (QTC_ADD_EVENT_FILTER cmake option)
+ - causes way too many errors.
+
+0.59.4
+------
+1. Fix reading in of lightBorder for custom gradients.
+2. Icon path fix by Ilya Paramonov.
+
0.59.3
------
1. Also check in share/kde4/apps/kstyle/themes for qtc_*.themerc files.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.59.3/CMakeLists.txt new/QtCurve-Gtk2-0.59.7/CMakeLists.txt
--- old/QtCurve-Gtk2-0.59.3/CMakeLists.txt 2008-05-12 21:29:16.000000000 +0200
+++ new/QtCurve-Gtk2-0.59.7/CMakeLists.txt 2008-07-30 21:17:37.000000000 +0200
@@ -8,7 +8,7 @@
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "59")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_PATCH "7")
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}")
@@ -98,13 +98,6 @@
configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
add_subdirectory(style)
add_subdirectory(mozilla)
- if(QTC_ADD_EVENT_FILTER)
- message("\n\n**************************************************************\n"
- "Warning: You have enabled the KDE event filter, this has been\n"
- " reported to interfere with firefox and crash some\n"
- " applications. USE AT YOUR OWN RISK!\n"
- "**************************************************************\n\n\n")
- endif(QTC_ADD_EVENT_FILTER)
if(QTC_REORDER_GTK_DIALOG_BUTTONS)
message("\n\n**************************************************************\n"
"Warning: You have enabled the option for QtCurve to try to manually\n"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.59.3/common/config_file.c new/QtCurve-Gtk2-0.59.7/common/config_file.c
--- old/QtCurve-Gtk2-0.59.3/common/config_file.c 2008-05-12 21:29:16.000000000 +0200
+++ new/QtCurve-Gtk2-0.59.7/common/config_file.c 2008-07-30 21:17:37.000000000 +0200
@@ -979,6 +979,7 @@
opts->customGradient[i]=malloc(sizeof(CustomGradient));
opts->customGradient[i]->numGrad=comma/2;
opts->customGradient[i]->grad=malloc(sizeof(Gradient) * opts->customGradient[i]->numGrad);
+ opts->customGradient[i]->lightBorder=lb;
str=c+1;
for(j=0; jparent);
}
+/*
static gboolean isSwtComboBoxEntry(GtkWidget *widget)
{
return GTK_APP_JAVA_SWT==qtSettings.app &&
isComboBoxEntry(widget) &&
widget->parent->parent && 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent->parent)), "SwtFixed");
}
+*/
static gboolean isGimpCombo(GtkWidget *widget)
{
@@ -800,7 +802,7 @@
GTK_IS_FIXED(widget->parent) && GTK_IS_WINDOW(widget->parent->parent);
}
-static void setState(GtkWidget *widget, GtkStateType *state, gboolean *btn_down)
+static void setState(GtkWidget *widget, GtkStateType *state, gboolean *btn_down, int sliderWidth, int sliderHeight)
{
if(isMozillaWidget(widget))
{
@@ -814,15 +816,15 @@
else
{
#define BTN_SIZE 15
-
GtkRange *range=GTK_RANGE(widget);
gboolean horiz=range->orientation,
- disableLeft=FALSE,
- disableRight=FALSE;
- int max=horiz ? range->range_rect.height
- : range->range_rect.width,
- leftBtns=0,
- rightBtns=0;
+ disableLeft=FALSE,
+ disableRight=FALSE;
+ int len=horiz ? sliderHeight : sliderWidth,
+ max=horiz ? range->range_rect.height
+ : range->range_rect.width,
+ leftBtns=0,
+ rightBtns=0;
switch(opts.scrollbarType)
{
@@ -846,11 +848,17 @@
case SCROLLBAR_NONE:
break;
}
-
- if(range->slider_start==leftBtns)
- disableLeft=TRUE;
- if(range->slider_end+rightBtns==max)
- disableRight=TRUE;
+ if(-1!=len)
+ disableLeft=disableRight=len==(max-(leftBtns+rightBtns));
+ else if(/*GTK_APP_JAVA_SWT!=qtSettings.app || */!widget || !widget->parent || !widget->parent->parent ||
+ !GTK_IS_FIXED(widget->parent) || !widget->parent->parent->name ||
+ strcmp(widget->parent->parent->name, "MozillaGtkWidget"))
+ {
+ if(range->slider_start==leftBtns)
+ disableLeft=TRUE;
+ if(range->slider_end+rightBtns==max)
+ disableRight=TRUE;
+ }
if(disableLeft && disableRight)
*state=GTK_STATE_INSENSITIVE;
@@ -2400,12 +2408,14 @@
/* For SWT (e.g. eclipse) apps. For some reason these only seem to allow a ythickness of at max 2 - but
for etching we need 3. So we fake this by drawing the 3rd lines here...*/
+/*
if(QTC_DO_EFFECT && GTK_STATE_INSENSITIVE!=state && DETAIL("entry_bg") &&
isSwtComboBoxEntry(widget) && GTK_WIDGET_HAS_FOCUS(widget))
{
drawHLine(cr, QTC_CAIRO_COL(qtcPalette.menuitem[QT_FRAME_DARK_SHADOW]), 1.0, x, y, width);
drawHLine(cr, QTC_CAIRO_COL(qtcPalette.menuitem[0]), 1.0, x, y+height-1, width);
}
+*/
}
QTC_CAIRO_END
}
@@ -2663,7 +2673,7 @@
#else
*/
if(GTK_IS_RANGE(widget) && sbar)
- setState(widget, &state, NULL);
+ setState(widget, &state, NULL, -1, -1);
/*
#endif
*/
@@ -2750,7 +2760,7 @@
0==strcmp(detail, "stepper"));
if(GTK_IS_RANGE(widget) && sbar)
- setState(widget, &state, &btn_down);
+ setState(widget, &state, &btn_down, -1, -1);
{
gboolean pbar=DETAIL("bar") && GTK_IS_PROGRESS_BAR(widget),
@@ -2966,12 +2976,13 @@
#endif
/* For some reason SWT combo's dont un-prelight when activated! So dont pre-light at all! */
+/*
if(GTK_APP_JAVA_SWT==qtSettings.app && WIDGET_STD_BUTTON==widgetType && GTK_STATE_PRELIGHT==state && WIDGET_COMBO==widgetType)
{
state=GTK_STATE_NORMAL;
bgnd=getFill(state, btn_down);
}
- else if(WIDGET_SB_BUTTON==widgetType && GTK_APP_MOZILLA!=qtSettings.app)
+ else */ if(WIDGET_SB_BUTTON==widgetType && GTK_APP_MOZILLA!=qtSettings.app)
switch(getStepper(widget, x, y, width, height))
{
case QTC_STEPPER_B:
@@ -4075,11 +4086,13 @@
}
else if (tri)
{
- int tx=x+(QTC_CHECK_SIZE/2),
- ty=y+(QTC_CHECK_SIZE/2);
+ int ty=y+(QTC_CHECK_SIZE/2);
+ GdkColor *col=GTK_STATE_INSENSITIVE==state
+ ? &style->text[ind_state]
+ : qtcPalette.check_radio;
- drawHLine(cr, QTC_CAIRO_COL(style->text[ind_state]), 1.0, tx-3, ty, 6);
- drawHLine(cr, QTC_CAIRO_COL(style->text[ind_state]), 1.0, tx-3, ty+1, 6);
+ drawHLine(cr, QTC_CAIRO_COL(*col), 1.0, x+3, ty, QTC_CHECK_SIZE-6);
+ drawHLine(cr, QTC_CAIRO_COL(*col), 1.0, x+3, ty+1, QTC_CHECK_SIZE-6);
}
QTC_CAIRO_END
@@ -4224,11 +4237,14 @@
}
else if(tri)
{
- int tx=x+(QTC_RADIO_SIZE/2),
- ty=y+(QTC_RADIO_SIZE/2);
+ int ty=y+(QTC_RADIO_SIZE/2);
+
+ GdkColor *col=GTK_STATE_INSENSITIVE==state
+ ? &style->text[ind_state]
+ : qtcPalette.check_radio;
- drawHLine(cr, QTC_CAIRO_COL(style->text[ind_state]), 1.0, tx-3, ty, 6);
- drawHLine(cr, QTC_CAIRO_COL(style->text[ind_state]), 1.0, tx-3, ty+1, 6);
+ drawHLine(cr, QTC_CAIRO_COL(*col), 1.0, x+3, ty, QTC_RADIO_SIZE-6);
+ drawHLine(cr, QTC_CAIRO_COL(*col), 1.0, x+3, ty+1, QTC_RADIO_SIZE-6);
}
}
QTC_CAIRO_END
@@ -4412,6 +4428,125 @@
}
}
+static GdkPixbuf * scaleOrRef(GdkPixbuf *src, int width, int height)
+{
+ if (width == gdk_pixbuf_get_width(src) && height == gdk_pixbuf_get_height(src))
+ return g_object_ref (src);
+ else
+ return gdk_pixbuf_scale_simple(src, width, height, GDK_INTERP_BILINEAR);
+}
+
+static GdkPixbuf * setTransparency(const GdkPixbuf *pixbuf, gdouble alpha_percent)
+{
+ GdkPixbuf *target;
+
+ g_return_val_if_fail(pixbuf != NULL, NULL);
+ g_return_val_if_fail(GDK_IS_PIXBUF (pixbuf), NULL);
+
+ /* Returns a copy of pixbuf with it's non-completely-transparent pixels to
+ have an alpha level "alpha_percent" of their original value. */
+
+ target = gdk_pixbuf_add_alpha (pixbuf, FALSE, 0, 0, 0);
+
+ if (alpha_percent == 1.0)
+ return target;
+ else
+ {
+ guint width = gdk_pixbuf_get_width(target),
+ height = gdk_pixbuf_get_height(target),
+ rowstride = gdk_pixbuf_get_rowstride(target);
+ guchar *data = gdk_pixbuf_get_pixels(target),
+ *current;
+ int x, y;
+
+ for (y = 0; y < height; y++)
+ for (x = 0; x < width; x++)
+ {
+ /* The "4" is the number of chars per pixel, in this case, RGBA,
+ the 3 means "skip to the alpha" */
+ current = data + (y * rowstride) + (x * 4) + 3;
+ *(current) = (guchar) (*(current) * alpha_percent);
+ }
+ }
+
+ return target;
+}
+
+static GdkPixbuf * gtkRenderIcon(GtkStyle *style, const GtkIconSource *source, GtkTextDirection direction,
+ GtkStateType state, GtkIconSize size, GtkWidget *widget, const char *detail)
+{
+ int width = 1,
+ height = 1;
+ GdkPixbuf *scaled,
+ *stated,
+ *base_pixbuf;
+ GdkScreen *screen;
+ GtkSettings *settings;
+ gboolean scaleMozilla=opts.mapKdeIcons && isMozilla() && GTK_ICON_SIZE_DIALOG==size;
+
+ /* Oddly, style can be NULL in this function, because GtkIconSet can be used without a style and if so
+ * it uses this function. */
+ base_pixbuf = gtk_icon_source_get_pixbuf(source);
+
+ g_return_val_if_fail(base_pixbuf != NULL, NULL);
+
+ if(widget && gtk_widget_has_screen(widget))
+ {
+ screen = gtk_widget_get_screen(widget);
+ settings = gtk_settings_get_for_screen(screen);
+ }
+ else if(style->colormap)
+ {
+ screen = gdk_colormap_get_screen(style->colormap);
+ settings = gtk_settings_get_for_screen(screen);
+ }
+ else
+ {
+ settings = gtk_settings_get_default();
+ GTK_NOTE(MULTIHEAD, g_warning("Using the default screen for gtk_default_render_icon()"));
+ }
+
+ if(scaleMozilla)
+ width=height=48;
+ else if(size !=(GtkIconSize) -1 && !gtk_icon_size_lookup_for_settings(settings, size, &width, &height))
+ {
+ g_warning(G_STRLOC ": invalid icon size '%d'", size);
+ return NULL;
+ }
+
+ /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
+ * leave it alone. */
+ if(scaleMozilla || (size !=(GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded(source)))
+ scaled = scaleOrRef(base_pixbuf, width, height);
+ else
+ scaled = g_object_ref(base_pixbuf);
+
+ /* If the state was wildcarded, then generate a state. */
+ if(gtk_icon_source_get_state_wildcarded(source))
+ {
+ if(GTK_STATE_INSENSITIVE==state)
+ {
+ stated = setTransparency(scaled, 0.5);
+ gdk_pixbuf_saturate_and_pixelate(stated, stated, 0.0, FALSE);
+ g_object_unref(scaled);
+ }
+#if 0 /* KDE does not highlight icons */
+ else if(GTK_STATE_PRELIGHT==state)
+ {
+ stated = gdk_pixbuf_copy(scaled);
+ gdk_pixbuf_saturate_and_pixelate(scaled, stated, 1.2, FALSE);
+ g_object_unref(scaled);
+ }
+#endif
+ else
+ stated = scaled;
+ }
+ else
+ stated = scaled;
+
+ return stated;
+}
+
static void gtkDrawTab(GtkStyle *style, GdkWindow *window, GtkStateType state,
GtkShadowType shadow_type, GdkRectangle *area, GtkWidget *widget,
const gchar *detail, gint x, gint y, gint width, gint height)
@@ -4896,7 +5031,7 @@
QTC_CAIRO_BEGIN
if(GTK_IS_RANGE(widget) && scrollbar)
- setState(widget, &state, NULL);
+ setState(widget, &state, NULL, width, height);
if(useButtonColor(detail))
{
@@ -5726,6 +5861,7 @@
style_class->draw_vline = gtkDrawVLine;
style_class->draw_focus = gtkDrawFocus;
style_class->draw_layout = gtkDrawLayout;
+ style_class->render_icon = gtkRenderIcon;
}
static GtkRcStyleClass *parent_rc_class;
@@ -5822,7 +5958,7 @@
{
if(qtInit(&opts))
generateColors();
-#ifdef QTC_ADD_EVENT_FILTER
+#ifdef QTC_ADD_EVENT_FILTER____DISABLED
qtcAddEventFilter();
#endif
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.59.3/style/qt_settings.c new/QtCurve-Gtk2-0.59.7/style/qt_settings.c
--- old/QtCurve-Gtk2-0.59.3/style/qt_settings.c 2008-05-12 21:29:16.000000000 +0200
+++ new/QtCurve-Gtk2-0.59.7/style/qt_settings.c 2008-07-30 21:17:37.000000000 +0200
@@ -94,6 +94,10 @@
COLOR_TEXT_SELECTED,
COLOR_BUTTON_TEXT,
COLOR_LV,
+
+ COLOR_TOOLTIP,
+ COLOR_TOOLTIP_TEXT,
+
COLOR_NONE,
COLOR_NUMCOLORS=COLOR_NONE /* NONE does not count! */
};
@@ -108,7 +112,7 @@
GTK_APP_GIMP,
GTK_APP_GIMP_PLUGIN,
GTK_APP_JAVA,
- GTK_APP_JAVA_SWT,
+ /*GTK_APP_JAVA_SWT,*/
GTK_APP_EVOLUTION
/*GTK_APP_GAIM*/
} EGtkApp;
@@ -347,6 +351,12 @@
case 13:
setRgb(&qtSettings.colors[p][COLOR_TEXT_SELECTED], l);
break;
+ case 18:
+ setRgb(&qtSettings.colors[p][COLOR_TOOLTIP], l);
+ break;
+ case 19:
+ setRgb(&qtSettings.colors[p][COLOR_TOOLTIP_TEXT], l);
+ break;
default:
break;
}
@@ -715,7 +725,7 @@
(int)size);
}
#ifdef QTC_DEBUG
-printf("REQUEST FONT: %s\n", qtSettings.font);
+ printf("REQUEST FONT: %s\n", qtSettings.font);
#endif
}
@@ -937,6 +947,13 @@
strcat(path, "\"");
+ {
+ int plen=strlen(path);
+
+ if(path[plen - 1] == ':')
+ path[plen - 1] = '\0';
+ }
+
return path;
}
@@ -1201,7 +1218,7 @@
}
#endif
-#ifdef QTC_ADD_EVENT_FILTER
+#ifdef QTC_ADD_EVENT_FILTER____DISABLED
/* ... Taken from Qt engine ... */
#include
@@ -1354,7 +1371,15 @@
qtSettings.iconSizes.btnSize=16;
qtSettings.iconSizes.mnuSize=16;
qtSettings.iconSizes.dlgSize=32;
- qtSettings.colors[PAL_ACTIVE][COLOR_LV].red=qtSettings.colors[PAL_ACTIVE][COLOR_LV].green=qtSettings.colors[PAL_ACTIVE][COLOR_LV].blue=0;
+ qtSettings.colors[PAL_ACTIVE][COLOR_LV].red=
+ qtSettings.colors[PAL_ACTIVE][COLOR_LV].green=
+ qtSettings.colors[PAL_ACTIVE][COLOR_LV].blue=0;
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].red=
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].green=
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].blue=0;
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].red=0xFFFF;
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].green=0xFFFF;
+ qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].blue=toGtkColor(192);
qtSettings.styleName=NULL;
lastRead=now;
@@ -1470,13 +1495,15 @@
qtSettings.app=GTK_APP_JAVA;
else if(0==strcmp(app, "evolution"))
qtSettings.app=GTK_APP_EVOLUTION;
+ /*else if(0==strcmp(app, "eclipse"))
+ qtSettings.app=GTK_APP_JAVA_SWT;*/
/*else if(app==strstr(app, "gaim"))
qtSettings.app=GTK_APP_GAIM;*/
}
/* Eclipse sets a application name, so if this is set then we're not a Swing java app */
- if(GTK_APP_JAVA==qtSettings.app && g_get_application_name() && 0!=strcmp(g_get_application_name(), "<unknown>"))
- qtSettings.app=GTK_APP_JAVA_SWT;
+ /*if(GTK_APP_JAVA==qtSettings.app && g_get_application_name() && 0!=strcmp(g_get_application_name(), "<unknown>"))
+ qtSettings.app=GTK_APP_JAVA_SWT;*/
/*if(isMozilla() || GTK_APP_JAVA==qtSettings.app)*/
if(GTK_APP_JAVA!=qtSettings.app)
@@ -1833,6 +1860,28 @@
} /* C-Scope */
} /* C-Scope 'doEffect' */
+ { /* C-Scope */
+ static const char *constStrFormat="style \"QtcTT\" "
+ "{ xthickness = 4 ythickness = 4 bg[NORMAL] = \"#%02X%02X%02X\" fg[NORMAL] = \"#%02X%02X%02X\"} "
+ "widget \"gtk-tooltips*\" style \"QtcTT\" "
+ "widget \"gtk-tooltip*\" style \"QtcTT\"";
+
+ tmpStr=(char *)realloc(tmpStr, strlen(constStrFormat)+1);
+ sprintf(tmpStr, constStrFormat,
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].red),
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].green),
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP_TEXT].blue),
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP].red),
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP].green),
+ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TOOLTIP].blue));
+ gtk_rc_parse_string(tmpStr);
+ } /* C-Scope */
+
+ if(ROUND_FULL==opts->round && EFFECT_NONE!=opts->buttonEffect)
+ gtk_rc_parse_string("style \"QtCSwt\" { xthickness = 3 ythickness = 2 }"
+ "widget_class \"*.SwtFixed.GtkCombo.GtkButton\" style \"QtCSwt\""
+ "widget_class \"*.SwtFixed.GtkCombo.GtkEntry\" style \"QtCSwt\"");
+
if(opts->lighterPopupMenuBgnd && !opts->borderMenuitems)
gtk_rc_parse_string("style \"QtCM\" { xthickness=1 ythickness=1 }\n"
"class \"*GtkMenu\" style \"QtCM\"");
++++++ qtcurve-gtk2-iconeffects.diff ++++++
--- /var/tmp/diff_new_pack.rZ8394/_old 2008-10-24 17:17:32.000000000 +0200
+++ /var/tmp/diff_new_pack.rZ8394/_new 2008-10-24 17:17:32.000000000 +0200
@@ -1,6 +1,6 @@
---- style/qtcurve.c
-+++ style/qtcurve.c
-@@ -5275,6 +5275,140 @@
+--- style/qtcurve.c.org 2008-10-19 13:05:01.000000000 +1100
++++ style/qtcurve.c 2008-10-19 13:06:13.000000000 +1100
+@@ -5702,6 +5702,57 @@
//QTC_CAIRO_END
}
@@ -40,7 +40,6 @@
+ return target;
+}
+
-+// copypasta
+static GdkPixbuf* scale_or_ref (GdkPixbuf *src, int width, int height)
+{
+ if (width == gdk_pixbuf_get_width (src) &&
@@ -56,96 +55,6 @@
+ }
+}
+
-+// copypasta
-+static GdkPixbuf * gtkRenderIcon (GtkStyle *style, const GtkIconSource *source,
-+ GtkTextDirection direction, GtkStateType state,
-+ GtkIconSize size, GtkWidget *widget, const char *detail)
-+{
-+ int width = 1;
-+ int height = 1;
-+ GdkPixbuf *scaled;
-+ GdkPixbuf *stated;
-+ GdkPixbuf *base_pixbuf;
-+ GdkScreen *screen;
-+ GtkSettings *settings;
-+
-+ /* Oddly, style can be NULL in this function, because
-+ * GtkIconSet can be used without a style and if so
-+ * it uses this function.
-+ */
-+
-+ base_pixbuf = gtk_icon_source_get_pixbuf (source);
-+
-+ g_return_val_if_fail (base_pixbuf != NULL, NULL);
-+
-+ if (widget && gtk_widget_has_screen (widget))
-+ {
-+ screen = gtk_widget_get_screen (widget);
-+ settings = gtk_settings_get_for_screen (screen);
-+ }
-+ else if (style->colormap)
-+ {
-+ screen = gdk_colormap_get_screen (style->colormap);
-+ settings = gtk_settings_get_for_screen (screen);
-+ }
-+ else
-+ {
-+ settings = gtk_settings_get_default ();
-+ GTK_NOTE (MULTIHEAD,
-+ g_warning ("Using the default screen for gtk_default_render_icon()"));
-+ }
-+
-+ if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup_for_settings (settings, size, &width, &height))
-+ {
-+ g_warning (G_STRLOC ": invalid icon size '%d'", size);
-+ return NULL;
-+ }
-+
-+ /* If the size was wildcarded, and we're allowed to scale, then scale; otherwise,
-+ * leave it alone.
-+ */
-+ if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source))
-+ scaled = scale_or_ref (base_pixbuf, width, height);
-+ else
-+ scaled = g_object_ref (base_pixbuf);
-+
-+ /* If the state was wildcarded, then generate a state. */
-+ if (gtk_icon_source_get_state_wildcarded (source))
-+ {
-+ if (state == GTK_STATE_INSENSITIVE)
-+ {
-+ stated = set_transparency (scaled, 0.3);
-+ gdk_pixbuf_saturate_and_pixelate (stated, stated, 0.1, FALSE);
-+
-+ g_object_unref (scaled);
-+ }
-+ else if (state == GTK_STATE_PRELIGHT)
-+ {
-+ stated = gdk_pixbuf_copy (scaled);
-+
-+ gdk_pixbuf_saturate_and_pixelate (scaled, stated, 1.2, FALSE);
-+
-+ g_object_unref (scaled);
-+ }
-+ else
-+ {
-+ stated = scaled;
-+ }
-+ }
-+ else
-+ stated = scaled;
-+
-+ return stated;
-+}
-+
static void styleRealize(GtkStyle *style)
{
QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style;
-@@ -5434,6 +5568,7 @@
- style_class->draw_vline = gtkDrawVLine;
- style_class->draw_focus = gtkDrawFocus;
- style_class->draw_layout = gtkDrawLayout;
-+ style_class->render_icon = gtkRenderIcon; // copypasta
- }
-
- static GtkRcStyleClass *parent_rc_class;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org