Index: src/f-spot.glade
===================================================================
--- src/f-spot.glade	(revision 3083)
+++ src/f-spot.glade	(working copy)
@@ -110,7 +110,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">False</property>
-	      <signal name="changed" handler="HandleVersionNameEntryChanged" last_modification_time="Sun, 09 Nov 2003 04:22:15 GMT"/>
+	      <signal name="changed" handler="HandleVersionNameEntryChanged"/>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -263,7 +263,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -292,7 +292,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -308,7 +308,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
-	      <signal name="changed" handler="HandleTagNameEntryChanged" last_modification_time="Tue, 11 Nov 2003 12:36:22 GMT"/>
+	      <signal name="changed" handler="HandleTagNameEntryChanged"/>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -331,7 +331,7 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -1363,7 +1363,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
-	      <signal name="changed" handler="HandleTagNameEntryChanged" last_modification_time="Tue, 11 Nov 2003 12:36:22 GMT"/>
+	      <signal name="changed" handler="HandleTagNameEntryChanged"/>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
@@ -1398,7 +1398,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">2</property>
 	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -1427,7 +1427,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -1444,7 +1444,7 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -1473,7 +1473,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -1489,6 +1489,8 @@
 	      <child>
 		<widget class="GtkImage" id="icon_image">
 		  <property name="visible">True</property>
+		  <property name="stock">gtk-missing-image</property>
+		  <property name="icon_size">4</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">0</property>
@@ -1646,6 +1648,8 @@
 		  <child>
 		    <widget class="GtkImage" id="preview_image">
 		      <property name="visible">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -2121,7 +2125,7 @@
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -2149,7 +2153,7 @@
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -2168,7 +2172,7 @@
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="y_options">fill</property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
@@ -2185,8 +2189,8 @@
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options">fill</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 			    </widget>
@@ -2295,7 +2299,7 @@
 				      <property name="right_attach">1</property>
 				      <property name="top_attach">0</property>
 				      <property name="bottom_attach">1</property>
-				      <property name="x_options">fill</property>
+				      <property name="x_options"></property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -2323,7 +2327,7 @@
 				      <property name="right_attach">1</property>
 				      <property name="top_attach">1</property>
 				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
+				      <property name="x_options"></property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -2344,7 +2348,7 @@
 				      <property name="right_attach">2</property>
 				      <property name="top_attach">0</property>
 				      <property name="bottom_attach">1</property>
-				      <property name="y_options">fill</property>
+				      <property name="y_options"></property>
 				    </packing>
 				  </child>
 
@@ -2364,8 +2368,8 @@
 				      <property name="right_attach">2</property>
 				      <property name="top_attach">1</property>
 				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
-				      <property name="y_options">fill</property>
+				      <property name="x_options"></property>
+				      <property name="y_options"></property>
 				    </packing>
 				  </child>
 
@@ -2381,7 +2385,7 @@
 				      <property name="right_attach">3</property>
 				      <property name="top_attach">1</property>
 				      <property name="bottom_attach">2</property>
-				      <property name="x_options">fill</property>
+				      <property name="x_options"></property>
 				      <property name="y_options"></property>
 				    </packing>
 				  </child>
@@ -2626,7 +2630,7 @@
 				      <property name="use_underline">True</property>
 				      <property name="relief">GTK_RELIEF_NORMAL</property>
 				      <property name="focus_on_click">True</property>
-				      <signal name="clicked" handler="HandleConfigureClicked" last_modification_time="Fri, 17 Sep 2004 16:43:52 GMT"/>
+				      <signal name="clicked" handler="HandleConfigureClicked"/>
 				    </widget>
 				    <packing>
 				      <property name="padding">0</property>
@@ -3132,12 +3136,7 @@
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="history">-1</property>
-				  <signal name="changed" handler="HandleAccountSelected" last_modification_time="Fri, 08 Oct 2004 22:18:26 GMT"/>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu1">
-				    </widget>
-				  </child>
+				  <signal name="changed" handler="HandleAccountSelected"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3154,7 +3153,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddGallery" last_modification_time="Fri, 08 Oct 2004 22:16:40 GMT"/>
+				  <signal name="clicked" handler="HandleAddGallery"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3323,7 +3322,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddAlbum" last_modification_time="Sat, 05 Nov 2005 17:24:31 GMT"/>
+				  <signal name="clicked" handler="HandleAddAlbum"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3434,7 +3433,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3771,12 +3770,7 @@
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="history">-1</property>
-				  <signal name="changed" handler="HandleAccountSelected" last_modification_time="Fri, 08 Oct 2004 22:18:26 GMT"/>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu1">
-				    </widget>
-				  </child>
+				  <signal name="changed" handler="HandleAccountSelected"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3793,7 +3787,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddGallery" last_modification_time="Fri, 08 Oct 2004 22:16:40 GMT"/>
+				  <signal name="clicked" handler="HandleAddGallery"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -3962,7 +3956,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddAlbum" last_modification_time="Sat, 05 Nov 2005 17:24:31 GMT"/>
+				  <signal name="clicked" handler="HandleAddAlbum"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -4073,7 +4067,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -4323,7 +4317,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4373,7 +4367,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4416,7 +4410,7 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">2</property>
 	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4528,7 +4522,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4557,7 +4551,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">3</property>
 	      <property name="bottom_attach">4</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4607,7 +4601,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">2</property>
 	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4657,7 +4651,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4688,14 +4682,14 @@
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="history">-1</property>
-	      <signal name="changed" handler="HandleChanged" last_modification_time="Sun, 06 Nov 2005 16:52:31 GMT"/>
+	      <signal name="changed" handler="HandleChanged"/>
 	    </widget>
 	    <packing>
 	      <property name="left_attach">1</property>
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -4897,7 +4891,7 @@
 	      <child>
 		<widget class="GtkImage" id="image45">
 		  <property name="visible">True</property>
-		  <property name="stock">gtk-dialog-authentication</property>
+		  <property name="stock">gtk-missing-image</property>
 		  <property name="icon_size">6</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0</property>
@@ -5019,7 +5013,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5069,7 +5063,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5117,7 +5111,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5148,6 +5142,8 @@
 
 		  <child>
 		    <widget class="GtkImage" id="captcha_image">
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -5165,8 +5161,8 @@
 		  <property name="right_attach">2</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
+		  <property name="x_options"></property>
+		  <property name="y_options"></property>
 		</packing>
 	      </child>
 	    </widget>
@@ -5399,7 +5395,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5449,7 +5445,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">3</property>
 		  <property name="bottom_attach">4</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5499,7 +5495,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5549,7 +5545,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -5937,7 +5933,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -6302,12 +6298,7 @@
 					      <property name="visible">True</property>
 					      <property name="can_focus">True</property>
 					      <property name="history">-1</property>
-					      <signal name="changed" handler="HandleAccountSelected" last_modification_time="Fri, 08 Oct 2004 22:18:26 GMT"/>
-
-					      <child>
-						<widget class="GtkMenu" id="menu2">
-						</widget>
-					      </child>
+					      <signal name="changed" handler="HandleAccountSelected"/>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
@@ -6324,7 +6315,7 @@
 					      <property name="use_stock">True</property>
 					      <property name="relief">GTK_RELIEF_NORMAL</property>
 					      <property name="focus_on_click">True</property>
-					      <signal name="clicked" handler="HandleAddGallery" last_modification_time="Fri, 08 Oct 2004 22:16:40 GMT"/>
+					      <signal name="clicked" handler="HandleAddGallery"/>
 					    </widget>
 					    <packing>
 					      <property name="padding">0</property>
@@ -8020,7 +8011,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="priv_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes" comment="this lable indicates who will be able to view the the files will have once uploaded to Flickr">&lt;b&gt;Viewing permissions&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Viewing permissions&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -8089,7 +8080,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -8288,7 +8279,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="file1">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
+	      <property name="label" translatable="yes">_File</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="file1_menu">
@@ -8296,10 +8288,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="new1">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_NEW_ITEM</property>
-		      <property name="label" translatable="yes">_Import...</property>
+		      <property name="label" translatable="yes">gtk-new</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleImportCommand" last_modification_time="Tue, 09 Dec 2003 21:01:04 GMT"/>
+		      <signal name="activate" handler="HandleImportCommand"/>
 		    </widget>
 		  </child>
 
@@ -8322,7 +8313,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Create _New Version...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleCreateVersionCommand" last_modification_time="Tue, 09 Dec 2003 20:42:48 GMT"/>
+		      <signal name="activate" handler="HandleCreateVersionCommand"/>
 		    </widget>
 		  </child>
 
@@ -8331,7 +8322,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Delete Version</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleDeleteVersionCommand" last_modification_time="Tue, 09 Dec 2003 20:42:48 GMT"/>
+		      <signal name="activate" handler="HandleDeleteVersionCommand"/>
 		    </widget>
 		  </child>
 
@@ -8340,7 +8331,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Rename Version</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRenameVersionCommand" last_modification_time="Tue, 09 Dec 2003 21:00:39 GMT"/>
+		      <signal name="activate" handler="HandleRenameVersionCommand"/>
 		    </widget>
 		  </child>
 
@@ -8363,7 +8354,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Print...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandlePrintCommand" last_modification_time="Thu, 05 Feb 2004 00:40:09 GMT"/>
+		      <signal name="activate" handler="HandlePrintCommand"/>
 		      <accelerator key="p" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -8385,12 +8376,12 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Send _Mail...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSendMailCommand" last_modification_time="Mon, 07 Jun 2004 22:31:01 GMT"/>
+		      <signal name="activate" handler="HandleSendMailCommand"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image47">
 			  <property name="visible">True</property>
-			  <property name="stock">gnome-stock-mail-fwd</property>
+			  <property name="stock">gtk-bold</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8412,7 +8403,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Quit</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleCloseCommand" last_modification_time="Tue, 09 Dec 2003 20:59:54 GMT"/>
+		      <signal name="activate" handler="HandleCloseCommand"/>
 		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		      <accelerator key="w" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
@@ -8437,7 +8428,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="edit2">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_EDIT_TREE</property>
+	      <property name="label" translatable="yes">_Edit</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="edit2_menu">
@@ -8456,7 +8448,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Select _All</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSelectAllCommand" last_modification_time="Sat, 07 Feb 2004 01:20:44 GMT"/>
+		      <signal name="activate" handler="HandleSelectAllCommand"/>
 		      <accelerator key="A" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -8466,7 +8458,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Select _None</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSelectNoneCommand" last_modification_time="Sat, 07 Feb 2004 01:21:48 GMT"/>
+		      <signal name="activate" handler="HandleSelectNoneCommand"/>
 		      <accelerator key="A" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -8482,13 +8474,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Rotate _Left</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRotate270Command" last_modification_time="Sat, 07 Feb 2004 02:25:23 GMT"/>
+		      <signal name="activate" handler="HandleRotate270Command"/>
 		      <accelerator key="bracketleft" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image556">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-rotate-270</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8504,13 +8496,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Rotate _Right</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRotate90Command" last_modification_time="Sat, 07 Feb 2004 02:26:31 GMT"/>
+		      <signal name="activate" handler="HandleRotate90Command"/>
 		      <accelerator key="bracketright" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image557">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-rotate-90</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8532,12 +8524,12 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Ad_just Color...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleAdjustColor" last_modification_time="Thu, 23 Dec 2004 12:00:46 GMT"/>
+		      <signal name="activate" handler="HandleAdjustColor"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image558">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-adjust-colors</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8553,7 +8545,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Sharpen...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSharpen" last_modification_time="Thu, 23 Dec 2004 12:01:23 GMT"/>
+		      <signal name="activate" handler="HandleSharpen"/>
 		    </widget>
 		  </child>
 
@@ -8562,7 +8554,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Adjust _Time...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleAdjustTime" last_modification_time="Tue, 10 Jan 2006 20:20:44 GMT"/>
+		      <signal name="activate" handler="HandleAdjustTime"/>
 		    </widget>
 		  </child>
 
