theme compatibility ...

[Michael Meeks <michael ximian com>]

Hi Guys,

	I just fixed #74395, the zoom number offset issue. I did it by adding a
new zoom_control attribute - which smells a little: 'number_v_2_offset'
this will default to 0 for old themes - which turns out to be pretty
much what we want.

	I also put back all the original number_v_offsets from nautilus 1.0, so
that they will work ( as before ) with stable nautilus as well. I hope
that's ok, while we'll never have both nautilus' installed, it's nice I
think to be able to write one theme that works with both nautilus'.

	Patch attached & committed,

	Regards,

		Michael.

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/nautilus/ChangeLog,v
retrieving revision 1.5295
diff -u -p -u -r1.5295 ChangeLog
--- ChangeLog	15 May 2002 15:57:05 -0000	1.5295
+++ ChangeLog	16 May 2002 09:46:14 -0000
@@ -1,3 +1,20 @@
+2002-05-16  Michael Meeks  <michael ximian com>
+
+	* icons/tahoe/tahoe.xml: 
+	* icons/gnome/gnome.xml:
+	* icons/sierra/sierra.xml: 
+	* icons/crux_teal/crux_teal.xml: 
+	* icons/crux_eggplant/crux_eggplant.xml: 
+	* icons/default/default.xml: put back the old
+	nautilus values, keep the new values in
+	number_v_2_offset.
+	
+	* src/nautilus-zoom-control.c (draw_number):
+	ask for number_v_2_offset so we can keep theme
+	compatibility and get offsets right. Mostly
+	we want 0 for the offset anyway, so this
+	automagically gets most things right.
+
 2002-05-15  Sean Atkinson  <sean cantab net>
 
 	* src/nautilus-window-manage-views.c
Index: icons/crux_eggplant/crux_eggplant.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/crux_eggplant/crux_eggplant.xml,v
retrieving revision 1.13
diff -u -p -u -r1.13 crux_eggplant.xml
--- icons/crux_eggplant/crux_eggplant.xml	21 Apr 2002 23:25:05 -0000	1.13
+++ icons/crux_eggplant/crux_eggplant.xml	16 May 2002 09:46:14 -0000
@@ -15,4 +15,6 @@
            tab_font="Helvetica Bold" />
 
   <desktop background_tile_image="./backgrounds/background_pattern.png"/>
+
+  <zoom_control number_v_offset="-6" number_v_2_offset="0"/>
 </theme>
Index: icons/crux_teal/crux_teal.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/crux_teal/crux_teal.xml,v
retrieving revision 1.5
diff -u -p -u -r1.5 crux_teal.xml
--- icons/crux_teal/crux_teal.xml	21 Apr 2002 23:25:06 -0000	1.5
+++ icons/crux_teal/crux_teal.xml	16 May 2002 09:46:14 -0000
@@ -13,4 +13,5 @@
            tab_font="Helvetica Bold" />
            
   <desktop background_tile_image="./backgrounds/background_pattern.png" />
+  <zoom_control number_v_offset="-6" number_v_2_offset="0"/>
 </theme>
Index: icons/default/default.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/default/default.xml,v
retrieving revision 1.5
diff -u -p -u -r1.5 default.xml
--- icons/default/default.xml	21 Apr 2002 23:25:06 -0000	1.5
+++ icons/default/default.xml	16 May 2002 09:46:14 -0000
@@ -20,6 +20,6 @@
   
  <thumbnails frame_offsets="3,3,6,6"/>
  <throbber frame_count="30" url="http://www.gnome.org/nautilus/"; delay="75"/>
- <zoom_control number_v_offset="-1" number_h_offset="-2"/>
+ <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>
  
 </theme>
Index: icons/gnome/gnome.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/gnome/gnome.xml,v
retrieving revision 1.19
diff -u -p -u -r1.19 gnome.xml
--- icons/gnome/gnome.xml	9 Mar 2002 02:45:04 -0000	1.19
+++ icons/gnome/gnome.xml	16 May 2002 09:46:14 -0000
@@ -23,6 +23,6 @@
   <thumbnails frame_offsets="3,3,6,6"/>
   <toolbar icon_theme="standard"/>
   <throbber frame_count="15" url="http://www.gnome.org"/>
-  <zoom_control number_v_offset="-1" number_h_offset="-2"/>
+  <zoom_control number_v_offset="0" number_v_2_offset="-1" number_h_offset="-2"/>
 
 </theme>
Index: icons/sierra/sierra.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/sierra/sierra.xml,v
retrieving revision 1.5
diff -u -p -u -r1.5 sierra.xml
--- icons/sierra/sierra.xml	9 Mar 2002 02:45:05 -0000	1.5
+++ icons/sierra/sierra.xml	16 May 2002 09:46:14 -0000
@@ -3,5 +3,5 @@
   <sidebar sidebar_background_tile_image="./green_weave.png" sidebar_background_color="#FFFFFF" tab_piece_images="none"/>
   <directory background_color="#BAC5C0" selection_box_color_rgba="0x70818359" selection_box_color="#708183"/>
   <desktop background_tile_image="./Sierra_desktop.png" background_color="#FFFFFF"/>
-  <zoom_control number_v_offset="-1" number_h_offset="-2"/>
+  <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>
 </theme>
Index: icons/tahoe/tahoe.xml
===================================================================
RCS file: /cvs/gnome/nautilus/icons/tahoe/tahoe.xml,v
retrieving revision 1.4
diff -u -p -u -r1.4 tahoe.xml
--- icons/tahoe/tahoe.xml	9 Mar 2002 02:45:06 -0000	1.4
+++ icons/tahoe/tahoe.xml	16 May 2002 09:46:14 -0000
@@ -3,5 +3,6 @@
   <sidebar sidebar_background_tile_image="./bluewall.png" sidebar_background_color="#FFFFFF" title_color="#000000" title_shadow_color="#BBBBBB" title_info_color="#000000"/>
   <directory background_tile_image="./blueridge.png" background_color="#FFFFFF"/>
   <desktop background_tile_image="patterns/fleur_de_lis.png" background_color="#FFFFFF"/>
-  <zoom_control number_v_offset="-1" number_h_offset="-2"/>
+  <zoom_control number_v_offset="-6" number_v_2_offset="-1" number_h_offset="-2"/>
 </theme>
+
Index: src/nautilus-zoom-control.c
===================================================================
RCS file: /cvs/gnome/nautilus/src/nautilus-zoom-control.c,v
retrieving revision 1.71
diff -u -p -u -r1.71 nautilus-zoom-control.c
--- src/nautilus-zoom-control.c	27 Apr 2002 16:40:16 -0000	1.71
+++ src/nautilus-zoom-control.c	16 May 2002 09:46:15 -0000
@@ -230,7 +230,7 @@ draw_number (GtkWidget *widget, GdkRecta
 
 	zoom_control = NAUTILUS_ZOOM_CONTROL (widget);
 	
-	num_v_offset = get_zoom_offset ("number_v_offset");
+	num_v_offset = get_zoom_offset ("number_v_2_offset");
 	num_h_offset = get_zoom_offset ("number_h_offset");
 		
 	percent = floor ((100.0 * zoom_control->details->zoom_level) + .5);

-- 
 mmeeks gnu org  <><, Pseudo Engineer, itinerant idiot