f-spot r4040 - in trunk: . src

[rubenv svn gnome org]

Author: rubenv
Date: Wed Jun  4 17:42:19 2008
New Revision: 4040
URL: http://svn.gnome.org/viewvc/f-spot?rev=4040&view=rev

Log:
2008-06-04  Ruben Vermeersch  <ruben savanne be>

	* src/MainWindow.cs: 
	* src/f-spot.glade: Rename tag_vbox to the more meaningful sidebar_vbox.


Modified:
   trunk/ChangeLog
   trunk/src/MainWindow.cs
   trunk/src/f-spot.glade

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Wed Jun  4 17:42:19 2008
@@ -126,7 +126,7 @@
 
 	[Glade.Widget] Gtk.HBox tagbar;
 	[Glade.Widget] Gtk.VBox tag_entry_container;
-	[Glade.Widget] Gtk.VBox tag_vbox;
+	[Glade.Widget] Gtk.VBox sidebar_vbox;
 	TagEntry tag_entry;
 
 	Gtk.Toolbar toolbar;
@@ -299,7 +299,7 @@
 		toolbar.Insert (ss_button, -1);
 
 		sidebar = new Sidebar ();
-		tag_vbox.Add (sidebar);
+		sidebar_vbox.Add (sidebar);
 
 		tag_selection_scrolled = new ScrolledWindow ();
 		
@@ -318,7 +318,7 @@
 		info_box = new InfoBox ();
 		info_box.VersionIdChanged += HandleInfoBoxVersionIdChange;
 		info_box.ShowTags = true;
-		tag_vbox.PackEnd (info_box, false, false, 0);
+		sidebar_vbox.PackEnd (info_box, false, false, 0);
 		info_box.Show ();
 		
 		tag_selection_widget.Selection.Changed += HandleTagSelectionChanged;
@@ -2151,7 +2151,26 @@
 			ColorDialog.SwitchViews (photo_view.View);
 		}
 	}
-	
+
+	void HandleViewFullscreenBrowser (object sender, EventArgs args)
+	{
+		int width = 0;
+		int height = 0;
+		Gdk.Screen screen = main_window.Screen;
+		
+		main_window.GetSize(out width, out height);
+		
+		if (screen.Width == width && screen.Height == height)
+			/* FIXME: After quiting the application while in Fullscreen mode,
+			 *        Unfullscreen does not restore the window dimentions to
+			 *        the previous dimentions. It restores the window borders,
+			 *        but the window is still the size of the screen. 
+			 */
+			main_window.Unfullscreen ();
+		else
+			main_window.Fullscreen ();
+	}
+
 	void HandleZoomScaleValueChanged (object sender, System.EventArgs args)
 	{
 		switch (view_mode) {

Modified: trunk/src/f-spot.glade
==============================================================================
--- trunk/src/f-spot.glade	(original)
+++ trunk/src/f-spot.glade	Wed Jun  4 17:42:19 2008
@@ -3408,7 +3408,6 @@
                         <property name="label" translatable="yes">_Fullscreen</property>
                         <property name="use_underline">True</property>
                         <signal name="activate" handler="HandleViewFullscreen"/>
-                        <accelerator key="F11" modifiers="" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image50">
                             <property name="visible">True</property>
@@ -3419,6 +3418,22 @@
                       </widget>
                     </child>
                     <child>
+                      <widget class="GtkImageMenuItem" id="fullscreen_browser">
+                        <property name="visible">True</property>
+                        <property name="label" translatable="yes">Fullscreen _Browser</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="HandleViewFullscreenBrowser"/>
+                        <accelerator key="F11" modifiers="" signal="activate"/>
+                        <child internal-child="image">
+                          <widget class="GtkImage" id="menu-item-image29">
+                            <property name="visible">True</property>
+                            <property name="icon_size">1</property>
+                            <property name="icon_name">view-fullscreen</property>
+                          </widget>
+                        </child>
+                      </widget>
+                    </child>
+                    <child>
                       <widget class="GtkSeparatorMenuItem" id="separator18">
                         <property name="visible">True</property>
                       </widget>
@@ -3989,7 +4004,7 @@
                   <widget class="GtkVBox" id="info_vbox">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkVBox" id="tag_vbox">
+                      <widget class="GtkVBox" id="sidebar_vbox">
                         <property name="visible">True</property>
                         <child>
                           <placeholder/>