@@ -8577,7 +8569,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Re_fresh Thumbnail</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleUpdateThumbnailCommand" last_modification_time="Sat, 07 Feb 2004 02:25:23 GMT"/>
+		      <signal name="activate" handler="HandleUpdateThumbnailCommand"/>
 		    </widget>
 		  </child>
 
@@ -8586,7 +8578,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Delete From Drive</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleDeleteCommand" last_modification_time="Fri, 06 Feb 2004 22:50:57 GMT"/>
+		      <signal name="activate" handler="HandleDeleteCommand"/>
 		    </widget>
 		  </child>
 
@@ -8595,7 +8587,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Remove From Catalog</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRemoveCommand" last_modification_time="Thu, 10 Jun 2004 03:21:10 GMT"/>
+		      <signal name="activate" handler="HandleRemoveCommand"/>
 		    </widget>
 		  </child>
 
@@ -8604,7 +8596,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Set as _Background</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSetAsBackgroundCommand" last_modification_time="Fri, 27 Feb 2004 14:31:41 GMT"/>
+		      <signal name="activate" handler="HandleSetAsBackgroundCommand"/>
 		    </widget>
 		  </child>
 
@@ -8639,7 +8631,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Rem_ove Tag</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleTagMenuActivate" last_modification_time="Thu, 17 Jun 2004 16:52:18 GMT"/>
+		      <signal name="activate" handler="HandleTagMenuActivate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image560">
@@ -8664,8 +8656,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="preferences3">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-		      <signal name="activate" handler="HandlePreferences" last_modification_time="Wed, 30 Nov 2005 15:26:28 GMT"/>
+		      <property name="label" translatable="yes">gtk-preferences</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandlePreferences"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -8687,13 +8680,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Slideshow</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewSlideShow" last_modification_time="Thu, 29 Jan 2004 04:47:18 GMT"/>
-		      <accelerator key="F5" signal="activate"/>
+		      <signal name="activate" handler="HandleViewSlideShow"/>
+		      <accelerator key="F5" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image49">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-slideshow</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8709,13 +8702,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Fullscreen</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewFullscreen" last_modification_time="Thu, 10 Jun 2004 02:58:42 GMT"/>
+		      <signal name="activate" handler="HandleViewFullscreen"/>
 		      <accelerator key="F11" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image50">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-fullscreen</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -8731,7 +8724,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Metadata Browser</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewFullExif" last_modification_time="Thu, 23 Sep 2004 21:15:21 GMT"/>
+		      <signal name="activate" handler="HandleViewFullExif"/>
 		      <accelerator key="i" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -8748,7 +8741,7 @@
 		      <property name="label" translatable="yes">Display Too_lbar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
-		      <signal name="activate" handler="HandleDisplayToolbar" last_modification_time="Tue, 11 Jan 2005 07:04:13 GMT"/>
+		      <signal name="activate" handler="HandleDisplayToolbar"/>
 		    </widget>
 		  </child>
 
@@ -8758,7 +8751,7 @@
 		      <property name="label" translatable="yes">Display _Timeline</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
-		      <signal name="activate" handler="HandleDisplayGroupSelector" last_modification_time="Tue, 11 Jan 2005 07:04:13 GMT"/>
+		      <signal name="activate" handler="HandleDisplayGroupSelector"/>
 		    </widget>
 		  </child>
 
@@ -8768,7 +8761,7 @@
 		      <property name="label" translatable="yes">Display Side_bar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
-		      <signal name="activate" handler="HandleDisplayInfoSidebar" last_modification_time="Fri, 04 Mar 2005 17:19:12 GMT"/>
+		      <signal name="activate" handler="HandleDisplayInfoSidebar"/>
 		      <accelerator key="F9" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
@@ -8779,7 +8772,7 @@
 		      <property name="label" translatable="yes">Display T_ags</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
-		      <signal name="activate" handler="HandleDisplayTags" last_modification_time="Sun, 10 Oct 2004 21:30:58 GMT"/>
+		      <signal name="activate" handler="HandleDisplayTags"/>
 		    </widget>
 		  </child>
 
@@ -8789,7 +8782,7 @@
 		      <property name="label" translatable="yes">Display _Dates</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
-		      <signal name="activate" handler="HandleDisplayDates" last_modification_time="Tue, 12 Oct 2004 19:13:14 GMT"/>
+		      <signal name="activate" handler="HandleDisplayDates"/>
 		    </widget>
 		  </child>
 
@@ -8804,7 +8797,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Zoom _in</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleZoomIn" last_modification_time="Sat, 21 Aug 2004 16:37:10 GMT"/>
+		      <signal name="activate" handler="HandleZoomIn"/>
 		      <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		      <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
@@ -8827,7 +8820,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Zoom _out</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleZoomOut" last_modification_time="Sat, 21 Aug 2004 16:37:10 GMT"/>
+		      <signal name="activate" handler="HandleZoomOut"/>
 		      <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -8849,7 +8842,7 @@
 		      <property name="visible">True</property>
 		    </widget>
 		  </child>
-		  
+
 		  <child>
 		    <widget class="GtkMenuItem" id="tag_icon_size">
 		      <property name="visible">True</property>
@@ -8863,39 +8856,42 @@
 			    <widget class="GtkRadioMenuItem" id="tag_icon_hidden">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Hidden</property>
+			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
-			      <property name="use_underline">True</property>
-			      <signal name="activate" handler="HandleTagSizeChange" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleTagSizeChange"/>
 			    </widget>
 			  </child>
+
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="tag_icon_small">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Small</property>
+			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
-			      <property name="use_underline">True</property>
 			      <property name="group">tag_icon_hidden</property>
-			      <signal name="activate" handler="HandleTagSizeChange" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleTagSizeChange"/>
 			    </widget>
 			  </child>
+
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="tag_icon_medium">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Medium</property>
+			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
-			      <property name="use_underline">True</property>
 			      <property name="group">tag_icon_hidden</property>
-			      <signal name="activate" handler="HandleTagSizeChange" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleTagSizeChange"/>
 			    </widget>
 			  </child>
+
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="tag_icon_large">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Large</property>
+			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
-			      <property name="use_underline">True</property>
 			      <property name="group">tag_icon_hidden</property>
-			      <signal name="activate" handler="HandleTagSizeChange" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleTagSizeChange"/>
 			    </widget>
 			  </child>
 			</widget>
@@ -8924,7 +8920,7 @@
 			      <property name="label" translatable="yes">_Month</property>
 			      <property name="use_underline">True</property>
 			      <property name="active">True</property>
-			      <signal name="activate" handler="HandleArrangeByTime" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleArrangeByTime"/>
 			    </widget>
 			  </child>
 
@@ -8935,7 +8931,7 @@
 			      <property name="use_underline">True</property>
 			      <property name="active">False</property>
 			      <property name="group">month</property>
-			      <signal name="activate" handler="HandleArrangeByDirectory" last_modification_time="Fri, 20 Aug 2004 22:26:32 GMT"/>
+			      <signal name="activate" handler="HandleArrangeByDirectory"/>
 			    </widget>
 			  </child>
 			</widget>
@@ -8969,9 +8965,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="find_by_tag">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="no"></property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleFindByTag" last_modification_time="Tue, 10 Aug 2004 07:08:24 GMT"/>
+		      <signal name="activate" handler="HandleFindByTag"/>
 		      <accelerator key="f" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -8991,9 +8985,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="find_add_tag">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleIncludeTag" last_modification_time="Tue, 10 Aug 2004 07:08:24 GMT"/>
+		      <signal name="activate" handler="HandleIncludeTag"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image35">
@@ -9013,9 +9005,7 @@
 		    <widget class="GtkMenuItem" id="find_add_tag_with">
 		      <property name="visible">True</property>
 		      <property name="sensitive">False</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleFindAddTagWith" last_modification_time="Tue, 10 Aug 2004 07:08:24 GMT"/>
+		      <signal name="activate" handler="HandleFindAddTagWith"/>
 		    </widget>
 		  </child>
 
@@ -9030,7 +9020,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Set _Date Range...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSetDateRange" last_modification_time="Tue, 10 Aug 2004 07:08:24 GMT"/>
+		      <signal name="activate" handler="HandleSetDateRange"/>
 		    </widget>
 		  </child>
 
@@ -9040,11 +9030,39 @@
 		      <property name="sensitive">False</property>
 		      <property name="label" translatable="yes">Clea_r Date Range</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleClearDateRange" last_modification_time="Tue, 10 Aug 2004 07:08:24 GMT"/>
+		      <signal name="activate" handler="HandleClearDateRange"/>
 		    </widget>
 		  </child>
 
 		  <child>
+		    <widget class="GtkCheckMenuItem" id="last_import_roll">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Last import roll</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="HandleSetLastImportRoll"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="last_import_rolls">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Last import rolls...</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleSetLastImportRolls"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="clear_last_import_filter">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Clear Last import filter</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleClearLastImportFilter"/>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator15">
 		      <property name="visible">True</property>
 		    </widget>
@@ -9078,12 +9096,12 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Create New _Tag...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleCreateNewCategoryCommand" last_modification_time="Tue, 09 Dec 2003 20:42:48 GMT"/>
+		      <signal name="activate" handler="HandleCreateNewCategoryCommand"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image53">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-new-tag</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -9105,7 +9123,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Edit Selected Tag...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleEditSelectedTag" last_modification_time="Wed, 11 Aug 2004 06:33:14 GMT"/>
+		      <signal name="activate" handler="HandleEditSelectedTag"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image554">
@@ -9126,7 +9144,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Delete Selected Tag</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleDeleteSelectedTagCommand" last_modification_time="Sat, 07 Feb 2004 01:26:54 GMT"/>
+		      <signal name="activate" handler="HandleDeleteSelectedTagCommand"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image555">
@@ -9153,7 +9171,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Attach Tag to Selection</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleAttachTagCommand" last_modification_time="Wed, 21 Jan 2004 05:44:42 GMT"/>
+		      <signal name="activate" handler="HandleAttachTagCommand"/>
 		      <accelerator key="t" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -9175,7 +9193,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Remove Tag From Selection</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRemoveTagCommand" last_modification_time="Wed, 21 Jan 2004 05:48:21 GMT"/>
+		      <signal name="activate" handler="HandleRemoveTagCommand"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image562">
@@ -9198,7 +9216,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="help1">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
+	      <property name="label" translatable="yes">_Help</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="help1_menu">
@@ -9208,7 +9227,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Contents</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleHelp" last_modification_time="Tue, 14 Feb 2006 00:10:33 GMT"/>
+		      <signal name="activate" handler="HandleHelp"/>
 		      <accelerator key="F1" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
@@ -9228,8 +9247,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="about1">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-		      <signal name="activate" handler="HandleAbout" last_modification_time="Fri, 08 Oct 2004 05:09:31 GMT"/>
+		      <property name="label" translatable="yes">gtk-about</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleAbout"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -9346,85 +9366,6 @@
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="tagbar">
-		      <property name="border_width">2</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">1</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label160">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Tags: </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="tag_entry_container">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkButton" id="tag_close_button">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="relief">GTK_RELIEF_NONE</property>
-			  <property name="focus_on_click">True</property>
-			  <signal name="pressed" handler="HandleTagBarCloseButtonPressed" last_modification_time="Tue, 08 Nov 2005 01:22:39 GMT"/>
-
-			  <child>
-			    <widget class="GtkImage" id="image23">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-close</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		      <property name="pack_type">GTK_PACK_END</property>
-		    </packing>
-		  </child>
-
-		  <child>
 		    <widget class="GtkNotebook" id="view_notebook">
 		      <property name="visible">True</property>
 		      <property name="show_tabs">False</property>
@@ -9520,6 +9461,85 @@
 		      <property name="fill">True</property>
 		    </packing>
 		  </child>
