Changeset 459

Timestamp:

01/08/07 06:18:35 (2 years ago)

Author:

radekk

Message:

Extending Time markers support, Selections, new icons, drawing name of selections, markers.

Files:

• sweep/branches/sweep-info-panel/Makefile.am (modified) (1 diff)
• sweep/branches/sweep-info-panel/pixmaps/done.png (modified) (previous)
• sweep/branches/sweep-info-panel/pixmaps/marker-img0.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img1.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img10.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img2.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img3.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img4.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img5.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img6.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img7.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img8.png (added)
• sweep/branches/sweep-info-panel/pixmaps/marker-img9.png (added)
• sweep/branches/sweep-info-panel/pixmaps/undo-rev-ico.png (added)
• sweep/branches/sweep-info-panel/pixmaps/undo-revall-ico.png (added)
• sweep/branches/sweep-info-panel/pixmaps/undo.png (modified) (previous)
• sweep/branches/sweep-info-panel/src/info-panel.c (modified) (19 diffs)
• sweep/branches/sweep-info-panel/src/info-panel.h (modified) (1 diff)
• sweep/branches/sweep-info-panel/src/sample-display.c (modified) (23 diffs)
• sweep/branches/sweep-info-panel/src/sample-display.h (modified) (2 diffs)
• sweep/branches/sweep-info-panel/src/sweep_marker.c (modified) (1 diff)

sweep/branches/sweep-info-panel/Makefile.am

@@ -5 +5 @@
-SUBDIRS = m4 intl po include src plugins doc
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-desktop_DATA = sweep.desktop

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

