f-spot r3759 - in trunk: . src

[sdelcroix svn gnome org]

Author: sdelcroix
Date: Mon Mar 17 07:29:10 2008
New Revision: 3759
URL: http://svn.gnome.org/viewvc/f-spot?rev=3759&view=rev

Log:
2008-03-16  Lorenzo Milesi <maxxer yetopen it>

	* src/f-spot.glade:
	* src/Preferences.cs:
	* src/MainWindow.cs:
	* src/PhotoView.cs: allow toggling filmstrip visibility.


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

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Mon Mar 17 07:29:10 2008
@@ -80,6 +80,7 @@
 	[Glade.Widget] CheckMenuItem display_toolbar;
 	[Glade.Widget] CheckMenuItem display_sidebar;
 	[Glade.Widget] CheckMenuItem display_timeline;
+	[Glade.Widget] CheckMenuItem display_filmstrip;
 	[Glade.Widget] CheckMenuItem display_dates_menu_item;
 	[Glade.Widget] CheckMenuItem display_tags_menu_item;
 	[Glade.Widget] CheckMenuItem display_ratings_menu_item;
@@ -454,6 +455,7 @@
 		LoadPreference (Preferences.SHOW_TOOLBAR);
 		LoadPreference (Preferences.SHOW_SIDEBAR);
 		LoadPreference (Preferences.SHOW_TIMELINE);
+		LoadPreference (Preferences.SHOW_FILMSTRIP);
 
 		LoadPreference (Preferences.GNOME_MAILTO_ENABLED);
 		
@@ -510,6 +512,7 @@
 				view_notebook.CurrentPage = 0;
 
 			display_timeline.Sensitive = true;
+			display_filmstrip.Sensitive = false;
 			group_selector.Visible = display_timeline.Active;
 
 			ColorDialog.Close ();
@@ -523,6 +526,7 @@
 				view_notebook.CurrentPage = 1;
 
 			display_timeline.Sensitive = false;
+			display_filmstrip.Sensitive = true;
 			group_selector.Visible = false;
 			
 			JumpTo (icon_view.FocusCell);
@@ -1755,6 +1759,7 @@
 		Preferences.Set (Preferences.SHOW_TOOLBAR,		toolbar.Visible);
 		Preferences.Set (Preferences.SHOW_SIDEBAR,		info_vbox.Visible);
 		Preferences.Set (Preferences.SHOW_TIMELINE,		display_timeline.Active);
+		Preferences.Set (Preferences.SHOW_FILMSTRIP,		display_filmstrip.Active);
 		Preferences.Set (Preferences.SHOW_TAGS,			icon_view.DisplayTags);
 		Preferences.Set (Preferences.SHOW_DATES,		icon_view.DisplayDates);
 		Preferences.Set (Preferences.SHOW_RATINGS,		icon_view.DisplayRatings);
@@ -2014,6 +2019,11 @@
 			group_selector.Show ();
 	}
 
+	void HandleDisplayFilmstrip (object sender, EventArgs args)
+	{
+		photo_view.FilmStripVisibility = display_filmstrip.Active;
+	}
+
 	void HandleDisplayInfoSidebar (object sender, EventArgs args)
 	{
 		if (info_vbox.Visible)
@@ -2572,6 +2582,11 @@
 				display_timeline.Active = (bool) val;
 			break;
 		
+		case Preferences.SHOW_FILMSTRIP:
+			if (display_filmstrip.Active != (bool) val)
+				display_filmstrip.Active = (bool) val;
+			break;
+		
 		case Preferences.SHOW_TAGS:
 			if (display_tags_menu_item.Active != (bool) val)
 				display_tags_menu_item.Active = (bool) val;

Modified: trunk/src/PhotoView.cs
==============================================================================
--- trunk/src/PhotoView.cs	(original)
+++ trunk/src/PhotoView.cs	Mon Mar 17 07:29:10 2008
@@ -456,6 +456,11 @@
 		CommitPendingChanges ();
 	}
 
+	public bool FilmStripVisibility {
+		get { return filmstrip.Visible; }
+		set { filmstrip.Visible = value; }
+	}
+
 	Gtk.Tooltips tips = new Gtk.Tooltips ();
 
 	public PhotoView (IBrowsableCollection query)

Modified: trunk/src/Preferences.cs
==============================================================================
--- trunk/src/Preferences.cs	(original)
+++ trunk/src/Preferences.cs	Mon Mar 17 07:29:10 2008
@@ -33,6 +33,7 @@
 		public const string SHOW_TOOLBAR = "/apps/f-spot/ui/show_toolbar";
 		public const string SHOW_SIDEBAR = "/apps/f-spot/ui/show_sidebar";
 		public const string SHOW_TIMELINE = "/apps/f-spot/ui/show_timeline";
+		public const string SHOW_FILMSTRIP = "/apps/f-spot/ui/show_filmstrip";
 		public const string SHOW_TAGS = "/apps/f-spot/ui/show_tags";
 		public const string SHOW_DATES = "/apps/f-spot/ui/show_dates";
 		public const string EXPANDED_TAGS = "/apps/f-spot/ui/expanded_tags";
@@ -142,6 +143,7 @@
 			case SHOW_TOOLBAR:
 			case SHOW_SIDEBAR:
 			case SHOW_TIMELINE:
+			case SHOW_FILMSTRIP:
 			case SHOW_TAGS:
 			case SHOW_DATES:
 			case SHOW_RATINGS:

Modified: trunk/src/f-spot.glade
==============================================================================
--- trunk/src/f-spot.glade	(original)
+++ trunk/src/f-spot.glade	Mon Mar 17 07:29:10 2008
@@ -3493,9 +3493,19 @@
 				<property name="label" translatable="yes">_Timeline</property>
 				<property name="use_underline">True</property>
 				<property name="active">True</property>
+                        	<property name="sensitive">False</property>
 				<signal name="activate" handler="HandleDisplayGroupSelector"/>
 			      </widget>
 			    </child>
+			    <child>
+			      <widget class="GtkCheckMenuItem" id="display_filmstrip">
+				<property name="visible">True</property>
+				<property name="label" translatable="yes">_Filmstrip</property>
+				<property name="use_underline">True</property>
+				<property name="active">True</property>
+				<signal name="activate" handler="HandleDisplayFilmstrip"/>
+			      </widget>
+			    </child>
                             <child>
 			      <widget class="GtkCheckMenuItem" id="display_toolbar">
 				<property name="visible">True</property>