f-spot r4005 - in trunk/src: . UI.Dialog

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Wed May 28 12:34:01 2008
New Revision: 4005
URL: http://svn.gnome.org/viewvc/f-spot?rev=4005&view=rev

Log:
forcing the square selection on the tag edit dialog

Modified:
   trunk/src/ImageView.cs
   trunk/src/UI.Dialog/SelectionRatioDialog.cs
   trunk/src/f-spot.glade

Modified: trunk/src/ImageView.cs
==============================================================================
--- trunk/src/ImageView.cs	(original)
+++ trunk/src/ImageView.cs	Wed May 28 12:34:01 2008
@@ -76,13 +76,14 @@
 	[DllImport ("libfspot")]
 	static extern double f_image_view_get_selection_xy_ratio (IntPtr image_view);
 
+	double delayed_ratio = -2;
 	public double SelectionXyRatio {
-		get {
-			return f_image_view_get_selection_xy_ratio (Handle);
-		}
-		set {
-			if (Pixbuf != null)
+		get { return f_image_view_get_selection_xy_ratio (Handle); }
+		set { 
+			if (Pixbuf != null) 
 				f_image_view_set_selection_xy_ratio (Handle, value);
+			else
+				delayed_ratio = value;
 		}
 	}
 
@@ -149,8 +150,13 @@
 		set {
 			if (value == null)
 				image_view_set_pixbuf (Handle, IntPtr.Zero);
-			else
+			else {
 				image_view_set_pixbuf (Handle, value.Handle);
+				if (delayed_ratio != -2) {
+					SelectionXyRatio = delayed_ratio;
+					delayed_ratio = -2;
+				}
+			}
 		}
 	}
 

Modified: trunk/src/UI.Dialog/SelectionRatioDialog.cs
==============================================================================
--- trunk/src/UI.Dialog/SelectionRatioDialog.cs	(original)
+++ trunk/src/UI.Dialog/SelectionRatioDialog.cs	Wed May 28 12:34:01 2008
@@ -1,5 +1,5 @@
 /*
- * FSpot.UI.Dialog.SelectionRatioDailog.cs
+ * FSpot.UI.Dialog.SelectionRatioDialog.cs
  *
  * Author(s):
  *	Stephane Delcroix  <stephane delcroix org>

Modified: trunk/src/f-spot.glade
==============================================================================
--- trunk/src/f-spot.glade	(original)
+++ trunk/src/f-spot.glade	Wed May 28 12:34:01 2008
@@ -1359,7 +1359,7 @@
   </widget>
   <widget class="GtkDialog" id="print_dialog">
     <property name="visible">True</property>
-    <property name="title" translatable="yes">Print</property>
+    <property name="title" translatable="yes">Print...</property>
     <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <property name="has_separator">False</property>
     <child internal-child="vbox">