nautilus r14256 - in trunk: . src

[cneumair svn gnome org]

Author: cneumair
Date: Wed Jun 11 18:45:48 2008
New Revision: 14256
URL: http://svn.gnome.org/viewvc/nautilus?rev=14256&view=rev

Log:
2008-06-11  Christian Neumair  <cneumair gnome org>

	* src/nautilus-file-management-properties.glade:
	* src/nautilus-zoom-control.c (nautilus_zoom_control_redraw):
	Slightly change zoom level algorithm to display "66%" instead of
	"67%". This looks more consistent with the "33%" label for a .3 zoom
	level. Also change preferences dialog accordingly: rename "75%" to
	"66%", and "25%" to "33%". Fixes #485965.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-file-management-properties.glade
   trunk/src/nautilus-zoom-control.c

Modified: trunk/src/nautilus-file-management-properties.glade
==============================================================================
--- trunk/src/nautilus-file-management-properties.glade	(original)
+++ trunk/src/nautilus-file-management-properties.glade	Wed Jun 11 18:45:48 2008
@@ -382,9 +382,9 @@
 			      <child>
 				<widget class="GtkComboBox" id="icon_view_zoom_combobox">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">25%
+				  <property name="items" translatable="yes">33%
 50%
-75%
+66%
 100%
 150%
 200%
@@ -544,9 +544,9 @@
 			      <child>
 				<widget class="GtkComboBox" id="compact_view_zoom_combobox">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">25%
+				  <property name="items" translatable="yes">33%
 50%
-75%
+66%
 100%
 150%
 200%
@@ -687,9 +687,9 @@
 			      <child>
 				<widget class="GtkComboBox" id="list_view_zoom_combobox">
 				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">25%
+				  <property name="items" translatable="yes">33%
 50%
-75%
+66%
 100%
 150%
 200%

Modified: trunk/src/nautilus-zoom-control.c
==============================================================================
--- trunk/src/nautilus-zoom-control.c	(original)
+++ trunk/src/nautilus-zoom-control.c	Wed Jun 11 18:45:48 2008
@@ -370,7 +370,7 @@
 	gtk_widget_set_sensitive (zoom_control->details->zoom_out,
 				  nautilus_zoom_control_can_zoom_out (zoom_control));
 
-	percent = floor ((100.0 * nautilus_get_relative_icon_size_for_zoom_level (zoom_control->details->zoom_level)) + .5);
+	percent = floor ((100.0 * nautilus_get_relative_icon_size_for_zoom_level (zoom_control->details->zoom_level)) + .2);
 	num_str = g_strdup_printf ("%d%%", percent);
 	gtk_label_set_text (GTK_LABEL (zoom_control->details->zoom_label), num_str);
 	g_free (num_str);