Merge pull request #2427 from havardAasen/haava/halscope-select-channel-dialog

halscope: Minor changes for 'Select Channel Source' dialog

Author: hansu

src/hal/utils/scope_vert.c

@@ -88,6 +88,7 @@ static void init_chan_info_window(void);
 static void init_vert_info_window(void);
 
 static gboolean dialog_select_source(int chan_num);
+static void selection_changed(GtkTreeSelection *selection, char *name);
 static void selection_made(GtkTreeView *treeview, GtkTreePath *path,
         GtkTreeViewColumn *col, GtkWidget *dialog);
 static void change_source_button(GtkWidget * widget, gpointer gdata);
@@ -915,7 +916,8 @@ static gboolean dialog_select_source(int chan_num)
 
     char *tab_label_text[3];
     char *name[HAL_NAME_LEN + 1];
-    char msg[BUFLEN];
+    char signal_name[HAL_NAME_LEN + 1];
+    char title[BUFLEN];
     int next, n, tab, retval;
     int row, match_tab, match_row;
 
@@ -924,24 +926,19 @@ static gboolean dialog_select_source(int chan_num)
 
     vert->chan_num = chan_num;
 
-    snprintf(msg, BUFLEN - 1, _("Select a pin, signal, or parameter\n"
-	"as the source for channel %d."), chan_num);
+    snprintf(title, BUFLEN - 1, _("Select Channel %d Source"), chan_num);
 
     /* create dialog window, disable resizing, set title, size and position */
-    dialog = gtk_dialog_new_with_buttons(_("Select Channel Source"),
+    dialog = gtk_dialog_new_with_buttons(title,
                                          NULL, GTK_DIALOG_MODAL,
+                                         _("_OK"), GTK_RESPONSE_ACCEPT,
                                          _("_Cancel"), GTK_RESPONSE_CANCEL,
                                          NULL);
     gtk_widget_set_size_request(GTK_WIDGET(dialog), -1, 400);
     gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
     gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
     content_area = gtk_dialog_get_content_area(GTK_DIALOG(dialog));
 
-    /* display message */
-    label = gtk_label_new(msg);
-    gtk_box_pack_start(GTK_BOX(GTK_CONTAINER(content_area)),
-            label, FALSE, FALSE, 10);
-
     /*
     * create a notebook to hold pin, signal, and parameter list,
     * remember the notebook so we can change the pages later and
@@ -977,6 +974,8 @@ static gboolean dialog_select_source(int chan_num)
 
         g_signal_connect(vert->lists[n], "row-activated",
             G_CALLBACK(selection_made), dialog);
+        g_signal_connect(gtk_tree_view_get_selection(GTK_TREE_VIEW(vert->lists[n])),
+                         "changed", G_CALLBACK(selection_changed), signal_name);
     }
 
     /* signals */
@@ -1049,38 +1048,32 @@ static gboolean dialog_select_source(int chan_num)
     retval = gtk_dialog_run(GTK_DIALOG(dialog));
     gtk_widget_destroy(dialog);
 
-    if (retval == 0) {
-        /* user made a selection */
-        channel_changed();
+    if (retval == GTK_RESPONSE_ACCEPT) {
+        if (set_channel_source(vert->chan_num, vert->listnum, signal_name))
+            channel_changed();
         return TRUE;
     }
     return FALSE;
 }
 
-/* If we come here, then the user has clicked a row in the list. */
-static void selection_made(GtkTreeView *treeview, GtkTreePath *path,
-        GtkTreeViewColumn *col, GtkWidget *dialog)
+static void selection_changed(GtkTreeSelection *selection, char *name)
 {
-    scope_vert_t *vert;
-    vert = &(ctrl_usr->vert);
-
     GtkTreeIter iter;
     GtkTreeModel *model;
+    char *tmp;
 
-    char *name;
-    int retval;
-
-    retval = -6;
-    model = gtk_tree_view_get_model(treeview);
-    if (gtk_tree_model_get_iter(model, &iter, path)) {
-        gtk_tree_model_get(model, &iter, LIST_ITEM, &name, -1);
-
-        /* try to set up the new source */
-        /* return value "0" is success */
-        retval = set_channel_source(vert->chan_num, vert->listnum, name);
-        g_free(name);
+    if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+        gtk_tree_model_get(model, &iter, LIST_ITEM, &tmp, -1);
+        strncpy(name, tmp, HAL_NAME_LEN);
+        g_free(tmp);
     }
-    gtk_dialog_response(GTK_DIALOG(dialog), retval);
+}
+
+/* User has double-clicked or hit 'enter' on a row in the list. */
+static void selection_made(GtkTreeView *treeview, GtkTreePath *path,
+                           GtkTreeViewColumn *col, GtkWidget *dialog)
+{
+    gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT);
 }
 
 void channel_changed(void)