rpms/gtk-nodoka-engine/devel gtk-nodoka-engine-0.6-tooltips.patch, NONE, 1.1 gtk-nodoka-engine-0.6-treeview.patch, NONE, 1.1 gtk-nodoka-engine.spec, 1.5, 1.6

[Martin Sourada (mso)]

Author: mso

Update of /cvs/extras/rpms/gtk-nodoka-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8142

Modified Files:
	gtk-nodoka-engine.spec 
Added Files:
	gtk-nodoka-engine-0.6-tooltips.patch 
	gtk-nodoka-engine-0.6-treeview.patch 
Log Message:


Allow user change of tooltips colors, fix colors in unfocused gtktreeview (rhbz #297271)




gtk-nodoka-engine-0.6-tooltips.patch:

--- NEW FILE gtk-nodoka-engine-0.6-tooltips.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.tooltips	2007-08-18 14:32:21.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:31:28.000000000 +0200
@@ -6,7 +6,7 @@
 #
 # Uses the Nodoka theme engine, forked from Murrine theme engine
 
-gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF"
+gtk_color_scheme = "fg_color:#000\nbg_color:#EDE9E3\nbase_color:#FFF\ntext_color:#000\nselected_bg_color:#008DD7\nselected_fg_color:#FFF\ntooltip_bg_color=#F5F5B5\ntooltip_fg_color=#000"
 
 style "fedora-default"
 {
@@ -165,11 +165,13 @@ style "fedora-frame-title" = "fedora-def
 	fg[NORMAL]	= lighter (@fg_color)
 }
 
-style "fedora-tooltips" = "fedora-default"
+style "fedora-tooltips"
 {
 	xthickness	= 4
 	ythickness	= 4
-	bg[NORMAL]	= { 1.0,1.0,0.75 }
+
+	bg[NORMAL]	= @tooltip_bg_color
+	fg[NORMAL]	= @tooltip_fg_color
 }
 
 style "fedora-progressbar" = "fedora-wide-bright"
@@ -234,8 +236,7 @@ widget_class "*.GtkCombo.GtkButton"	styl
 widget_class "*.GtkComboBox.GtkFrame"	style "fedora-wider"
 
 # tooltips stuff
-widget "gtk-tooltips"			style "fedora-tooltips"
-widget "gtk-tooltip"			style "fedora-tooltips"
+widget "gtk-tooltip*"			style "fedora-tooltips"
 
 # treeview stuff
 widget_class "*.GtkTreeView.GtkButton"	style "fedora-tree"

gtk-nodoka-engine-0.6-treeview.patch:

--- NEW FILE gtk-nodoka-engine-0.6-treeview.patch ---
diff -up gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc
--- gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc.treeview	2007-09-20 22:33:33.000000000 +0200
+++ gtk-nodoka-engine-0.6/src/GnomeTheme/gtk-2.0/gtkrc	2007-09-20 22:34:50.000000000 +0200
@@ -49,13 +49,13 @@ style "fedora-default"
 
 	base[NORMAL]			= @base_color
 	base[PRELIGHT]			= shade (0.3967, @base_color)
-	base[ACTIVE]			= shade (0.9437, @bg_color)
+	base[ACTIVE]			= shade (0.65, @selected_fg_color)
 	base[SELECTED]			= @selected_bg_color
 	base[INSENSITIVE]		= shade (0.9437, @bg_color)
 
 	text[NORMAL]			= @text_color
 	text[PRELIGHT]			= @text_color
-	text[ACTIVE]			= @text_color
+	text[ACTIVE]			= @selected_fg_color
 	text[SELECTED]			= @selected_fg_color
 	text[INSENSITIVE]		= darker (@selected_fg_color)
 


Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-nodoka-engine/devel/gtk-nodoka-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-nodoka-engine.spec	25 Aug 2007 15:31:27 -0000	1.5
+++ gtk-nodoka-engine.spec	20 Sep 2007 20:50:17 -0000	1.6
@@ -1,12 +1,14 @@
 Name:           gtk-nodoka-engine
 Version:        0.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Nodoka GTK Theme Engine
 
 Group:          System Environment/Libraries
 License:        GPLv2
 URL:            http://fedoraproject.org/wiki/Artwork/NodokaTheme
 Source0:        gtk-nodoka-engine-%{version}.tar.gz
+Patch0:         gtk-nodoka-engine-0.6-tooltips.patch
+Patch1:         gtk-nodoka-engine-0.6-treeview.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel
@@ -19,6 +21,8 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .tooltips
+%patch1 -p1 -b .treeview
 
 %build
 %configure
@@ -44,6 +48,10 @@
 %{_datadir}/themes/Nodoka
 
 %changelog
+* Thu Sep 20 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-2
+- Add user specified tooltips coloring
+- Fix colours in unfocused GTKTreeView (rhbz #297271)
+
 * Sat Aug 25 2007 Martin Sourada <martin.sourada at seznam.cz> - 0.6-1
 - new version
   -- first stable