Changeset 457

Timestamp:

01/05/07 01:05:20 (2 years ago)

Author:

radekk

Message:

Time Markers support work in progress.
Bugfix for named selections feature.

Files:

• sweep/branches/sweep-info-panel/AUTHORS (modified) (1 diff)
• sweep/branches/sweep-info-panel/include/sweep/sweep_marker.h (modified) (1 diff)
• sweep/branches/sweep-info-panel/include/sweep/sweep_types.h (modified) (1 diff)
• sweep/branches/sweep-info-panel/pixmaps/marker-add-ico.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-del-ico.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker.png (modified) (previous)
• sweep/branches/sweep-info-panel/pixmaps/select-add-ico.png (added)
• sweep/branches/sweep-info-panel/pixmaps/select-del-ico.png (added)
• sweep/branches/sweep-info-panel/po/pl.po (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/db_ruler.c (modified) (6 diffs)
• sweep/branches/sweep-info-panel/src/info-panel.c (modified) (23 diffs)
• sweep/branches/sweep-info-panel/src/info-panel.h (modified) (3 diffs)
• sweep/branches/sweep-info-panel/src/sample-display.c (modified) (6 diffs)
• sweep/branches/sweep-info-panel/src/sweep_sample.c (modified) (4 diffs)
• sweep/branches/sweep-info-panel/src/sweep_selection.c (modified) (1 diff)

sweep/branches/sweep-info-panel/AUTHORS

@@ -39 +39 @@
-
-Peter Shorthose
-
+       
- 
-Daniel Dreschers
-
+
+
+
+
+
+
+
-
-Borrowed Code

sweep/branches/sweep-info-panel/include/sweep/sweep_marker.h

@@ -24 +24 @@
-
-sw_mark *
-s
+
-
-sw_mark *

sweep/branches/sweep-info-panel/include/sweep/sweep_types.h

@@ -102 +102 @@
- */
-typedef enum {
-TEP
+IMPLE
-  SWEEP_MARK_TYPE_LOOP,
-  SWEEP_MARK_TYPE_END

sweep/branches/sweep-info-panel/po/pl.po

@@ -1386 +1386 @@
-#: src/info-panel.c:540
-msgid "Add Selection..."
-
+...
-
-#: src/info-panel.c:548

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

@@ -239 +239 @@
-  else
-    y = event->y;
-
+
-  if (DB_RULER(widget)->dragging && (state & GDK_BUTTON1_MASK)) {
+
+g_print("Jestem ale nie wiem co robie!!!!\n");
+
-    ydelta = DB_RULER(widget)->y - y;
-
@@ -252 +255 @@
-    gtk_ruler_draw_ticks (ruler);
-  }
-
+
-  DB_RULER(widget)->y = y;
-
@@ -327 +330 @@
-  DB_RULER(widget)->dragging = FALSE;
-
+g_print("db_ruler_leave_notify\n");
+  
-  return TRUE;
-}
@@ -390 +395 @@
-                 height - ythickness);
-
-
-
+  
+  
-
-//   upper = ruler->upper;
@@ -403 +408 @@
-
-// * strlen (unit_str)
-
+  
-
-  for (scale = 0; scale < MAXIMUM_SCALES; scale++)
- /*   if (ruler->metric->ruler_scale[scale] * fabs(increment) > 2 * text_height)
-      break;*/
-
+  
-      break;
+  
-  if (scale == MAXIMUM_SCALES)
-    scale = MAXIMUM_SCALES - 1;
@@ -421 +427 @@
-                  ruler->backing_store,
-                  GTK_WIDGET_STATE (widget),
-               
+
-                  NULL,
-                  widget,
-                  "vruler",
-                  2,
-/
+ / 
-                  layout);
-

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

