more TODOs

diff --git a/disobedience/TODO b/disobedience/TODO
deleted file mode 100644 (file)
index 31168db..0000000
--- a/disobedience/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
-properties
-       make return be the same as OK
-search
-       select tracks by tag
-
-general:
-       disobedience doesn't like starting up if the server isn't running.

diff --git a/disobedience/choose.c b/disobedience/choose.c
index 86e60bcbd16cc2f7d33bc93e119d3bd276ce552a..c30d7128d47b368d817542acee95d0021a868b50 100644 (file)
--- a/disobedience/choose.c
+++ b/disobedience/choose.c
@@ -242,7 +242,10 @@ static void choose_populate(GtkTreeRowReference *parent_ref,
       /* We've reached the end of the new tracks from td[], but there are
        * further tracks in the tree */
       //fprintf(stderr, " deleting\n");
-      action = DELETE;
+      if(choose_is_file(it) == isfile)
+        action = DELETE;
+      else
+        action = SKIP_TREE;
     }
     
     switch(action) {

diff --git a/disobedience/login.c b/disobedience/login.c
index 5831aa6cef6cc2455ae71cba2caca449b016ffe9..b1047d689fd2ea15b5b50a91f8b277349bb6610b 100644 (file)
--- a/disobedience/login.c
+++ b/disobedience/login.c
@@ -27,6 +27,10 @@
  * window remains.
  *
  * It you hit Cancel then the window disappears without saving anything.
+ *
+ * TODO
+ * - escape and return should work
+ * - cancel/close should be consistent with properties
  */
 
 #include "disobedience.h"

diff --git a/disobedience/properties.c b/disobedience/properties.c
index 57ed65d007ddd782e16a485d97a542f91c7f10b7..ade23fbfbfc0781e38befbb112e43973dc8e87ba 100644 (file)
--- a/disobedience/properties.c
+++ b/disobedience/properties.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2006-2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,11 +17,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-
+/** @file disobedience/properties.c
+ * @brief Track properties editor
+ *
+ * TODO:
+ * - return and escape keys should work 
+ */
 #include "disobedience.h"
 
-/* Track properties -------------------------------------------------------- */
-
 struct prefdata;
 
 static void kickoff_namepart(struct prefdata *f);

diff --git a/disobedience/users.c b/disobedience/users.c
index 0590d699b67157aa69d90d03c9614d167c64ccbf..af42858a1ec2010f91d6649e63de3a206f3d5297 100644 (file)
--- a/disobedience/users.c
+++ b/disobedience/users.c
@@ -33,9 +33,10 @@
  * When you select 'add' a new empty set of details are displayed to be edited.
  * Again Apply will commit them.
  *
- * TODO: it would be really nice if the Username entry could be removed and new
- * user names entered in the list, rather off in the details panel.  This may
- * be possible with a sufficiently clever GtkCellRenderer.
+ * TODO:
+ * - enter new username in the GtkTreeView
+ * - escape and enter keys should work
+ * - should have a cancel or close button, consistent with properties and login
  */
 
 #include "disobedience.h"