+
+		  <child>
+		    <widget class="GtkHBox" id="tagbar">
+		      <property name="border_width">2</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">1</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label160">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Tags: </property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkVBox" id="tag_entry_container">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkButton" id="tag_close_button">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="relief">GTK_RELIEF_NONE</property>
+			  <property name="focus_on_click">True</property>
+			  <signal name="pressed" handler="HandleTagBarCloseButtonPressed"/>
+
+			  <child>
+			    <widget class="GtkImage" id="image23">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-close</property>
+			      <property name="icon_size">4</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		      <property name="pack_type">GTK_PACK_END</property>
+		    </packing>
+		  </child>
 		</widget>
 		<packing>
 		  <property name="shrink">True</property>
@@ -9561,7 +9581,7 @@
 		  <property name="can_focus">True</property>
 		  <property name="relief">GTK_RELIEF_NONE</property>
 		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="HandleImportCommand" last_modification_time="Wed, 15 Jun 2005 05:48:11 GMT"/>
+		  <signal name="clicked" handler="HandleImportCommand"/>
 
 		  <child>
 		    <widget class="GtkImage" id="image14">
@@ -9600,7 +9620,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="status_label">
 	      <property name="visible">True</property>
-	      <property name="label"></property>
+	      <property name="label" translatable="yes"></property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -9636,12 +9656,14 @@
 		  <property name="events">GDK_BUTTON_PRESS_MASK</property>
 		  <property name="visible_window">True</property>
 		  <property name="above_child">False</property>
-		  <signal name="button_press_event" handler="HandleZoomOut" last_modification_time="Mon, 05 Dec 2005 04:56:18 GMT"/>
+		  <signal name="button_press_event" handler="HandleZoomOut"/>
 
 		  <child>
 		    <widget class="GtkImage" id="far_image">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -9683,12 +9705,14 @@
 		  <property name="events">GDK_BUTTON_PRESS_MASK</property>
 		  <property name="visible_window">True</property>
 		  <property name="above_child">False</property>
-		  <signal name="button_press_event" handler="HandleZoomIn" last_modification_time="Mon, 05 Dec 2005 04:56:18 GMT"/>
+		  <signal name="button_press_event" handler="HandleZoomIn"/>
 
 		  <child>
 		    <widget class="GtkImage" id="near_image">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -9868,7 +9892,7 @@
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
-			      <signal name="clicked" handler="HandleBrowseExisting" last_modification_time="Wed, 12 Jan 2005 23:04:41 GMT"/>
+			      <signal name="clicked" handler="HandleBrowseExisting"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -10058,7 +10082,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="HandleCancelClicked" last_modification_time="Thu, 02 Sep 2004 18:30:59 GMT"/>
+	      <signal name="clicked" handler="HandleCancelClicked"/>
 	    </widget>
 	  </child>
 
@@ -10072,7 +10096,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="HandleOkClicked" last_modification_time="Thu, 02 Sep 2004 18:30:36 GMT"/>
+	      <signal name="clicked" handler="HandleOkClicked"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -10125,6 +10149,8 @@
 		  <child>
 		    <widget class="GtkImage" id="histogram_image">
 		      <property name="visible">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">12</property>
@@ -10203,7 +10229,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10232,7 +10258,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">2</property>
 			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10261,7 +10287,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10290,7 +10316,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10311,7 +10337,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -10331,7 +10357,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -10351,7 +10377,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">2</property>
 			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -10371,7 +10397,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -10392,7 +10418,7 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10414,7 +10440,7 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10436,7 +10462,7 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">2</property>
 			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10458,7 +10484,7 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">3</property>
 			  <property name="bottom_attach">4</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10535,7 +10561,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10563,7 +10589,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -10598,7 +10624,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="y_options">expand</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -10632,8 +10658,8 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">expand</property>
+			  <property name="x_options"></property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 		    </widget>
@@ -10842,26 +10868,6 @@
 	  <property name="spacing">6</property>
 
 	  <child>
-	    <widget class="GtkCheckButton" id="recurse_check">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Include subfolders</property>
-	      <property name="use_underline">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="active">True</property>
-	      <property name="inconsistent">False</property>
-	      <property name="draw_indicator">True</property>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">False</property>
-	      <property name="pack_type">GTK_PACK_END</property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkVBox" id="vbox65">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
@@ -11069,7 +11075,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -11085,8 +11091,8 @@
 		  <property name="right_attach">2</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options">fill</property>
+		  <property name="x_options"></property>
+		  <property name="y_options"></property>
 		</packing>
 	      </child>
 
@@ -11113,7 +11119,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -11143,6 +11149,26 @@
 	      <property name="fill">False</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="recurse_check">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Include subfolders</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">True</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	      <property name="pack_type">GTK_PACK_END</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
@@ -11352,7 +11378,7 @@
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -11381,7 +11407,7 @@
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -11426,8 +11452,8 @@
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
-				  <property name="y_options">fill</property>
+				  <property name="x_options"></property>
+				  <property name="y_options"></property>
 				</packing>
 			      </child>
 
@@ -11476,7 +11502,7 @@
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">2</property>
 				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -11727,7 +11753,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -11902,7 +11928,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="file2">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_FILE_TREE</property>
+	      <property name="label" translatable="yes">_File</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="file2_menu">
@@ -11912,7 +11939,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_New Window</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleNewWindow" last_modification_time="Tue, 14 Feb 2006 00:10:33 GMT"/>
+		      <signal name="activate" handler="HandleNewWindow"/>
 		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -11932,8 +11959,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="open1">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_OPEN_ITEM</property>
-		      <signal name="activate" handler="HandleOpen" last_modification_time="Mon, 13 Feb 2006 23:30:05 GMT"/>
+		      <property name="label" translatable="yes">gtk-open</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleOpen"/>
 		    </widget>
 		  </child>
 
@@ -11942,7 +11970,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Open _Folder...</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleOpenFolder" last_modification_time="Tue, 14 Feb 2006 00:07:44 GMT"/>
+		      <signal name="activate" handler="HandleOpenFolder"/>
 		      <accelerator key="O" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 
 		      <child internal-child="image">
@@ -11982,8 +12010,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="close">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_CLOSE_ITEM</property>
-		      <signal name="activate" handler="HandleFileClose" last_modification_time="Sat, 25 Jun 2005 18:52:28 GMT"/>
+		      <property name="label" translatable="yes">gtk-close</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleFileClose"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -12005,13 +12034,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Rotate _Left</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRotate270Command" last_modification_time="Fri, 10 Nov 2006 22:44:18 GMT"/>
+		      <signal name="activate" handler="HandleRotate270Command"/>
 		      <accelerator key="bracketleft" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image571">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-rotate-270</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -12027,13 +12056,13 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Rotate _Right</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleRotate90Command" last_modification_time="Fri, 10 Nov 2006 22:44:18 GMT"/>
+		      <signal name="activate" handler="HandleRotate90Command"/>
 		      <accelerator key="bracketright" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
 			<widget class="GtkImage" id="image572">
 			  <property name="visible">True</property>
-			  <property name="stock">f-spot-rotate-90</property>
+			  <property name="stock">gtk-missing-image</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -12055,7 +12084,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Set as _Background</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleSetAsBackgroundCommand" last_modification_time="Wed, 15 Nov 2006 09:26:50 GMT"/>
+		      <signal name="activate" handler="HandleSetAsBackgroundCommand"/>
 		    </widget>
 		  </child>
 
@@ -12068,8 +12097,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="preferences4">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-		      <signal name="activate" handler="HandlePreferences" last_modification_time="Tue, 21 Nov 2006 10:03:27 GMT"/>
+		      <property name="label" translatable="yes">gtk-preferences</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandlePreferences"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -12080,7 +12110,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="view2">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_VIEW_TREE</property>
+	      <property name="label" translatable="yes">_View</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="view2_menu">
@@ -12090,8 +12121,8 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Slideshow</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewSlideshow" last_modification_time="Sat, 25 Jun 2005 16:58:10 GMT"/>
-		      <accelerator key="F5" signal="activate"/>
+		      <signal name="activate" handler="HandleViewSlideshow"/>
+		      <accelerator key="F5" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -12100,7 +12131,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Fullscreen</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewFullscreen" last_modification_time="Sat, 25 Jun 2005 16:59:13 GMT"/>
+		      <signal name="activate" handler="HandleViewFullscreen"/>
 		      <accelerator key="F11" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
@@ -12110,7 +12141,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Metadata Browser</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleViewMetadata" last_modification_time="Fri, 20 Jan 2006 07:05:11 GMT"/>
+		      <signal name="activate" handler="HandleViewMetadata"/>
 		      <accelerator key="I" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -12128,7 +12159,7 @@
 		      <property name="label" translatable="yes">Toolbar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
-		      <signal name="activate" handler="HandleViewToolbar" last_modification_time="Sat, 25 Jun 2005 16:53:52 GMT"/>
+		      <signal name="activate" handler="HandleViewToolbar"/>
 		      <accelerator key="T" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -12140,20 +12171,20 @@
 		      <property name="label" translatable="yes">Side _pane</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
-		      <signal name="activate" handler="HandleViewSidePane" last_modification_time="Sat, 25 Jun 2005 22:40:00 GMT"/>
+		      <signal name="activate" handler="HandleViewSidePane"/>
 		      <accelerator key="F9" modifiers="0" signal="activate"/>
 		    </widget>
 		  </child>
 
-                  <child>
-                    <widget class="GtkCheckMenuItem" id="filenames_item">
-                      <property name="visible">True</property>
-                      <property name="label" translatable="yes">Display File Names</property>
-                      <property name="use_underline">True</property>
-                      <property name="active">False</property>
-                      <signal name="activate" handler="HandleViewFilenames" last_modification_time="Tue, 14 Nov 2006 13:05:41 GMT"/>
-                    </widget>
-                  </child>
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="filenames_item">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Display File Names</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="HandleViewFilenames"/>
+		    </widget>
+		  </child>
 
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator25">
@@ -12166,7 +12197,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Zoom _in</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleZoomIn" last_modification_time="Sat, 21 Aug 2004 16:37:10 GMT"/>
+		      <signal name="activate" handler="HandleZoomIn"/>
 		      <accelerator key="equal" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		      <accelerator key="plus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
@@ -12177,7 +12208,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Zoom _out</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleZoomOut" last_modification_time="Sat, 21 Aug 2004 16:37:10 GMT"/>
+		      <signal name="activate" handler="HandleZoomOut"/>
 		      <accelerator key="minus" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -12189,7 +12220,8 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="help2">
 	      <property name="visible">True</property>
-	      <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
+	      <property name="label" translatable="yes">_Help</property>
+	      <property name="use_underline">True</property>
 
 	      <child>
 		<widget class="GtkMenu" id="help2_menu">
@@ -12197,8 +12229,9 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="about2">
 		      <property name="visible">True</property>
-		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-		      <signal name="activate" handler="HandleAbout" last_modification_time="Mon, 13 Feb 2006 23:36:32 GMT"/>
+		      <property name="label" translatable="yes">gtk-about</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="HandleAbout"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -12318,7 +12351,7 @@
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="HandleHideSidePane" last_modification_time="Sun, 26 Jun 2005 14:39:46 GMT"/>
+		      <signal name="clicked" handler="HandleHideSidePane"/>
 
 		      <child>
 			<widget class="GtkImage" id="image20">
@@ -12468,12 +12501,14 @@
 		  <property name="events">GDK_BUTTON_PRESS_MASK</property>
 		  <property name="visible_window">True</property>
 		  <property name="above_child">False</property>
-		  <signal name="button_press_event" handler="HandleZoomOut" last_modification_time="Mon, 05 Dec 2005 04:56:18 GMT"/>
+		  <signal name="button_press_event" handler="HandleZoomOut"/>
 
 		  <child>
 		    <widget class="GtkImage" id="far_image">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -12515,12 +12550,14 @@
 		  <property name="events">GDK_BUTTON_PRESS_MASK</property>
 		  <property name="visible_window">True</property>
 		  <property name="above_child">False</property>
-		  <signal name="button_press_event" handler="HandleZoomIn" last_modification_time="Mon, 05 Dec 2005 04:56:18 GMT"/>
+		  <signal name="button_press_event" handler="HandleZoomIn"/>
 
 		  <child>
 		    <widget class="GtkImage" id="near_image">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