@@ -35 +35 @@
-#include <sweep/sweep_undo.h>
-#include <sweep/sweep_selection.h>
+#include <sweep/sweep_marker.h>
-
-#include "sweep_app.h"
@@ -74 +75 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -99 +111 @@
-}
-
+GtkWidget * info_panel_menu_item_new_with_ico_label (const gchar * text, GdkPixbuf * icon)
+{
+        GtkWidget *menuitem;
+        GtkWidget *hbox, *label, *image;
+
+        menuitem = gtk_menu_item_new();
+
+        hbox = gtk_hbox_new(FALSE, 6);
+
+        label = gtk_label_new(text);
+
+        image = gtk_image_new_from_pixbuf( icon );
+
+        gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(image), FALSE, FALSE, 0);
+        gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
+
+        gtk_container_add(GTK_CONTAINER(menuitem), hbox);
+
+        return menuitem;
+}
+
-GtkTreeModel * info_panel_create_sample_model (void)
-{
-        GtkTreeStore * treestore;
-        GtkTreeIter toplevel, child;
-        GdkPixbuf * icon;
-
-        /* sample_info */
@@ -115 +147 @@
-
-        // toplevel
-
+
+
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
-                INFO_PANEL_SAMPLE_COL_NAME, _("Sample info"),
-                INFO_PANEL_SAMPLE_COL_TYPE, INFO_PANEL_SAMPLE,
-
+sample_
-                -1);
-
@@ -204 +237 @@
-        GtkTreeStore * treestore;
-        GtkTreeIter toplevel;
-        GdkPixbuf * icon;
-
-        treestore = gtk_tree_store_new(INFO_PANEL_SELECTIONS_NUM_COLS,
@@ -216 +248 @@
-                       );
-
-
+
+
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
-                INFO_PANEL_SELECTIONS_COL_NAME, _("Selections"),
-                INFO_PANEL_SELECTIONS_COL_TYPE, INFO_PANEL_SELECTIONS,
-
+select_
-                -1);
-        
+        if (select_add_icon == NULL)
+                select_add_icon = info_panel_load_icon("select-add-ico.png");
+        if (select_del_icon == NULL)
+                select_del_icon = info_panel_load_icon("select-del-ico.png");
+
-        return GTK_TREE_MODEL(treestore);
-}
@@ -231 +269 @@
-        GtkTreeStore * treestore;
-        GtkTreeIter toplevel, child;
-        GdkPixbuf * icon;
-
-        treestore = gtk_tree_store_new(INFO_PANEL_UNDOS_NUM_COLS,
@@ -242 +279 @@
-                       );
-
-
+
+
-
-#ifdef INFO_PANEL_REVERT
-
+
+
-#endif
-
-
+
+
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
-                INFO_PANEL_UNDOS_COL_NAME, _("Undo"),
-                INFO_PANEL_UNDOS_COL_TYPE, INFO_PANEL_UNDOS,
-
+undo_
-                -1);
-
@@ -270 +310 @@
-        GtkTreeStore * treestore;
-        GtkTreeIter toplevel, child;
-
+//
-
-        treestore = gtk_tree_store_new(INFO_PANEL_MARKERS_NUM_COLS,
@@ -276 +316 @@
-                       G_TYPE_UINT,             // type
-                       GDK_TYPE_PIXBUF,         // icon
-
+
+
+
+
+
-                       );
-
-
-
+
+
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
-                INFO_PANEL_MARKERS_COL_NAME, _("Markers"),
-                INFO_PANEL_MARKERS_COL_TYPE, INFO_PANEL_MARKERS,
-
+marker_
-                -1);
+
+        if (marker_add_icon == NULL)
+                marker_add_icon = info_panel_load_icon("marker-add-ico.png");
+        if (marker_del_icon == NULL)
+                marker_del_icon = info_panel_load_icon("marker-del-ico.png");
-
-        return GTK_TREE_MODEL(treestore);
@@ -307 +357 @@
-
-
-marker
+plugin
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
@@ -445 +495 @@
-                nsel++;
-
-
+
+
+
+
-        if (nsel > n){
-                
@@ -453 +506 @@
-                
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child,
-_ITEM
+S_NAME
-                                                -1);
-                }
-                
-        } else
-
+
+
+
+
-        if (nsel < n){
-                
@@ -844 +900 @@
-}
-
-
-void info_panel_selection_popup_menu (GtkWidget *treeview, GdkEventButton *event, sw_view * view, gboolean del)
-{
@@ -851 +906 @@
-        menu = gtk_menu_new();
-
-gtk_menu_item_new_with_label(_("Add Selection...")
+info_panel_menu_item_new_with_ico_label(_("Add Selection..."), select_add_icon
-
-        g_signal_connect(menuitem, "activate",
@@ -859 +914 @@
-
-        if (del){
-gtk_menu_item_new_with_label(_("Delete All Selections...")
+info_panel_menu_item_new_with_ico_label(_("Delete All Selections"), select_del_icon
-
-                g_signal_connect(menuitem, "activate",
@@ -885 +940 @@
-        menu = gtk_menu_new();
-
-gtk_menu_item_new_with_label(_("Delete Selection")
+info_panel_menu_item_new_with_ico_label(_("Delete Selection"), select_del_icon
-
-        data = g_malloc(sizeof(PopupData));
@@ -988 +1043 @@
-
-}
+
+void info_panel_add_markers_cb (GtkWidget * menuitem, sw_view * view)
+{
+        GtkWidget * dialog;
+        GtkWidget * table;
+        GtkWidget * label;
+        GtkWidget * entry;
+        GtkWidget * spin;
+
+        dialog = gtk_dialog_new_with_buttons ( _("Add time marker"),
+                                                GTK_WINDOW(view->window),
+                                                GTK_DIALOG_MODAL,
+                                                GTK_STOCK_OK,
+                                                GTK_RESPONSE_ACCEPT,
+                                                GTK_STOCK_CANCEL,
+                                                GTK_RESPONSE_REJECT,
+                                                NULL);
+        g_signal_connect_swapped (dialog,
+                                "response", 
+                                G_CALLBACK (gtk_widget_destroy),
+                                dialog);
+
+        table = gtk_table_new (4, 2, TRUE);
+
+        label = gtk_label_new(_("Marker time"));
+        gtk_table_attach (GTK_TABLE(table), label,
+                        0, 1, 0, 1,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        entry = gtk_entry_new_with_max_length (14);
+        gtk_entry_set_text (GTK_ENTRY(entry), "00:00:00.000");
+        gtk_table_attach (GTK_TABLE(table), entry,
+                        1, 2, 0, 1,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        
+        label = gtk_label_new(_("Marker frame"));
+        gtk_table_attach (GTK_TABLE(table), label,
+                        0, 1, 1, 2,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        spin = gtk_spin_button_new_with_range (0, 10000, 1);
+        gtk_table_attach (GTK_TABLE(table), spin,
+                        1, 2, 1, 2,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        0, 0);
+#if 0
+        label = gtk_label_new(_("End of selection"));
+        gtk_table_attach (GTK_TABLE(table), label,
+                        0, 1, 2, 3,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        entry = gtk_entry_new_with_max_length (14);
+        gtk_entry_set_text (GTK_ENTRY(entry), "00:00:01.000");
+        gtk_table_attach (GTK_TABLE(table), entry,
+                        1, 2, 2, 3,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        
+        label = gtk_label_new(_("End frame"));
+        gtk_table_attach (GTK_TABLE(table), label,
+                        0, 1, 3, 4,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        6, 6);
+        spin = gtk_spin_button_new_with_range (0, 10000, 1);
+        gtk_table_attach (GTK_TABLE(table), spin,
+                        1, 2, 3, 4,
+                        GTK_EXPAND|GTK_FILL|GTK_SHRINK, GTK_FILL,
+                        0, 0);
+#endif
+        gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox),
+                        table);
+
+        gtk_widget_show_all (dialog);
+}
+
+void info_panel_add_markers_1_cb (GtkWidget * menuitem, sw_view * view)
+{
+        sw_mark * mark;
+
+        mark = mark_new( 100, SWEEP_MARK_TYPE_SIMPLE, "TEST1" );
+
+        view->sample->sounddata->marks = marks_add_marker( view->sample->sounddata->marks, mark );
+
+}
+
+void info_panel_markers_popup_menu (GtkWidget *treeview, GdkEventButton *event, sw_view * view, gboolean del)
+{
+        GtkWidget *menu, *menuitem;
+
+        menu = gtk_menu_new();
+
+        menuitem = info_panel_menu_item_new_with_ico_label(_("Add Time Marker..."), marker_add_icon);
+
+        g_signal_connect(menuitem, "activate",
+                                 (GCallback) info_panel_add_markers_1_cb, view);
+
+        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+
+        if (del){
+                menuitem = info_panel_menu_item_new_with_ico_label(_("Delete All Time Markers"), marker_del_icon);
+
+//              g_signal_connect(menuitem, "activate",
+//                               (GCallback) info_panel_delete_all_selections_cb, view);
+
+                gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+        }
+
+        gtk_widget_show_all(menu);
+
+        /* Note: event can be NULL here when called from view_onPopupMenu;
+         * gdk_event_get_time() accepts a NULL argument */
+
+        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+                               (event != NULL) ? event->button : 0,
+                                gdk_event_get_time((GdkEvent*)event));
+
+}
+
+void info_panel_markers_item_popup_menu (GtkWidget *treeview, GdkEventButton *event, sw_view * view)
+{
+#if 0
+        GtkWidget *menu, *menuitem;
+        PopupData * data;
+        
+        menu = gtk_menu_new();
+
+        menuitem = gtk_menu_item_new_with_label(_("Delete Selection"));
+
+        data = g_malloc(sizeof(PopupData));
+        
+        data->view = view;
+        data->treeview = GTK_TREE_VIEW(treeview);
+        
+        g_signal_connect(menuitem, "activate",
+                                 (GCallback) info_panel_delete_selection_cb, data);
+
+        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+
+        gtk_widget_show_all(menu);
+
+        /* Note: event can be NULL here when called from view_onPopupMenu;
+         * gdk_event_get_time() accepts a NULL argument */
+
+        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
+                               (event != NULL) ? event->button : 0,
+                                gdk_event_get_time((GdkEvent*)event));
+#endif
+}
+
-
-gboolean info_panel_selections_bpress_cb (GtkWidget *treeview, GdkEventButton *event, sw_view * view)
@@ -1024 +1229 @@
-
-                                        break;
-_ITEM
+S_NAME
-
-                                        info_panel_selection_item_popup_menu(treeview, event, view);
@@ -1140 +1345 @@
-#endif
-
+gboolean info_panel_markers_bpress_cb (GtkWidget *treeview, GdkEventButton *event, sw_view * view)
+{
+        GtkTreeSelection * selection;
+        GtkTreeModel * model;
+        GtkTreePath * path;
+        GtkTreeIter iter;
+        gint type;
+
+        if (event->type == GDK_BUTTON_PRESS && event->button == 3){
+                selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
+
+                if (gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(treeview),
+                                                (gint) event->x,
+                                                (gint) event->y,
+                                                &path, NULL, NULL, NULL))
+                {
+                        gtk_tree_selection_unselect_all(selection);
+                        gtk_tree_selection_select_path(selection, path);
+
+                        model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+        
+                        gtk_tree_model_get_iter(model, &iter, path);
+        
+                        gtk_tree_model_get(model, &iter, INFO_PANEL_SELECTIONS_COL_TYPE, &type, -1);
+
+                        switch (type){
+                                case INFO_PANEL_MARKERS:
+
+                                        if (gtk_tree_model_iter_n_children(model, &iter)){
+                                                info_panel_markers_popup_menu(treeview, event, view, TRUE);
+                                        } else {
+                                                info_panel_markers_popup_menu(treeview, event, view, FALSE);
+                                        }
+
+                                        break;
+                                case INFO_PANEL_MARKERS_NAME:
+
+                                        info_panel_markers_item_popup_menu(treeview, event, view);
+
+                                        break;
+                        }
+                        gtk_tree_path_free(path);
+                }
+                return TRUE;
+        }
+
+        return FALSE;
+}
+
-static sw_sample * info_panel_selection_modify (sw_sample * s, sw_param_set unused, SelectionData * seldata)
-{
@@ -1174 +1428 @@
-
-        switch (type){
-_ITEM
+S_NAME
-                        gtk_tree_model_get(model, &iter, INFO_PANEL_SELECTIONS_COL_NAME, &name, INFO_PANEL_SELECTIONS_COL_POINTER, &gl, -1);
-
@@ -1466 +1720 @@
-
-        switch (type){
-_ITEM
+S_NAME
-                        gtk_tree_model_get(model, &iter, INFO_PANEL_SELECTIONS_COL_VALUE, &param, INFO_PANEL_SELECTIONS_COL_POINTER, &gl, -1);
-
@@ -1725 +1979 @@
-        renderer = gtk_cell_renderer_pixbuf_new();
-        gtk_tree_view_column_pack_start(col, renderer, FALSE);
-SELECTION
+MARKER
-
-        renderer = gtk_cell_renderer_text_new();
-        gtk_tree_view_column_pack_start(col, renderer, FALSE);
-SELECTION
-/*     gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_SELECTION
-g_signal_connect(renderer, "edited", (GCallback) info_panel_selection
-
+MARKER
+       gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_MARKER
+//g_signal_connect(renderer, "edited", (GCallback) info_panel_marker
+
-        renderer = gtk_cell_renderer_text_new();
-        gtk_tree_view_column_pack_start(col, renderer, FALSE);
-SELECTION
-/*     gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_SELECTION
-
-g_signal_connect(renderer, "edited", (GCallback) info_panel_selection
-selection
-
+MARKER
+       gtk_tree_view_column_add_attribute(col, renderer, "editable", INFO_PANEL_MARKER
+
+//g_signal_connect(renderer, "edited", (GCallback) info_panel_marker
+marker
+
-        return treeview;
-}
-
-
-

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

@@ -72 +72 @@
-{
-        INFO_PANEL_SELECTIONS = 1,
-
+
+
+
-} info_panel_selections_type_t;
-
@@ -113 +115 @@
-{
-        INFO_PANEL_MARKERS = 1,
-
+
+
+
+
-} info_panel_markers_type_t;
-
@@ -123 +128 @@
-        INFO_PANEL_MARKERS_COL_ICON,
-        INFO_PANEL_MARKERS_COL_VALUE,
+        INFO_PANEL_MARKERS_COL_COLOR,
+        INFO_PANEL_MARKERS_COL_MTYPE,
+        INFO_PANEL_MARKERS_COL_EDITABLE_NAME,
+        INFO_PANEL_MARKERS_COL_EDITABLE_VALUE,
-        INFO_PANEL_MARKERS_NUM_COLS
-} info_panel_markers_t;

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

@@ -1281 +1281 @@
-
-static void
-
+s
-                         const SampleDisplay * s,
-                         int x_min, int x_max)
@@ -1295 +1295 @@
-    mark = (sw_mark *)gl->data;
-
-g_print("MARK: DRAW\n");
-
-    x = OFFSET_TO_XPOS(mark->frame);
@@ -1302 +1301 @@
-
-    x1 = CLAMP (x - 3, x_min, x_max);
-3
-
-user
+4
+
+rec
-                  x, 8,
-                  x, s->height);
@@ -1316 +1315 @@
-    poly[0].y = 0;
-    poly[1].y = 0;
-5
-8
-5
-
-user
+7
+10
+7
+
+rec
-
-  }
@@ -1608 +1607 @@
-
-    /* draw markers */
-
+s
-
-    /* draw the offset cursors */
@@ -1655 +1654 @@
-
-/*** EVENT HANDLERS ***/
-
-
-static gint

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

@@ -1611 +1611 @@
-sample_clear_tmp_sel (sw_sample * s)
-{
-
+
+
+
+
+
- s->tmp_sel = NULL;
- last_tmp_view = NULL;
@@ -1660 +1664 @@
-}
-
-
+
+
- * we pass the actual sw_sample pointer to the tmp_sel handling ops.
- */
@@ -1700 +1705 @@
-        n = snprintf (buf, BUF_LEN, _("Insert selection"));
-
- 
+//
-
-  sel = sel_copy (s->tmp_sel);
-
-
-
-
-
+
+
+
+
+
+
-  
-  perform_selection_op (s, buf, ssits, NULL, sel);
@@ -1753 +1759 @@
-  n += snprintf (buf+n, BUF_LEN-n, "]");
-
-
+//
-
-  sel = sel_copy (s->tmp_sel);
-
-
-
-
-
+
+
+
+
+
-  
-  perform_selection_op (s, buf, sssts, NULL, sel);

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

@@ -51 +51 @@
-  if (name != NULL)
-        sel->name = g_strdup(name);
+  else
+        sel->name = NULL;
-
-  return sel;