Changeset 430

Timestamp:

08/28/06 23:23:04 (4 years ago)

Author:

radekk

Message:

Named selections - first cut done.

Files:

• sweep/branches/sweep-info-panel/src/info-panel.c (modified) (17 diffs)
• sweep/branches/sweep-info-panel/src/view.c (modified) (1 diff)

sweep/branches/sweep-info-panel/src/info-panel.c

@@ -41 +41 @@
-
-
+
-typedef struct _PopupData PopupData;
-
@@ -124 +125 @@
-                                                                                        INFO_PANEL_COL_TYPE, INFO_PANEL_SAMPLE_MEMORY,
-                                                                                        -1);
+#if 0
-        gtk_tree_store_append(treestore, &child, &toplevel);
-        gtk_tree_store_set(treestore, &child,
@@ -160 +162 @@
-                                                                                        INFO_PANEL_COL_EDITABLE_PARAM, TRUE,
-                                                                                        -1);
+#endif
-
-        /* selections_info */
@@ -220 +223 @@
-        /* sample parent itier */
-        if (sample->modified){
-
+info 
-        } else {
-
+ info
-        }
-
@@ -451 +454 @@
-}
-
-
+_cb
-{
-                g_print ("Do something!\n");
-}
-
-
+_cb
-{
-
@@ -465 +468 @@
-}
-
-
+_cb
-{
-        GtkTreeModel * model;
@@ -502 +505 @@
-
-        g_signal_connect(menuitem, "activate",
-
+_cb
-
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -510 +513 @@
-
-                g_signal_connect(menuitem, "activate",
-
+_cb
-
-                gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -541 +544 @@
-        
-        g_signal_connect(menuitem, "activate",
-
+_cb
-
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -556 +559 @@
-}
-
-
+_cb
-{
-        GtkTreeModel * model;
@@ -576 +579 @@
-}
-
-
+_cb
-{
-
@@ -592 +595 @@
-
-        g_signal_connect(menuitem, "activate",
-
+_cb
-
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -622 +625 @@
-
-        g_signal_connect(menuitem, "activate",
-
+_cb
-
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
@@ -679 +682 @@
-                                case INFO_PANEL_UNDO:
-
-gtk_tree_model_iter_n_children(model, &iter) > 1
+(gtk_tree_model_iter_n_children(model, &iter) > 1) && (view->sample->current_undo)
-                                                        info_panel_undo_popup_menu(treeview, event, view);
-                                                }
+
-                                                break;
-                                case INFO_PANEL_UNDO_ITEM:
-       
+
-                                                info_panel_undo_item_popup_menu(treeview, event, view);
-
@@ -697 +701 @@
-}
-
+void info_panel_edited_name_cb (GtkCellRendererText *cell, gchar *path_string, gchar *new_text, sw_view * view)
+{
+        GtkTreeModel * model = view->sample->info_panel;
+        GtkTreeIter iter;
+        gint type;
+        sw_sel * sel;
+        GList * gl;
+
+        g_print("name edited: %s [%s]\n", path_string, new_text);
+
+        gtk_tree_model_get_iter_from_string(model, &iter, path_string);
+
+        gtk_tree_model_get(model, &iter, INFO_PANEL_COL_TYPE, &type, INFO_PANEL_COL_POINTER, &gl, -1);
+
+        switch (type){
+                case INFO_PANEL_SELECTION_ITEM:
+                                info_panel_row_update_str(model, path_string, INFO_PANEL_COL_NAME, new_text);
+                                sel = (sw_sel *)gl->data;
+                                sel->name = g_strdup(new_text);
+                                break;
+        }
+
+}
+
+void info_panel_edited_param_cb (GtkCellRendererText *cell, gchar *path_string, gchar *new_text, sw_view * view)
+{
+        GtkTreeModel * model = view->sample->info_panel;
+        GtkTreeIter iter;
+        gint type;
+        gchar * name;
+
+        g_print("param edited: %s [%s]\n", path_string, new_text);
+
+        gtk_tree_model_get_iter_from_string(model, &iter, path_string);
+
+        gtk_tree_model_get(model, &iter, INFO_PANEL_COL_TYPE, &type, -1);
+
+        switch (type){
+                case INFO_PANEL_SAMPLE_FILENAME:
+                                name = g_build_filename(g_path_get_dirname(view->sample->pathname), new_text, NULL);
+                                info_panel_row_update_str(model, path_string, INFO_PANEL_COL_PARAM1, new_text);
+                                sample_set_pathname(view->sample, name);
+                                g_print("%s\n", name);
+                                g_free(name);
+                                break;
+        }
+
+}
+
-static GtkWidget * info_panel_create_view (sw_view * view)
-{
@@ -717 +770 @@
-        gtk_tree_view_column_add_attribute(col, renderer, "text", INFO_PANEL_COL_NAME);
-        gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_COL_EDITABLE_NAME);
+        g_signal_connect(renderer, "edited", (GCallback) info_panel_edited_name_cb, view);
-
-        renderer = gtk_cell_renderer_text_new();
@@ -722 +776 @@
-        gtk_tree_view_column_add_attribute(col, renderer, "text", INFO_PANEL_COL_PARAM1);
-        gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_COL_EDITABLE_PARAM);
+        g_signal_connect(renderer, "edited", (GCallback) info_panel_edited_param_cb, view);
-/*
-        renderer = gtk_cell_renderer_text_new();

sweep/branches/sweep-info-panel/src/view.c

@@ -1161 +1161 @@
-  ** and is quite a bit neater than the old stuff.
-  */
-
+//
-
-