summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Neumair <cneumair@gnome.org>2008-06-11 18:45:48 +0000
committerChristian Neumair <cneumair@src.gnome.org>2008-06-11 18:45:48 +0000
commit1be2f583199fbd16c379af86e92492728cfde256 (patch)
treee1bca286c14f72702f4068ec28b4b3085d3f4642
parent41a08e56825d7f8573afa28122921040a68d675b (diff)
downloadnautilus-1be2f583199fbd16c379af86e92492728cfde256.tar.gz
Slightly change zoom level algorithm to display "66%" instead of "67%".
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. svn path=/trunk/; revision=14256
-rw-r--r--ChangeLog9
-rw-r--r--src/nautilus-file-management-properties.glade12
-rw-r--r--src/nautilus-zoom-control.c2
3 files changed, 16 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e6c71cc4..f63132890 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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.
+
+2008-06-11 Christian Neumair <cneumair@gnome.org>
+
* libnautilus-private/nautilus-file.c (update_info_internal),
(nautilus_file_get_icon):
* libnautilus-private/nautilus-thumbnails.c
diff --git a/src/nautilus-file-management-properties.glade b/src/nautilus-file-management-properties.glade
index 19ce7432d..61080a940 100644
--- a/src/nautilus-file-management-properties.glade
+++ b/src/nautilus-file-management-properties.glade
@@ -382,9 +382,9 @@ By Emblems</property>
<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 @@ By Emblems</property>
<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 @@ By Emblems</property>
<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%
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index 1710eb849..3e3ad389d 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -370,7 +370,7 @@ nautilus_zoom_control_redraw (NautilusZoomControl *zoom_control)
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);