New Query Bug and Nixing Categories

[Gabriel Burt <gabriel burt gmail com>]

I've noticed that when I have tags a few levels deep, if I toggle a
parent with several levels below it, and then try to untoggle it, F-Spot
is frozen.  I'm getting this with CVS and 0.1.3.  I think it has to do
with when you toggle a parent, it toggles all of its children.  Is
anybody else seeing this?

I've also attached a patch for getting rid of one of F-Spot's most
confusing issues - the distinction between categories and tags.  Where
before there was "create new tag" and "create new category" there is
only create new tag now, but all "tags" can have children.  Internally
when you create a new tag it is actually creating a new category.  The
only thing the old Tag class is used for then is for special tags like
Hidden and such that we don't want users to be able to make child tags
of.

Other patches I have outstanding right now include
- improved photo selection via keyboard with shift/ctrl
- save which tags are expanded on exit and restore them next time
- inline tag name editing (eg withing the tree), and smaller tag icons
- and the query patch that allows for graphical, arbitrary querying

The website is looking great, but we can still use some more help
finessing the Features page and adding content to the User Guide.  It's
a wiki so it's easy and fast to help with: http://www.f-spot.org/

Thanks,

Gabriel

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/f-spot/ChangeLog,v
retrieving revision 1.1121
diff -u -r1.1121 ChangeLog
--- ChangeLog	14 Nov 2005 07:14:58 -0000	1.1121
+++ ChangeLog	14 Nov 2005 18:44:32 -0000
@@ -1,3 +1,16 @@
+2005-11-14  Gabriel Burt <gabriel burt gmail com>
+
+	* src/MainWindow.cs: change references to categories to tags because
+	user's never need to make tags that can't have children and having
+	tags and categories is a very confusing thing.
+	
+	* src/TagCommands.cs: change references to Category to Tag
+
+	* src/TagPopup.cs: Allow only creation of new 'tags' which are what
+	used to be called categories.
+	
+	* src/f-spot.glade: Remove menu items referring to categories
+
 2005-11-14  Larry Ewing  <lewing novell com>
 
 	* src/MainWindow.cs: remove unused variable.
Index: src/MainWindow.cs
===================================================================
RCS file: /cvs/gnome/f-spot/src/MainWindow.cs,v
retrieving revision 1.232
diff -u -r1.232 MainWindow.cs
--- src/MainWindow.cs	14 Nov 2005 07:14:58 -0000	1.232
+++ src/MainWindow.cs	14 Nov 2005 18:44:44 -0000
@@ -1906,8 +1906,8 @@
 				System.Console.WriteLine ("this is something or another");
 
 				// A Category is not empty. Can not delete it.