+		      <property name="stock">gtk-missing-image</property>
+		      <property name="icon_size">4</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
 		      <property name="xpad">0</property>
@@ -12594,7 +12631,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="HandleResetClicked" last_modification_time="Mon, 03 Oct 2005 22:23:24 GMT"/>
+	      <signal name="clicked" handler="HandleResetClicked"/>
 
 	      <child>
 		<widget class="GtkAlignment" id="alignment50">
@@ -12672,7 +12709,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-6</property>
-	      <signal name="clicked" handler="HandleCancelClicked" last_modification_time="Mon, 20 Feb 2006 06:59:03 GMT"/>
+	      <signal name="clicked" handler="HandleCancelClicked"/>
 	    </widget>
 	  </child>
 
@@ -12688,7 +12725,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="HandleOkClicked" last_modification_time="Mon, 20 Feb 2006 06:55:15 GMT"/>
+	      <signal name="clicked" handler="HandleOkClicked"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -12717,6 +12754,8 @@
 		<widget class="GtkImage" id="histogram_image">
 		  <property name="height_request">132</property>
 		  <property name="visible">True</property>
+		  <property name="stock">gtk-missing-image</property>
+		  <property name="icon_size">4</property>
 		  <property name="xalign">0.5</property>
 		  <property name="yalign">0.5</property>
 		  <property name="xpad">12</property>
@@ -12795,7 +12834,7 @@
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">3</property>
 		      <property name="bottom_attach">4</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12824,7 +12863,7 @@
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">2</property>
 		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12845,7 +12884,7 @@
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">3</property>
 		      <property name="bottom_attach">4</property>
-		      <property name="y_options">fill</property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 
@@ -12866,7 +12905,7 @@
 		      <property name="right_attach">3</property>
 		      <property name="top_attach">2</property>
 		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12888,7 +12927,7 @@
 		      <property name="right_attach">3</property>
 		      <property name="top_attach">3</property>
 		      <property name="bottom_attach">4</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12917,7 +12956,7 @@
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12938,8 +12977,8 @@
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
+		      <property name="x_options"></property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 
@@ -12960,7 +12999,7 @@
 		      <property name="right_attach">3</property>
 		      <property name="top_attach">0</property>
 		      <property name="bottom_attach">1</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -12989,7 +13028,7 @@
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">4</property>
 		      <property name="bottom_attach">5</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -13010,7 +13049,7 @@
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		    </packing>
 		  </child>
 
@@ -13038,7 +13077,7 @@
 		      <property name="right_attach">1</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -13060,7 +13099,7 @@
 		      <property name="right_attach">3</property>
 		      <property name="top_attach">1</property>
 		      <property name="bottom_attach">2</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -13082,7 +13121,7 @@
 		      <property name="right_attach">3</property>
 		      <property name="top_attach">4</property>
 		      <property name="bottom_attach">5</property>
-		      <property name="x_options">fill</property>
+		      <property name="x_options"></property>
 		      <property name="y_options"></property>
 		    </packing>
 		  </child>
@@ -13103,8 +13142,8 @@
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">2</property>
 		      <property name="bottom_attach">3</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
+		      <property name="x_options"></property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 
@@ -13124,8 +13163,8 @@
 		      <property name="right_attach">2</property>
 		      <property name="top_attach">4</property>
 		      <property name="bottom_attach">5</property>
-		      <property name="x_options">fill</property>
-		      <property name="y_options">fill</property>
+		      <property name="x_options"></property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 		</widget>
@@ -13139,13 +13178,15 @@
 
 		  <child>
 		    <widget class="GtkCheckButton" id="exposure_check">
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
 		      <property name="active">True</property>
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
+
+		      <child>
+			<placeholder/>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -13186,7 +13227,7 @@
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="HandleExposureResetClicked" last_modification_time="Wed, 30 Nov 2005 05:41:22 GMT"/>
+		      <signal name="clicked" handler="HandleExposureResetClicked"/>
 
 		      <child>
 			<widget class="GtkImage" id="exposure_reset">
@@ -13248,7 +13289,7 @@
 			  <child>
 			    <widget class="GtkImage" id="image28">
 			      <property name="visible">True</property>
-			      <property name="stock">gtk-color-picker</property>
+			      <property name="stock">gtk-missing-image</property>
 			      <property name="icon_size">4</property>
 			      <property name="xalign">0.5</property>
 			      <property name="yalign">0.5</property>
@@ -13304,7 +13345,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -13333,7 +13374,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -13354,7 +13395,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -13367,15 +13408,15 @@
 			  <property name="digits">0</property>
 			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
 			  <property name="inverted">False</property>
-			  <property name="adjustment">-0 -150 150 1 12 24</property>
+			  <property name="adjustment">0 -150 150 1 12 24</property>
 			</widget>
 			<packing>
 			  <property name="left_attach">1</property>
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="x_options"></property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -13409,8 +13450,8 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
-			  <property name="y_options">fill</property>
+			  <property name="x_options"></property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -13431,7 +13472,7 @@
 			  <property name="right_attach">3</property>
 			  <property name="top_attach">0</property>
 			  <property name="bottom_attach">1</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -13453,13 +13494,15 @@
 
 		  <child>
 		    <widget class="GtkCheckButton" id="white_check">
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
 		      <property name="active">True</property>
 		      <property name="inconsistent">False</property>
 		      <property name="draw_indicator">True</property>
+
+		      <child>
+			<placeholder/>
+		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -13473,7 +13516,7 @@
 		      <property name="can_focus">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="HandleWPResetClicked" last_modification_time="Wed, 30 Nov 2005 05:38:17 GMT"/>
+		      <signal name="clicked" handler="HandleWPResetClicked"/>
 
 		      <child>
 			<widget class="GtkImage" id="image29">
@@ -13610,7 +13653,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
-	      <signal name="clicked" handler="HandleClose" last_modification_time="Wed, 30 Nov 2005 16:24:06 GMT"/>
+	      <signal name="clicked" handler="HandleClose"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -13664,7 +13707,7 @@
 			  <property name="active">False</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="MetadataToggled" last_modification_time="Wed, 30 Nov 2005 15:42:59 GMT"/>
+			  <signal name="toggled" handler="MetadataToggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -14068,7 +14111,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -14096,7 +14139,7 @@
 			  <property name="right_attach">1</property>
 			  <property name="top_attach">2</property>
 			  <property name="bottom_attach">3</property>
-			  <property name="x_options">fill</property>
+			  <property name="x_options"></property>
 			  <property name="y_options"></property>
 			</packing>
 		      </child>
@@ -14114,7 +14157,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">1</property>
 			  <property name="bottom_attach">2</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 
@@ -14133,7 +14176,7 @@
 			  <property name="right_attach">2</property>
 			  <property name="top_attach">2</property>
 			  <property name="bottom_attach">3</property>
-			  <property name="y_options">fill</property>
+			  <property name="y_options"></property>
 			</packing>
 		      </child>
 		    </widget>
@@ -14475,7 +14518,7 @@
 					  <property name="right_attach">1</property>
 					  <property name="top_attach">1</property>
 					  <property name="bottom_attach">2</property>
-					  <property name="x_options">fill</property>
+					  <property name="x_options"></property>
 					  <property name="y_options"></property>
 					</packing>
 				      </child>
@@ -14503,7 +14546,7 @@
 					  <property name="right_attach">1</property>
 					  <property name="top_attach">0</property>
 					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
+					  <property name="x_options"></property>
 					  <property name="y_options"></property>
 					</packing>
 				      </child>
@@ -14531,7 +14574,7 @@
 					  <property name="right_attach">2</property>
 					  <property name="top_attach">0</property>
 					  <property name="bottom_attach">1</property>
-					  <property name="x_options">fill</property>
+					  <property name="x_options"></property>
 					  <property name="y_options"></property>
 					</packing>
 				      </child>
@@ -14899,6 +14942,260 @@
   </child>
 </widget>
 
+<widget class="GtkDialog" id="last_import_rolls_filter">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Last Import Rolls Filter</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox1">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area1">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton1">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Show all photos.</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="okbutton1">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Display only those photos that were imported in specified Rolls.</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox1">
+	  <property name="width_request">450</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">5</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">&lt;b&gt;View all pictures imported&lt;/b&gt;</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox1">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">4</property>
+
+	      <child>
+		<widget class="GtkComboBox" id="combo_filter">
+		  <property name="visible">True</property>
+		  <property name="items" translatable="yes" comments="at, or after a date, or between dates">at
+after
+between</property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="changed" handler="on_combo_filter_changed"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkComboBox" id="combo_roll_1">
+		  <property name="visible">True</property>
+		  <property name="items" translatable="yes"></property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="changed" handler="on_combo_roll_changed"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="and_label">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">and</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkComboBox" id="combo_roll_2">
+		  <property name="visible">True</property>
+		  <property name="items" translatable="yes"></property>
+		  <property name="add_tearoffs">False</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="changed" handler="on_combo_roll_changed"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox85">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label210">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Number of photos in selected rolls :</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="photos_in_selected_rolls">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">3</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">5</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">3</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 <widget class="GtkDialog" id="mail_dialog">
   <property name="visible">True</property>
   <property name="title" translatable="yes">Create Mail</property>
@@ -15089,14 +15386,14 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:18 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15114,14 +15411,14 @@
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">tiny_size</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:05 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15139,14 +15436,14 @@
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">tiny_size</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:27 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
 				  <property name="top_attach">2</property>
 				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15164,14 +15461,14 @@
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">tiny_size</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:35 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">0</property>
 				  <property name="bottom_attach">1</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15189,14 +15486,14 @@
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">tiny_size</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:44 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">1</property>
 				  <property name="bottom_attach">2</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15214,14 +15511,14 @@
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
 				  <property name="group">tiny_size</property>
-				  <signal name="toggled" handler="on_size_toggled" last_modification_time="Sun, 21 Aug 2005 10:49:53 GMT"/>
+				  <signal name="toggled" handler="on_size_toggled"/>
 				</widget>
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
 				  <property name="top_attach">2</property>
 				  <property name="bottom_attach">3</property>
-				  <property name="x_options">fill</property>
+				  <property name="x_options"></property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -15388,7 +15685,7 @@
 			      <property name="right_attach">1</property>
 			      <property name="top_attach">0</property>
 			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15416,7 +15713,7 @@
 			      <property name="right_attach">1</property>
 			      <property name="top_attach">1</property>
 			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15444,7 +15741,7 @@
 			      <property name="right_attach">1</property>
 			      <property name="top_attach">2</property>
 			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15472,7 +15769,7 @@
 			      <property name="right_attach">2</property>
 			      <property name="top_attach">0</property>
 			      <property name="bottom_attach">1</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15500,7 +15797,7 @@
 			      <property name="right_attach">2</property>
 			      <property name="top_attach">1</property>
 			      <property name="bottom_attach">2</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15528,7 +15825,7 @@
 			      <property name="right_attach">2</property>
 			      <property name="top_attach">2</property>
 			      <property name="bottom_attach">3</property>
-			      <property name="x_options">fill</property>
+			      <property name="x_options"></property>
 			      <property name="y_options"></property>
 			    </packing>
 			  </child>
@@ -15728,7 +16025,7 @@
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <property name="response_id">-7</property>
-	      <signal name="clicked" handler="HandleClose" last_modification_time="Wed, 30 Nov 2005 16:24:06 GMT"/>
+	      <signal name="clicked" handler="HandleClose"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -15782,7 +16079,7 @@
 			  <property name="active">True</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="InterpolationToggled" last_modification_time="Wed, 22 Nov 2006 14:33:34 GMT"/>
+			  <signal name="toggled" handler="InterpolationToggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -15902,7 +16199,7 @@
 			  <property name="active">True</property>
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
-			  <signal name="toggled" handler="HandleTransparencyToggled" last_modification_time="Tue, 28 Nov 2006 10:18:31 GMT"/>
+			  <signal name="toggled" handler="HandleTransparencyToggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -15923,7 +16220,7 @@
 			  <property name="inconsistent">False</property>
 			  <property name="draw_indicator">True</property>
 			  <property name="group">as_background_radio</property>
