Hello community,
here is the log from the commit of package qtcurve-gtk2
checked in at Wed May 2 11:48:47 CEST 2007.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-04-05 12:12:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-05-02 11:08:17.000000000 +0200
@@ -1,0 +2,7 @@
+Wed May 2 11:08:01 CEST 2007 - stbinner(a)suse.de
+
+- update to 0.48.5:
+ - Fix slight slider drawing errors.
+ - Set cursor colours.
+
+-------------------------------------------------------------------
Old:
----
QtCurve-Gtk2-0.48.4.tar.gz
New:
----
QtCurve-Gtk2-0.48.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.f19173/_old 2007-05-02 11:48:33.000000000 +0200
+++ /var/tmp/diff_new_pack.f19173/_new 2007-05-02 11:48:33.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 0.48.4)
+# spec file for package qtcurve-gtk2 (Version 0.48.5)
#
# 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.4
+Version: 0.48.5
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: QtCurve-Gtk2-%{version}.tar.gz
@@ -74,6 +74,10 @@
%pref/share/themes/QtCurve
%changelog
+* Wed May 02 2007 - stbinner(a)suse.de
+- update to 0.48.5:
+ - Fix slight slider drawing errors.
+ - Set cursor colours.
* Thu Apr 05 2007 - stbinner(a)suse.de
- update to 0.48.4:
- Make light border consistent with KDE
++++++ QtCurve-Gtk2-0.48.4.tar.gz -> QtCurve-Gtk2-0.48.5.tar.gz ++++++
++++ 3184 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/ChangeLog new/QtCurve-Gtk2-0.48.5/ChangeLog
--- old/QtCurve-Gtk2-0.48.4/ChangeLog 2007-04-02 11:23:39.000000000 +0200
+++ new/QtCurve-Gtk2-0.48.5/ChangeLog 2007-05-01 00:05:07.000000000 +0200
@@ -1,3 +1,8 @@
+0.48.5
+------
+1. Fix slight slider drawing errors.
+2. Set cursor colours.
+
0.48.4
------
1. Make light border consistent with KDE - thanks to Daniel Bausch
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/configure.in new/QtCurve-Gtk2-0.48.5/configure.in
--- old/QtCurve-Gtk2-0.48.4/configure.in 2007-04-02 11:23:39.000000000 +0200
+++ new/QtCurve-Gtk2-0.48.5/configure.in 2007-04-14 15:12:19.000000000 +0200
@@ -1,6 +1,6 @@
AC_INIT(README)
PACKAGE=QtCurve-Gtk2
-VERSION=0.48.4
+VERSION=0.48.5
AC_SUBST(VERSION)
AUTOMAKE_OPTIONS=no-dependencies
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/gtk2/common.h new/QtCurve-Gtk2-0.48.5/gtk2/common.h
--- old/QtCurve-Gtk2-0.48.4/gtk2/common.h 2007-03-21 21:40:07.000000000 +0100
+++ new/QtCurve-Gtk2-0.48.5/gtk2/common.h 2007-04-30 23:31:51.000000000 +0200
@@ -37,8 +37,6 @@
#include "config.h"
#ifdef __cplusplus
-#include <qstring.h>
-#include <qsettings.h>
#include <qconfig.h>
#ifdef QTC_CONFIG_DIALOG
#include <qapplication.h>
@@ -351,7 +349,7 @@
return (fabs(d1 - d2) < 0.0001);
}
-static char checkBounds(int num)
+static unsigned char checkBounds(int num)
{
return num < 0 ? 0 :
num > 255 ? 255 :
@@ -374,7 +372,7 @@
for(column=0; column<width; column+=numChannels)
{
- int source=(int)data[offset+column+1];
+ unsigned char source=data[offset+column+1];
#if defined __cplusplus
#if Q_BYTE_ORDER == Q_BIG_ENDIAN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/gtk2/gtkrc-top new/QtCurve-Gtk2-0.48.5/gtk2/gtkrc-top
--- old/QtCurve-Gtk2-0.48.4/gtk2/gtkrc-top 2007-03-18 01:16:05.000000000 +0100
+++ new/QtCurve-Gtk2-0.48.5/gtk2/gtkrc-top 2007-05-01 00:05:07.000000000 +0200
@@ -101,6 +101,7 @@
xthickness = 4
ythickness = 4
bg[NORMAL] = { 1.0,1.0,0.75 }
+ fg[NORMAL] = { 0.0,0.0,0.0 }
}
style "qtcurve-menuitem" = "qtcurve-default"
@@ -153,7 +154,7 @@
widget_class "*Tree*GtkButton" style "qtcurve-default"
widget_class "*List*GtkButton" style "qtcurve-default"
widget_class "BasePWidget.GtkEventBox.GtkTable.GtkFrame" style "qtcurve-w2"
-widget "gtk-tooltips" style "qtcurve-tooltips"
+widget "gtk-tooltips*" style "qtcurve-tooltips"
widget_class "*Toolbar*" style "qtcurve-toolbar"
widget_class "*Toolbar*Button" style "qtcurve-toolbarbutton"
widget_class "*HandleBox*HBox*SPDesktopWidget" style "qtcurve-sptoolbar"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/gtk2/qtcurve.c new/QtCurve-Gtk2-0.48.5/gtk2/qtcurve.c
--- old/QtCurve-Gtk2-0.48.4/gtk2/qtcurve.c 2007-04-02 11:23:39.000000000 +0200
+++ new/QtCurve-Gtk2-0.48.5/gtk2/qtcurve.c 2007-05-01 00:05:07.000000000 +0200
@@ -2860,7 +2860,6 @@
{
GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(widget));
int used_x=x, used_y=y, used_h=0, used_w=0,
- rest_x=x, rest_y=y, rest_h=height, rest_w=width,
pos=(int)(((double)(horiz ? width : height) /
(adjustment->upper - adjustment->lower)) *
(adjustment->value - adjustment->lower));
@@ -2879,45 +2878,41 @@
{
y +=(height - SLIDER_TROUGH_SIZE)>>1;
height = SLIDER_TROUGH_SIZE;
- rest_y=used_y=y;
- rest_h=used_h=height;
+ used_y=y;
+ used_h=height;
}
else
{
x +=(width - SLIDER_TROUGH_SIZE)>>1;
width = SLIDER_TROUGH_SIZE;
- rest_x=used_x=x;
- rest_w=used_w=width;
+ used_x=x;
+ used_w=width;
}
+ 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|
+ (horiz ? 0 : DF_VERT));
+
if(adjustment->upper!=adjustment->lower && state!=GTK_STATE_INSENSITIVE)
{
if(horiz)
- if(inverted)
- {
+ {
+ pos+=(width>10 && pos<(width/2)) ? 3 : 0;
+
+ if(inverted) /* <rest><slider><used> */
used_x+=width-pos;
- used_w=pos;
- rest_w-=pos;
- }
- else
- {
- used_w=pos;
- rest_w-=pos;
- rest_x+=pos;
- }
+ used_w=pos;
+ }
else
+ {
+ pos+=(height>10 && pos<(height/2)) ? 3 : 0;
+
if(inverted)
- {
used_y+=height-pos;
- used_h=pos;
- rest_h=height-pos;
- }
- else
- {
- rest_h=height-pos;
- used_h=pos;
- rest_y+=pos;
- }
+ used_h=pos;
+ }
if(used_w>0 && used_h>0)
{
@@ -2940,13 +2935,6 @@
(horiz ? 0 : DF_VERT));
}
}
-
- if(rest_w>0 && rest_h>0)
- drawLightBevel(style, window, state, area, NULL, rest_x, rest_y, rest_w, rest_h,
- 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|
- (horiz ? 0 : DF_VERT));
}
else if(GTK_IS_PROGRESS_BAR(widget))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/QtCurve-Gtk2-0.48.4/gtk2/qt_settings.c new/QtCurve-Gtk2-0.48.5/gtk2/qt_settings.c
--- old/QtCurve-Gtk2-0.48.4/gtk2/qt_settings.c 2007-03-14 22:04:36.000000000 +0100
+++ new/QtCurve-Gtk2-0.48.5/gtk2/qt_settings.c 2007-05-01 00:02:07.000000000 +0200
@@ -1296,6 +1296,23 @@
gtk_rc_parse_string(tmpStr);
}
+
+ /* Set cursor colours... */
+ {
+ static const char *constStrFormat="style \"QtCCrsr\" "
+ "{ GtkWidget::cursor-color=\"#%02X%02X%02X\" "
+ "GtkWidget::secondary-cursor-color=\"#%02X%02X%02X\" } "
+ "class \"*\" style \"QtCCrsr\"";
+ tmpStr=(char *)realloc(tmpStr, strlen(constStrFormat)+1);
+
+ sprintf(tmpStr, constStrFormat, qtSettings.colors[COLOR_TEXT].red>>8,
+ qtSettings.colors[COLOR_TEXT].green>>8,
+ qtSettings.colors[COLOR_TEXT].blue>>8,
+ qtSettings.colors[COLOR_TEXT].red>>8,
+ qtSettings.colors[COLOR_TEXT].green>>8,
+ qtSettings.colors[COLOR_TEXT].blue>>8);
+ gtk_rc_parse_string(tmpStr);
+ }
if(tmpStr)
free(tmpStr);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
