#include <sigc++/bind.h>
-#include <libgnomecanvas/libgnomecanvas.h>
#include <pbd/error.h>
+#include <gtkmm/image.h>
+#include <gdkmm/color.h>
+#include <gdkmm/bitmap.h>
+
#include <gtkmm2ext/gtk_ui.h>
#include <gtkmm2ext/tearoff.h>
#include <gtkmm2ext/utils.h>
#include <ardour/location.h>
#include <ardour/audioplaylist.h>
#include <ardour/audioregion.h>
-#include <ardour/session.h>
+#include <ardour/region.h>
#include <ardour/session_route.h>
#include <ardour/tempo.h>
#include <ardour/utils.h>
#include "ardour_ui.h"
-#include "canvas-ruler.h"
-#include "canvas-simpleline.h"
-#include "canvas-simplerect.h"
-#include "canvas-waveview.h"
-#include "check_mark.h"
#include "editor.h"
#include "grouped_buttons.h"
#include "keyboard.h"
#include "public_editor.h"
#include "crossfade_edit.h"
#include "audio_time_axis.h"
+#include "canvas_impl.h"
+#include "actions.h"
#include "gui_thread.h"
#include "i18n.h"
using namespace sigc;
using namespace ARDOUR;
using namespace Gtk;
+using namespace Glib;
using namespace Gtkmm2ext;
using namespace Editing;
-/* XXX this is a hack. it ought to be the maximum value of an jack_nframes_t */
-
-const double max_canvas_coordinate = 100000000.0;
const double Editor::timebar_height = 15.0;
#include "editor_xpms"
-static const gchar *route_list_titles[] = {
- N_("Tracks"),
- 0
-};
-
-static const gchar *edit_group_list_titles[] = {
- "foo", "bar", 0
-};
-
-static const gchar *named_selection_display_titles[] = {
- N_("Chunks"),
- 0
-};
-
static const int32_t slide_index = 0;
static const int32_t splice_index = 1;
/* Soundfile drag-n-drop */
-enum {
- TARGET_STRING,
- TARGET_ROOTWIN,
- TARGET_URL
-};
+Gdk::Cursor* Editor::cross_hair_cursor = 0;
+Gdk::Cursor* Editor::selector_cursor = 0;
+Gdk::Cursor* Editor::trimmer_cursor = 0;
+Gdk::Cursor* Editor::grabber_cursor = 0;
+Gdk::Cursor* Editor::zoom_cursor = 0;
+Gdk::Cursor* Editor::time_fx_cursor = 0;
+Gdk::Cursor* Editor::fader_cursor = 0;
+Gdk::Cursor* Editor::speaker_cursor = 0;
+Gdk::Cursor* Editor::wait_cursor = 0;
+Gdk::Cursor* Editor::timebar_cursor = 0;
-static GtkTargetEntry target_table[] = {
- { "STRING", 0, TARGET_STRING },
- { "text/plain", 0, TARGET_STRING },
- { "text/uri-list", 0, TARGET_URL },
- { "application/x-rootwin-drop", 0, TARGET_ROOTWIN }
-};
+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 */
-static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
+ if (!gtk_window_propagate_key_event (win, ev)) {
+ return gtk_window_activate_key (win, ev);
+ }
-GdkCursor* Editor::cross_hair_cursor = 0;
-GdkCursor* Editor::selector_cursor = 0;
-GdkCursor* Editor::trimmer_cursor = 0;
-GdkCursor* Editor::grabber_cursor = 0;
-GdkCursor* Editor::zoom_cursor = 0;
-GdkCursor* Editor::time_fx_cursor = 0;
-GdkCursor* Editor::fader_cursor = 0;
-GdkCursor* Editor::speaker_cursor = 0;
-GdkCursor* Editor::null_cursor = 0;
-GdkCursor* Editor::wait_cursor = 0;
-GdkCursor* Editor::timebar_cursor = 0;
-GdkPixmap *Editor::check_pixmap = 0;
-GdkBitmap *Editor::check_mask = 0;
-GdkPixmap *Editor::empty_pixmap = 0;
-GdkBitmap *Editor::empty_mask = 0;
+ return true;
+}
-extern gint route_list_compare_func (GtkCList*,gconstpointer,gconstpointer);
+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),
- named_selection_display (internationalize (named_selection_display_titles)),
-
+ /* 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 */
editor_mixer_button (_("editor\nmixer")),
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;
_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;
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;
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_controls_vbox.set_spacing (track_spacing);
+ 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));
- edit_vscrollbar.set_adjustment(*track_canvas_scroller.get_vadjustment());
- edit_hscrollbar.set_adjustment(*track_canvas_scroller.get_hadjustment());
+ track_canvas.set_hadjustment (horizontal_adjustment);
+ track_canvas.set_vadjustment (vertical_adjustment);
+ time_canvas.set_hadjustment (horizontal_adjustment);
- 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.size_allocate.connect (mem_fun(*this, &Editor::hscroll_slider_allocate));
+ 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));
- 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");
-
- 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);
+ // edit_controls_hbox.pack_start (edit_controls_vbox, true, true);
+ controls_layout.add (edit_controls_vbox);
+ controls_layout.set_name ("EditControlsBase");
+ controls_layout.signal_size_request().connect (mem_fun(*this, &Editor::set_layout_width), false);
+ controls_layout.signal_expose_event().connect (mem_fun(*this, &Editor::layout_expose), false);
+
+ 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 ();
- XMLNode* node = ARDOUR_UI::instance()->editor_settings();
- set_state (*node);
-
edit_cursor_clock.ValueChanged.connect (mem_fun(*this, &Editor::edit_cursor_clock_changed));
time_canvas_vbox.pack_start (*minsec_ruler, false, false);
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 Image (Gdk::Pixbuf::create_from_xpm_data(zoom_in_button_xpm)))));
- zoom_out_button.add (*(manage (new Image (Gdk::Pixbuf::create_from_xpm_data(zoom_out_button_xpm)))));
- zoom_out_full_button.add (*(manage (new 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 Gtk::Image (Stock::ZOOM_IN, ICON_SIZE_BUTTON))));
+ zoom_out_button.add (*(manage (new Gtk::Image (Stock::ZOOM_OUT, ICON_SIZE_BUTTON))));
+ zoom_out_full_button.add (*(manage (new Gtk::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.set_size_request (75,-1);
- route_list.column_titles_active();
- route_list.set_compare_func (route_list_compare_func);
- route_list.set_shadow_type (Gtk::SHADOW_IN);
- route_list.set_selection_mode (Gtk::SELECTION_MULTIPLE);
+ route_list.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
route_list.set_reorderable (true);
- edit_group_list.set_size_request (75, -1);
+
+ route_list.set_size_request (75,-1);
+ route_list.set_headers_visible (true);
+ route_list.set_headers_clickable (true);
+
+ // GTK2FIX
+ // route_list.signal_rows_reordered().connect (mem_fun (*this, &Editor::queue_route_list_reordered));
+
+ // GTK2FIX
+ // route_display_model->set_sort_func (0, mem_fun (*this, &Editor::route_list_compare_func));
+
+ // 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.select_row.connect (mem_fun(*this, &Editor::route_list_selected));
- route_list.unselect_row.connect (mem_fun(*this, &Editor::route_list_unselected));
- route_list.row_move.connect (mem_fun(*this, &Editor::queue_route_list_reordered));
- route_list.click_column.connect (mem_fun(*this, &Editor::route_list_column_click));
+ 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));
edit_group_list_button_label.set_text (_("Edit Groups"));
edit_group_list_button_label.set_name ("EditGroupTitleButton");
edit_group_list_button.add (edit_group_list_button_label);
edit_group_list_button.set_name ("EditGroupTitleButton");
- edit_group_list.column_titles_hide();
+ 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));
+
+ /* use checkbox for the active column */
+
+ CellRendererToggle *active_cell = dynamic_cast<CellRendererToggle*>(edit_group_list.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);
- edit_group_list.set_selection_mode (Gtk::SELECTION_MULTIPLE);
+ //edit_group_list.set_shadow_type (Gtk::SHADOW_IN);
+
+ edit_group_list.columns_autosize ();
+ edit_group_list.get_selection()->set_mode (Gtk::SELECTION_MULTIPLE);
edit_group_list.set_reorderable (false);
+
edit_group_list.set_size_request (75, -1);
- edit_group_list.set_column_auto_resize (0, true);
- edit_group_list.columns_autosize ();
+ edit_group_list.set_headers_visible (true);
edit_group_list_scroller.add (edit_group_list);
edit_group_list_scroller.set_policy (Gtk::POLICY_AUTOMATIC, Gtk::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.select_row.connect (mem_fun(*this, &Editor::edit_group_selected));
- edit_group_list.unselect_row.connect (mem_fun(*this, &Editor::edit_group_unselected));
-
+ edit_group_list.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;
stupid_list.push_back ("*");
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_model = TreeStore::create (region_list_columns));
+ 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_scroller.add (region_list_display);
region_list_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
- region_list_display.drag_dest_set (GTK_DEST_DEFAULT_ALL,
- target_table, n_targets - 1,
- GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- region_list_display.drag_data_received.connect (mem_fun(*this, &Editor::region_list_display_drag_data_received));
+ list<Gtk::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"));
+
+ // 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_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_release_event().connect (mem_fun(*this, &Editor::region_list_display_button_release));
- region_list_display.signal_motion_notify_event().connect (mem_fun(*this, &Editor::region_list_display_motion));
- region_list_display.signal_enter_notify_event().connect (mem_fun(*this, &Editor::region_list_display_enter_notify));
- region_list_display.signal_leave_notify_event().connect (mem_fun(*this, &Editor::region_list_display_leave_notify));
- region_list_display.select_row.connect (mem_fun(*this, &Editor::region_list_display_selected));
- region_list_display.unselect_row.connect (mem_fun(*this, &Editor::region_list_display_unselected));
- region_list_display.click_column.connect (mem_fun(*this, &Editor::region_list_column_click));
+ 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));
named_selection_scroller.add (named_selection_display);
named_selection_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::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_size_request (100, -1);
named_selection_display.set_name ("RegionListDisplay");
+
+ named_selection_display.get_selection()->set_mode (Gtk::SELECTION_SINGLE);
named_selection_display.set_size_request (100, -1);
- named_selection_display.column_titles_active ();
- named_selection_display.set_selection_mode (Gtk::SELECTION_SINGLE);
-
+ named_selection_display.set_headers_visible (true);
+ named_selection_display.set_headers_clickable (true);
named_selection_display.signal_button_press_event().connect (mem_fun(*this, &Editor::named_selection_display_button_press));
- named_selection_display.select_row.connect (mem_fun(*this, &Editor::named_selection_display_selected));
- named_selection_display.unselect_row.connect (mem_fun(*this, &Editor::named_selection_display_unselected));
-
- region_selection_vpane.pack1 (region_list_scroller, true, true);
- region_selection_vpane.pack2 (named_selection_scroller, true, true);
-
- canvas_region_list_pane.pack1 (edit_frame, true, true);
- canvas_region_list_pane.pack2 (region_selection_vpane, true, true);
-
- track_list_canvas_pane.signal_size_allocate().connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&track_list_canvas_pane)));
- canvas_region_list_pane.signal_size_allocate().connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&canvas_region_list_pane)));
- route_group_vpane.signal_size_allocate().connect_after (bind (mem_fun(*this, &Editor::pane_allocation_handler),
- static_cast<Gtk::Paned*> (&route_group_vpane)));
- region_selection_vpane.signal_size_allocate().connect_after (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);
+ named_selection_display.get_selection()->signal_changed().connect (mem_fun (*this, &Editor::named_selection_display_selection_changed));
- /* 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 (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));
- 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);
+ edit_pane.pack1 (edit_frame, true, true);
+ edit_pane.pack2 (*notebook_tearoff, true, true);
- 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.signal_size_allocate().connect_notify (bind (mem_fun(*this, &Editor::pane_allocation_handler), static_cast<Gtk::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");
+ cerr << "Adding accel group " << ActionManager::ui_manager->get_accel_group()->gobj() << endl;
+ add_accel_group (ActionManager::ui_manager->get_accel_group());
+ cerr << "... done\n";
vpacker.pack_end (global_hpacker, true, true);
+ XMLNode* node = ARDOUR_UI::instance()->editor_settings();
+ set_state (*node);
+
_playlist_selector = new PlaylistSelector();
_playlist_selector->signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), static_cast<Window *> (_playlist_selector)));
/* nudge stuff */
- 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)))));
+ 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)))));
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"));
fade_context_menu.set_name ("ArdourContextMenu");
- install_keybindings ();
-
set_title (_("ardour: editor"));
set_wmclass (_("ardour_editor"), "Ardour");
add (vpacker);
add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK);
- configure_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
- delete_event.connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
+ signal_configure_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::configure_handler));
+ signal_delete_event().connect (mem_fun (*ARDOUR_UI::instance(), &ARDOUR_UI::exit_on_main_window_close));
constructed = true;
instant_save ();
}
-void
-Editor::initialize_canvas ()
-{
- gnome_canvas_init ();
-
- /* adjust sensitivity for "picking" items */
-
- // GNOME_CANVAS(track_gnome_canvas)->close_enough = 2;
-
- track_canvas.signal_event().connect (slot (*this, &Editor::track_canvas_event));
- track_canvas.set_name ("EditorMainCanvas");
- track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
- track_canvas.signal_event().connect (slot (*this, &Editor::track_canvas_event));
- track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
-
- /* set up drag-n-drop */
-
- track_canvas.drag_dest_set (GTK_DEST_DEFAULT_ALL,
- target_table, n_targets - 1,
- GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- track_canvas.drag_data_received.connect (mem_fun(*this, &Editor::track_canvas_drag_data_received));
-
- /* stuff for the verbose canvas cursor */
-
- Pango::FontDescription font = get_font_for_style (N_("VerboseCanvasCursor"));
-
- verbose_canvas_cursor = new Canvas::Text (track_canvas.root());
- verbose_canvas_cursor->property_font_descr() << font;
- verbose_canvas_cursor->property_anchor() << GTK_ANCHOR_NW;
- verbose_canvas_cursor->property_fill_color_rgba() << color_map[cVerboseCanvasCursor];
-
- verbose_cursor_visible = false;
-
- /* a group to hold time (measure) lines */
-
- time_line_group = new Canvas::Group (track_canvas.root(), 0.0, 0.0);
- cursor_group = new Canvas::Group (track_canvas.root(), 0.0, 0.0);
-
- time_canvas.set_name ("EditorTimeCanvas");
- time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
-
- meter_group = new Canvas::Group (time_canvas.root(), 0.0, 0.0);
- tempo_group = new Canvas::Group (time_canvas.root(), 0.0, 0.0);
- marker_group = new Canvas::Group (time_canvas.root(), 0.0, timebar_height * 2.0);
- range_marker_group = new Canvas::Group (time_canvas.root(), 0.0, timebar_height * 3.0);
- transport_marker_group = new Canvas::Group (time_canvas.root(), 0.0, timebar_height * 4.0);
-
- tempo_bar = Canvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- tempo_bar->property_fill_color_rgba() << color_map[cTempoBar];
- tempo_bar->property_outline_pixels() << 0;
-
- meter_bar = Canvas::SimpleRect (*meter_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- meter_bar->property_fill_color_rgba() << color_map[cMeterBar];
- meter_bar->property_outline_pixels() << 0;
-
- marker_bar = Canvas::SimpleRect (*marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- marker_bar->property_fill_color_rgba() << color_map[cMarkerBar];
- marker_bar->property_outline_pixels() << 0;
-
- range_marker_bar = Canvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- range_marker_bar->property_fill_color_rgba() << color_map[cRangeMarkerBar];
- range_marker_bar->property_outline_pixels() << 0;
-
- transport_marker_bar = Canvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- transport_marker_bar->property_fill_color_rgba() << color_map[cTransportMarkerBar];
- transport_marker_bar->property_outline_pixels() << 0;
-
- range_bar_drag_rect = Canvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- range_bar_drag_rect->property_fill_color_rgba() << color_map[cRangeBarDragRectFill];
- range_bar_drag_rect->property_outline_color_rgba() << color_map[cRangeBarDragRect];
- range_bar_drag_rect->property_outline_pixels() << 0;
- range_bar_drag_rect->hide ();
-
- transport_bar_drag_rect = Canvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- transport_bar_drag_rect ->property_fill_color_rgba() << color_map[cTransportBarDragRectFill];
- transport_bar_drag_rect->property_outline_color_rgba() << color_map[cTransportBarDragRect];
- transport_bar_drag_rect->property_outline_pixels() << 0;
- transport_bar_drag_rect->hide ();
-
- marker_drag_line_points = new Canvas::Points (2);
- marker_drag_line_points[0]->set_x (0.0);
- marker_drag_line_points[0]->set_y (0.0);
- marker_drag_line_points[1]->set_x (0.0);
- marker_drag_line_points[1]->set_y (0.0);
-
- marker_drag_line = Canvas::Line (track_canvas.root());
- marker_drag_line->property_width_pixels() << 1;
- marker_drag_line->property_fill_color_rgba() << color_map[cMarkerDragLine];
- marker_drag_line->property_points() << marker_drag_line_points;
- marker_drag_line->hide();
-
- range_marker_drag_rect = new Canvas::SimpleRect (track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- range_marker_drag_rect->property_fill_color_rgba() << color_map[cRangeDragRectFill];
- range_marker_drag_rect->property_outline_color_rgba() << color_map[cRangeDragRect];
- range_marker_drag_rect->hide ();
-
- transport_loop_range_rect = new Canvas::Simplerect (group.root(), 0.0, 0.0, 0.0, 0.0);
- transport_loop_range_rect->property_fill_color_rgba() << color_map[cTransportLoopRectFill];
- transport_loop_range_rect->property_outline_color_rgba() << color_map[cTransportLoopRect];
- transport_loop_range_rect->property_outline_pixels() << 1;
- transport_loop_range_rect->hide();
-
- transport_punch_range_rect = new Canvas::Simplerect (group.root(), 0.0, 0.0, 0.0, 0.0);
- transport_punch_range_rect->property_fill_color_rgba() << color_map[cTransportPunchRectFill];
- transport_punch_range_rect->property_outline_color_rgba() << color_map[cTransportPunchRect];
- transport_punch_range_rect->property_outline_pixels() << 0;
- transport_punch_range_rect->hide();
-
- transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
-
- transport_punchin_line = new Canvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
- transport_punchin_line->property_outline_color_rgba() << color_map[cPunchInLine];
- transport_punchin_line->property_outline_pixels() << 1;
- transport_punchin_line->hide ();
-
- transport_punchout_line = new Canvas::Simplerect (group.root(), 0.0, 0.0, 0.0, 0.0);
- transport_punchout_line->property_outline_color_rgba() << color_map[cPunchOutLine];
- transport_punchout_line->property_outline_pixels() << 1;
- transport_punchout_line->hide();
-
- // used to show zoom mode active zooming
- zoom_rect = new Canvas::Simplerect (track_gnome_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- zoom_rect->property_fill_color_rgba() << color_map[cZoomRectFill];
- zoom_rect->property_outline_color_rgba() << color_map[cZoomRect];
- zoom_rect->property_outline_pixels() << 1;
- zoom_rect->hide();
-
- zoom_rect.signal_event().connect (slot (*this, &PublicEditor::canvas_zoom_rect_event));
-
- // used as rubberband rect
- rubberband_rect = new Canvas::Simplerect (track_gnome_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- rubberband_rect->property_outline_color_rgba() << color_map[cRubberBandRect];
- rubberband_rect->property_fill_color_rgba() << (guint32) color_map[cRubberBandRectFill];
- rubberband_rect->property_outline_pixels() << 1;
- rubberband_rect->hide();
-
- tempo_bar.signal_event().connect (slot (*this, &PublicEditor::canvas_tempo_bar_event));
- meter_bar.signal_event().connect (slot (*this, &PublicEditor::canvas_meter_bar_event));
- marker_bar.signal_event().connect (slot (*this, &PublicEditor::canvas_marker_bar_event));
- range_marker_bar.signal_event().connect (slot (*this, &PublicEditor::canvas_range_marker_bar_event));
- transport_marker_bar.signal_event().connect (slot (*this, &PublicEditor::canvas_transport_marker_bar_event));
-
- /* separator lines */
-
- tempo_line_points = new Canvas::Points (2);
- tempo_line_points[0]->set_x (0.0);
- tempo_line_points[0]->set_y (timebar_height);
- tempo_line_points[1]->set_x (max_canvas_coordinate);
- tempo_line_points[1]->set_y (timebar_height);
-
- tempo_line = Canvas::Line (*tempo_group, *tempo_line_points);
- tempo_line->property_width_pixels() << 0;
- tempo_line->property_fill_color() << "black";
-
- meter_line_points = new Canvas::Points (2);
- meter_line_points[0]->set_x (0);
- meter_line_points[0]->set_y (timebar_height);
- meter_line_points[1]->set_x (max_canvas_coordinate);
- meter_line_points[1]->set_y (timebar_height);
-
- meter_line = Canvas::Line (*meter_group, *meter_line_points);
- meter_line->property_width_pixels() << 0;
- meter_line->property_fill_color() << "black";
-
- marker_line_points = Canvas::Points (2);
- marker_line_points[0]->set_x (0);
- marker_line_points[0]->set_y (timebar_height);
- marker_line_points[1]->set_x (max_canvas_coordinate);
- marker_line_points[1]->set_y (timebar_height);
-
- marker_line = new Canvas::Line (*marker_group, *marker_line_points);
- marker_line->property_width_pixels() << 0;
- marker_line->property_fill_color() << "black";
-
- range_marker_line = new Canvas::Line (*range_marker_group, marker_line_points);
- range_marker_line->property_width_pixels() << 0;
- range_marker_line->property_fill_color() << "black";
-
- transport_marker_line = new Canvas::Line (*transport_marker_group, marker_line_points);
- transport_marker_line->property_width_pixels() << 0;
- transport_marker_line->property_fill_color() << "black";
-
- ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
- ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));
-
- double time_height = timebar_height * 5;
- double time_width = FLT_MAX/frames_per_unit;
- gnome_canvas_set_scroll_region (GNOME_CANVAS(time_gnome_canvas), 0.0, 0.0, time_width, time_height);
-
- edit_cursor = new Cursor (*this, "blue", (GtkSignalFunc) _canvas_edit_cursor_event);
- playhead_cursor = new Cursor (*this, "red", (GtkSignalFunc) _canvas_playhead_cursor_event);
-
- track_canvas.size_allocate.connect (mem_fun(*this, &Editor::track_canvas_allocate));
-}
-
void
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());
+ double y1 = vertical_adjustment.get_value();
+ controls_layout.get_vadjustment()->set_value (y1);
- float y1 = track_canvas_scroller.get_vadjustment()->get_value();
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) {
void
Editor::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());
-
Window::on_realize ();
-
- GdkPixmap* empty_pixmap = gdk_pixmap_new (get_window()->gobj(), 1, 1, 1);
- GdkPixmap* empty_bitmap = gdk_pixmap_new (get_window()->gobj(), 1, 1, 1);
- GdkColor white = { 0, 0, 0 };
-
- null_cursor = gdk_cursor_new_from_pixmap (empty_pixmap, empty_bitmap, &white, &white, 0, 0);
-}
-
-void
-Editor::on_map ()
-{
- Window::on_map ();
-
- track_canvas_scroller.get_window()->set_cursor (current_canvas_cursor);
- time_canvas_scroller.get_window()->set_cursor (timebar_cursor);
-}
-
-void
-Editor::track_canvas_allocate (GtkAllocation *alloc)
-{
- canvas_width = alloc->width;
- canvas_height = alloc->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 = gnome_canvas_item_new (gnome_canvas_root(GNOME_CANVAS(track_gnome_canvas)),
- gnome_canvas_text_get_type(),
- "fontdesc", font,
- "fill_color_rgba", color_map[cFirstActionMessage],
- "x", (gdouble) (canvas_width - pixel_width) / 2.0,
- "y", (gdouble) (canvas_height/2.0) - (2.0 * (pixel_height)),
- "anchor", GTK_ANCHOR_NORTH_WEST,
- "text", txt,
- NULL);
-
- } else {
-
- /* center it */
-
- gnome_canvas_item_set (first_action_message,
- "x", (gdouble) (canvas_width - pixel_width) / 2.0,
- "y", (gdouble) (canvas_height/2.0) - (2.0 * (pixel_height)),
- NULL);
- }
- }
-
- 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 */
-}
-
-void
-Editor::reset_scrolling_region (GtkAllocation *alloc)
-{
- guint32 last_canvas_unit;
- double height;
- guint32 canvas_alloc_height, canvas_alloc_width;
- TrackViewList::iterator i;
- static bool first_time = true;
-
- /* We need to make sure that the canvas always has its
- scrolling region set to larger of:
-
- - the size allocated for it (within the container its packed in)
- - the size required to see the entire session
-
- If we don't ensure at least the first of these, the canvas
- does some wierd and in my view unnecessary stuff to center
- itself within the allocated area, which causes bad, bad
- results.
-
- XXX GnomeCanvas has fixed this, and has an option to
- control the centering behaviour.
- */
-
- last_canvas_unit = (guint32) ceil ((float) max_frames / frames_per_unit);
-
- height = 0;
-
- if (session) {
- for (i = track_views.begin(); i != track_views.end(); ++i) {
- if ((*i)->control_parent) {
- height += (*i)->effective_height;
- height += track_spacing;
- }
- }
-
- if (height) {
- height -= track_spacing;
- }
- }
-
- canvas_height = (guint32) height;
-
- if (alloc) {
- canvas_alloc_height = alloc->height;
- canvas_alloc_width = alloc->width;
- } else {
- canvas_alloc_height = track_gnome_canvas->allocation.height;
- canvas_alloc_width = track_gnome_canvas->allocation.width;
- }
-
- canvas_height = max (canvas_height, canvas_alloc_height);
-
- gnome_canvas_set_scroll_region (GNOME_CANVAS(track_gnome_canvas), 0.0, 0.0,
- max (last_canvas_unit, canvas_alloc_width),
- canvas_height);
-
- if (edit_cursor) edit_cursor->set_length (canvas_alloc_height);
- if (playhead_cursor) playhead_cursor->set_length (canvas_alloc_height);
-
- if (marker_drag_line) {
- marker_drag_line_points->coords[3] = canvas_height;
- // cerr << "set mlA points, nc = " << marker_drag_line_points->num_points << endl;
- gnome_canvas_item_set (marker_drag_line, "points", marker_drag_line_points, NULL);
- }
- if (range_marker_drag_rect) {
- gnome_canvas_item_set (range_marker_drag_rect, "y1", 0.0, "y2", (double) canvas_height, NULL);
- }
- if (transport_loop_range_rect) {
- gnome_canvas_item_set (transport_loop_range_rect, "y1", 0.0, "y2", (double) canvas_height, NULL);
- }
- if (transport_punch_range_rect) {
- gnome_canvas_item_set (transport_punch_range_rect, "y1", 0.0, "y2", (double) canvas_height, NULL);
- }
- if (transport_punchin_line) {
- gnome_canvas_item_set (transport_punchin_line, "y1", 0.0, "y2", (double) canvas_height, NULL);
- }
- if (transport_punchout_line) {
- gnome_canvas_item_set (transport_punchout_line, "y1", 0.0, "y2", (double) canvas_height, NULL);
- }
-
-
- update_fixed_rulers ();
-
- if (is_visible() && first_time) {
- tempo_map_changed (Change (0));
- first_time = false;
- } else {
- redisplay_tempo ();
- }
+ 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 (stringcr_t snap_name)
{
ENSURE_GUI_THREAD(bind (mem_fun(*this, &Editor::update_title_s), snap_name));
session = t;
if (first_action_message) {
- gnome_canvas_item_hide (first_action_message);
+ first_action_message->hide();
}
flush_track_canvas();
switch (session->get_edit_mode()) {
case Splice:
- edit_mode_selector.get_entry()->set_text (edit_mode_strings[splice_index]);
+ edit_mode_selector.set_active_text (edit_mode_strings[splice_index]);
break;
case Slide:
- edit_mode_selector.get_entry()->set_text (edit_mode_strings[slide_index]);
+ edit_mode_selector.set_active_text (edit_mode_strings[slide_index]);
break;
}
redisplay_regions ();
redisplay_named_selections ();
- route_list.freeze ();
- route_list.clear ();
+ //route_list.freeze (); GTK2FIX
+ route_display_model->clear ();
session->foreach_route (this, &Editor::handle_new_route);
// route_list.select_all ();
- route_list.sort ();
+ // GTK2FIX
+ //route_list.sort ();
route_list_reordered ();
- route_list.thaw ();
-
- if (embed_audio_item) {
- embed_audio_item->set_sensitive (true);
- }
- if (import_audio_item) {
- import_audio_item->set_sensitive (true);
- }
+ //route_list.thaw ();
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));
if (ARDOUR_UI::instance()->session_is_new ()) {
- Gtk::CList_Helpers::RowList::iterator i;
- Gtk::CList_Helpers::RowList& rowlist = route_list.rows();
-
- route_list.freeze ();
+ TreeModel::Children rows = route_display_model->children();
+ TreeModel::Children::iterator i;
+
+ //route_list.freeze ();
- for (i = rowlist.begin(); i != rowlist.end(); ++i) {
- TimeAxisView *tv = (TimeAxisView *) i->get_data ();
+ for (i = rows.begin(); i != rows.end(); ++i) {
+ TimeAxisView *tv = (*i)[route_display_columns.tv];
AudioTimeAxisView *atv;
if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
if (atv->route().master()) {
- (*i)->unselect ();
+ route_list.get_selection()->unselect (i);
+ //(*i)->unselect ();
}
}
}
- route_list.thaw ();
+ //route_list.thaw ();
}
}
void
Editor::build_cursors ()
{
- GdkPixmap *source, *mask;
- GdkColor fg = { 0, 65535, 0, 0 }; /* Red. */
- GdkColor bg = { 0, 0, 0, 65535 }; /* Blue. */
+ using namespace Gdk;
- source = gdk_bitmap_create_from_data (NULL, hand_bits,
- hand_width, hand_height);
- mask = gdk_bitmap_create_from_data (NULL, handmask_bits,
- handmask_width, handmask_height);
- grabber_cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, hand_x_hot, hand_y_hot);
- gdk_pixmap_unref (source);
- gdk_pixmap_unref (mask);
+ Gdk::Color mbg ("#000000" ); /* Black */
+ Gdk::Color mfg ("#0000ff" ); /* Blue. */
+ {
+ RefPtr<Bitmap> source, mask;
+ source = Bitmap::create (mag_bits, mag_width, mag_height);
+ mask = Bitmap::create (magmask_bits, mag_width, mag_height);
+ zoom_cursor = new Gdk::Cursor (source, mask, mfg, mbg, mag_x_hot, mag_y_hot);
+ }
- GdkColor mbg = { 0, 0, 0, 0 }; /* Black */
- GdkColor mfg = { 0, 0, 0, 65535 }; /* Blue. */
+ Gdk::Color fbg ("#ffffff" );
+ Gdk::Color ffg ("#000000" );
- source = gdk_bitmap_create_from_data (NULL, mag_bits,
- mag_width, mag_height);
- mask = gdk_bitmap_create_from_data (NULL, magmask_bits,
- mag_width, mag_height);
- zoom_cursor = gdk_cursor_new_from_pixmap (source, mask, &mfg, &mbg, mag_x_hot, mag_y_hot);
- gdk_pixmap_unref (source);
- gdk_pixmap_unref (mask);
-
- GdkColor fbg = { 0, 65535, 65535, 65535 };
- GdkColor ffg = { 0, 0, 0, 0 };
+ {
+ RefPtr<Bitmap> source, mask;
+
+ source = Bitmap::create (fader_cursor_bits, fader_cursor_width, fader_cursor_height);
+ mask = Bitmap::create (fader_cursor_mask_bits, fader_cursor_width, fader_cursor_height);
+ fader_cursor = new Gdk::Cursor (source, mask, ffg, fbg, fader_cursor_x_hot, fader_cursor_y_hot);
+ }
- source = gdk_bitmap_create_from_data (NULL, fader_cursor_bits,
- fader_cursor_width, fader_cursor_height);
- mask = gdk_bitmap_create_from_data (NULL, fader_cursor_mask_bits,
- fader_cursor_width, fader_cursor_height);
- fader_cursor = gdk_cursor_new_from_pixmap (source, mask, &ffg, &fbg, fader_cursor_x_hot, fader_cursor_y_hot);
- gdk_pixmap_unref (source);
- gdk_pixmap_unref (mask);
-
- source = gdk_bitmap_create_from_data (NULL, speaker_cursor_bits,
- speaker_cursor_width, speaker_cursor_height);
- mask = gdk_bitmap_create_from_data (NULL, speaker_cursor_mask_bits,
- speaker_cursor_width, speaker_cursor_height);
- speaker_cursor = gdk_cursor_new_from_pixmap (source, mask, &ffg, &fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
- gdk_pixmap_unref (source);
- gdk_pixmap_unref (mask);
-
- cross_hair_cursor = gdk_cursor_new (GDK_CROSSHAIR);
- trimmer_cursor = gdk_cursor_new (GDK_SB_H_DOUBLE_ARROW);
- selector_cursor = gdk_cursor_new (GDK_XTERM);
- time_fx_cursor = gdk_cursor_new (GDK_SIZING);
- wait_cursor = gdk_cursor_new (GDK_WATCH);
- timebar_cursor = gdk_cursor_new (GDK_LEFT_PTR);
+ {
+ RefPtr<Bitmap> source, mask;
+ source = Bitmap::create (speaker_cursor_bits, speaker_cursor_width, speaker_cursor_height);
+ mask = Bitmap::create (speaker_cursor_mask_bits, speaker_cursor_width, speaker_cursor_height);
+ speaker_cursor = new Gdk::Cursor (source, mask, ffg, fbg, speaker_cursor_x_hot, speaker_cursor_y_hot);
+ }
+
+ 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
-Editor::popup_fade_context_menu (int button, int32_t time, GnomeCanvasItem* item, ItemType item_type)
+Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* item, ItemType item_type)
{
using namespace Menu_Helpers;
- AudioRegionView* arv = static_cast<AudioRegionView*> (gtk_object_get_data (GTK_OBJECT(item), "regionview"));
+ AudioRegionView* arv = static_cast<AudioRegionView*> (item->get_data ("regionview"));
if (arv == 0) {
fatal << _("programming error: fade in canvas item has no regionview data pointer!") << endmsg;
if (!with_selection) {
if (region_edit_menu_split_item) {
if (clicked_regionview && clicked_regionview->region.covers (edit_cursor->current_frame)) {
- region_edit_menu_split_item->set_sensitive (true);
+ // GTK2FIX find the action, change its sensitivity
+ // region_edit_menu_split_item->set_sensitive (true);
} else {
- region_edit_menu_split_item->set_sensitive (false);
+ // GTK2FIX see above
+ // region_edit_menu_split_item->set_sensitive (false);
}
}
if (region_edit_menu_split_multichannel_item) {
if (clicked_regionview && clicked_regionview->region.n_channels() > 1) {
- region_edit_menu_split_multichannel_item->set_sensitive (true);
+ // GTK2FIX find the action, change its sensitivity
+ // region_edit_menu_split_multichannel_item->set_sensitive (true);
} else {
- region_edit_menu_split_multichannel_item->set_sensitive (false);
+ // GTK2FIX see above
+ // region_edit_menu_split_multichannel_item->set_sensitive (false);
}
}
}
{
snap_type = st;
vector<string> txt = internationalize (snap_type_strings);
- snap_type_selector.get_entry()->set_text (txt[(int)st]);
+ snap_type_selector.set_active_text (txt[(int)st]);
instant_save ();
{
snap_mode = mode;
vector<string> txt = internationalize (snap_mode_strings);
- snap_mode_selector.get_entry()->set_text (txt[(int)mode]);
+ snap_mode_selector.set_active_text (txt[(int)mode]);
instant_save ();
}
}
set_default_size(width, height);
- set_uposition(x, y-yoff);
+ move (x, y-yoff);
if ((prop = node.property ("zoom-focus"))) {
set_zoom_focus ((ZoomFocus) atoi (prop->value()));
char buf[32];
if (is_realized()) {
- Gdk_Window win = get_window();
+ Glib::RefPtr<Gdk::Window> win = get_window();
int x, y, xoff, yoff, width, height;
- win.get_root_origin(x, y);
- win.get_position(xoff, yoff);
- win.get_size(width, height);
+ win->get_root_origin(x, y);
+ win->get_position(xoff, yoff);
+ win->get_size(width, height);
XMLNode* geometry = new XMLNode ("geometry");
char buf[32];
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);
}
void
Editor::setup_toolbar ()
{
- nstring pixmap_path;
+ string pixmap_path;
vector<ToggleButton *> mouse_mode_buttons;
mouse_mode_buttons.push_back (&mouse_move_button);
mouse_mode_tearoff->set_name ("MouseModeBase");
mouse_mode_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
- static_cast<Gtk::Widget*>(&mouse_mode_button_table)));
+ mouse_mode_tearoff->tearoff_window()));
mouse_mode_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
- static_cast<Gtk::Widget*> (&mouse_mode_button_table), 1));
+ mouse_mode_tearoff->tearoff_window(), 1));
mouse_move_button.set_name ("MouseModeButton");
mouse_select_button.set_name ("MouseModeButton");
edit_mode_label.set_name ("ToolBarLabel");
edit_mode_selector.set_name ("EditModeSelector");
- edit_mode_selector.get_entry()->set_name ("EditModeSelector");
- edit_mode_selector.get_popwin()->set_name ("EditModeSelector");
edit_mode_box.set_spacing (3);
edit_mode_box.set_border_width (3);
/* XXX another disgusting hack because of the way combo boxes size themselves */
- Gtkmm2ext::set_size_request_to_display_given_text (*edit_mode_selector.get_entry(), "EdgtMode", 2, 10);
- set_popdown_string (edit_mode_selector, internationalize (edit_mode_strings));
-
+ 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);
- edit_mode_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::edit_mode_selection_done));
+ edit_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::edit_mode_selection_done));
/* Snap Type */
snap_type_label.set_name ("ToolBarLabel");
snap_type_selector.set_name ("SnapTypeSelector");
- snap_type_selector.get_entry()->set_name ("SnapTypeSelector");
- snap_type_selector.get_popwin()->set_name ("SnapTypeSelector");
snap_type_box.set_spacing (3);
snap_type_box.set_border_width (3);
/* 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.get_entry(), "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_type_box.pack_start (snap_type_selector, false, false);
- snap_type_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::snap_type_selection_done));
+ snap_type_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_type_selection_done));
/* Snap mode, not snap type */
snap_mode_label.set_name ("ToolBarLabel");
snap_mode_selector.set_name ("SnapModeSelector");
- snap_mode_selector.get_entry()->set_name ("SnapModeSelector");
- snap_mode_selector.get_popwin()->set_name ("SnapModeSelector");
snap_mode_box.set_spacing (3);
snap_mode_box.set_border_width (3);
- Gtkmm2ext::set_size_request_to_display_given_text (*snap_mode_selector.get_entry(), "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);
snap_mode_box.pack_start (snap_mode_selector, false, false);
- snap_mode_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
+ snap_mode_selector.signal_changed().connect (mem_fun(*this, &Editor::snap_mode_selection_done));
/* Zoom focus mode */
zoom_focus_label.set_name ("ToolBarLabel");
zoom_focus_selector.set_name ("ZoomFocusSelector");
- zoom_focus_selector.get_entry()->set_name ("ZoomFocusSelector");
- zoom_focus_selector.get_popwin()->set_name ("ZoomFocusSelector");
zoom_focus_box.set_spacing (3);
zoom_focus_box.set_border_width (3);
/* XXX another disgusting hack because of the way combo boxes size themselves */
- Gtkmm2ext::set_size_request_to_display_given_text (*zoom_focus_selector.get_entry(), "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);
zoom_focus_box.pack_start (zoom_focus_selector, false, false);
- zoom_focus_selector.get_popwin()->signal_unmap_event().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
+ zoom_focus_selector.signal_changed().connect (mem_fun(*this, &Editor::zoom_focus_selection_done));
/* selection/cursor clocks */
tools_tearoff->set_name ("MouseModeBase");
tools_tearoff->Detach.connect (bind (mem_fun(*this, &Editor::detach_tearoff), static_cast<Gtk::Box*>(&toolbar_hbox),
- static_cast<Gtk::Widget*>(hbox)));
+ tools_tearoff->tearoff_window()));
tools_tearoff->Attach.connect (bind (mem_fun(*this, &Editor::reattach_tearoff), static_cast<Gtk::Box*> (&toolbar_hbox),
- static_cast<Gtk::Widget*> (hbox), 0));
+ tools_tearoff->tearoff_window(), 0));
+
toolbar_hbox.set_spacing (8);
toolbar_hbox.set_border_width (2);
double wx;
double wy;
- gnome_canvas_window_to_world (GNOME_CANVAS(track_gnome_canvas), (double) x, (double) y, &wx, &wy);
+ track_canvas.c2w( x, y, wx, wy);
ev.type = GDK_BUTTON_RELEASE;
ev.button.x = wx;
out this method entirely
*/
- //gnome_canvas_update_now (GNOME_CANVAS(track_gnome_canvas));
+ //gnome_canvas_update_now (GNOME_CANVAS(track_canvas));
//gtk_main_iteration ();
}
commit_reversible_command () ;
}
-gint
+bool
Editor::set_selected_regionview_from_map_event (GdkEventAny* ev, StreamView* sv, Region* r)
{
AudioRegionView* rv;
Editor::set_edit_menu (Menu& menu)
{
edit_menu = &menu;
- edit_menu->map_.connect (mem_fun(*this, &Editor::edit_menu_map_handler));
+ edit_menu->signal_map_event().connect (mem_fun(*this, &Editor::edit_menu_map_handler));
}
-void
-Editor::edit_menu_map_handler ()
+bool
+Editor::edit_menu_map_handler (GdkEventAny* ev)
{
using namespace Menu_Helpers;
MenuList& edit_items = edit_menu->items();
edit_items.clear ();
if (session == 0) {
- return;
+ return false;
}
if (session->undo_depth() == 0) {
if (!session->have_captured()) {
edit_items.back().set_sensitive (false);
}
+
+ return false;
}
void
ArdourDialog win ("duplicate dialog");
Entry entry;
Label label (_("Duplicate how many times?"));
- HBox hbox;
- HBox button_box;
- Button ok_button (_("OK"));
- Button cancel_button (_("Cancel"));
- VBox vbox;
-
- button_box.set_spacing (7);
- set_size_request_to_display_given_text (ok_button, _("Cancel"), 20, 15); // this is cancel on purpose
- set_size_request_to_display_given_text (cancel_button, _("Cancel"), 20, 15);
- button_box.pack_end (ok_button, false, false);
- button_box.pack_end (cancel_button, false, false);
-
- hbox.set_spacing (5);
- hbox.pack_start (label);
- hbox.pack_start (entry, true, true);
-
- vbox.set_spacing (5);
- vbox.set_border_width (5);
- vbox.pack_start (hbox);
- vbox.pack_start (button_box);
- win.add (vbox);
- win.set_position (Gtk::WIN_POS_MOUSE);
- win.show_all ();
+ win.get_vbox()->pack_start (label);
+ win.add_action_widget (entry, RESPONSE_ACCEPT);
+ win.add_button (Stock::OK, RESPONSE_ACCEPT);
+ win.add_button (Stock::CANCEL, RESPONSE_CANCEL);
- ok_button.signal_clicked().connect (bind (mem_fun (win, &ArdourDialog::stop), 0));
- entry.signal_activate().connect (bind (mem_fun (win, &ArdourDialog::stop), 0));
- cancel_button.signal_clicked().connect (bind (mem_fun (win, &ArdourDialog::stop), 1));
+ win.set_position (Gtk::WIN_POS_MOUSE);
- entry.signal_focus_in_event().connect (sigc::ptr_fun (ARDOUR_UI::generic_focus_in_event));
- entry.signal_focus_out_event().connect (sigc::ptr_fun (ARDOUR_UI::generic_focus_out_event));
-
entry.set_text ("1");
set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
entry.select_region (0, entry.get_text_length());
-
- win.set_position (Gtk::WIN_POS_MOUSE);
- win.realize ();
- win.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
-
entry.grab_focus ();
- win.run ();
+ // GTK2FIX
+ // win.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
+
- if (win.run_status() != 0) {
+ switch (win.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
return;
}
void
Editor::show_verbose_canvas_cursor ()
{
- gnome_canvas_item_raise_to_top (verbose_canvas_cursor);
- gnome_canvas_item_show (verbose_canvas_cursor);
+ verbose_canvas_cursor->raise_to_top();
+ verbose_canvas_cursor->show();
verbose_cursor_visible = true;
}
void
Editor::hide_verbose_canvas_cursor ()
{
- gnome_canvas_item_hide (verbose_canvas_cursor);
+ verbose_canvas_cursor->hide();
verbose_cursor_visible = false;
}
void
-Editor::set_verbose_canvas_cursor (string txt, double x, double y)
+Editor::set_verbose_canvas_cursor (stringcr_t 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}
*/
- gnome_canvas_item_set (verbose_canvas_cursor, "text", txt.c_str(), "x", x, "y", y, NULL);
+ verbose_canvas_cursor->property_text() = txt.c_str();
+ verbose_canvas_cursor->property_x() = x;
+ verbose_canvas_cursor->property_y() = y;
}
void
-Editor::set_verbose_canvas_cursor_text (string txt)
+Editor::set_verbose_canvas_cursor_text (stringcr_t txt)
{
- gnome_canvas_item_set (verbose_canvas_cursor, "text", txt.c_str(), NULL);
+ verbose_canvas_cursor->property_text() = txt.c_str();
}
-gint
-Editor::edit_mode_selection_done (GdkEventAny *ev)
+void
+Editor::edit_mode_selection_done ()
{
if (session == 0) {
- return FALSE;
+ return;
}
- string choice = edit_mode_selector.get_entry()->get_text();
+ string choice = edit_mode_selector.get_active_text();
EditMode mode = Slide;
if (choice == _("Splice")) {
}
session->set_edit_mode (mode);
-
- return FALSE;
}
-gint
-Editor::snap_type_selection_done (GdkEventAny *ev)
+void
+Editor::snap_type_selection_done ()
{
if (session == 0) {
- return FALSE;
+ return;
}
- string choice = snap_type_selector.get_entry()->get_text();
+ string choice = snap_type_selector.get_active_text();
SnapType snaptype = SnapToFrame;
if (choice == _("Beats/3")) {
}
set_snap_to (snaptype);
-
- return FALSE;
}
-gint
-Editor::snap_mode_selection_done (GdkEventAny *ev)
+void
+Editor::snap_mode_selection_done ()
{
- if(session == 0) return FALSE;
+ if(session == 0) {
+ return;
+ }
- string choice = snap_mode_selector.get_entry()->get_text();
+ string choice = snap_mode_selector.get_active_text();
SnapMode mode = SnapNormal;
if (choice == _("Normal")) {
}
set_snap_mode (mode);
-
- return FALSE;
}
-gint
-Editor::zoom_focus_selection_done (GdkEventAny *ev)
+void
+Editor::zoom_focus_selection_done ()
{
if (session == 0) {
- return FALSE;
+ return;
}
- string choice = zoom_focus_selector.get_entry()->get_text();
+ string choice = zoom_focus_selector.get_active_text();
ZoomFocus focus_type = ZoomFocusLeft;
if (choice == _("Left")) {
}
set_zoom_focus (focus_type);
-
- return FALSE;
}
gint
}
}
-void
-Editor::run_sub_event_loop ()
-{
- Keyboard::the_keyboard().allow_focus (true);
- sub_event_loop_status = 0;
- Main::run ();
-}
-
-void
-Editor::finish_sub_event_loop (int status)
-{
- Main::quit ();
- Keyboard::the_keyboard().allow_focus (false);
- 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)
{
if (zoom_focus != f) {
zoom_focus = f;
vector<string> txt = internationalize (zoom_focus_strings);
- zoom_focus_selector.get_entry()->set_text (txt[(int)f]);
+ zoom_focus_selector.set_active_text (txt[(int)f]);
ZoomFocusChanged (); /* EMIT_SIGNAL */
instant_save ();
}
void
-Editor::pane_allocation_handler (GtkAllocation *alloc, Gtk::Paned* which)
+Editor::pane_allocation_handler (Gtk::Allocation &alloc, Gtk::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.
height = atoi(geometry->property("y_size")->value());
}
- if (which == static_cast<Gtk::Paned*> (&track_list_canvas_pane)) {
+ if (which == static_cast<Gtk::Paned*> (&edit_pane)) {
if (done[0]) {
return;
}
- if (!geometry || (prop = geometry->property("track_list_canvas_pane_pos")) == 0) {
+ if (!geometry || (prop = geometry->property ("edit_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 (done[2]) {
- return;
- }
-
- if (!geometry || (prop = geometry->property("route_group_pane_pos")) == 0) {
- pos = width - (95 * 2);
- 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[0] = GTK_WIDGET(edit_pane.gobj())->allocation.width > pos)) {
+ edit_pane.set_position (pos);
}
}
}
void
-Editor::detach_tearoff (Gtk::Box* b, Gtk::Widget* w)
+Editor::detach_tearoff (Gtk::Box* b, Gtk::Window* w)
{
if (tools_tearoff->torn_off() &&
mouse_mode_tearoff->torn_off()) {
top_hbox.remove (toolbar_frame);
}
- ensure_float (*w->get_toplevel());
+ ensure_float (*w);
}
void
-Editor::reattach_tearoff (Gtk::Box* b, Gtk::Widget* w, int32_t n)
+Editor::reattach_tearoff (Gtk::Box* b, Gtk::Window* w, int32_t n)
{
if (toolbar_frame.get_parent() == 0) {
top_hbox.pack_end (toolbar_frame);
ensure_float (cew);
- cew.ok_button.signal_clicked().connect (bind (mem_fun (cew, &ArdourDialog::stop), 1));
- cew.cancel_button.signal_clicked().connect (bind (mem_fun (cew, &ArdourDialog::stop), 0));
- cew.signal_delete_event().connect (mem_fun (cew, &ArdourDialog::wm_doi_event_stop));
+ // GTK2FIX
+ // cew.signal_delete_event().connect (mem_fun (cew, &ArdourDialog::wm_doi_event_stop));
- cew.run ();
-
- if (cew.run_status() == 1) {
- cew.apply ();
- xfade->StateChanged (Change (~0));
+ switch (cew.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
+ return;
}
+
+ cew.apply ();
+ xfade->StateChanged (Change (~0));
}
PlaylistSelector&
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 left alone, no audio files used by it will be cleaned.\n"
"If deleted, audio files used by it alone by will cleaned."),
pl->name()));
- HBox button_box;
- Button del_button (_("Delete playlist"));
- Button keep_button (_("Keep playlist"));
- Button abort_button (_("Cancel cleanup"));
- VBox vbox;
-
- button_box.set_spacing (7);
- button_box.set_homogeneous (true);
- button_box.pack_end (del_button, false, false);
- button_box.pack_end (keep_button, false, false);
- button_box.pack_end (abort_button, false, false);
-
- vbox.set_spacing (5);
- vbox.set_border_width (5);
- vbox.pack_start (label);
- vbox.pack_start (button_box);
- dialog.add (vbox);
dialog.set_position (Gtk::WIN_POS_CENTER);
- dialog.show_all ();
-
- del_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 0));
- keep_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 1));
- abort_button.signal_clicked().connect (bind (mem_fun (dialog, &ArdourDialog::stop), 2));
+ dialog.get_vbox()->pack_start (label);
- dialog.realize ();
- dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
+ dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT);
+ dialog.add_button (_("Keep playlist"), RESPONSE_CANCEL);
+ dialog.add_button (_("Cancel"), RESPONSE_CANCEL);
- dialog.run ();
-
- switch (dialog.run_status()) {
- case 1:
- /* keep the playlist */
- return 1;
- break;
- case 0:
+ switch (dialog.run ()) {
+ case RESPONSE_ACCEPT:
/* delete the playlist */
return 0;
break;
- case 2:
- /* abort cleanup */
- return -1;
- break;
- default:
+
+ case RESPONSE_REJECT:
/* keep the playlist */
return 1;
+ break;
+
+ default:
+ break;
}
+
+ return -1;
}
bool
return 0;
}
}
+
+void
+Editor::set_layout_width(Gtk::Requisition *r)
+{
+ edit_controls_vbox.check_resize();
+ int w = edit_controls_vbox.get_width();
+ cerr << "set_layout_width() called w = " << w << endl;
+
+ controls_layout.set_size_request (w, -1);
+}
+
+bool
+Editor::layout_expose (GdkEventExpose* ex)
+{
+ cerr << "layout_expose() called" << endl;
+ return TRUE;
+}
projects / ardour.git / blobdiff