-			  <signal name="toggled" handler="HandleTransparencyToggled" last_modification_time="Tue, 28 Nov 2006 10:18:47 GMT"/>
+			  <signal name="toggled" handler="HandleTransparencyToggled"/>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
@@ -15950,7 +16247,7 @@
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
 			      <property name="group">as_background_radio</property>
-			      <signal name="toggled" handler="HandleTransparencyToggled" last_modification_time="Tue, 28 Nov 2006 10:19:02 GMT"/>
+			      <signal name="toggled" handler="HandleTransparencyToggled"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -15965,7 +16262,7 @@
 			      <property name="can_focus">True</property>
 			      <property name="use_alpha">False</property>
 			      <property name="focus_on_click">True</property>
-			      <signal name="color_set" handler="HandleTransparentColorSet" last_modification_time="Tue, 28 Nov 2006 10:14:32 GMT"/>
+			      <signal name="color_set" handler="HandleTransparentColorSet"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -16257,12 +16554,7 @@
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="history">-1</property>
-				  <signal name="changed" handler="HandleAccountSelected" last_modification_time="Fri, 08 Oct 2004 22:18:26 GMT"/>
-
-				  <child>
-				    <widget class="GtkMenu" id="menu3">
-				    </widget>
-				  </child>
+				  <signal name="changed" handler="HandleAccountSelected"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -16279,7 +16571,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddGallery" last_modification_time="Fri, 08 Oct 2004 22:16:40 GMT"/>
+				  <signal name="clicked" handler="HandleAddGallery"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -16448,7 +16740,7 @@
 				  <property name="use_stock">True</property>
 				  <property name="relief">GTK_RELIEF_NORMAL</property>
 				  <property name="focus_on_click">True</property>
-				  <signal name="clicked" handler="HandleAddAlbum" last_modification_time="Sat, 05 Nov 2005 17:24:31 GMT"/>
+				  <signal name="clicked" handler="HandleAddAlbum"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -16559,7 +16851,7 @@
 				  <property name="active">False</property>
 				  <property name="inconsistent">False</property>
 				  <property name="draw_indicator">True</property>
-				  <signal name="toggled" handler="HandleSizeActive" last_modification_time="Sat, 12 Feb 2005 10:29:48 GMT"/>
+				  <signal name="toggled" handler="HandleSizeActive"/>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -16789,7 +17081,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -16818,7 +17110,7 @@
 	      <property name="right_attach">1</property>
 	      <property name="top_attach">0</property>
 	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -16861,7 +17153,7 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">2</property>
 	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
+	      <property name="x_options"></property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
@@ -16877,8 +17169,8 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options">fill</property>
+	      <property name="x_options"></property>
+	      <property name="y_options"></property>
 	    </packing>
 	  </child>
 	</widget>
@@ -17009,7 +17301,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -17059,7 +17351,7 @@
 		  <property name="right_attach">1</property>
 		  <property name="top_attach">0</property>
 		  <property name="bottom_attach">1</property>
-		  <property name="x_options">fill</property>
+		  <property name="x_options"></property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
Index: src/PhotoStore.cs
===================================================================
--- src/PhotoStore.cs	(revision 3083)
+++ src/PhotoStore.cs	(working copy)
@@ -208,6 +208,16 @@
 		}
 	}
 
+        private uint roll_id = 0;
+	public uint RollId {
+		get { 
+		      return roll_id; 
+		}
+		set { 
+		      roll_id = value; 
+		}
+	}
+
 	// Version management
 	public const int OriginalVersionId = 1;
 	private uint highest_version_id;
@@ -685,6 +695,7 @@
 			"       directory_path     STRING NOT NULL,		   " +
 			"       name               STRING NOT NULL,		   " +
 			"       description        TEXT NOT NULL,	           " +
+			"       roll_id            INTEGER NOT NULL,		   " +
 			"       default_version_id INTEGER NOT NULL		   " +
 			")");
 
@@ -707,12 +718,13 @@
 	}
 
 
-	public Photo Create (string path, out Pixbuf thumbnail)
+	public Photo Create (string path, uint roll_id, out Pixbuf thumbnail)
 	{
-		return Create (path, path, out thumbnail);
+		return Create (path, path, roll_id, out thumbnail);
+
 	}
 
-	public Photo Create (string newPath, string origPath, out Pixbuf thumbnail)
+	public Photo Create (string newPath, string origPath, uint roll_id, out Pixbuf thumbnail)
 	{
 		Photo photo;
 		using (FSpot.ImageFile img = FSpot.ImageFile.Create (origPath)) {
@@ -720,13 +732,14 @@
 			string description = img.Description != null  ? img.Description.Split ('\0') [0] : String.Empty;
 	
 	 		uint id = (uint) Database.Execute (new DbCommand ("INSERT INTO photos (time, "	+
-					"directory_path, name, description, default_version_id) "	+
+					"directory_path, name, description, roll_id, default_version_id) "	+
 	 				"VALUES (:time, :directory_path, :name, :description, "		+
-					":default_version_id)",
+					":roll_id, :default_version_id)",
 	 				"time", unix_time,
 	 				"directory_path", System.IO.Path.GetDirectoryName (newPath),
 	 				"name", System.IO.Path.GetFileName (newPath),
 	 				"description", description,
+					"roll_id", roll_id,
 	 				"default_version_id", Photo.OriginalVersionId));
 	
 			photo = new Photo (id, unix_time, newPath);
@@ -889,7 +902,7 @@
 			return photo;
 
 		SqliteDataReader reader = Database.Query(new DbCommand("SELECT time, directory_path, name, description, "
-                                                     + "default_version_id FROM photos WHERE id = :id", "id", id));
+                                                     + "roll_id, default_version_id FROM photos WHERE id = :id", "id", id));
 
 		if (reader.Read ()) {
 			photo = new Photo (id,
@@ -898,7 +911,8 @@
 					   reader [2].ToString ());
 
 			photo.Description = reader[3].ToString ();
-			photo.DefaultVersionId = Convert.ToUInt32 (reader[4]);
+			photo.RollId = Convert.ToUInt32 (reader[4]);
+			photo.DefaultVersionId = Convert.ToUInt32 (reader[5]);
 			AddToCache (photo);
 		}
 		reader.Close();
@@ -922,7 +936,7 @@
 		string directory_path = System.IO.Path.GetDirectoryName (path);
 		string filename = System.IO.Path.GetFileName (path);
 
-		SqliteDataReader reader = Database.Query(new DbCommand("SELECT id, time, description, default_version_id FROM photos "
+		SqliteDataReader reader = Database.Query(new DbCommand("SELECT id, time, description, roll_id, default_version_id FROM photos "
                 + "WHERE directory_path = :directory_path AND name = :name", "directory_path", directory_path, "name", filename));
 
 		if (reader.Read ()) {
@@ -932,7 +946,8 @@
 					   filename);
 
 			photo.Description = reader[2].ToString ();
-			photo.DefaultVersionId = Convert.ToUInt32 (reader[3]);
+			photo.RollId = Convert.ToUInt32 (reader[3]);
+			photo.DefaultVersionId = Convert.ToUInt32 (reader[4]);
 			AddToCache (photo);
 		}
         reader.Close();
@@ -1068,19 +1083,91 @@
 		}
 	}
 
+	public class ImportIdRange 
+	// This class contains the active import rolls the user wants to filter on.
+	// For instance, if he is interested on import rolls, 19, 20, 21 and 22
+	// the first 4 values in importidhistory would be 19, 20, 21, 22
+	{
+		private uint [] importidhistory;
+
+		public bool FilterOnImports {
+			get {
+				return importidhistory.Length > 0;
+			}
+		}		
+		public uint GetNumberOfImportFilters {
+			get {
+				return (uint) importidhistory.Length;
+			}
+		}		
+		public uint GetImportId (uint val)
+		{
+			return importidhistory[val];
+		}
+		// constructor : A range of rolls
+		public ImportIdRange (uint [] ids)
+		{
+			importidhistory = ids;
+		}
+		// constructor : just one specific roll
+		public ImportIdRange (uint id)
+		{
+			importidhistory = new uint[1];
+			importidhistory[0] = id;
+		}
+	}
+
 	// Queries.
+
+	private String AddLastImportFilter (ImportIdRange importidrange, bool added_where)
+	{
+/* 
+Building something like this
+	where photos.roll_id in (3, 4, 5)
+*/	
+		string q = null;		// contains the resulting sub-query
+		bool add_comma = false;		// If ", " should be added before the parameter.
+		
+		if (importidrange == null)	// return directly, if importidrange is not set.
+			return q;
+
+		q = String.Format (" {0} photos.roll_id IN ( ", added_where ? " AND " : " WHERE " );
+
+		for (uint k = 0; k < importidrange.GetNumberOfImportFilters; k++) {
+				q = q + String.Format ("{0}{1}", add_comma ? ", " : "", importidrange.GetImportId(k));
+				add_comma = true;
+		} // for
+		q = q + (" ) " ); // AND id IN
+//		System.Console.WriteLine ("Last Import filter = >>{0}<<", q);
+		return q;
+	}
+
+	
+	
+	public Photo [] Query (Tag [] tags, DateTime start, DateTime end, uint [] importrange)
+	{
+		return Query (tags, null, new DateRange (start, end), new ImportIdRange (importrange));
+	}
+
+	public Photo [] Query (Tag [] tags, uint [] importrange)
+	{
+		return Query (tags, null, null, importrange == null ? null : new ImportIdRange (importrange));
+	}
+
 	public Photo [] Query (Tag [] tags, DateTime start, DateTime end)
 	{
-		return Query (tags, null, new DateRange (start, end));
+		return Query (tags, null, new DateRange (start, end), null);
 	}
 	
 	public Photo [] Query (Tag [] tags) {
-		return Query (tags, null, null);
+		return Query (tags, null, null, null);
 	}
 
 	public Photo [] Query (string query)
 	{
 		SqliteDataReader reader = Database.Query(query);
+
+System.Console.WriteLine ("Query == >>{0}<<", query);		
 		
 		ArrayList version_list = new ArrayList ();
 		ArrayList id_list = new ArrayList ();
@@ -1095,7 +1182,8 @@
 						   reader [3].ToString ());
 				
 				photo.Description = reader[4].ToString ();
-				photo.DefaultVersionId = Convert.ToUInt32 (reader[5]);		 
+				photo.RollId = Convert.ToUInt32 (reader[5]);
+				photo.DefaultVersionId = Convert.ToUInt32 (reader[6]);
 				
 				version_list.Add (photo);
 			}
@@ -1130,6 +1218,7 @@
 						     "       photos.directory_path,              " +
 						     "       photos.name,                        " +
 						     "       photos.description,                 " +
+						     "       photos.roll_id,                     " +
 						     "       photos.default_version_id           " +
 						     "     FROM photos                           " +
 						     "     WHERE directory_path = \"{0}\"", dir.FullName);
@@ -1137,30 +1226,37 @@
 		return Query (query_string);
 	}
 
-	public Photo [] QueryUntagged (DateRange range)
+	public Photo [] QueryUntagged (DateRange range, ImportIdRange importidrange)
 	{
 		StringBuilder query_builder = new StringBuilder ();
 
 		query_builder.Append ("SELECT * FROM photos WHERE id NOT IN " +
 					"(SELECT DISTINCT photo_id FROM photo_tags) ");
 		
+		bool added_where = true;
 		if (range != null) {
 			query_builder.Append (String.Format ("AND photos.time >= {0} AND photos.time <= {1} ",
 							     DbUtils.UnixTimeFromDateTime (range.Start), 
 							     DbUtils.UnixTimeFromDateTime (range.End)));
+			added_where = true;
 		}
 
+		if (importidrange != null) {
+			query_builder.Append (AddLastImportFilter (importidrange, added_where));
+			added_where = true;
+ 		}
+
 		query_builder.Append("ORDER BY time");
 
 		return Query (query_builder.ToString ());
 	}
 