-				string error_msg = Mono.Posix.Catalog.GetString ("Category is not empty");
-				string error_desc = String.Format (Mono.Posix.Catalog.GetString ("Can not delete categories that have tags." + 
+				string error_msg = Mono.Posix.Catalog.GetString ("Tag is not empty");
+				string error_desc = String.Format (Mono.Posix.Catalog.GetString ("Can not delete tags that have tags within them." + 
 												 "Please delete tags under \"{0}\" first"),
 								   e.Tag.Name);
 				
Index: src/TagCommands.cs
===================================================================
RCS file: /cvs/gnome/f-spot/src/TagCommands.cs,v
retrieving revision 1.28
diff -u -r1.28 TagCommands.cs
--- src/TagCommands.cs	28 Oct 2005 19:52:30 -0000	1.28
+++ src/TagCommands.cs	14 Nov 2005 18:44:46 -0000
@@ -43,7 +43,7 @@
 			Menu menu = new Menu ();
 
 			if (categories.Count == 0) {
-				MenuItem item = new MenuItem (Mono.Posix.Catalog.GetString ("(No categories)"));
+				MenuItem item = new MenuItem (Mono.Posix.Catalog.GetString ("(No tags)"));
 				category_option_menu.Sensitive = false;
 				menu.Append (item);
 			} else {
@@ -124,16 +124,8 @@
 
 			this.Dialog.DefaultResponse = ResponseType.Ok;
 
-			switch (type) {
-			case TagType.Tag:
-				this.Dialog.Title = Mono.Posix.Catalog.GetString ("Create New Tag");
-				prompt_label.Text = Mono.Posix.Catalog.GetString ("Name of new tag:");
-				break;
-			case TagType.Category:
-				this.Dialog.Title = Mono.Posix.Catalog.GetString ("Create New Category");
-				prompt_label.Text = Mono.Posix.Catalog.GetString ("Name of new category:");
-				break;
-			}
+			this.Dialog.Title = Mono.Posix.Catalog.GetString ("Create New Tag");
+			prompt_label.Text = Mono.Posix.Catalog.GetString ("Name of new tag:");
 
 			PopulateCategoryOptionMenu ();
 			this.Category = default_category;
@@ -287,13 +279,8 @@
 			tag = t;
 			this.Dialog.DefaultResponse = ResponseType.Ok;
 
-			if (t is Category) {
-				this.Dialog.Title = Mono.Posix.Catalog.GetString ("Edit Category");
-				prompt_label.Text = Mono.Posix.Catalog.GetString ("Category name:");
-			} else {
-				this.Dialog.Title = Mono.Posix.Catalog.GetString ("Edit Tag");
-				prompt_label.Text = Mono.Posix.Catalog.GetString ("Tag name:");
-			}
+			this.Dialog.Title = Mono.Posix.Catalog.GetString ("Edit Tag");
+			prompt_label.Text = Mono.Posix.Catalog.GetString ("Tag name:");
 
 			orig_name = last_valid_name = t.Name;
 			tag_name_entry.Text = t.Name;
Index: src/TagPopup.cs
===================================================================
RCS file: /cvs/gnome/f-spot/src/TagPopup.cs,v
retrieving revision 1.4
diff -u -r1.4 TagPopup.cs
--- src/TagPopup.cs	11 Nov 2005 02:23:15 -0000	1.4
+++ src/TagPopup.cs	14 Nov 2005 18:44:46 -0000
@@ -18,8 +18,6 @@
 		Gtk.Menu popup_menu = new Gtk.Menu ();
 		
 		GtkUtil.MakeMenuItem (popup_menu, Mono.Posix.Catalog.GetString ("Create New Tag"),
-				      new EventHandler (MainWindow.Toplevel.HandleCreateNewTagCommand), true);
-		GtkUtil.MakeMenuItem (popup_menu, Mono.Posix.Catalog.GetString ("Create New Category"),
 				      new EventHandler (MainWindow.Toplevel.HandleCreateNewCategoryCommand), true);
 		
 		GtkUtil.MakeMenuSeparator (popup_menu);
Index: src/f-spot.glade
===================================================================
RCS file: /cvs/gnome/f-spot/src/f-spot.glade,v
retrieving revision 1.118
diff -u -r1.118 f-spot.glade
--- src/f-spot.glade	11 Nov 2005 10:04:28 -0000	1.118
+++ src/f-spot.glade	14 Nov 2005 18:45:13 -0000
@@ -242,7 +242,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="category_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Category:</property>
+	      <property name="label" translatable="yes">Parent tag:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1595,7 +1595,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="category_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Category:</property>
+	      <property name="label" translatable="yes">Parent tag:</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5923,7 +5923,7 @@
 					    <widget class="GtkCheckButton" id="checkbutton14">
 					      <property name="visible">True</property>
 					      <property name="can_focus">True</property>
-					      <property name="label" translatable="yes">Export Tags and Categories</property>
+					      <property name="label" translatable="yes">Export Tags</property>
 					      <property name="use_underline">True</property>
 					      <property name="relief">GTK_RELIEF_NORMAL</property>
 					      <property name="focus_on_click">True</property>
@@ -7189,18 +7189,9 @@
 		<widget class="GtkMenu" id="tags1_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="create_new_tag1">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Create New _Tag...</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="HandleCreateNewTagCommand" last_modification_time="Tue, 09 Dec 2003 20:42:48 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkMenuItem" id="create_new_category1">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Create New _Category...</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"/>
 		    </widget>