gthumb r2317 - in trunk: . data/glade src

[mjc svn gnome org]

Author: mjc
Date: Tue Apr  8 13:46:24 2008
New Revision: 2317
URL: http://svn.gnome.org/viewvc/gthumb?rev=2317&view=rev

Log:
2008-04-08  Michael J. Chudobiak  <mjc svn gnome org>

        * data/glade/gthumb_preferences.glade:
        * src/dlg-preferences.c:
        Add "Fit to Window" zoom preference, to complemented the existing
        "Fit to Window if Larger" mode. Bug #464446.



Modified:
   trunk/ChangeLog
   trunk/data/glade/gthumb_preferences.glade
   trunk/src/dlg-preferences.c

Modified: trunk/data/glade/gthumb_preferences.glade
==============================================================================
--- trunk/data/glade/gthumb_preferences.glade	(original)
+++ trunk/data/glade/gthumb_preferences.glade	Tue Apr  8 13:46:24 2008
@@ -1575,6 +1575,14 @@
 				      </child>
 
 				      <child>
+					<widget class="GtkMenuItem" id="fit_to_window1">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Fit to window</property>
+					  <property name="use_underline">True</property>
+					</widget>
+				      </child>
+
+				      <child>
 					<widget class="GtkMenuItem" id="convertwidget21">
 					  <property name="visible">True</property>
 					  <property name="label" translatable="yes">Fit to window if larger</property>
@@ -1595,7 +1603,6 @@
 					  <property name="visible">True</property>
 					  <property name="label" translatable="yes">Fit to width if larger</property>
 					  <property name="use_underline">True</property>
-					  <signal name="activate" handler="on_fit_to_width_if_larger1_activate" last_modification_time="Fri, 01 Dec 2006 20:39:45 GMT"/>
 					</widget>
 				      </child>
 				    </widget>

Modified: trunk/src/dlg-preferences.c
==============================================================================
--- trunk/src/dlg-preferences.c	(original)
+++ trunk/src/dlg-preferences.c	Tue Apr  8 13:46:24 2008
@@ -52,6 +52,7 @@
 static int thumb_size[] = { 48, 64, 85, 95, 112, 128, 164, 200, 256 };
 static int thumb_sizes = sizeof (thumb_size) / sizeof (int);
 static GthZoomChange zoom_change[] = { GTH_ZOOM_CHANGE_KEEP_PREV,
+                                       GTH_ZOOM_CHANGE_FIT_SIZE,
 				       GTH_ZOOM_CHANGE_FIT_SIZE_IF_LARGER,
 	 		               GTH_ZOOM_CHANGE_ACTUAL_SIZE,
 	 		               GTH_ZOOM_CHANGE_FIT_WIDTH_IF_LARGER };