-	public Photo [] Query (Tag [] tags, string extra_condition, DateRange range)
+	public Photo [] Query (Tag [] tags, string extra_condition, DateRange range, ImportIdRange importidrange)
 	{
-		return Query (OrTerm.FromTags(tags), extra_condition, range);
+		return Query (OrTerm.FromTags(tags), extra_condition, range, importidrange);
 	}
 
-	public Photo [] Query (Term searchexpression, string extra_condition, DateRange range)
+	public Photo [] Query (Term searchexpression, string extra_condition, DateRange range, ImportIdRange importidrange)
 	{
 		bool hide = (extra_condition == null);
 
@@ -1171,6 +1267,7 @@
 		//        photos.directory_path,
 		//        photos.name,
 		//        photos.description,
+		//	  photos.roll_id,
 		//        photos.default_version_id
 		//                  FROM photos, photo_tags
 		//                  WHERE photos.id = photo_tags.photo_id
@@ -1178,6 +1275,8 @@
 		//			            OR photo_tags.tag_id = cat1tag2 ) 
 		// 		                AND (photo_tags.tag_id = cat2tag1
 		//			            OR photo_tags.tag_id = cat2tag2 )
+		//			  	AND (photos.roll_id = roll_id1
+		//			   	    OR photos.roll_id = roll_id2 ...)
 		//                  GROUP BY photos.id
 		
 		StringBuilder query_builder = new StringBuilder ();
@@ -1186,6 +1285,7 @@
 					     "photos.directory_path, " 		+
 					     "photos.name, "			+
 					     "photos.description, "		+
+				      	     "photos.roll_id, "   		+
 					     "photos.default_version_id "	+
 				      "FROM photos ");
 		
@@ -1197,6 +1297,11 @@
 							     DbUtils.UnixTimeFromDateTime (range.End)));
 			where_statement_added = true;
 		}
