/*
- Copyright (C) 2000 Paul Davis
+ Copyright (C) 2000-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <ardour/utils.h>
#include "ardour_ui.h"
-#include "check_mark.h"
#include "editor.h"
#include "grouped_buttons.h"
#include "keyboard.h"
#include "crossfade_edit.h"
#include "audio_time_axis.h"
#include "canvas_impl.h"
+#include "actions.h"
#include "gui_thread.h"
#include "i18n.h"
Gdk::Cursor* Editor::time_fx_cursor = 0;
Gdk::Cursor* Editor::fader_cursor = 0;
Gdk::Cursor* Editor::speaker_cursor = 0;
-Gdk::Cursor* Editor::null_cursor = 0;
Gdk::Cursor* Editor::wait_cursor = 0;
Gdk::Cursor* Editor::timebar_cursor = 0;
-GdkPixmap *Editor::check_pixmap = 0;
-GdkBitmap *Editor::check_mask = 0;
-GdkPixmap *Editor::empty_pixmap = 0;
-GdkBitmap *Editor::empty_mask = 0;
+bool
+Editor::on_key_press_event (GdkEventKey* ev)
+{
+ GtkWindow* win = gobj();
+
+ /* This exists to allow us to override the way GTK handles
+ key events. The normal sequence is:
+
+ a) event is delivered to a GtkWindow
+ b) accelerators/mnemonics are activated
+ c) if (b) didn't handle the event, propagate to
+ the focus widget and/or focus chain
+
+ The problem with this is that if the accelerators include
+ keys without modifiers, such as the space bar or the
+ letter "e", then pressing the key while typing into
+ a text entry widget results in the accelerator being
+ activated, instead of the desired letter appearing
+ in the text entry.
+
+ There is no good way of fixing this, but this
+ represents a compromise. The idea is that
+ key events involving modifiers (not Shift)
+ get routed into the activation pathway first, then
+ get propagated to the focus widget if necessary.
+
+ If the key event doesn't involve modifiers,
+ we deliver to the focus widget first, thus allowing
+ it to get "normal text" without interference
+ from acceleration.
+
+ Of course, this can also be problematic: if there
+ is a widget with focus, then it will swallow
+ all "normal text" accelerators.
+ */
+
+ if (ev->state & ~Gdk::SHIFT_MASK) {
+ /* modifiers in effect, accelerate first */
+ if (!gtk_window_activate_key (win, ev)) {
+ return gtk_window_propagate_key_event (win, ev);
+ } else {
+ return true;
+ }
+ }
+
+ /* no modifiers, propagate first */
+
+ if (!gtk_window_propagate_key_event (win, ev)) {
+ return gtk_window_activate_key (win, ev);
+ }
+
+
+ return true;
+}
+
+void
+show_me_the_size (Requisition* r, const char* what)
+{
+ cerr << "size of " << what << " = " << r->width << " x " << r->height << endl;
+}
Editor::Editor (AudioEngine& eng)
: engine (eng),
transport_mark_label (_("Loop/Punch Ranges")),
edit_packer (3, 3, false),
- edit_hscroll_left_arrow (Gtk::ARROW_LEFT, Gtk::SHADOW_OUT),
- edit_hscroll_right_arrow (Gtk::ARROW_RIGHT, Gtk::SHADOW_OUT),
+
+ /* the values here don't matter: layout widgets
+ reset them as needed.
+ */
+
+ vertical_adjustment (0.0, 0.0, 400.0, 10),
+ horizontal_adjustment (0.0, 0.0, 1200.0, 20),
/* tool bar related */
init_colormap ();
- check_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
- gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
- &check_mask, NULL, (gchar **) check_xpm);
- empty_pixmap = gdk_pixmap_colormap_create_from_xpm_d (NULL,
- gtk_widget_get_colormap (GTK_WIDGET(edit_group_list.gobj())),
- &empty_mask, NULL, (gchar **) empty_xpm);
-
session = 0;
selection = new Selection;
show_gain_after_trim = false;
no_zoom_repos_update = false;
ignore_route_list_reorder = false;
+ no_route_list_redisplay = false;
verbose_cursor_on = true;
route_removal = false;
track_spacing = 0;
_xfade_visibility = true;
editor_ruler_menu = 0;
no_ruler_shown_update = false;
+ edit_hscroll_dragging = false;
edit_group_list_menu = 0;
route_list_menu = 0;
region_list_menu = 0;
new_transport_marker_menu = 0;
editor_mixer_strip_width = Wide;
repos_zoom_queued = false;
- import_audio_item = 0;
- embed_audio_item = 0;
region_edit_menu_split_item = 0;
temp_location = 0;
region_edit_menu_split_multichannel_item = 0;
- edit_hscroll_dragging = false;
leftmost_frame = 0;
ignore_mouse_mode_toggle = false;
current_stepping_trackview = 0;
range_marker_drag_rect = 0;
marker_drag_line = 0;
- mouse_mode = MouseZoom; /* force change in next call */
set_mouse_mode (MouseObject, true);
frames_per_unit = 2048; /* too early to use set_frames_per_unit */
initialize_rulers ();
initialize_canvas ();
- track_canvas_scroller.add (track_canvas);
- track_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
- track_canvas_scroller.set_name ("TrackCanvasScroller");
-
- track_canvas_scroller.get_vadjustment()->signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling));
- track_canvas_scroller.get_vadjustment()->set_step_increment (10.0);
-
- track_canvas_scroller.get_hadjustment()->set_lower (0.0);
- track_canvas_scroller.get_hadjustment()->set_upper (1200.0);
- track_canvas_scroller.get_hadjustment()->set_step_increment (20.0);
- track_canvas_scroller.get_hadjustment()->signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
-
- edit_vscrollbar.set_adjustment(*track_canvas_scroller.get_vadjustment());
- edit_hscrollbar.set_adjustment(*track_canvas_scroller.get_hadjustment());
-
- edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscroll_slider_button_press));
- edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscroll_slider_button_release));
- edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscroll_slider_allocate));
+ edit_controls_vbox.set_spacing (0);
+ horizontal_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::canvas_horizontally_scrolled));
+ vertical_adjustment.signal_value_changed().connect (mem_fun(*this, &Editor::tie_vertical_scrolling));
- time_canvas_scroller.add (time_canvas);
- time_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
- time_canvas_scroller.set_hadjustment (*track_canvas_scroller.get_hadjustment());
- time_canvas_scroller.set_name ("TimeCanvasScroller");
+ track_canvas.set_hadjustment (horizontal_adjustment);
+ track_canvas.set_vadjustment (vertical_adjustment);
+ time_canvas.set_hadjustment (horizontal_adjustment);
- track_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler));
- time_canvas_scroller.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler));
+ track_canvas.signal_map_event().connect (mem_fun (*this, &Editor::track_canvas_map_handler));
+ time_canvas.signal_map_event().connect (mem_fun (*this, &Editor::time_canvas_map_handler));
+
+ controls_layout.add (edit_controls_vbox);
+ controls_layout.set_name ("EditControlsBase");
+ controls_layout.add_events (Gdk::SCROLL_MASK);
+ controls_layout.signal_scroll_event().connect (mem_fun(*this, &Editor::control_layout_scroll), false);
- edit_controls_vbox.set_spacing (track_spacing);
- edit_controls_hbox.pack_start (edit_controls_vbox, true, true);
- edit_controls_scroller.add (edit_controls_hbox);
- edit_controls_scroller.set_name ("EditControlsBase");
- edit_controls_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
+ controls_layout.add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
+ controls_layout.signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release));
- Viewport* viewport = static_cast<Viewport*> (edit_controls_scroller.get_child());
+ edit_vscrollbar.set_adjustment (vertical_adjustment);
+ edit_hscrollbar.set_adjustment (horizontal_adjustment);
- viewport->set_shadow_type (Gtk::SHADOW_NONE);
- viewport->set_name ("EditControlsBase");
- viewport->add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK);
- viewport->signal_button_release_event().connect (mem_fun(*this, &Editor::edit_controls_button_release));
+ edit_hscrollbar.signal_button_press_event().connect (mem_fun(*this, &Editor::hscrollbar_button_press));
+ edit_hscrollbar.signal_button_release_event().connect (mem_fun(*this, &Editor::hscrollbar_button_release));
+ edit_hscrollbar.signal_size_allocate().connect (mem_fun(*this, &Editor::hscrollbar_allocate));
build_cursors ();
setup_toolbar ();
time_canvas_vbox.pack_start (*smpte_ruler, false, false);
time_canvas_vbox.pack_start (*frames_ruler, false, false);
time_canvas_vbox.pack_start (*bbt_ruler, false, false);
- time_canvas_vbox.pack_start (time_canvas_scroller, true, true);
+ time_canvas_vbox.pack_start (time_canvas, true, true);
time_canvas_vbox.set_size_request (-1, (int)(timebar_height * visible_timebars));
bbt_label.set_name ("EditorTimeButton");
for the canvas areas.
*/
- track_canvas_event_box.add (track_canvas_scroller);
+ track_canvas_event_box.add (track_canvas);
time_canvas_event_box.add (time_canvas_vbox);
time_canvas_event_box.set_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK);
-
edit_packer.set_col_spacings (0);
edit_packer.set_row_spacings (0);
edit_packer.set_homogeneous (false);
edit_packer.set_name ("EditorWindow");
-// edit_packer.attach (edit_hscroll_left_arrow_event, 0, 1, 0, 1, Gtk::FILL, 0, 0, 0);
-// edit_packer.attach (edit_hscroll_slider, 1, 2, 0, 1, Gtk::FILL|Gtk::EXPAND, 0, 0, 0);
-// edit_packer.attach (edit_hscroll_right_arrow_event, 2, 3, 0, 1, Gtk::FILL, 0, 0, 0);
- edit_packer.attach (edit_hscrollbar, 1, 2, 0, 1, FILL|EXPAND, FILL, 0, 0);
+ edit_packer.attach (edit_hscrollbar, 1, 2, 0, 1, FILL|EXPAND, FILL, 0, 0);
- edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, FILL, 0, 0);
- edit_packer.attach (time_canvas_event_box, 1, 2, 1, 2, FILL|EXPAND, FILL, 0, 0);
+ edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, FILL, 0, 0);
+ edit_packer.attach (time_canvas_event_box, 1, 2, 1, 2, FILL|EXPAND, FILL, 0, 0);
- edit_packer.attach (edit_controls_scroller, 0, 1, 2, 3, FILL, FILL|EXPAND, 0, 0);
- edit_packer.attach (track_canvas_event_box, 1, 2, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0);
- edit_packer.attach (edit_vscrollbar, 2, 3, 2, 3, FILL, FILL|EXPAND, 0, 0);
+ edit_packer.attach (controls_layout, 0, 1, 2, 3, FILL, FILL|EXPAND, 0, 0);
+ edit_packer.attach (track_canvas_event_box, 1, 2, 2, 3, FILL|EXPAND, FILL|EXPAND, 0, 0);
+ edit_packer.attach (edit_vscrollbar, 2, 3, 2, 3, FILL, FILL|EXPAND, 0, 0);
edit_frame.set_name ("BaseFrame");
edit_frame.set_shadow_type (SHADOW_IN);
ARDOUR_UI::instance()->tooltips().set_tip (zoom_in_button, _("Zoom in"));
ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_button, _("Zoom out"));
-// zoom_onetoone_button.set_name ("EditorTimeButton");
zoom_out_full_button.set_name ("EditorTimeButton");
-// ARDOUR_UI::instance()->tooltips().set_tip (zoom_onetoone_button, _("Zoom in 1:1"));
ARDOUR_UI::instance()->tooltips().set_tip (zoom_out_full_button, _("Zoom to session"));
- zoom_in_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_in_button_xpm)))));
- zoom_out_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_out_button_xpm)))));
- zoom_out_full_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(zoom_out_full_button_xpm)))));
-// zoom_onetoone_button.add (*(manage (new Gtk::Image (zoom_onetoone_button_xpm))));
-
+ zoom_in_button.add (*(manage (new Image (Stock::ZOOM_IN, ICON_SIZE_BUTTON))));
+ zoom_out_button.add (*(manage (new Image (Stock::ZOOM_OUT, ICON_SIZE_BUTTON))));
+ zoom_out_full_button.add (*(manage (new Image (Stock::ZOOM_FIT, ICON_SIZE_BUTTON))));
zoom_in_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), false));
zoom_out_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom_step), true));
zoom_out_full_button.signal_clicked().connect (mem_fun(*this, &Editor::temporal_zoom_session));
-// zoom_onetoone_button.signal_clicked().connect (bind (mem_fun(*this, &Editor::temporal_zoom), 1.0));
zoom_indicator_box.pack_start (zoom_out_button, false, false);
zoom_indicator_box.pack_start (zoom_in_button, false, false);
zoom_indicator_box.pack_start (zoom_range_clock, false, false);
-// zoom_indicator_box.pack_start (zoom_onetoone_button, false, false);
zoom_indicator_box.pack_start (zoom_out_full_button, false, false);
zoom_indicator_label.set_text (_("Zoom Span"));
zoom_indicator_label.set_name ("ToolBarLabel");
-
zoom_indicator_vbox.set_spacing (3);
zoom_indicator_vbox.set_border_width (3);
zoom_indicator_vbox.pack_start (zoom_indicator_label, false, false);
zoom_indicator_vbox.pack_start (zoom_indicator_box, false, false);
-
bottom_hbox.set_border_width (3);
bottom_hbox.set_spacing (3);
route_display_model = ListStore::create(route_display_columns);
- route_list.set_model (route_display_model);
- route_list.append_column (_("Tracks"), route_display_columns.text);
- route_list.set_name ("TrackListDisplay");
- route_list.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
- route_list.set_reorderable (true);
-
- route_list.set_size_request (75,-1);
- route_list.set_headers_visible (true);
- route_list.set_headers_clickable (true);
+ route_list_display.set_model (route_display_model);
+ route_list_display.append_column (_("Tracks"), route_display_columns.text);
+ route_list_display.set_headers_visible (false);
+ route_list_display.set_name ("TrackListDisplay");
+ route_list_display.get_selection()->set_mode (SELECTION_MULTIPLE);
+ route_list_display.set_reorderable (true);
+ route_list_display.set_size_request (75,-1);
- // GTK2FIX
- // route_list.signal_rows_reordered().connect (mem_fun (*this, &Editor::queue_route_list_reordered));
+ route_display_model->signal_rows_reordered().connect (mem_fun (*this, &Editor::route_list_reordered));
+ route_display_model->set_sort_func (0, mem_fun (*this, &Editor::route_list_compare_func));
+ route_display_model->set_sort_column (0, SORT_ASCENDING);
- // GTK2FIX
- // route_display_model->set_sort_func (0, mem_fun (*this, &Editor::route_list_compare_func));
+ route_list_scroller.add (route_list_display);
+ route_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
- // GTK2FIX
- //route_list.set_shadow_type (Gtk::SHADOW_IN);
-
- route_list_scroller.add (route_list);
- route_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
-
- route_list.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::route_display_selection_changed));
- route_list.signal_columns_changed().connect (mem_fun(*this, &Editor::route_list_column_click));
+ route_list_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::route_display_selection_changed));
edit_group_list_button_label.set_text (_("Edit Groups"));
edit_group_list_button_label.set_name ("EditGroupTitleButton");
edit_group_list_button.set_name ("EditGroupTitleButton");
group_model = ListStore::create(group_columns);
- edit_group_list.set_model (group_model);
- edit_group_list.append_column (_("active"), group_columns.is_active);
- edit_group_list.append_column (_("groupname"), group_columns.text);
- edit_group_list.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
- edit_group_list.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+ edit_group_display.set_model (group_model);
+ edit_group_display.append_column (_("active"), group_columns.is_active);
+ edit_group_display.append_column (_("groupname"), group_columns.text);
+ edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
+ edit_group_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+ edit_group_display.set_headers_visible (false);
/* use checkbox for the active column */
- CellRendererToggle *active_cell = dynamic_cast<CellRendererToggle*>(edit_group_list.get_column_cell_renderer (0));
+ CellRendererToggle *active_cell = dynamic_cast<CellRendererToggle*>(edit_group_display.get_column_cell_renderer (0));
active_cell->property_activatable() = true;
active_cell->property_radio() = false;
- edit_group_list.set_name ("MixerGroupList");
- //edit_group_list.set_shadow_type (Gtk::SHADOW_IN);
- route_list.set_headers_visible (false);
- edit_group_list.set_reorderable (false);
- edit_group_list.set_size_request (75, -1);
- edit_group_list.columns_autosize ();
- edit_group_list.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
+ edit_group_display.set_name ("MixerGroupList");
+ edit_group_display.columns_autosize ();
+ edit_group_display.get_selection()->set_mode (SELECTION_MULTIPLE);
+ edit_group_display.set_reorderable (false);
+
+ edit_group_display.set_size_request (75, -1);
- edit_group_list_scroller.add (edit_group_list);
- edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::POLICY_AUTOMATIC);
+ edit_group_list_scroller.add (edit_group_display);
+ edit_group_list_scroller.set_policy (POLICY_AUTOMATIC, POLICY_AUTOMATIC);
edit_group_list_button.signal_clicked().connect (mem_fun(*this, &Editor::edit_group_list_button_clicked));
- edit_group_list.signal_button_press_event().connect (mem_fun(*this, &Editor::edit_group_list_button_press_event));
- edit_group_list.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::edit_group_selection_changed));
+ edit_group_display.signal_button_press_event().connect (mem_fun(*this, &Editor::edit_group_list_button_press_event));
+ edit_group_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::edit_group_selection_changed));
TreeModel::Row row = *(group_model->append());
row[group_columns.is_active] = false;
row[group_columns.text] = (_("-all-"));
- edit_group_list.get_selection()->select (row);
-/* GTK2FIX is set_data(0) setting the is_active to false here?
- list<string> stupid_list;
+ row[group_columns.routegroup] = 0;
+ edit_group_display.get_selection()->select (row);
- stupid_list.push_back ("*");
- stupid_list.push_back (_("-all-"));
-
- edit_group_list.rows().push_back (stupid_list);
- edit_group_list.rows().back().set_data (0);
- edit_group_list.rows().back().select();
-
-*/
edit_group_vbox.pack_start (edit_group_list_button, false, false);
edit_group_vbox.pack_start (edit_group_list_scroller, true, true);
- route_list_frame.set_name ("BaseFrame");
- route_list_frame.set_shadow_type (Gtk::SHADOW_IN);
- route_list_frame.add (route_list_scroller);
-
- edit_group_list_frame.set_name ("BaseFrame");
- edit_group_list_frame.set_shadow_type (Gtk::SHADOW_IN);
- edit_group_list_frame.add (edit_group_vbox);
-
- route_group_vpane.add1 (route_list_frame);
- route_group_vpane.add2 (edit_group_list_frame);
-
- list_vpacker.pack_start (route_group_vpane, true, true);
+ region_list_display.set_size_request (100, -1);
+ region_list_display.set_name ("RegionListDisplay");
region_list_model = TreeStore::create (region_list_columns);
- region_list_sort_model = TreeModelSort::create (region_list_model);
region_list_model->set_sort_func (0, mem_fun (*this, &Editor::region_list_sorter));
+ region_list_model->set_sort_column (0, SORT_ASCENDING);
- region_list_display.set_model (region_list_sort_model);
- region_list_display.append_column (_("Regions"), region_list_columns.name);
+ region_list_display.set_model (region_list_model);
+ CellRendererText* renderer = manage( new CellRendererText() );
+ region_list_display.append_column (_("Regions"), *renderer);
+ region_list_display.set_headers_visible (false);
+
+ region_list_display.get_selection()->set_select_function (mem_fun (*this, &Editor::region_list_selection_filter));
+
+ TreeViewColumn* tv_col = region_list_display.get_column(0);
+ tv_col->add_attribute(renderer->property_text(), region_list_columns.name);
+ tv_col->add_attribute(renderer->property_foreground_gdk(), region_list_columns.color_);
+
region_list_display.set_reorderable (true);
- region_list_display.set_size_request (100, -1);
- region_list_display.set_data ("editor", this);
- region_list_display.set_flags (Gtk::CAN_FOCUS);
- region_list_display.set_name ("RegionListDisplay");
- region_list_scroller.add (region_list_display);
- region_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ region_list_display.get_selection()->set_mode (SELECTION_MULTIPLE);
+ region_list_display.add_object_drag (region_list_columns.region.index(), "regions");
- list<Gtk::TargetEntry> region_list_target_table;
+ /* setup DnD handling */
+
+ list<TargetEntry> region_list_target_table;
- region_list_target_table.push_back (TargetEntry ("STRING"));
region_list_target_table.push_back (TargetEntry ("text/plain"));
region_list_target_table.push_back (TargetEntry ("text/uri-list"));
region_list_target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
+
+ region_list_display.add_drop_targets (region_list_target_table);
+ region_list_display.signal_drag_data_received().connect (mem_fun(*this, &Editor::region_list_display_drag_data_received));
- // GTK2FIX
- // region_list_display.drag_dest_set (region_list_target_table, DEST_DEFAULT_ALL, GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- // region_list_display.signal_drag_data_received().connect (mem_fun(*this, &Editor::region_list_display_drag_data_received));
+ region_list_scroller.add (region_list_display);
+ region_list_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
region_list_display.signal_key_press_event().connect (mem_fun(*this, &Editor::region_list_display_key_press));
region_list_display.signal_key_release_event().connect (mem_fun(*this, &Editor::region_list_display_key_release));
- region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press));
+ region_list_display.signal_button_press_event().connect (mem_fun(*this, &Editor::region_list_display_button_press), false);
region_list_display.signal_button_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release));
region_list_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::region_list_selection_changed));
- // GTK2FIX
- //region_list_display.unselect_row.connect (mem_fun(*this, &Editor::region_list_display_unselected));
- //region_list_display.signal_columns_changed().connect (mem_fun(*this, &Editor::region_list_column_click));
+ // region_list_display.signal_popup_menu().connect (bind (mem_fun (*this, &Editor::show_region_list_display_context_menu), 1, 0));
named_selection_scroller.add (named_selection_display);
- named_selection_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
+ named_selection_scroller.set_policy (POLICY_NEVER, POLICY_AUTOMATIC);
named_selection_model = TreeStore::create (named_selection_columns);
named_selection_display.set_model (named_selection_model);
+ named_selection_display.append_column (_("Chunks"), named_selection_columns.text);
+ named_selection_display.set_headers_visible (false);
+ named_selection_display.set_size_request (100, -1);
named_selection_display.set_name ("RegionListDisplay");
+
+ named_selection_display.get_selection()->set_mode (SELECTION_SINGLE);
named_selection_display.set_size_request (100, -1);
- named_selection_display.set_headers_visible (true);
- named_selection_display.set_headers_clickable (true);
- named_selection_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
- named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press));
+ named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press), false);
named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed));
- region_selection_vpane.pack1 (region_list_scroller, true, true);
- region_selection_vpane.pack2 (named_selection_scroller, true, true);
+ /* SNAPSHOTS */
- canvas_region_list_pane.pack1 (edit_frame, true, true);
- canvas_region_list_pane.pack2 (region_selection_vpane, true, true);
+ snapshot_display_model = ListStore::create (snapshot_display_columns);
+ snapshot_display.set_model (snapshot_display_model);
+ snapshot_display.append_column (X_("snapshot"), snapshot_display_columns.visible_name);
+ snapshot_display.set_name ("SnapshotDisplayList");
+ snapshot_display.set_size_request (75, -1);
+ snapshot_display.set_headers_visible (false);
+ snapshot_display.set_reorderable (false);
+ snapshot_display_scroller.add (snapshot_display);
+ snapshot_display_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- track_list_canvas_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&track_list_canvas_pane)));
- canvas_region_list_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&canvas_region_list_pane)));
- route_group_vpane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&route_group_vpane)));
- region_selection_vpane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (®ion_selection_vpane)));
-
- track_list_canvas_pane.pack1 (list_vpacker, true, true);
- track_list_canvas_pane.pack2 (canvas_region_list_pane, true, true);
+ snapshot_display.get_selection()->signal_changed().connect (mem_fun(*this, &Editor::snapshot_display_selection_changed));
+ snapshot_display.signal_button_press_event().connect (mem_fun (*this, &Editor::snapshot_display_button_press), false);
- /* provide special pane-handle event handling for easy "hide" action */
+ the_notebook.append_page (region_list_scroller, _("Regions"));
+ the_notebook.append_page (route_list_scroller, _("Tracks/Busses"));
+ the_notebook.append_page (snapshot_display_scroller, _("Snapshots"));
+ the_notebook.append_page (edit_group_vbox, _("Edit Groups"));
+ the_notebook.append_page (named_selection_scroller, _("Chunks"));
+ the_notebook.set_show_tabs (true);
+ the_notebook.set_scrollable (true);
+ the_notebook.popup_enable ();
- /* 0: collapse to show left/upper child
- 1: collapse to show right/lower child
- */
+ TearOff *notebook_tearoff = manage (new TearOff (the_notebook, true));
+ notebook_tearoff->tearoff_window().set_size_request (200, 400);
- route_group_vpane.set_data ("collapse-direction", (gpointer) 0);
- region_selection_vpane.set_data ("collapse-direction", (gpointer) 0);
- canvas_region_list_pane.set_data ("collapse-direction", (gpointer) 0);
- track_list_canvas_pane.set_data ("collapse-direction", (gpointer) 1);
-
- route_group_vpane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*> (&route_group_vpane)));
- region_selection_vpane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*> (®ion_selection_vpane)));
- canvas_region_list_pane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*> (&canvas_region_list_pane)));
- track_list_canvas_pane.signal_button_release_event().connect (bind (sigc::ptr_fun (pane_handler), static_cast<Paned*> (&track_list_canvas_pane)));
+ edit_pane.pack1 (edit_frame, true, true);
+ edit_pane.pack2 (*notebook_tearoff, true, true);
+
+ edit_pane.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Paned*> (&edit_pane)));
top_hbox.pack_start (toolbar_frame, true, true);
HBox *hbox = manage (new HBox);
- hbox->pack_start (track_list_canvas_pane, true, true);
+ hbox->pack_start (edit_pane, true, true);
global_vpacker.pack_start (top_hbox, false, false);
global_vpacker.pack_start (*hbox, true, true);
global_hpacker.pack_start (global_vpacker, true, true);
set_name ("EditorWindow");
+ add_accel_group (ActionManager::ui_manager->get_accel_group());
vpacker.pack_end (global_hpacker, true, true);
+
+ /* register actions now so that set_state() can find them and set toggles/checks etc */
+
+ register_actions ();
XMLNode* node = ARDOUR_UI::instance()->editor_settings();
set_state (*node);
/* nudge stuff */
- nudge_forward_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(right_arrow_xpm)))));
- nudge_backward_button.add (*(manage (new Gtk::Image (Gdk::Pixbuf::create_from_xpm_data(left_arrow_xpm)))));
+ nudge_forward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(right_arrow_xpm)))));
+ nudge_backward_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(left_arrow_xpm)))));
ARDOUR_UI::instance()->tooltips().set_tip (nudge_forward_button, _("Nudge region/selection forwards"));
ARDOUR_UI::instance()->tooltips().set_tip (nudge_backward_button, _("Nudge region/selection backwards"));
Editor::show_window ()
{
show_all ();
-
+ present ();
+
/* now reset all audio_time_axis heights, because widgets might need
to be re-hidden
*/
void
Editor::tie_vertical_scrolling ()
{
- edit_controls_scroller.get_vadjustment()->set_value (track_canvas_scroller.get_vadjustment()->get_value());
-
- float y1 = track_canvas_scroller.get_vadjustment()->get_value();
+ double y1 = vertical_adjustment.get_value();
+ controls_layout.get_vadjustment()->set_value (y1);
playhead_cursor->set_y_axis(y1);
edit_cursor->set_y_axis(y1);
}
// convert fpu to frame count
- frames = (jack_nframes_t) (fpu * canvas_width);
+ frames = (jack_nframes_t) floor (fpu * canvas_width);
/* don't allow zooms that fit more than the maximum number
of frames into an 800 pixel wide space.
*/
if (session) {
- track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit);
+ horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
}
if (!no_zoom_repos_update) {
- track_canvas_scroller.get_hadjustment()->set_value (leftmost_frame/frames_per_unit);
- update_hscroller ();
+ horizontal_adjustment.set_value (leftmost_frame/frames_per_unit);
update_fixed_rulers ();
tempo_map_changed (Change (0));
}
if (frame != leftmost_frame) {
leftmost_frame = frame;
double pixel = frame_to_pixel (frame);
- if (pixel >= track_canvas_scroller.get_hadjustment()->get_upper()) {
- track_canvas_scroller.get_hadjustment()->set_upper (frame_to_pixel (frame + (current_page_frames())));
+ if (pixel >= horizontal_adjustment.get_upper()) {
+ horizontal_adjustment.set_upper (frame_to_pixel (frame + (current_page_frames())));
}
- track_canvas_scroller.get_hadjustment()->set_value (frame/frames_per_unit);
+ horizontal_adjustment.set_value (frame/frames_per_unit);
XOriginChanged (); /* EMIT_SIGNAL */
}
}
return;
}
- double fpu = (double) zoom_range_clock.current_duration() / (double) canvas_width;
+ double fpu = zoom_range_clock.current_duration() / canvas_width;
if (fpu < 1.0) {
fpu = 1.0;
- zoom_range_clock.set ((jack_nframes_t) (fpu * canvas_width));
- }
- else if (fpu > session->current_end_frame() / (double) canvas_width) {
- fpu = session->current_end_frame() / (double) canvas_width;
- zoom_range_clock.set ((jack_nframes_t) (fpu * canvas_width));
+ zoom_range_clock.set ((jack_nframes_t) floor (fpu * canvas_width));
+ } else if (fpu > session->current_end_frame() / canvas_width) {
+ fpu = session->current_end_frame() / canvas_width;
+ zoom_range_clock.set ((jack_nframes_t) floor (fpu * canvas_width));
}
temporal_zoom (fpu);
void
Editor::canvas_horizontally_scrolled ()
{
- /* XXX note the potential loss of accuracy here caused by
- adjustments being 32bit floats with only a 24 bit mantissa,
- whereas jack_nframes_t is at least a 32 bit uint32_teger.
- */
-
- leftmost_frame = (jack_nframes_t) floor (track_canvas_scroller.get_hadjustment()->get_value() * frames_per_unit);
+ leftmost_frame = (jack_nframes_t) floor (horizontal_adjustment.get_value() * frames_per_unit);
- update_hscroller ();
update_fixed_rulers ();
if (!edit_hscroll_dragging) {
Editor::on_realize ()
{
Window::on_realize ();
-
- /* Even though we're not using acceleration, we want the
- labels to show up.
- */
-
- track_context_menu.accelerate (*this->get_toplevel());
- track_region_context_menu.accelerate (*this->get_toplevel());
-
- Glib::RefPtr<Gdk::Pixmap> empty_pixmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
- Glib::RefPtr<Gdk::Pixmap> empty_bitmap = Gdk::Pixmap::create(get_window(), 1, 1, 1);
- Gdk::Color white ("#ffffff" );
-
- null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
-}
-
-void
-Editor::track_canvas_allocate (Gtk::Allocation alloc)
-{
- canvas_width = alloc.get_width();
- canvas_height = alloc.get_height();
-
- if (session == 0 && !ARDOUR_UI::instance()->will_create_new_session_automatically()) {
-
- Pango::FontDescription font = get_font_for_style (N_("FirstActionMessage"));
-
- const char *txt1 = _("Start a new session\n");
- const char *txt2 = _("via Session menu");
-
- /* this mess of code is here to find out how wide this text is and
- position the message in the center of the editor window. there
- are two lines, so we use the longer of the the lines to
- compute width, and multiply the height by 2.
- */
-
- int pixel_height;
- int pixel_width;
-
- /* this is a dummy widget that exists so that we can get the
- style from the RC file.
- */
-
- Label foo (_(txt2));
- Glib::RefPtr<Pango::Layout> layout;
- foo.set_name ("NoSessionMessage");
- foo.ensure_style ();
-
- layout = foo.create_pango_layout (_(txt2));
- layout->set_font_description (font);
- layout->get_pixel_size (pixel_width, pixel_height);
-
- if (first_action_message == 0) {
-
- char txt[strlen(txt1)+strlen(txt2)+1];
-
- /* merge both lines */
-
- strcpy (txt, _(txt1));
- strcat (txt, _(txt2));
-
- first_action_message = new ArdourCanvas::Text (*track_canvas.root());
- first_action_message->property_font_desc() = font;
- first_action_message->property_fill_color_rgba() = color_map[cFirstActionMessage];
- first_action_message->property_x() = (gdouble) (canvas_width - pixel_width) / 2.0;
- first_action_message->property_y() = (gdouble) (canvas_height/2.0) - (2.0 * (pixel_height));
- first_action_message->property_anchor() = ANCHOR_NORTH_WEST;
- first_action_message->property_text() = ustring (txt);
-
- } else {
-
- /* center it */
- first_action_message->property_x() = (gdouble) (canvas_width - pixel_width) / 2.0;
- first_action_message->property_y() = (gdouble) (canvas_height/2.0) - (2.0 * (pixel_height));
- }
- }
-
- zoom_range_clock.set ((jack_nframes_t) (canvas_width * frames_per_unit));
- edit_cursor->set_position (edit_cursor->current_frame);
- playhead_cursor->set_position (playhead_cursor->current_frame);
- reset_scrolling_region (&alloc);
-
- Resized (); /* EMIT_SIGNAL */
+ Realized ();
}
void
void
Editor::center_screen (jack_nframes_t frame)
{
- float page = canvas_width * frames_per_unit;
+ double page = canvas_width * frames_per_unit;
/* if we're off the page, then scroll.
*/
if (frame < leftmost_frame || frame >= leftmost_frame + page) {
- center_screen_internal (frame,page);
+ center_screen_internal (frame, page);
}
}
reset_scrolling_region ();
if (session) {
- track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit);
- track_canvas_scroller.get_hadjustment()->set_value (leftmost_frame/frames_per_unit);
+ horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
+ horizontal_adjustment.set_value (leftmost_frame/frames_per_unit);
}
-
- update_hscroller ();
}
void
-Editor::update_title_s (string snap_name)
+Editor::update_title_s (const string & snap_name)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
first_action_message->hide();
}
- flush_track_canvas();
-
update_title ();
session->going_away.connect (mem_fun(*this, &Editor::session_going_away));
update_punch_range_view (true);
session->ControlChanged.connect (mem_fun(*this, &Editor::queue_session_control_changed));
-
+ session->StateSaved.connect (mem_fun(*this, &Editor::session_state_saved));
refresh_location_display ();
session->locations()->added.connect (mem_fun(*this, &Editor::add_new_location));
redisplay_regions ();
redisplay_named_selections ();
+ redisplay_snapshots ();
- //route_list.freeze (); GTK2FIX
route_display_model->clear ();
+ no_route_list_redisplay = true;
session->foreach_route (this, &Editor::handle_new_route);
- // route_list.select_all ();
- // GTK2FIX
- //route_list.sort ();
- route_list_reordered ();
- //route_list.thaw ();
+ no_route_list_redisplay = false;
+ route_list_display.get_selection()->select_all ();
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(static_cast<TimeAxisView*>(*i))->set_samples_per_unit (frames_per_unit);
leftmost_frame = 0;
- track_canvas_scroller.get_hadjustment()->set_upper (session->current_end_frame() / frames_per_unit);
- track_canvas_scroller.get_hadjustment()->set_value (0);
+ horizontal_adjustment.set_upper (session->current_end_frame() / frames_per_unit);
+ horizontal_adjustment.set_value (0);
- update_hscroller ();
restore_ruler_visibility ();
tempo_map_changed (Change (0));
TreeModel::Children rows = route_display_model->children();
TreeModel::Children::iterator i;
- //route_list.freeze ();
+ //route_list_display.freeze ();
for (i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
if (atv->route().master()) {
- route_list.get_selection()->unselect (i);
+ route_list_display.get_selection()->unselect (i);
//(*i)->unselect ();
}
}
}
- //route_list.thaw ();
+ //route_list_display.thaw ();
}
}
Editor::build_cursors ()
{
using namespace Gdk;
-
- Gdk::Color fg ("#ff0000"); /* Red. */
- Gdk::Color bg ("#0000ff"); /* Blue. */
-
- {
- RefPtr<Bitmap> source, mask;
- source = Bitmap::create (hand_bits, hand_width, hand_height);
- mask = Bitmap::create (handmask_bits, handmask_width, handmask_height);
- grabber_cursor = new Gdk::Cursor (source, mask, fg, bg, hand_x_hot, hand_y_hot);
- }
Gdk::Color mbg ("#000000" ); /* Black */
Gdk::Color mfg ("#0000ff" ); /* Blue. */
speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
}
- cross_hair_cursor = new Gdk::Cursor (Gdk::CROSSHAIR);
- trimmer_cursor = new Gdk::Cursor (Gdk::SB_H_DOUBLE_ARROW);
- selector_cursor = new Gdk::Cursor (Gdk::XTERM);
- time_fx_cursor = new Gdk::Cursor (Gdk::SIZING);
- wait_cursor = new Gdk::Cursor (Gdk::WATCH);
- timebar_cursor = new Gdk::Cursor(Gdk::LEFT_PTR);
+ grabber_cursor = new Gdk::Cursor (HAND2);
+ cross_hair_cursor = new Gdk::Cursor (CROSSHAIR);
+ trimmer_cursor = new Gdk::Cursor (SB_H_DOUBLE_ARROW);
+ selector_cursor = new Gdk::Cursor (XTERM);
+ time_fx_cursor = new Gdk::Cursor (SIZING);
+ wait_cursor = new Gdk::Cursor (WATCH);
+ timebar_cursor = new Gdk::Cursor(LEFT_PTR);
}
void
if (!with_selection) {
if (region_edit_menu_split_item) {
if (clicked_regionview && clicked_regionview->region.covers (edit_cursor->current_frame)) {
- // GTK2FIX find the action, change its sensitivity
- // region_edit_menu_split_item->set_sensitive (true);
+ ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, true);
} else {
- // GTK2FIX see above
- // region_edit_menu_split_item->set_sensitive (false);
+ ActionManager::set_sensitive (ActionManager::edit_cursor_in_region_sensitive_actions, false);
}
}
if (region_edit_menu_split_multichannel_item) {
}
set_default_size(width, height);
- // GTK2FIX
- // set_position(x, y-yoff);
+ move (x, y-yoff);
if ((prop = node.property ("zoom-focus"))) {
set_zoom_focus ((ZoomFocus) atoi (prop->value()));
if ((prop = node.property ("follow-playhead"))) {
bool yn = (prop->value() == "yes");
- _follow_playhead = !yn;
- set_follow_playhead (yn);
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+ /* do it twice to force the change */
+ tact->set_active (!yn);
+ tact->set_active (yn);
+ }
}
if ((prop = node.property ("xfades-visible"))) {
geometry->add_property("x_off", string(buf));
snprintf(buf, sizeof(buf), "%d", yoff);
geometry->add_property("y_off", string(buf));
- snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&canvas_region_list_pane)->gobj()));
- geometry->add_property("canvas_region_list_pane_pos", string(buf));
- snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast<Paned*>(&track_list_canvas_pane)->gobj()));
- geometry->add_property("track_list_canvas_pane_pos", string(buf));
- snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast<Paned*>(®ion_selection_vpane)->gobj()));
- geometry->add_property("region_selection_pane_pos", string(buf));
- snprintf(buf,sizeof(buf), "%d", gtk_paned_get_position (static_cast<Paned*>(&route_group_vpane)->gobj()));
- geometry->add_property("route_group_pane_pos", string(buf));
+ snprintf(buf,sizeof(buf), "%d",gtk_paned_get_position (static_cast<Paned*>(&edit_pane)->gobj()));
+ geometry->add_property("edit_pane_pos", string(buf));
node->add_child_nocopy (*geometry);
}
mouse_mode_tearoff = manage (new TearOff (mouse_mode_button_table));
mouse_mode_tearoff->set_name ("MouseModeBase");
- mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
- mouse_mode_tearoff->tearoff_window()));
- mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
- mouse_mode_tearoff->tearoff_window(), 1));
+ mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &mouse_mode_tearoff->tearoff_window()));
+ mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &mouse_mode_tearoff->tearoff_window(), 1));
mouse_move_button.set_name ("MouseModeButton");
mouse_select_button.set_name ("MouseModeButton");
ARDOUR_UI::instance()->tooltips().set_tip (mouse_timefx_button, _("stretch/shrink regions"));
ARDOUR_UI::instance()->tooltips().set_tip (mouse_audition_button, _("listen to specific regions"));
- mouse_move_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_select_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_gain_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_zoom_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_timefx_button.unset_flags (Gtk::CAN_FOCUS);
- mouse_audition_button.unset_flags (Gtk::CAN_FOCUS);
+ mouse_move_button.unset_flags (CAN_FOCUS);
+ mouse_select_button.unset_flags (CAN_FOCUS);
+ mouse_gain_button.unset_flags (CAN_FOCUS);
+ mouse_zoom_button.unset_flags (CAN_FOCUS);
+ mouse_timefx_button.unset_flags (CAN_FOCUS);
+ mouse_audition_button.unset_flags (CAN_FOCUS);
mouse_select_button.signal_toggled().connect (bind (mem_fun(*this, &Editor::mouse_mode_toggled), Editing::MouseRange));
mouse_select_button.signal_button_release_event().connect (mem_fun(*this, &Editor::mouse_select_button_release));
/* XXX another disgusting hack because of the way combo boxes size themselves */
- Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "EdgtMode", 2, 10);
+ const guint32 FUDGE = 20; // Combo's are stupid - they steal space from the entry for the button
+ Gtkmm2ext::set_size_request_to_display_given_text (edit_mode_selector, "EdgtMode", 2+FUDGE, 10);
set_popdown_strings (edit_mode_selector, internationalize (edit_mode_strings));
edit_mode_box.pack_start (edit_mode_label, false, false);
edit_mode_box.pack_start (edit_mode_selector, false, false);
/* XXX another disgusting hack because of the way combo boxes size themselves */
- const guint32 FUDGE = 10; // Combo's are stupid - they steal space from the entry for the button
- Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "Region bounds", 2+FUDGE, 10);
+ Gtkmm2ext::set_size_request_to_display_given_text (snap_type_selector, "SMPTE Seconds", 2+FUDGE, 10);
set_popdown_strings (snap_type_selector, internationalize (snap_type_strings));
snap_type_box.pack_start (snap_type_label, false, false);
snap_mode_box.set_spacing (3);
snap_mode_box.set_border_width (3);
- Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "SngpMode", 2, 10);
+ Gtkmm2ext::set_size_request_to_display_given_text (snap_mode_selector, "SngpMode", 2+FUDGE, 10);
set_popdown_strings (snap_mode_selector, internationalize (snap_mode_strings));
snap_mode_box.pack_start (snap_mode_label, false, false);
/* XXX another disgusting hack because of the way combo boxes size themselves */
- Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edgt Cursor", 2, 10);
+ Gtkmm2ext::set_size_request_to_display_given_text (zoom_focus_selector, "Edgt Cursor", 2+FUDGE, 10);
set_popdown_strings (zoom_focus_selector, internationalize (zoom_focus_strings));
zoom_focus_box.pack_start (zoom_focus_label, false, false);
selection_start_clock_label.set_text (_("Start:"));
selection_end_clock_label.set_text (_("End:"));
- edit_cursor_clock_label.set_text (_("Edit:"));
+ edit_cursor_clock_label.set_text (_("Edit"));
+
+ /* the zoom in/out buttons are generally taller than the clocks, so
+ put all the toolbar clocks into a size group with one of the
+ buttons to make them all equal height.
+
+ this also applies to the various toolbar combos
+ */
- toolbar_selection_clock_table.set_border_width (5);
- toolbar_selection_clock_table.set_col_spacings (2);
- toolbar_selection_clock_table.set_homogeneous (false);
+ RefPtr<SizeGroup> toolbar_clock_size_group = SizeGroup::create (SIZE_GROUP_VERTICAL);
+ toolbar_clock_size_group->add_widget (zoom_out_button);
+ toolbar_clock_size_group->add_widget (edit_cursor_clock);
+ toolbar_clock_size_group->add_widget (zoom_range_clock);
+ toolbar_clock_size_group->add_widget (nudge_clock);
+ toolbar_clock_size_group->add_widget (edit_mode_selector);
+ toolbar_clock_size_group->add_widget (snap_type_selector);
+ toolbar_clock_size_group->add_widget (snap_mode_selector);
+ toolbar_clock_size_group->add_widget (zoom_focus_selector);
-// toolbar_selection_clock_table.attach (selection_start_clock_label, 0, 1, 0, 1, 0, 0, 0, 0);
-// toolbar_selection_clock_table.attach (selection_end_clock_label, 1, 2, 0, 1, 0, 0, 0, 0);
- toolbar_selection_clock_table.attach (edit_cursor_clock_label, 2, 3, 0, 1, FILL, FILL, 0, 0);
+ HBox* edit_clock_hbox = manage (new HBox());
+ VBox* edit_clock_vbox = manage (new VBox());
-// toolbar_selection_clock_table.attach (selection_start_clock, 0, 1, 1, 2, 0, 0);
-// toolbar_selection_clock_table.attach (selection_end_clock, 1, 2, 1, 2, 0, 0);
- toolbar_selection_clock_table.attach (edit_cursor_clock, 2, 3, 1, 2, FILL, FILL);
+ edit_clock_hbox->pack_start (edit_cursor_clock, false, false);
+ edit_clock_vbox->set_spacing (3);
+ edit_clock_vbox->set_border_width (3);
+ edit_clock_vbox->pack_start (edit_cursor_clock_label, false, false);
+ edit_clock_vbox->pack_start (*edit_clock_hbox, false, false);
-// toolbar_clock_vbox.set_spacing (2);
-// toolbar_clock_vbox.set_border_width (10);
/* the editor/mixer button will be enabled at session connect */
editor_mixer_button.set_active(false);
HBox* hbox = new HBox;
hbox->pack_start (editor_mixer_button, false, false);
- hbox->pack_start (toolbar_selection_clock_table, false, false);
+ hbox->pack_start (*edit_clock_vbox, false, false);
hbox->pack_start (zoom_indicator_vbox, false, false);
hbox->pack_start (zoom_focus_box, false, false);
hbox->pack_start (snap_type_box, false, false);
tools_tearoff = new TearOff (*hbox);
tools_tearoff->set_name ("MouseModeBase");
- tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
- tools_tearoff->tearoff_window()));
- tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
- tools_tearoff->tearoff_window(), 0));
+ tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Box*>(&toolbar_hbox),
+ &tools_tearoff->tearoff_window()));
+ tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Box*> (&toolbar_hbox),
+ &tools_tearoff->tearoff_window(), 0));
toolbar_hbox.set_spacing (8);
toolbar_base.set_name ("ToolBarBase");
toolbar_base.add (toolbar_hbox);
- toolbar_frame.set_shadow_type (Gtk::SHADOW_OUT);
+ toolbar_frame.set_shadow_type (SHADOW_OUT);
toolbar_frame.set_name ("BaseFrame");
toolbar_frame.add (toolbar_base);
}
int
Editor::convert_drop_to_paths (vector<string>& paths,
- GdkDragContext *context,
+ const RefPtr<Gdk::DragContext>& context,
gint x,
gint y,
- GtkSelectionData *data,
+ const SelectionData& data,
guint info,
guint time)
{
- string spath;
- char *path;
- int state;
- gchar *tname = gdk_atom_name (data->type);
-
- if (session == 0 || strcmp (tname, "text/plain") != 0) {
+ if (session == 0) {
return -1;
}
- /* Parse the "uri-list" format that Nautilus provides,
- where each pathname is delimited by \r\n
- */
+ vector<ustring> uris = data.get_uris();
- path = (char *) data->data;
- state = 0;
+ if (uris.empty()) {
+
+ /* This is seriously fucked up. Nautilus doesn't say that its URI lists
+ are actually URI lists. So do it by hand.
+ */
- for (int n = 0; n < data->length; ++n) {
+ if (data.get_target() != "text/plain") {
+ return -1;
+ }
+
+ /* Parse the "uri-list" format that Nautilus provides,
+ where each pathname is delimited by \r\n
+ */
+
+ const char* p = data.get_text().c_str();
+ const char* q;
- switch (state) {
- case 0:
- if (path[n] == '\r') {
- state = 1;
- } else {
- spath += path[n];
- }
- break;
- case 1:
- if (path[n] == '\n') {
- paths.push_back (spath);
- spath = "";
- state = 0;
- } else {
- warning << _("incorrectly formatted URI list, ignored")
- << endmsg;
- return -1;
+ while (p)
+ {
+ if (*p != '#')
+ {
+ while (g_ascii_isspace (*p))
+ p++;
+
+ q = p;
+ while (*q && (*q != '\n') && (*q != '\r'))
+ q++;
+
+ if (q > p)
+ {
+ q--;
+ while (q > p && g_ascii_isspace (*q))
+ q--;
+
+ if (q > p)
+ {
+ uris.push_back (ustring (p, q - p + 1));
+ }
+ }
}
- break;
+ p = strchr (p, '\n');
+ if (p)
+ p++;
}
- }
-
- /* nautilus and presumably some other file managers prefix even text/plain with file:// */
-
- for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
-
- // cerr << "dropped text was " << *p << endl;
-
- url_decode (*p);
- // cerr << "decoded was " << *p << endl;
-
- if ((*p).substr (0,7) == "file://") {
- (*p) = (*p).substr (7);
+ if (uris.empty()) {
+ return -1;
}
}
- return 0;
-}
-
-void
-Editor::track_canvas_drag_data_received (GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *data,
- guint info,
- guint time)
-{
- TimeAxisView* tvp;
- AudioTimeAxisView* tv;
- double cy;
- vector<string> paths;
- string spath;
- GdkEvent ev;
- jack_nframes_t frame;
-
- if (convert_drop_to_paths (paths, context, x, y, data, info, time)) {
- goto out;
- }
-
- /* D-n-D coordinates are window-relative, so convert to "world" coordinates
- */
-
- double wx;
- double wy;
-
- track_canvas.c2w( x, y, wx, wy);
-
- ev.type = GDK_BUTTON_RELEASE;
- ev.button.x = wx;
- ev.button.y = wy;
-
- frame = event_frame (&ev, 0, &cy);
-
- snap_to (frame);
-
- if ((tvp = trackview_by_y_position (cy)) == 0) {
-
- /* drop onto canvas background: create a new track */
-
- insert_paths_as_new_tracks (paths, false);
-
-
- } else if ((tv = dynamic_cast<AudioTimeAxisView*>(tvp)) != 0) {
-
- /* check that its an audio track, not a bus */
-
- if (tv->get_diskstream()) {
-
- for (vector<string>::iterator p = paths.begin(); p != paths.end(); ++p) {
- insert_sndfile_into (*p, true, tv, frame);
- }
+ for (vector<ustring>::iterator i = uris.begin(); i != uris.end(); ++i) {
+ if ((*i).substr (0,7) == "file://") {
+ string p = *i;
+ url_decode (p);
+ cerr << "adding " << p << endl;
+ paths.push_back (p.substr (7));
}
-
}
- out:
- gtk_drag_finish (context, TRUE, FALSE, time);
+ return 0;
}
void
}
}
-void
-Editor::flush_track_canvas ()
-{
- /* I don't think this is necessary, and only causes more problems.
- I'm commenting it out
- and if the imageframe folks don't have any issues, we can take
- out this method entirely
- */
-
- //gnome_canvas_update_now (GNOME_CANVAS(track_canvas));
- //gtk_main_iteration ();
-}
-
void
Editor::set_selected_track_from_click (bool add, bool with_undo, bool no_remove)
{
win.add_button (Stock::OK, RESPONSE_ACCEPT);
win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
- win.set_position (Gtk::WIN_POS_MOUSE);
+ win.set_position (WIN_POS_MOUSE);
entry.set_text ("1");
set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
}
void
-Editor::set_verbose_canvas_cursor (string txt, double x, double y)
+Editor::set_verbose_canvas_cursor (const string & txt, double x, double y)
{
/* XXX get origin of canvas relative to root window,
add x and y and check compared to gdk_screen_{width,height}
}
void
-Editor::set_verbose_canvas_cursor_text (string txt)
+Editor::set_verbose_canvas_cursor_text (const string & txt)
{
verbose_canvas_cursor->property_text() = txt.c_str();
}
}
}
-void
-Editor::run_sub_event_loop ()
-{
- sub_event_loop_status = 0;
- Main::run ();
-}
-
-void
-Editor::finish_sub_event_loop (int status)
-{
- Main::quit ();
- sub_event_loop_status = status;
-}
-
-gint
-Editor::finish_sub_event_loop_on_delete (GdkEventAny *ignored, int32_t status)
-{
- finish_sub_event_loop (status);
- return TRUE;
-}
-
gint
Editor::mouse_select_button_release (GdkEventButton* ev)
{
}
void
-Editor::pane_allocation_handler (Gtk::Allocation &alloc, Gtk::Paned* which)
+Editor::pane_allocation_handler (Allocation &alloc, Paned* which)
{
/* recover or initialize pane positions. do this here rather than earlier because
we don't want the positions to change the child allocations, which they seem to do.
char buf[32];
XMLNode* node = ARDOUR_UI::instance()->editor_settings();
int width, height;
- static int32_t done[4] = { 0, 0, 0, 0 };
+ static int32_t done;
XMLNode* geometry;
if ((geometry = find_named_node (*node, "geometry")) == 0) {
height = atoi(geometry->property("y_size")->value());
}
- if (which == static_cast<Gtk::Paned*> (&track_list_canvas_pane)) {
-
- if (done[0]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("track_list_canvas_pane_pos")) == 0) {
- pos = 75;
- snprintf (buf, sizeof(buf), "%d", pos);
- } else {
- pos = atoi (prop->value());
- }
-
- if ((done[0] = GTK_WIDGET(track_list_canvas_pane.gobj())->allocation.width > pos)) {
- track_list_canvas_pane.set_position (pos);
- }
-
- } else if (which == static_cast<Gtk::Paned*> (&canvas_region_list_pane)) {
-
- if (done[1]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("canvas_region_list_pane_pos")) == 0) {
- pos = width - (95 * 2);
- snprintf (buf, sizeof(buf), "%d", pos);
- } else {
- pos = atoi (prop->value());
- }
-
- if ((done[1] = GTK_WIDGET(canvas_region_list_pane.gobj())->allocation.width > pos)) {
- canvas_region_list_pane.set_position (pos);
- }
-
- } else if (which == static_cast<Gtk::Paned*> (&route_group_vpane)) {
+ if (which == static_cast<Paned*> (&edit_pane)) {
- if (done[2]) {
+ if (done) {
return;
}
- if (!geometry || (prop = geometry->property("route_group_pane_pos")) == 0) {
- pos = width - (95 * 2);
+ if (!geometry || (prop = geometry->property ("edit_pane_pos")) == 0) {
+ /* initial allocation is 90% to canvas, 10% to notebook */
+ pos = (int) floor (alloc.get_width() * 0.90f);
snprintf (buf, sizeof(buf), "%d", pos);
} else {
pos = atoi (prop->value());
}
-
- if ((done[2] = GTK_WIDGET(route_group_vpane.gobj())->allocation.height > pos)) {
- route_group_vpane.set_position (pos);
- }
-
- } else if (which == static_cast<Gtk::Paned*> (®ion_selection_vpane)) {
-
- if (done[3]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("region_selection_pane_pos")) == 0) {
- pos = width - (95 * 2);
- snprintf (buf, sizeof(buf), "%d", pos);
- } else {
- pos = atoi (prop->value());
- }
-
- if ((done[3] = GTK_WIDGET(region_selection_vpane.gobj())->allocation.height > pos)) {
- region_selection_vpane.set_position (pos);
+
+ if ((done = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) {
+ edit_pane.set_position (pos);
}
}
}
void
-Editor::detach_tearoff (Gtk::Box* b, Gtk::Window* w)
+Editor::detach_tearoff (Box* b, Window* w)
{
if (tools_tearoff->torn_off() &&
mouse_mode_tearoff->torn_off()) {
top_hbox.remove (toolbar_frame);
}
-
- ensure_float (*w);
}
void
-Editor::reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n)
+Editor::reattach_tearoff (Box* b, Window* w, int32_t n)
{
if (toolbar_frame.get_parent() == 0) {
top_hbox.pack_end (toolbar_frame);
}
}
+void
+Editor::toggle_follow_playhead ()
+{
+ RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("ToggleFollowPlayhead"));
+ if (act) {
+ RefPtr<ToggleAction> tact = RefPtr<ToggleAction>::cast_dynamic(act);
+ set_follow_playhead (tact->get_active());
+ }
+}
+
void
Editor::set_follow_playhead (bool yn)
{
Editor::end_location_changed (Location* location)
{
ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::end_location_changed), location));
- track_canvas_scroller.get_hadjustment()->set_upper (location->end() / frames_per_unit);
+ horizontal_adjustment.set_upper (location->end() / frames_per_unit);
}
int
"If deleted, audio files used by it alone by will cleaned."),
pl->name()));
- dialog.set_position (Gtk::WIN_POS_CENTER);
+ dialog.set_position (WIN_POS_CENTER);
dialog.get_vbox()->pack_start (label);
dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT);
}
}
-void
-Editor::on_map ()
+bool
+Editor::control_layout_scroll (GdkEventScroll* ev)
{
- // XXX remove me
+ switch (ev->direction) {
+ case GDK_SCROLL_UP:
+ scroll_tracks_up_line ();
+ return true;
+ break;
+
+ case GDK_SCROLL_DOWN:
+ scroll_tracks_down_line ();
+ return true;
+
+ default:
+ /* no left/right handling yet */
+ break;
+ }
+
+ return false;
}
+
+void
+Editor::snapshot_display_selection_changed ()
+{
+ if (snapshot_display.get_selection()->count_selected_rows() > 0) {
+
+ TreeModel::iterator i = snapshot_display.get_selection()->get_selected();
+
+ cerr << "snapshot selected\n";
+
+ Glib::ustring snap_name = (*i)[snapshot_display_columns.real_name];
+
+ cerr << "name is " << snap_name << endl;
+
+ if (snap_name.length() == 0) {
+ return;
+ }
+
+ if (session->snap_name() == snap_name) {
+ return;
+ }
+
+ ARDOUR_UI::instance()->load_session(session->path(), string (snap_name));
+ }
+}
+
+bool
+Editor::snapshot_display_button_press (GdkEventButton* ev)
+{
+ return false;
+}
+
+void
+Editor::redisplay_snapshots ()
+{
+ if (session == 0) {
+ return;
+ }
+
+ vector<string*>* states;
+
+ if ((states = session->possible_states()) == 0) {
+ return;
+ }
+
+ snapshot_display_model->clear ();
+
+ for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) {
+ string statename = *(*i);
+ TreeModel::Row row = *(snapshot_display_model->append());
+ row[snapshot_display_columns.visible_name] = statename;
+ row[snapshot_display_columns.real_name] = statename;
+ }
+
+ delete states;
+}
+
+void
+Editor::session_state_saved (string snap_name)
+{
+ ENSURE_GUI_THREAD (bind (mem_fun(*this, &Editor::session_state_saved), snap_name));
+ redisplay_snapshots ();
+}
+
projects / ardour.git / blobdiff