@@ -80 +80 @@
-static GdkPixbuf * select_del_icon = NULL;
-static GdkPixbuf * undo_icon = NULL;
+static GdkPixbuf * undo_rev_icon = NULL;
+static GdkPixbuf * undo_revall_icon = NULL;
-static GdkPixbuf * done_icon = NULL;
-static GdkPixbuf * marker_icon = NULL;
@@ -289 +291 @@
-        if (undo_icon == NULL)
-                undo_icon = info_panel_load_icon("undo.png");
+
+        if (undo_rev_icon == NULL)
+                undo_rev_icon = info_panel_load_icon("undo-rev-ico.png");
+        
+        if (undo_revall_icon == NULL)
+                undo_revall_icon = info_panel_load_icon("undo-revall-ico.png");
+
-        gtk_tree_store_append(treestore, &toplevel, NULL);
-        gtk_tree_store_set(treestore, &toplevel,
@@ -299 +308 @@
-        gtk_tree_store_set(treestore, &child,
-                INFO_PANEL_UNDOS_COL_NAME, _("Original data"),
-
+_ORIG
-                INFO_PANEL_UNDOS_COL_ICON, done_icon,
-                -1);
@@ -535 +544 @@
-
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child,
-temp
+TempSel
-                                                -1);
-
@@ -554 +563 @@
-                        sel = (sw_sel *)gl->data;
-                        
-"#%d"
+_("Selection#%d")
-                        
-                        snprint_time(start, BUF_LEN, frames_to_time (sample->sounddata->format, sel->sel_start));
@@ -717 +726 @@
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child_data,
-                                                INFO_PANEL_MARKERS_COL_TYPE, INFO_PANEL_MARKERS_FRAME,
-
+
+
+
+
+
+
+
+
-                                                -1);
-                        
@@ -724 +740 @@
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child_data,
-                                                INFO_PANEL_MARKERS_COL_TYPE, INFO_PANEL_MARKERS_COLOR,
-
-
-
-
-
-
-
-
+
-                                                -1);
-                }
@@ -767 +776 @@
-                        mark = (sw_mark *)gl->data;
-                        
-"#%d"
+_("Marker#%d")
-                        
-                        snprint_time(mtime, BUF_LEN, frames_to_time (sample->sounddata->format, mark->frame));
@@ -773 +782 @@
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child,
-                                        INFO_PANEL_MARKERS_COL_NAME, mark->name ? mark->name : buf,
-//
+
-                                        INFO_PANEL_MARKERS_COL_POINTER, gl,
-                                        INFO_PANEL_MARKERS_COL_EDITABLE_NAME, TRUE,
@@ -780 +789 @@
-                        gtk_tree_model_iter_children (info_panel, &child_data, &child);
-
+                        g_snprintf (buf, BUF_LEN, "%d", mark->frame);
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child_data,
-mtime
+buf
-                                        INFO_PANEL_MARKERS_COL_EDITABLE_VALUE, TRUE,
-                                        -1);
-                        
-                        gtk_tree_model_iter_next(info_panel, &child_data);
+
+                        g_snprintf (buf, BUF_LEN, "%d", mark->color);
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child_data,
-mtime
+buf
-                                        INFO_PANEL_MARKERS_COL_EDITABLE_VALUE, TRUE,
-                                        -1);
-                        
-                        gtk_tree_model_iter_next(info_panel, &child_data);
+                        g_snprintf (buf, BUF_LEN, "%d", mark->type);
-                        gtk_tree_store_set(GTK_TREE_STORE(info_panel), &child_data,
-mtime
+buf
-                                        INFO_PANEL_MARKERS_COL_EDITABLE_VALUE, TRUE,
-                                        -1);
@@ -1153 +1166 @@
-        menu = gtk_menu_new();
-
-gtk_menu_item_new_with_label(_("Revert to Original data")
+info_panel_menu_item_new_with_ico_label (_("Revert to Original data"), undo_revall_icon
-
-        g_signal_connect(menuitem, "activate",
@@ -1178 +1191 @@
-        menu = gtk_menu_new();
-
-gtk_menu_item_new_with_label(_("Revert to selected state")
+info_panel_menu_item_new_with_ico_label (_("Revert to selected state"), undo_rev_icon
-
-        data = g_malloc(sizeof(PopupData));
@@ -1296 +1309 @@
-        menu = gtk_menu_new();
-
-...
+
-
-        g_signal_connect(menuitem, "activate",
@@ -1325 +1338 @@
-void info_panel_markers_item_popup_menu (GtkWidget *treeview, GdkEventButton *event, sw_view * view)
-{
-#if 0
-        GtkWidget *menu, *menuitem;
-        PopupData * data;
@@ -1331 +1343 @@
-        menu = gtk_menu_new();
-
-gtk_menu_item_new_with_label(_("Delete Selection")
+info_panel_menu_item_new_with_ico_label(_("Delete Time Marker"), marker_del_icon
-
-        data = g_malloc(sizeof(PopupData));
@@ -1337 +1349 @@
-        data->view = view;
-        data->treeview = GTK_TREE_VIEW(treeview);
-
+/*
-        g_signal_connect(menuitem, "activate",
-selection
-
+marker
+
-        gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
@@ -1351 +1363 @@
-                               (event != NULL) ? event->button : 0,
-                                gdk_event_get_time((GdkEvent*)event));
-#endif
-}
-
@@ -1410 +1421 @@
-        GtkTreeModel * model;
-        GtkTreePath * path;
-
+, parent
-        gint type;
-
@@ -1440 +1451 @@
-                
-                                info_panel_undo_item_popup_menu(treeview, event, view);
+
+                                break;
+                        case INFO_PANEL_UNDO_ITEM_ORIG:
+                                
+                                gtk_tree_model_iter_parent (model, &parent, &iter);
+                                
+                                if ((gtk_tree_model_iter_n_children(model, &parent) > 1) && (view->sample->current_undo))
+                                        info_panel_undo_item_popup_menu(treeview, event, view);
-
-                                break;

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

@@ -95 +95 @@
-{
-        INFO_PANEL_UNDOS = 1,
-
+
+
-} info_panel_undos_type_t;
-

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

@@ -62 +62 @@
-
-
-
+
+
- * drawing the crossing vectors
- */
@@ -123 +124 @@
-
-static const int default_colors[] = {
- 
- 
-
+
+
+   
-  220, 230, 255, /* user */
-  100, 100, 100, /* zero */
@@ -131 +132 @@
-  110, 110, 100, /* tmp_sel XOR mask */
-#if 1
-   
+
-#else
-
+ 
-#endif
-  166, 166, 154, /* minmax */
@@ -139 +140 @@
-  81, 101, 81,   /* lowlight */
-  230, 0, 0,     /* rec */
-
+
+
+
+
-};
-
@@ -150 +154 @@
-  220, 220, 210, /* bg */
-#else
-   
+
-#endif
-  199, 203, 158, /* fg */
@@ -163 +167 @@
-  81, 101, 81,   /* lowlight */
-  240, 0, 0,     /* rec */
-
+
+
+
+
-};
-#endif
@@ -203 +210 @@
-};
-
+//extern const int mark_colors[];
+extern GdkPixbuf * mark_icons[];
+
-/* Values for s->selecting */
-enum {
@@ -468 +478 @@
-      gtk_widget_queue_draw_area (GTK_WIDGET(s), x, s->height - 1, x2 - x, 1);
-    }
+  }
+}
+
+static void
+sample_display_refresh_marks (SampleDisplay * s)
+{
+  int x, x2;
+  sw_sample * sample;
+  GList * gl;
+  sw_mark * mark;
+
+  g_return_if_fail(s != NULL);
+  g_return_if_fail(IS_SAMPLE_DISPLAY(s));
+
+  if(!IS_INITIALIZED(s))
+    return;
+
+  sample = s->view->sample;
+
+  for (gl = sample->sounddata->marks; gl; gl = gl->next) {
+    mark = (sw_mark *)gl->data;
+/*
+    x = OFFSET_TO_XPOS(mark->frame);
+
+    if ((x >= 0) && (x <= s->width)) {
+      gtk_widget_queue_draw_area (GTK_WIDGET(s), x, 0, 1, s->height);
+    }
+    if ((x2 >= 0) && (x2 <= s->width)) {
+      gtk_widget_queue_draw_area (GTK_WIDGET(s), x2, 0, 1, s->height);
+    }
+
+    if ((x <= s->width) && (x2 >= 0)) {
+      x = CLAMP (x, 0, s->width);
+      x2 = CLAMP (x2, 0, s->width);
+      gtk_widget_queue_draw_area (GTK_WIDGET(s), x, 0, x2 - x, 1);
+      gtk_widget_queue_draw_area (GTK_WIDGET(s), x, s->height - 1, x2 - x, 1);
+    }
+*/
-  }
-}
@@ -792 +840 @@
-  s->marks_relief_gc = gdk_gc_new (widget->window);
-  gdk_gc_set_foreground(s->marks_relief_gc, &SAMPLE_DISPLAY_CLASS(GTK_WIDGET_GET_CLASS(widget))->colors[SAMPLE_DISPLAYCOL_MARKS_RELIEF]);
+  
+  s->tmp_sel_text_gc = gdk_gc_new(widget->window);
+  gdk_gc_set_foreground(s->tmp_sel_text_gc, &SAMPLE_DISPLAY_CLASS(GTK_WIDGET_GET_CLASS(widget))->colors[SAMPLE_DISPLAYCOL_TMPSEL_TEXT]);
+  gdk_gc_set_function (s->tmp_sel_text_gc, GDK_XOR);
+
+  s->sel_text_gc = gdk_gc_new(widget->window);
+  gdk_gc_set_foreground(s->sel_text_gc, &SAMPLE_DISPLAY_CLASS(GTK_WIDGET_GET_CLASS(widget))->colors[SAMPLE_DISPLAYCOL_SEL_TEXT]);
+  gdk_gc_set_function (s->sel_text_gc, GDK_XOR);
+
+  s->mark_text_gc = gdk_gc_new(widget->window);
+  gdk_gc_set_foreground(s->mark_text_gc, &SAMPLE_DISPLAY_CLASS(GTK_WIDGET_GET_CLASS(widget))->colors[SAMPLE_DISPLAYCOL_MARK_TEXT]);
-
-  sample_display_init_display(s, attributes.width, attributes.height);
@@ -834 +893 @@
-
-    x1 = OFFSET_TO_XPOS(sel->sel_start);
-+
+ + 
-
-    x2 = OFFSET_TO_XPOS(sel->sel_end);
-+
+ + 
-
-    if (x2 - x1 > 1){ 
@@ -851 +910 @@
-    if (sel->sel_start != sel->sel_end) {
-      x1 = OFFSET_TO_XPOS(sel->sel_start);
-+
+ + 
-      
-      x2 = OFFSET_TO_XPOS(sel->sel_end);
-+
+ + 
-      
-      if (x2 - x1 > 1) {
-
+       
-                            x1, y, x2 - x1, y + height -1);
-      }
@@ -1200 +1259 @@
-
-static void
-
+ 
-                            GdkGC * gc,
-                            const SampleDisplay * s,
-
-
-int draw_left, int
+g
+g
+gboolean draw_left, gboolean
-{
-  if (width <= 0) {
@@ -1212 +1271 @@
-  }
-
-
+
+
-   * drawing a rectangle where possible, the marching ants go
-   * crazy. We don't want that to happen, they are cute.
@@ -1219 +1279 @@
-  gdk_draw_line(win, gc,
-                x, 0,
-
+
+
-  gdk_draw_line(win, gc,
-
-
+
+
+
-  if (draw_left) {
-    
+       
-                  x, 0,
-                  x, s->height - 1);
@@ -1233 +1295 @@
-#endif
-  }
+  
-  if (draw_right) {
-    gdk_draw_line(win, gc,
@@ -1240 +1303 @@
-#ifdef DRAW_CROSSING_VECTORS
-    /* crossing vector */
-+
+ + 
-#endif
-  }
@@ -1253 +1316 @@
-  GList * gl;
-  sw_sel * sel;
-
-
+
+
+
+
+
+
-
-  /* Draw real selection */
@@ -1260 +1327 @@
-    sel = (sw_sel *)gl->data;
-
-
-2
-
-
-2
-
- >= x_min) && (x
- = CLAMP (x
-
-2 >= x_min) && (x2
-2 = CLAMP (x2
+s
+e
+
+s
+e
+
+s >= x_min) && (xs
+s = CLAMP (xs
+
+e >= x_min) && (xe
+e = CLAMP (xe
-    
-    /* draw the selection */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -1284 +1358 @@
-
-  if (sel) {
-
- >= x_min) && (x
- = CLAMP (x
-
-2
-2 >= x_min) && (x2
-2 = CLAMP (x2
+s
+s >= x_min) && (xs
+s = CLAMP (xs
+
+e
+e >= x_min) && (xe
+e = CLAMP (xe
-
-    /* draw the selection */
-    sample_display_draw_sel_box(win, s->tmp_sel_gc,
-, x2 - x
+s, xe - xs
-                                l_end, r_end /* draw_ends */);
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1312 +1395 @@
-  int x, x1, x2;
-  PangoLayout *layout;
-//
+
-
-  layout = gtk_widget_create_pango_layout (GTK_WIDGET(s), NULL);
-
-  for (gl = sample->sounddata->marks; gl; gl = gl->next) {
+
-    mark = (sw_mark *)gl->data;
-
-
-    x = OFFSET_TO_XPOS(mark->frame);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            x2 = CLAMP (x + 3, x_min, x_max);
+*/
+            x2 = x + 3;
-
-            gdk_draw_line(win, s->marks_gcs[mark->color],
@@ -1350 +1449 @@
-            gdk_draw_polygon (win, s->marks_relief_gc, FALSE, poly, 5);
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-    }
@@ -1644 +1746 @@
-
-    /* draw the sample graph */
-
+ 
-
-    /* draw the selection bounds */
@@ -2037 +2139 @@
-  } else {
-          for ( gl = s->view->sample->sounddata->marks; gl; gl = gl->next){
-                g_print ("Mark found: %p\n", gl->data);
-        
-                mark = (sw_mark *)gl->data;
-
-                if ( (mark->frame >= off1) && (mark->frame <= off2) ){
-                        g_print ("mamy cię!\n");
-                        
-                        s->view->sample->tmp_mark = mark;

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

@@ -50 +50 @@
-  SAMPLE_DISPLAYCOL_REC,
-  SAMPLE_DISPLAYCOL_MARKS_RELIEF,
+  SAMPLE_DISPLAYCOL_TMPSEL_TEXT,
+  SAMPLE_DISPLAYCOL_SEL_TEXT,
+  SAMPLE_DISPLAYCOL_MARK_TEXT,
-  SAMPLE_DISPLAYCOL_LAST
-};
@@ -57 +60 @@
-  GtkWidget widget;
-
-,
-  *crossing
+;
+GdkGC *crossing_gc, *tmp_sel_text_gc, *sel_text_gc, *mark_text
-  GdkGC *minmax_gc, *zeroline_gc, *highlight_gc, *lowlight_gc;
-

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

@@ -33 +33 @@
-#include <sweep/sweep_marker.h>
-
+#include <sweep/sweep_i18n.h>
+
-#include "format.h"
-#include "view.h"
-#include "sample-display.h"
-#include "driver.h"
+
+#define MARKER_IMG_NUMBER       11
+
+static const int mark_colors[] = {
+  255,     0,   0,
+    0,   255,   0,
+    0,     0, 255,
+  255,     0, 255,
+  255,   127,   0,
+    0,   255, 255,
+  127,     0, 255,
+  255,   255,   0,
+  127,   127, 127,
+  255,     0, 127,
+    0,   127, 255,
+};
+
+static GdkPixbuf * mark_icons[] = { 
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+  NULL,
+};
+
+void sweep_load_marker_icons ( void )
+{
+#define BUF_LEN 256
+  gint a;
+  GdkPixbuf * icon;
+  GError *error = NULL;
+  gchar buf[BUF_LEN];
+
+  if (mark_icons[0] == NULL){
+
+        for (a = 0; a < MARKER_IMG_NUMBER; a++){
+
+                g_snprintf(buf, BUF_LEN, "%s/marker-img%d.png", PACKAGE_DATA_DIR, a);
+
+                icon = gdk_pixbuf_new_from_file(buf, &error);
+
+                if (error) {
+                        g_warning("%s: %s: %s\n", G_STRLOC, _("Could not load icon"), error->message);
+                        g_error_free(error);
+                        error = NULL;
+                }
+
+                mark_icons[a] = icon;
+        }
+ }
+#undef BUF_LEN
+};
-
-sw_mark *