Changeset 438

Timestamp:

11/23/06 23:08:38 (2 years ago)

Author:

radekk

Message:

Introducing Hand Tool.

Files:

• sweep/trunk/pixmaps/hand.xpm (added)
• sweep/trunk/po/fr.po (modified) (1 diff)
• sweep/trunk/po/pl.po (modified) (1 diff)
• sweep/trunk/src/cursors.c (modified) (1 diff)
• sweep/trunk/src/cursors.h (modified) (1 diff)
• sweep/trunk/src/question_dialogs.c (modified) (3 diffs)
• sweep/trunk/src/sample-display.c (modified) (7 diffs)
• sweep/trunk/src/sweep_app.h (modified) (2 diffs)
• sweep/trunk/src/view.c (modified) (1 diff)
• sweep/trunk/src/view_pixmaps.h (modified) (1 diff)

sweep/trunk/po/fr.po

@@ -4 +4 @@
-#
-#: src/sample-display.c:220
-#, fuzzy
-msgid ""
-msgstr ""

sweep/trunk/po/pl.po

@@ -2634 +2634 @@
-c do ciszy"
-
-#~ msgid "About Sweep"
-#~ msgstr "O programie Sweep"
-
-#~ msgid "Channels:"
-#~ msgstr "Kanały:"
-
-#~ msgid "Mono (mixdown)"
-#~ msgstr "Mono (wymieszane)"
-
-#~ msgid "Stereo (duplicate)"
-#~ msgstr "Stereo (powielone)"
-
-#~ msgid "Bitwidth:"
-#~ msgstr "Szerokość bitowa:"
-
-#~ msgid "8 bit"
-#~ msgstr "8 bit"
-
-#~ msgid "16 bit"
-#~ msgstr "16 bit"
-
-#~ msgid "24 bit"
-#~ msgstr "24 bit"
-
-#~ msgid "32 bit"
-#~ msgstr "32 bit"

sweep/trunk/src/cursors.c

@@ -100 +100 @@
-  sweep_cursors[SWEEP_CURSOR_PENCIL] = gdk_cursor_new (GDK_PENCIL);
-  sweep_cursors[SWEEP_CURSOR_NOISE] = gdk_cursor_new (GDK_SPRAYCAN);
+  sweep_cursors[SWEEP_CURSOR_HAND] = gdk_cursor_new (GDK_HAND1);
-
-  create_bitmap_and_mask_from_xpm (&bitmap, &mask, horiz_xpm);

sweep/trunk/src/cursors.h

@@ -33 +33 @@
-  SWEEP_CURSOR_PENCIL,
-  SWEEP_CURSOR_NOISE,
+  SWEEP_CURSOR_HAND,
-  SWEEP_CURSOR_MAX
-};

sweep/trunk/src/question_dialogs.c

@@ -136 +136 @@
-  gtk_widget_show (label);
-
+  /* New layout of buttons */
+
+  gtk_button_box_set_layout (GTK_BUTTON_BOX(GTK_DIALOG(window)->action_area), GTK_BUTTONBOX_SPREAD);
+
-  /* OK */
-
@@ -142 +146 @@
-  GTK_WIDGET_SET_FLAGS (GTK_WIDGET (ok_button), GTK_CAN_DEFAULT);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG(window)->action_area),
-FALS
+TRU
-  g_object_set_data (G_OBJECT(ok_button), "default", ok_callback);
-  gtk_widget_show (ok_button);
@@ -156 +160 @@
-    GTK_WIDGET_SET_FLAGS (GTK_WIDGET (button), GTK_CAN_DEFAULT);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG(window)->action_area),
-FALS
+TRU
-    g_object_set_data (G_OBJECT(button), "default", no_callback);
-    gtk_widget_show (button);

sweep/trunk/src/sample-display.c