+
+		if (importidrange != null) {
+			query_builder.Append (AddLastImportFilter (importidrange, where_statement_added));
+			where_statement_added = true;
+		}		
 		
 		if (hide && tag_store.Hidden != null) {
 			query_builder.Append (String.Format ("{0} photos.id NOT IN (SELECT photo_id FROM photo_tags WHERE tag_id = {1}) ", 
@@ -1293,14 +1398,14 @@
 
 		Pixbuf unused_thumbnail;
 
-		Photo ny_landscape = db.Photos.Create (DateTime.Now.ToUniversalTime (), "/home/ettore/Photos/ny_landscape.jpg",
+		Photo ny_landscape = db.Photos.Create (DateTime.Now.ToUniversalTime (), 1, "/home/ettore/Photos/ny_landscape.jpg",
 						       out unused_thumbnail);
 		ny_landscape.Description = "Pretty NY skyline";
 		ny_landscape.AddTag (landscapes_tag);
 		ny_landscape.AddTag (favorites_tag);
 		db.Photos.Commit (ny_landscape);
 
-		Photo me_in_sf = db.Photos.Create (DateTime.Now.ToUniversalTime (), "/home/ettore/Photos/me_in_sf.jpg",
+		Photo me_in_sf = db.Photos.Create (DateTime.Now.ToUniversalTime (), 2, "/home/ettore/Photos/me_in_sf.jpg",
 						   out unused_thumbnail);
 		me_in_sf.AddTag (landscapes_tag);
 		me_in_sf.AddTag (portraits_tag);
@@ -1313,7 +1418,7 @@
 		me_in_sf.CreateVersion ("UM-ed", Photo.OriginalVersionId);
 		db.Photos.Commit (me_in_sf);
 
-		Photo macro_shot = db.Photos.Create (DateTime.Now.ToUniversalTime (), "/home/ettore/Photos/macro_shot.jpg",
+		Photo macro_shot = db.Photos.Create (DateTime.Now.ToUniversalTime (), 2, "/home/ettore/Photos/macro_shot.jpg",
 						     out unused_thumbnail);
 		db.Dispose ();
 
Index: src/TimeAdaptor.cs
===================================================================
--- src/TimeAdaptor.cs	(revision 3083)
+++ src/TimeAdaptor.cs	(working copy)
@@ -222,7 +222,7 @@
 		{
 			years.Clear ();
 
-			Photo [] photos = query.Store.Query ((Tag [])null, null, null);
+			Photo [] photos = query.Store.Query ((Tag [])null, null, null, null);
 			Array.Sort (query.Photos);
 			Array.Sort (photos);
 
Index: src/FileImportBackend.cs
===================================================================
--- src/FileImportBackend.cs	(revision 3083)
+++ src/FileImportBackend.cs	(working copy)
@@ -16,6 +16,7 @@
 
 public class FileImportBackend : ImportBackend {
 	PhotoStore store;
+ 	ImportStore imports;
 	TagStore tag_store = FSpot.Core.Database.Tags;
 	bool recurse;
 	bool copy;
@@ -216,12 +217,12 @@
 			// Don't copy if we are already home
 			if (info.OriginalPath == destination) {
 				info.DestinationPath = destination;
-				photo = store.Create (info.DestinationPath, out thumbnail);
+				photo = store.Create (info.DestinationPath, imports.GetImportId(), out thumbnail);
 			} else {
 				System.IO.File.Copy (info.OriginalPath, destination);
 				info.DestinationPath = destination;
 
-				photo = store.Create (info.DestinationPath, info.OriginalPath, out thumbnail);
+				photo = store.Create (info.DestinationPath, info.OriginalPath, imports.GetImportId(), out thumbnail);
 
 				try {
 					File.SetAttributes (destination, File.GetAttributes (info.DestinationPath) & ~FileAttributes.ReadOnly);
@@ -247,6 +248,8 @@
 				store.Commit(photo);
 			
 			info.Photo = photo;
+
+                        
 		} catch (System.Exception e) {
 			System.Console.WriteLine ("Error importing {0}{2}{1}", info.OriginalPath, e.ToString (), Environment.NewLine);
 			if (thumbnail != null)
@@ -309,6 +312,8 @@
 		}
 		// Clean up just created tags
 		xmptags.Cancel();
+ 		// Remove the imported session
+ 		imports.DeleteCurrent(); 
 	}
 
 	public override void Finish ()
@@ -324,13 +329,15 @@
 		import_info = null;
 		xmptags.Finish();
 		count = 0;
+		imports.EndImport();    // Clean up the imported session.
 	}
 
-	public FileImportBackend (PhotoStore store, string [] base_paths, bool recurse, Gtk.Window parent) : this (store, base_paths, false, recurse, null, parent) {}
+	public FileImportBackend (PhotoStore store, ImportStore imports, string [] base_paths, bool recurse, Gtk.Window parent) : this (store, imports, base_paths, false, recurse, null, parent) {}
 
-	public FileImportBackend (PhotoStore store, string [] base_paths, bool copy, bool recurse, Tag [] tags, Gtk.Window parent)
+	public FileImportBackend (PhotoStore store, ImportStore imports, string [] base_paths, bool copy, bool recurse, Tag [] tags, Gtk.Window parent)
 	{
 		this.store = store;
+		this.imports = imports;
 		this.copy = copy;
 		this.base_paths = base_paths;
 		this.recurse = recurse;
@@ -352,7 +359,7 @@
 
 		Db db = new Db (path, true);
 
-		FileImportBackend import = new FileImportBackend (db.Photos, args [0],true);
+		FileImportBackend import = new FileImportBackend (db.Photos, db.Imports, args [0],true, this);
 
 		Console.WriteLine ("Preparing...");
 
Index: src/Updater.cs
===================================================================
--- src/Updater.cs	(revision 3083)
+++ src/Updater.cs	(working copy)
@@ -81,9 +81,56 @@
 			//Version 4.0, bump the version number to a integer, for backward compatibility
 			AddUpdate (new Version (4, 0), delegate () {});
 
+
+			//Version 5.0, Creating a new table to keep the Import sessions.
+			AddUpdate (new Version (5, 0), delegate () {
+				System.Console.WriteLine ("Will add a roll_id field to photos!");
+				
+				string tmp_photos = MoveTableToTemp ("photos");
+System.Console.WriteLine ("Copied data to tmp table!");								
+				ExecuteNonQuery (
+					"CREATE TABLE photos (                                     " +
+					"	id                 INTEGER PRIMARY KEY NOT NULL,   " +
+					"       time               INTEGER NOT NULL,	   	   " +
+					"       directory_path     STRING NOT NULL,		   " +
+					"       name               STRING NOT NULL,		   " +
+					"       description        TEXT NOT NULL,	           " +
+					"       roll_id            INTEGER NOT NULL,		   " +
+					"       default_version_id INTEGER NOT NULL		   " +
+					")");
+System.Console.WriteLine ("Created new table!");				
+				// Copy the data back from Temp table
+				ExecuteScalar (String.Format("INSERT INTO photos SELECT id, time, directory_path, name, description, 0, default_version_id FROM {0}", tmp_photos));
+System.Console.WriteLine ("Copied data back to photos!");									
+				// Delete the tmp table
+				ExecuteNonQuery (String.Format("DROP TABLE {0}", tmp_photos));
+System.Console.WriteLine ("Dropped the tmp table!");									
+				System.Console.WriteLine ("Added roll_id field to photos!");
+				
+				System.Console.WriteLine ("Will rename imports to rolls!");
+				
+				string tmp_rolls = MoveTableToTemp ("imports");
+System.Console.WriteLine ("Copied data to tmp table!");								
+				ExecuteNonQuery (
+					"CREATE TABLE rolls (                                     " +
+					"	id                 INTEGER PRIMARY KEY NOT NULL,   " +
+					"       time               INTEGER NOT NULL	   	   " +
+					")");
+System.Console.WriteLine ("Created new table!");				
+				// Copy the data back from Temp table
+				ExecuteScalar (String.Format("INSERT INTO rolls SELECT id, time FROM {0}", tmp_rolls));
+System.Console.WriteLine ("Copied data back to rolls!");									
+				// Delete the tmp table
+				ExecuteNonQuery (String.Format("DROP TABLE {0}", tmp_rolls));
+System.Console.WriteLine ("Dropped the temp table!");									
+				System.Console.WriteLine ("Renamed imports to rolls!");
+				
+			});				
+
+
 //TODO: please consider fixing bgo 324425 on the next update of the db.
-			// Update to version 5.0
-			//AddUpdate (new Version (5,0),delegate () {
+			// Update to version 6.0
+			//AddUpdate (new Version (6,0),delegate () {
 			//	do update here
 			//});
 
Index: src/PhotoQuery.cs
===================================================================
--- src/PhotoQuery.cs	(revision 3083)
+++ src/PhotoQuery.cs	(working copy)
@@ -11,12 +11,13 @@
 		private Tag [] tags;
 		private string extra_condition;
 		private PhotoStore.DateRange range = null;
+		private PhotoStore.ImportIdRange importidrange = null;
 		
 		// Constructor
 		public PhotoQuery (PhotoStore store)
 		{
 			this.store = store;
-			photos = store.Query ((Tag [])null, null, range);
+			photos = store.Query ((Tag [])null, null, range, importidrange);
 		}
 
 		public int Count {
@@ -116,12 +117,26 @@
 			}
 		}
 
+		public PhotoStore.ImportIdRange ImportIdRange {
+			get {
+				return importidrange;
+			}
+			set {
+				if (value == importidrange)
+					return;
+
+				importidrange = value;
+				
+ 				RequestReload ();
+ 			}
+		}
+
 		public void RequestReload ()
 		{
 			if (untagged)
-				photos = store.QueryUntagged (range);
+				photos = store.QueryUntagged (range, importidrange);
 			else
-				photos = store.Query (terms, extra_condition, range);
+				photos = store.Query (terms, extra_condition, range, importidrange);
 
 			if (Changed != null)
 				Changed (this);
Index: src/ImportStore.cs
===================================================================
--- src/ImportStore.cs	(revision 3083)
+++ src/ImportStore.cs	(working copy)
@@ -4,25 +4,29 @@
 using System;
 using Banshee.Database;
 
-
-public class ImportStore : DbStore {
-
-	public class Import : DbItem {
-		// The time is always in UTC.
-		private DateTime time;
-		public DateTime Time {
-			get {
-				return time;
-			}
+public class Import : DbItem {
+	// The time is always in UTC.
+	private DateTime time;
+	public DateTime Time {
+		get {
+			return time;
 		}
+	}
 
 		public Import (uint id, long unix_time)
-			: base (id)
-		{
-			time = DbUtils.DateTimeFromUnixTime (unix_time);
-		}
+		: base (id)
+	{
+		time = DbUtils.DateTimeFromUnixTime (unix_time);
 	}
+}
 
+
+
+public class ImportStore : DbStore {
+        
+	Import import_session;		// This import session.
+	private int max_roll_history;	// will be populated from gconf, and indicates how many rolls we should track 
+	        
 	private class ImportComparerByDate : IComparer {
 		public int Compare (Object a, Object b) {
 			return DateTime.Compare ((a as Import).Time, (b as Import).Time);
@@ -34,22 +38,34 @@
 	public ImportStore (QueuedSqliteDatabase database, bool is_new)
 		: base (database, false)
 	{
+
+                this.import_session = null;
+
 		if (! is_new)
 			return;
 		
 		Database.ExecuteNonQuery (
-			"CREATE TABLE imports (                            " +
+			"CREATE TABLE rolls (                            " +
 			"	id          INTEGER PRIMARY KEY NOT NULL,  " +
-			"       time        INTEGER			   " +
+			"       time        INTEGER NOT NULL		   " +
 			")");
 
 	}
 
+	// Get the number of import rolls to keep, default to 20 
+	public int MaxNumberGuiRolls { 
+		get { 
+			return (int) FSpot.Preferences.Get (FSpot.Preferences.IMPORT_GUI_ROLL_HISTORY, 20);
+		}
+	}
+
+
+
 	public Import Create (DateTime time_in_utc)
 	{
 		long unix_time = DbUtils.UnixTimeFromDateTime (time_in_utc);
 
-		uint id = (uint)Database.Execute (new DbCommand ("INSERT INTO import (time) VALUES (:time)", "time", unix_time));
+		uint id = (uint)Database.Execute (new DbCommand ("INSERT INTO rolls (time) VALUES (:time)", "time", unix_time));
 
 		Import import = new Import (id, unix_time);
 		AddToCache (import);
@@ -57,6 +73,12 @@
 		return import;
 	}
 
+	public Import Create ()
+	{
+		return Create (System.DateTime.Now);
+	}
+
+
 	public override DbItem Get (uint id)
 	{
 		Import import = LookupInCache (id) as Import;
@@ -64,7 +86,7 @@
 			return import;
 
 		
-		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT time FROM imports WHERE id = :id", "id", id));
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT time FROM rolls WHERE id = :id", "id", id));
 
 		if (reader.Read ()) {
 			import = new Import (id, Convert.ToUInt32 (reader [0]));
@@ -78,7 +100,7 @@
 	{
 		RemoveFromCache (item);
 
-		Database.ExecuteNonQuery (new DbCommand ("DELETE FROM imports WHERE id = :id", "id", item.Id));
+		Database.ExecuteNonQuery (new DbCommand ("DELETE FROM rolls WHERE id = :id", "id", item.Id));
 	}
 
 	public override void Commit (DbItem item)
@@ -86,12 +108,146 @@
 		// Nothing to do here, since all the properties of an import are immutable.
 	}
 
+	public uint GetImportId()
+	{
+                if (import_session == null) {
+                        import_session = Create ();
+                }
+                return import_session.Id;
+	
+	}
+	
+	public DateTime GetImportTime (uint roll_id)
+	{
+		// Check if a valid import id.
+                if ( roll_id < 1 ) 
+                	return System.DateTime.MinValue;
+		
+		return (Get (roll_id) as Import).Time;
+	}
+
+	public DateTime GetImportTime (int roll_id)
+	{
+		// roll_id is stored as an uint.
+		return GetImportTime ((uint) roll_id);
+	}
+
+	public uint GetNumberOfPhotosInRoll (uint roll_id)
+	{
+		uint number_of_photos_in_roll = 0;
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT count(*) FROM photos WHERE roll_id = :id", "id", roll_id));
+
+		if (reader.Read ()) {
+			number_of_photos_in_roll = Convert.ToUInt32 (reader [0]);
+		}
+               
+                return number_of_photos_in_roll;	
+	}
+
+	public System.DateTime GetDateForRoll (uint roll_id)
+	{
+		System.DateTime date_for_roll = System.DateTime.MinValue;
+
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT time FROM rolls WHERE id = :id", "id", roll_id));
+
+		if (reader.Read ()) {
+			date_for_roll = DbUtils.DateTimeFromUnixTime (Convert.ToUInt32 (reader[0]));
+		}
+               
+                return date_for_roll;	
+	}
+		
+		
+	
+	public uint [] GetActiveRolls()
+	{
+		// Before we return any rows, lets purge out any old empty rows.
+		// PurgeOldData();
+
+		// Ok, now we only should have real data there, so lets return them.
+		ArrayList result = new ArrayList();
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT id, time FROM rolls ORDER BY id DESC"));
+                
+		int MaxRollsInGui = MaxNumberGuiRolls;
+		int fetched_rows = 0;
+		while (reader.Read () && (fetched_rows < MaxRollsInGui)) {
+			// Note that we get both time and ID from the database, but we have to see
+			// if the item is already in the cache first to make sure we return always
+			// the same object for a given ID.
+			
+			uint id = Convert.ToUInt32 (reader[0]);
+
+			Import import = LookupInCache (id) as Import;
+			if (import == null) {
+				import = new Import (id, Convert.ToUInt32 (reader[1]));
+				AddToCache (import);
+			}
+			result.Add (id);
+			fetched_rows++;
+//System.Console.WriteLine ("Fetched_Rows={0}, MaxRollsInGui={1}", fetched_rows, MaxRollsInGui);
+		}
+		return (uint [])result.ToArray(typeof(uint));
+	}
+	
+	public uint GetLastRollId()
+	{
+		// Nothing to do here, since all the properties of an import are immutable.
+		uint last_roll_id = 0;
+
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT MAX(id) FROM rolls"));
+
+                if (reader.Read ()) {
+                        last_roll_id = Convert.ToUInt32 (reader[0]);
+                }
+                                
+                return last_roll_id;
+	}
+	
+        public uint NumberOfRows()
+        {
+                uint rows = 0;
+
+		// Lets do the awkward select by searching the photos, since 
+		// if user deleted photos, the rolls table is not updated.
+//		command.CommandText = "SELECT count(*) FROM imports";
+		SqliteDataReader reader = Database.Query(new DbCommand ("SELECT COUNT(roll_id) FROM (SELECT DISTINCT roll_id FROM photos)"));
+
+                if (reader.Read ()) {
+                        rows = Convert.ToUInt32 (reader[0]);
+                }
+                
+                return rows;
+        }
+
+	public void EndImport ()
+	{ 
+	       import_session = null;          // So next time we import, we create a new import session.
+	}
+	
+	public void DeleteCurrent ()
+	{ 
+		if (import_session != null)
+			Remove (import_session);
+		EndImport();
+	}
+
+        public void AddPhotoToSession (uint imported_photo_id)
+        {
+        
+                // I wanted to store each imported_photo_id in an CollectionArray, 
+                // and do the database update in Commit. But if something goes wrong during the import
+                // the database would not be updated. So...
+                // Add this photo id to the import session.
+                if (import_session == null) {
+                        import_session = Create ();
+                }
+        }
 	// FIXME: Maybe this should be an abstract method in the base class?
 	public ArrayList GetAll ()
 	{
 		ArrayList list = new ArrayList ();
 
-		SqliteDataReader reader = Database.Query("SELECT id, time FROM imports"); 
+		SqliteDataReader reader = Database.Query("SELECT id, time FROM rolls"); 
 
 		while (reader.Read ()) {
 			// Note that we get both time and ID from the database, but we have to see
Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 3083)
+++ src/Makefile.am	(working copy)
@@ -135,6 +135,7 @@
 	$(srcdir)/Imaging/X3fFile.cs		\
 	$(srcdir)/Imaging/XmpFile.cs		\
 	$(srcdir)/Imaging/Tiff.cs		\
+	$(srcdir)/LastRollDialog.cs		\
 	$(srcdir)/Loupe.cs			\
 	$(srcdir)/MainWindow.cs			\
 	$(srcdir)/MetaStore.cs			\
Index: src/ImportCommand.cs
===================================================================
--- src/ImportCommand.cs	(revision 3083)
+++ src/ImportCommand.cs	(working copy)
@@ -314,6 +314,7 @@
 
 	int total;
 	PhotoStore store;
+	ImportStore import_sessions;
 	FSpot.Delay step;
 	
 	FSpot.PhotoImageView photo_view;
@@ -331,7 +332,7 @@
 	
 	private SourceItem Source {
 		set {
-			if (store == null || collection == null)
+			if (store == null || collection == null || import_sessions == null)
 				return;
 			
 			SourceItem item = value;
@@ -553,9 +554,10 @@
 		idle_start.Start ();
 	}
 
-	public int ImportFromFile (PhotoStore store, string path)
+	public int ImportFromFile (PhotoStore store, ImportStore import_sessions, string path)
 	{
 		this.store = store;
+		this.import_sessions = import_sessions;
 		this.CreateDialog ("import_dialog");
 		
 		this.Dialog.TransientFor = main_window;
@@ -736,7 +738,7 @@
 			recurse = recurse_check.Active;
 		
 //		importer = new FileImportBackend (store, pathimport, copy, recurse, null);
-		importer = new FileImportBackend (store, pathimport, copy, recurse, null, Dialog);
+		importer = new FileImportBackend (store, import_sessions, pathimport, copy, recurse, null, Dialog);
 		AllowFinish = false;
 		
 		total = importer.Prepare ();
@@ -753,20 +755,20 @@
 		return false;
 	}
 
-	public int ImportFromPaths (PhotoStore store, string [] paths, bool copy)
+	public int ImportFromPaths (PhotoStore store, ImportStore import_sessions, string [] paths, bool copy)
 	{
-		return ImportFromPaths (store, paths, null, copy);
+		return ImportFromPaths (store, import_sessions, paths, null, copy);
 	}
 	
-	public int ImportFromPaths (PhotoStore store, string [] paths, Tag [] tags)
+	public int ImportFromPaths (PhotoStore store, ImportStore import_sessions, string [] paths, Tag [] tags)
 	{
-		return ImportFromPaths (store, paths, tags, false);
+		return ImportFromPaths (store, import_sessions, paths, tags, false);
 	}
 	
-	public int ImportFromPaths (PhotoStore store, string [] paths, Tag [] tags, bool copy)
+	public int ImportFromPaths (PhotoStore store, ImportStore import_sessions, string [] paths, Tag [] tags, bool copy)
 	{
 		collection = new FSpot.PhotoList (new Photo [0]);
-		int count = DoImport (new FileImportBackend (store, paths, copy, true, tags, main_window ));
+		int count = DoImport (new FileImportBackend (store, import_sessions, paths, copy, true, tags, main_window ));
 
 		Finish ();
 
Index: src/Preferences.cs
===================================================================
--- src/Preferences.cs	(revision 3083)
+++ src/Preferences.cs	(working copy)
@@ -103,6 +103,8 @@
  		public const string EXPORT_EMAIL_ROTATE = "/apps/f-spot/export/email/auto_rotate";
  		public const string EXPORT_EMAIL_DELETE_TIMEOUT_SEC = "/apps/f-spot/export/email/delete_timeout_seconds";
 
+		public const string IMPORT_GUI_ROLL_HISTORY = "/apps/f-spot/import/gui_roll_history";
+
 		public const string SCREENSAVER_TAG = "/apps/f-spot/screensaver/tag_id";
 
 		public const string STORAGE_PATH = "/apps/f-spot/import/storage_path";
Index: src/MainWindow.cs
===================================================================
--- src/MainWindow.cs	(revision 3083)
+++ src/MainWindow.cs	(working copy)
@@ -98,6 +98,10 @@
 
 	[Glade.Widget] CheckMenuItem find_untagged;
 	
+	[Glade.Widget] CheckMenuItem last_import_roll;
+	[Glade.Widget] MenuItem last_import_rolls;
+	[Glade.Widget] MenuItem clear_last_import_filter;	
+	
 	// Tags
 	[Glade.Widget] MenuItem edit_selected_tag;
 	[Glade.Widget] MenuItem delete_selected_tag;
@@ -143,6 +147,7 @@
 	
 	ModeType view_mode;
 	bool write_metadata = false;
+	bool last_import_roll_active = false; // to ensure the checkmenuitem can be controlled from other area.
 
 	// Tag Icon Sizes
 	public int TagsIconSize {
@@ -1129,7 +1134,7 @@
 	public void ImportUriList (UriList list, bool copy) 
 	{
 		ImportCommand command = new ImportCommand (main_window);
-		if (command.ImportFromPaths (db.Photos, list.ToLocalPaths (), copy) > 0) {
+		if (command.ImportFromPaths (db.Photos, db.Imports, list.ToLocalPaths (), copy) > 0) {
 			UpdateQuery ();
 		}
 	}
@@ -1137,7 +1142,7 @@
 	public void ImportFile (string path)
 	{
 		ImportCommand command = new ImportCommand (main_window);
-		if (command.ImportFromFile (db.Photos, path) > 0) {
+		if (command.ImportFromFile (db.Photos, db.Imports, path) > 0) {
 			UpdateQuery ();
 		}
 	}
@@ -1346,7 +1351,7 @@
 	{
 		db.Sync = false;
 		ImportCommand command = new ImportCommand (main_window);
-		if (command.ImportFromFile (db.Photos, null) > 0) {
+		if (command.ImportFromFile (db.Photos, db.Imports, null) > 0) {
 			UpdateQuery ();
 		}
 		db.Sync = true;		
@@ -2466,6 +2471,35 @@
 		}
 		query.Range = null;
 	}
+
+	void HandleSetLastImportRoll (object sender, EventArgs args) {
+		if (last_import_roll.Active) {
+			query.ImportIdRange = new PhotoStore.ImportIdRange (db.Imports.GetLastRollId());
+			last_import_roll_active = true;		
+		} else {
+			if (last_import_roll_active) {
+				query.ImportIdRange = null;
+				last_import_roll_active = false;
+			}
+		}
+	}
+
+	void HandleSetLastImportRolls (object sender, EventArgs args) {
+		LastRolls.Set set_command = new LastRolls.Set (query, db.Imports, main_window);
+		if (set_command.Execute ()) {
+			last_import_roll.Active = false;	// Since user manually opened the gui, we clear the last roll filter.
+		} else {
+			if (!last_import_roll_active)
+				query.ImportIdRange = null;
+		}
+	}
+
+	void HandleClearLastImportFilter (object sender, EventArgs args) {
+		query.ImportIdRange = null;
+		last_import_roll.Active = false;
+
+	}
+
 	
 	void HandleFindUntagged (object sender, EventArgs args) {
 		if (query.Untagged == find_untagged.Active)
@@ -2761,7 +2795,15 @@
 		exif_data.Sensitive = active_selection;
 		sharpen.Sensitive = active_selection;
 		remove_from_catalog.Sensitive = active_selection;
-
+		
+		last_import_roll.Sensitive = (db.Imports.NumberOfRows() > 0);
+		last_import_rolls.Sensitive = (db.Imports.NumberOfRows() > 1);
+		clear_last_import_filter.Sensitive = (last_import_rolls.Sensitive);
+		if ((last_import_roll.Active) && (query.ImportIdRange == null))	{	// Clean up tick, if roll filter is not active.
+			last_import_roll_active = false;
+			last_import_roll.Active = false;
+		}
+		
 		delete_selected_tag.Sensitive = tag_sensitive;
 		edit_selected_tag.Sensitive = tag_sensitive;
 
Index: src/CameraFileSelectionDialog.cs
===================================================================
--- src/CameraFileSelectionDialog.cs	(revision 3083)
+++ src/CameraFileSelectionDialog.cs	(working copy)
@@ -265,7 +265,7 @@
 		private void ImportFiles ()
 		{
 			ImportCommand command = new ImportCommand (null);
-			command.ImportFromPaths (db.Photos, saved_files, selected_tags);
+			command.ImportFromPaths (db.Photos, db.Imports, saved_files, selected_tags);
 		}
 		
 		public Tag[] Tags {
Index: src/DirectoryAdaptor.cs
===================================================================
--- src/DirectoryAdaptor.cs	(revision 3083)
+++ src/DirectoryAdaptor.cs	(working copy)
@@ -92,7 +92,7 @@
 		public override void Reload () 
 		{
 			System.Collections.Hashtable ht = new System.Collections.Hashtable ();
-			Photo [] photos = query.Store.Query ((Tag [])null, null, null);
+			Photo [] photos = query.Store.Query ((Tag [])null, null, null, null);
 			
 			foreach (Photo p in photos) {
 				if (ht.Contains (p.DirectoryPath)) {
--- /dev/null	2007-04-11 16:17:18.000000000 +1000
+++ ./src/LastRollDialog.cs	2007-04-20 00:28:01.890740185 +1000
@@ -0,0 +1,169 @@
+//
+// LastRollDialog.cs: Displays a small gui, from which the user can choose 
+//	which Roll Id (of the last 20) to base the search filter upon.
+//
+// Author:
+//   Bengt Thuree (bengt@thuree.com)
+//	With great help from Stephane Delcroix (GUI and feedback)
+//
+// (C) 2006 Bengt Thuree
+//
+
+using Gtk;
+using Gnome;
+
+public class LastRolls {
+	public class Set : FSpot.GladeDialog {
+		FSpot.PhotoQuery query;
+		ImportStore imports;
+		Gtk.Window parent_window;
+		
+		uint [] ActiveRolls; // Last XX Roll Id (3, 4, 5, 6, 7, 8, 9..., 22)
+
+		[Glade.Widget] private ComboBox combo_filter; // at, after, or between
+		[Glade.Widget] private ComboBox combo_roll_1;
+		[Glade.Widget] private ComboBox combo_roll_2;
+		[Glade.Widget] private Label    and_label; // and label between two comboboxes.
+		[Glade.Widget] private Label    photos_in_selected_rolls; 
+		
+		public Set (FSpot.PhotoQuery query, ImportStore imports, Gtk.Window parent_window)
+		{
+			this.query = query;
+			this.imports = imports;
+			this.parent_window = parent_window;
+			this.ActiveRolls = imports.GetActiveRolls();	// Get the import roll history
+		}
+		
+		void on_combo_filter_changed (object o, System.EventArgs args)
+		{
+			ComboBox combo = o as ComboBox;
+			if (o == null)
+				return;
+
+			// Disable the second combobox and 'and' label if not needed.
+			combo_roll_2.Sensitive = (combo.Active == 2); // Only made combo_roll 2 active if combo_filter = 2 (between)
+			and_label.Sensitive = combo_roll_2.Sensitive; // Only display the 'and' label if roll2 is visible.
+			combo_roll_2.Visible = combo_roll_2.Sensitive; // Only made combo_roll 2 active if combo_filter = 2 (between)
+			and_label.Visible = combo_roll_2.Sensitive; // Only display the 'and' label if roll2 is visible.
+			Update_Number_Of_Photos_In_Roll();
+		}
+
+		void on_combo_roll_changed (object o, System.EventArgs args)
+		{
+			Update_Number_Of_Photos_In_Roll();
+		}
+
+		private void Update_Number_Of_Photos_In_Roll()
+		{
+			uint [] selected_rolls;
+			uint sum = 0;
+			selected_rolls = Get_ImportIDs_from_combo_rolls();
+			if (selected_rolls != null)
+				foreach (uint roll_id in selected_rolls) 
+					sum = sum + imports.GetNumberOfPhotosInRoll(roll_id);
+			photos_in_selected_rolls.Text = sum.ToString();
+		}
+		
+		private void Populate_Combo_Rolls()
+		{
+			// This function will populate the two combo rolls with "<Date> - <Imported photos> photos"
+			string header;
+
+			// For every roll in the history, prepare a header
+			for (uint k = 0; k < ActiveRolls.Length; k++)
+			{
+				header = "";
+				
+				// Get data for this import roll
+				uint numphotos = imports.GetNumberOfPhotosInRoll(ActiveRolls[k]);
+				System.DateTime dateforroll = imports.GetDateForRoll((uint) ActiveRolls[k]);
+				
+				// Prepare the header
+				header = System.String.Format ("{0} ({1})",
+					dateforroll.ToString("%dd %MMM, %HH:%mm"),
+					numphotos);		
+					
+				// Add the header we just created to both combo_rolls
+				combo_roll_1.AppendText (header);
+				combo_roll_2.AppendText (header);
+			} // for					
+		}
+		
+		private uint [] Get_ImportIDs_from_combo_rolls()
+		{
+
+			// Return null if combo boxes are not setup properly.
+			if ( (combo_roll_1.Active < 0) || ( (combo_filter.Active==2) && (combo_roll_2.Active<0) ) )
+				return null;
+				
+			// This function will convert the combo boxes to some Import Roll IDs (at, after or between import rolls) 
+			System.Collections.ArrayList result = new System.Collections.ArrayList();
+
+			switch (combo_filter.Active) {
+			
+			case 0 : // at - Return the roll the user selected
+				result.Add (ActiveRolls[ combo_roll_1.Active ]);
+				break;
+				
+			case 1 : // after - Return all rolls from latest to the one the user selected
+				for (uint k = 0; k <= combo_roll_1.Active; k++)
+					result.Add (ActiveRolls[ k ]);
+				break;
+				
+			case 2 : // between - Return all rolls between the two import rolls the user selected
+				uint k1 = (uint) combo_roll_1.Active;
+				uint k2 = (uint) combo_roll_2.Active;
+				if (k1 > k2) { // Reversed order, so lets swap the start and end :)
+					k1 = (uint) combo_roll_2.Active;
+					k2 = (uint) combo_roll_1.Active;
+				}
+				for (uint k = k1; k <= k2; k++) {
+					result.Add (ActiveRolls[ k ]);
+				}
+				break;
+				
+			default :
+				System.Console.WriteLine ("This switch case {0}, should not happend. Get_ImportIDs_from_combo_rolls", combo_filter.Active);
+				break;
+			
+			}
+			return (uint [])result.ToArray(typeof(uint));
+		}
+
+		public bool Execute ()
+		{
+			this.CreateDialog ("last_import_rolls_filter");
+			
+			// Init the dialog
+			Populate_Combo_Rolls();
+			
+			// Set default values to the combo boxes
+			combo_filter.Active = 0; // At.
+			combo_roll_1.Active = 0; // Last Roll.			
+			combo_roll_2.Active = 0; // Last Roll.			
+			
+			this.Dialog.DefaultResponse = ResponseType.Ok;
+
+			ResponseType response = (ResponseType) this.Dialog.Run ();
+
+			bool success = false;
+
+			if (response == ResponseType.Ok) {
+				uint [] resultticks = Get_ImportIDs_from_combo_rolls();
+				
+				System.Console.Write ("Import roll " );		
+				foreach (uint rollid in resultticks)
+					System.Console.Write ("{0} ", rollid);		
+				System.Console.WriteLine ("selected." );
+				
+				if (resultticks.Length > 0 ) {
+					query.ImportIdRange = new PhotoStore.ImportIdRange (resultticks);
+					success = true;
+				};
+			}
+
+			this.Dialog.Destroy ();
+			return success;
+		}
+	}
+}
