towards nice buttons

4 files changed, 88 insertions, 1 deletions

diff --git a/TODO b/TODO
index 6799d288..bef98d93 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,5 @@
 0.7.1:
-- disable inactive buttons (if no search/download 
+- disable inactive buttons in summary dialog (if no search/download 
   is selected to operate on) [ medium ] [pre1]
 - highlight active downloads in search list [ easy ] [pre1]
 - highlight completed downloads [ easy ] [pre1]
diff --git a/gnunet-gtk.glade b/gnunet-gtk.glade
index 1c1610b5..2f281d6f 100644
--- a/gnunet-gtk.glade
+++ b/gnunet-gtk.glade
@@ -1585,6 +1585,7 @@ This release fixes downloads of files from directories.  The previous version ha
                               <property name="add_tearoffs">False</property>
                               <property name="has_frame">True</property>
                               <property name="focus_on_click">True</property>
+                              <signal name="changed" handler="on_fssearchKeywordComboBoxEntry_changed_" last_modification_time="Sun, 03 Dec 2006 18:59:17 GMT"/>
                             </widget>
                           </child>
                         </widget>
@@ -1598,6 +1599,7 @@ This release fixes downloads of files from directories.  The previous version ha
                       <child>
                         <widget class="GtkButton" id="fssearchbutton">
                           <property name="visible">True</property>
+                          <property name="sensitive">False</property>
                           <property name="tooltip" translatable="yes">Search GNUnet for content under the specified keyword (and, if applicable, restrict the search to the given namespace)</property>
                           <property name="has_default">True</property>
                           <property name="can_focus">True</property>
@@ -2334,6 +2336,7 @@ This release fixes downloads of files from directories.  The previous version ha
                       <child>
                         <widget class="GtkButton" id="fsinsertuploadbutton">
                           <property name="visible">True</property>
+                          <property name="sensitive">False</property>
                           <property name="tooltip" translatable="yes">Share the specified file with the selected options (you will then be prompted to enter meta-data and keywords).</property>
                           <property name="can_focus">True</property>
                           <property name="relief">GTK_RELIEF_NORMAL</property>
@@ -2492,6 +2495,7 @@ This release fixes downloads of files from directories.  The previous version ha
                               <property name="add_tearoffs">False</property>
                               <property name="has_frame">True</property>
                               <property name="focus_on_click">True</property>
+                              <signal name="changed" handler="on_uploadFilenameComboBoxEntry_changed_" last_modification_time="Sun, 03 Dec 2006 19:05:39 GMT"/>
                             </widget>
                           </child>
                         </widget>
@@ -4378,6 +4382,7 @@ Press ENTER to add the data.</atkproperty>
                   <child>
                     <widget class="GtkButton" id="downloadButton">
                       <property name="visible">True</property>
+                      <property name="sensitive">False</property>
                       <property name="tooltip" translatable="yes">Download selected files.</property>
                       <property name="can_focus">True</property>
                       <property name="relief">GTK_RELIEF_NORMAL</property>
diff --git a/src/plugins/fs/search.c b/src/plugins/fs/search.c
index 2fd26f51..f7cc87d4 100644
--- a/src/plugins/fs/search.c
+++ b/src/plugins/fs/search.c
@@ -34,6 +34,26 @@
 #include <GNUnet/gnunet_util_crypto.h>
 #include <GNUnet/gnunet_namespace_lib.h>
 
+
+/**
+ * The user has edited the search entry.
+ * Update search button status.
+ */
+static void on_fssearchSelectionChanged(gpointer signal,
+                                        gpointer cls) {
+  SearchList * list = cls;
+  GtkTreeSelection * selection;
+  GtkWidget * downloadButton;
+
+  selection = gtk_tree_view_get_selection(list->treeview);
+  downloadButton
+    = glade_xml_get_widget(list->searchXML,
+                           "downloadButton");
+  gtk_widget_set_sensitive(downloadButton,
+                           gtk_tree_selection_count_selected_rows(selection) > 0);
+}
+
+
 /* **************** FSUI event handling ****************** */
 
 /**
@@ -221,6 +241,12 @@ fs_search_started(struct FSUI_SearchList * fsui_list,
   gtk_tree_selection_set_mode(gtk_tree_view_get_selection(list->treeview),
                               GTK_SELECTION_MULTIPLE);
 
+  g_signal_connect_data(gtk_tree_view_get_selection(list->treeview),
+                        "changed",
+                        G_CALLBACK(&on_fssearchSelectionChanged),
+                        list,
+                        NULL,
+                        0);
   renderer = gtk_cell_renderer_text_new();
   col = gtk_tree_view_insert_column_with_attributes(list->treeview,
                                                     -1,
@@ -462,6 +488,25 @@ void fs_search_stopped(SearchList * list) {
 
 
 /**
+ * The user has edited the search entry.
+ * Update search button status.
+ */
+void on_fssearchKeywordComboBoxEntry_changed_fs(gpointer dummy2,
+                                                GtkWidget * searchEntry) {
+  const char * searchString;
+  GtkWidget * searchButton;
+
+  searchString = getEntryLineValue(getMainXML(),
+                                   "fssearchKeywordComboBoxEntry");
+  searchButton
+    = glade_xml_get_widget(getMainXML(),
+                           "fssearchbutton");
+  gtk_widget_set_sensitive(searchButton,
+                           strlen(searchString) > 0);
+}
+
+
+/**
  * The user has clicked the "SEARCH" button.
  * Initiate a search.
  */
diff --git a/src/plugins/fs/upload.c b/src/plugins/fs/upload.c
index 5b14a19f..91114d11 100644
--- a/src/plugins/fs/upload.c
+++ b/src/plugins/fs/upload.c
@@ -442,6 +442,43 @@ clearCompletedUploadCallback(GtkTreeModel * model,
   }
 }
 
+/**
+ * The user has edited the search entry.
+ * Update search button status.
+ */
+void on_uploadFilenameComboBoxEntry_changed_fs(gpointer dummy2,
+                                               GtkWidget * searchEntry) {
+  const char * filename;
+  GtkWidget * uploadButton;
+  struct stat buf;
+  int ok;
+  GtkWidget * toggle;
+
+  filename = getEntryLineValue(getMainXML(),
+                               "uploadFilenameComboBoxEntry");
+  ok = (0 == stat(filename, &buf));
+  if (ok)  
+    ok = (0 == ACCESS(filename, R_OK));
+  if (ok) {
+    if (S_ISDIR(buf.st_mode)) {
+      toggle = glade_xml_get_widget(getMainXML(),
+                                    "scopeRecursiveButton");
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
+                                   1);
+    } else {
+      toggle = glade_xml_get_widget(getMainXML(),
+                                    "scopeFileOnlyButton");
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle),
+                                   1);
+    }
+  }
+  uploadButton
+    = glade_xml_get_widget(getMainXML(),
+                           "fsinsertuploadbutton");
+  gtk_widget_set_sensitive(uploadButton,
+                           ok);
+}
+
 void on_clearCompletedUploadsButton_clicked_fs(void * unused,
                                                GtkWidget * clearButton) {
   ggc_tree_model_foreach(GTK_TREE_MODEL(upload_summary),