@@ -200 +200 @@
-  SELECTING_PENCIL,
-  SELECTING_NOISE,
+  SELECTING_HAND,
-};
-
@@ -634 +635 @@
-  s->height = h;
-
+  window = GTK_WIDGET(s)->window;
+  visual = gdk_rgb_get_visual();
+
+#if DOUBLE_BUFFER
-  if(s->backing_pixmap) {
-    g_object_unref(s->backing_pixmap);
-  }
-  window = GTK_WIDGET(s)->window;
-  visual = gdk_rgb_get_visual();
-
-  s->backing_pixmap = gdk_pixmap_new (GTK_WIDGET(s)->window,  
-                                      w, h, visual->depth);
+#endif
+
-}
-
@@ -1878 +1882 @@
-
-static void
+sample_display_handle_hand_motion (SampleDisplay * s, int x, int y)
+{
+  sw_framecount_t move, vstart, vend;
+  sw_framecount_t step = PIXEL_TO_OFFSET(1);
+  GtkAdjustment * adj = GTK_ADJUSTMENT(s->view->adj);
+
+//  g_print("X: %i OLD: %i MOVE: %i STEP: %i\n", x, s->view->hand_offset, s->view->hand_offset - x, step);
+
+  if (s->view->hand_offset != x){
+    move = s->view->hand_offset - x;
+
+    vstart = s->view->start + move * step;
+    vend = s->view->end + move * step;
+
+    if (vstart < 0){
+        vstart = 0;
+        vend = adj->page_size;
+    }
+    if (vend > s->view->sample->sounddata->nr_frames){
+        vstart = s->view->sample->sounddata->nr_frames - adj->page_size; 
+        vend = s->view->sample->sounddata->nr_frames;
+    }
+
+    s->view->start = vstart;
+    s->view->end = vend;
+
+    view_refresh_display(s->view);
+
+    gtk_adjustment_set_value( GTK_ADJUSTMENT(s->view->adj), vstart);
+  }
+  s->view->hand_offset = x;
+}
+
+
+
+static void
-sample_display_handle_noise_motion (SampleDisplay * s, int x, int y)
-{
@@ -2095 +2135 @@
-    gdk_window_get_pointer (event->window, &x, &y, &state);
-    sample_display_handle_playmarker_motion (s, x, y);
-
+
+
-    /* Cancel the current operation if a different button is pressed. */
-    sample_display_clear_sel (s);
-if (last_tmp_view && last_tmp_view != s->view &&
-           
+
+  if (last_tmp_view && last_tmp_view != s->view &&
-    view_clear_last_tmp_view ();
-  } else {
@@ -2159 +2200 @@
-#endif
-        break;
+      case TOOL_HAND:
+        s->selecting = SELECTING_HAND;
+        s->view->hand_offset = x;
+        SET_CURSOR(widget, HAND);
+        sample_display_handle_hand_motion (s, x, y);
+        break;
-      case TOOL_ZOOM:
-        o = XPOS_TO_OFFSET(x);
@@ -2295 +2342 @@
-    if (s->meta_down) return TRUE;
-    break;
+  case TOOL_HAND:
+    s->view->hand_offset = -1;
+    break;
-  case TOOL_MOVE:
-    break;
@@ -2350 +2400 @@
-      case SELECTING_PLAYMARKER:
-        sample_display_handle_playmarker_motion (s, x, y);
+        break;
+      case SELECTING_HAND:
+        sample_display_handle_hand_motion (s, x, y);
-        break;
-      case SELECTING_PENCIL:

sweep/trunk/src/sweep_app.h

@@ -45 +45 @@
-  TOOL_PENCIL,
-  TOOL_NOISE,
+  TOOL_HAND
-} sw_tool_t;
-
@@ -86 +87 @@
-
-  gboolean following; /* whether or not to follow playmarker */
+
+  gint hand_offset;
-
-  GtkWidget * window;

sweep/trunk/src/view.c

@@ -1878 +1878 @@
-
-  view->tool_buttons = NULL;
+
+  button = create_pixmap_button (window, hand_xpm, _("Hand tool"),
+                                 style_light_grey, VIEW_TOOLBAR_TOGGLE_BUTTON,
+                                 G_CALLBACK (view_set_tool_cb), NULL, NULL, view);
+  g_object_set_data (G_OBJECT(button), "default", GINT_TO_POINTER(TOOL_HAND));
+  gtk_box_pack_start (GTK_BOX (tool_hbox), button, FALSE, FALSE, 0);
+  gtk_widget_show (button);
+  view->tool_buttons = g_list_append (view->tool_buttons, button);
-
-  button = create_pixmap_button (window, select_xpm, _("Selector tool"),

sweep/trunk/src/view_pixmaps.h

@@ -53 +53 @@
-#include "../pixmaps/scrub.xpm"
-#include "../pixmaps/select.xpm"
+#include "../pixmaps/hand.xpm"
-#ifdef DEVEL_CODE
-#include "../pixmaps/pencil.xpm"