#include <sigc++/bind.h>
-#include <libgnomecanvasmm/init.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 "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 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"
initialize_canvas ();
track_canvas_scroller.add (track_canvas);
- track_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
+ track_canvas_scroller.set_policy (POLICY_NEVER, 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_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_size_allocate().connect (mem_fun(*this, &Editor::hscroll_slider_allocate));
time_canvas_scroller.add (time_canvas);
- time_canvas_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_NEVER);
+ time_canvas_scroller.set_policy (POLICY_NEVER, POLICY_NEVER);
time_canvas_scroller.set_hadjustment (*track_canvas_scroller.get_hadjustment());
time_canvas_scroller.set_name ("TimeCanvasScroller");
+ 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));
+
edit_controls_vbox.set_spacing (track_spacing);
edit_controls_hbox.pack_start (edit_controls_vbox, true, true);
edit_controls_scroller.add (edit_controls_hbox);
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);
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 (time_button_event_box, 0, 1, 1, 2, FILL, 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 (edit_controls_scroller, 0, 1, 2, 3, FILL,FILL, 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 (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);
/* use checkbox for the active column */
CellRendererToggle *active_cell = dynamic_cast<CellRendererToggle*>(edit_group_list.get_column_cell_renderer (0));
- active_cell->set_property ("activatable", true);
- active_cell->set_property ("radio", false);
+ 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);
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_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.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));
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);
+ 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"));
}
-void
-Editor::initialize_canvas ()
-{
- Gnome::Canvas::init ();
-
- /* adjust sensitivity for "picking" items */
-
- // GNOME_CANVAS(track_canvas)->close_enough = 2;
-
- track_canvas.signal_event().connect (bind (mem_fun (*this, &Editor::track_canvas_event), (ArdourCanvas::Item*) 0));
- track_canvas.set_name ("EditorMainCanvas");
- track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK);
- track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas));
-
- /* set up drag-n-drop */
- vector<Gtk::TargetEntry> target_table;
-
- target_table.push_back (TargetEntry ("STRING"));
- target_table.push_back (TargetEntry ("text/plain"));
- target_table.push_back (TargetEntry ("text/uri-list"));
- target_table.push_back (TargetEntry ("application/x-rootwin-drop"));
-
- // GTK2FIX
- // track_canvas.drag_dest_set (target_table, DEST_DEFAULT_ALL, GdkDragAction (Gdk::ACTION_COPY|Gdk::ACTION_MOVE));
- // track_canvas.signal_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 Gnome::Canvas::Text (*track_canvas.root());
- verbose_canvas_cursor->set_property ("font_desc", font);
- verbose_canvas_cursor->set_property ("anchor", GTK_ANCHOR_NW);
- verbose_canvas_cursor->set_property ("fill_color_rgba", color_map[cVerboseCanvasCursor]);
-
- verbose_cursor_visible = false;
-
- /* a group to hold time (measure) lines */
-
- time_line_group = new Gnome::Canvas::Group (*track_canvas.root(), 0.0, 0.0);
- cursor_group = new Gnome::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 Gnome::Canvas::Group (*time_canvas.root(), 0.0, 0.0);
- tempo_group = new Gnome::Canvas::Group (*time_canvas.root(), 0.0, 0.0);
- marker_group = new Gnome::Canvas::Group (*time_canvas.root(), 0.0, timebar_height * 2.0);
- range_marker_group = new Gnome::Canvas::Group (*time_canvas.root(), 0.0, timebar_height * 3.0);
- transport_marker_group = new Gnome::Canvas::Group (*time_canvas.root(), 0.0, timebar_height * 4.0);
-
- tempo_bar = new Gnome::Canvas::SimpleRect (*tempo_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- tempo_bar->set_property ("fill_color_rgba", color_map[cTempoBar]);
- tempo_bar->set_property ("outline_pixels", 0);
-
- meter_bar = new Gnome::Canvas::SimpleRect (*meter_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- meter_bar->set_property ("fill_color_rgba", color_map[cMeterBar]);
- meter_bar->set_property ("outline_pixels",0);
-
- marker_bar = new Gnome::Canvas::SimpleRect (*marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- marker_bar->set_property ("fill_color_rgba", color_map[cMarkerBar]);
- marker_bar->set_property ("outline_pixels", 0);
-
- range_marker_bar = new Gnome::Canvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- range_marker_bar->set_property ("fill_color_rgba", color_map[cRangeMarkerBar]);
- range_marker_bar->set_property ("outline_pixels", 0);
-
- transport_marker_bar = new Gnome::Canvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- transport_marker_bar->set_property ("fill_color_rgba", color_map[cTransportMarkerBar]);
- transport_marker_bar->set_property ("outline_pixels", 0);
-
- range_bar_drag_rect = new Gnome::Canvas::SimpleRect (*range_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- range_bar_drag_rect->set_property ("fill_color_rgba", color_map[cRangeDragBarRectFill]);
- range_bar_drag_rect->set_property ("outline_color_rgba", color_map[cRangeDragBarRect]);
- range_bar_drag_rect->set_property ("outline_pixels", 0);
- range_bar_drag_rect->hide ();
-
- transport_bar_drag_rect = new Gnome::Canvas::SimpleRect (*transport_marker_group, 0.0, 0.0, max_canvas_coordinate, timebar_height);
- transport_bar_drag_rect ->set_property ("fill_color_rgba", color_map[cTransportDragRectFill]);
- transport_bar_drag_rect->set_property ("outline_color_rgba", color_map[cTransportDragRect]);
- transport_bar_drag_rect->set_property ("outline_pixels", 0);
- transport_bar_drag_rect->hide ();
-
- marker_drag_line_points->push_back(Gnome::Art::Point(0.0, 0.0));
- marker_drag_line_points->push_back(Gnome::Art::Point(0.0, 0.0));
-
- marker_drag_line = new Gnome::Canvas::Line (*track_canvas.root());
- marker_drag_line->set_property ("width_pixels", 1);
- marker_drag_line->set_property("fill_color_rgba", color_map[cMarkerDragLine]);
- marker_drag_line->set_property("points", marker_drag_line_points->gobj());
- marker_drag_line->hide();
-
- range_marker_drag_rect = new Gnome::Canvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- range_marker_drag_rect->set_property ("fill_color_rgba", color_map[cRangeDragRectFill]);
- range_marker_drag_rect->set_property ("outline_color_rgba", color_map[cRangeDragRect]);
- range_marker_drag_rect->hide ();
-
- transport_loop_range_rect = new Gnome::Canvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
- transport_loop_range_rect->set_property ("fill_color_rgba", color_map[cTransportLoopRectFill]);
- transport_loop_range_rect->set_property ("outline_color_rgba", color_map[cTransportLoopRect]);
- transport_loop_range_rect->set_property ("outline_pixels", 1);
- transport_loop_range_rect->hide();
-
- transport_punch_range_rect = new Gnome::Canvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
- transport_punch_range_rect->set_property ("fill_color_rgba", color_map[cTransportPunchRectFill]);
- transport_punch_range_rect->set_property ("outline_color_rgba", color_map[cTransportPunchRect]);
- transport_punch_range_rect->set_property ("outline_pixels", 0);
- transport_punch_range_rect->hide();
-
- transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
-
- transport_punchin_line = new Gnome::Canvas::Line (*time_line_group);
- transport_punchin_line->set_property ("x1", 0.0);
- transport_punchin_line->set_property ("y1", 0.0);
- transport_punchin_line->set_property ("x2", 0.0);
- transport_punchin_line->set_property ("y2", 0.0);
-
- transport_punchin_line->set_property ("outline_color_rgba", color_map[cPunchInLine]);
- transport_punchin_line->set_property ("outline_pixels", 1);
- transport_punchin_line->hide ();
-
- transport_punchout_line = new Gnome::Canvas::Line (*time_line_group);
- transport_punchout_line->set_property ("x1", 0.0);
- transport_punchout_line->set_property ("y1", 0.0);
- transport_punchout_line->set_property ("x2", 0.0);
- transport_punchout_line->set_property ("y2", 0.0);
- transport_punchout_line->set_property ("outline_color_rgba", color_map[cPunchOutLine]);
- transport_punchout_line->set_property ("outline_pixels", 1);
- transport_punchout_line->hide();
-
- // used to show zoom mode active zooming
- zoom_rect = new Gnome::Canvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- zoom_rect->set_property ("fill_color_rgba", color_map[cZoomRectFill]);
- zoom_rect->set_property ("outline_color_rgba", color_map[cZoomRect]);
- zoom_rect->set_property ("outline_pixels", 1);
- zoom_rect->hide();
-
- zoom_rect->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_zoom_rect_event), (ArdourCanvas::Item*) 0));
-
- // used as rubberband rect
- rubberband_rect = new Gnome::Canvas::SimpleRect (*track_canvas.root(), 0.0, 0.0, 0.0, 0.0);
- rubberband_rect->set_property ("outline_color_rgba", color_map[cRubberBandRect]);
- rubberband_rect->set_property ("fill_color_rgba", (guint32) color_map[cRubberBandRectFill]);
- rubberband_rect->set_property ("outline_pixels", 1);
- rubberband_rect->hide();
-
- tempo_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_tempo_bar_event), tempo_bar));
- meter_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_meter_bar_event), meter_bar));
- marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_marker_bar_event), marker_bar));
- range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
- transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-
- /* separator lines */
-
- tempo_line_points.push_back(Gnome::Art::Point(0, timebar_height));
- tempo_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
-
- tempo_line = new Gnome::Canvas::Line (*tempo_group, tempo_line_points);
- tempo_line->set_property ("width_pixels", 0);
- tempo_line->set_property ("fill_color", Gdk::Color ("#000000"));
-
- meter_line_points.push_back(Gnome::Art::Point (0, timebar_height));
- meter_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
-
- meter_line = new Gnome::Canvas::Line (*meter_group, meter_line_points);
- meter_line->set_property ("width_pixels", 0);
- meter_line->set_property ("fill_color", Gdk::Color ("#000000"));
-
- marker_line_points.push_back(Gnome::Art::Point (0, timebar_height));
- marker_line_points.push_back(Gnome::Art::Point(max_canvas_coordinate, timebar_height));
-
- marker_line = new Gnome::Canvas::Line (*marker_group, marker_line_points);
- marker_line->set_property ("width_pixels", 0);
- marker_line->set_property ("fill_color", Gdk::Color ("#000000"));
-
- range_marker_line = new Gnome::Canvas::Line (*range_marker_group, marker_line_points);
- range_marker_line->set_property ("width_pixels", 0);
- range_marker_line->set_property ("fill_color", Gdk::Color ("#000000"));
-
- transport_marker_line = new Gnome::Canvas::Line (*transport_marker_group, marker_line_points);
- transport_marker_line->set_property ("width_pixels", 0);
- transport_marker_line->set_property ("fill_color", Gdk::Color ("#000000"));
-
- 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;
- time_canvas.set_scroll_region(0.0, 0.0, time_width, time_height);
-
- edit_cursor = new Cursor (*this, "blue", &Editor::canvas_edit_cursor_event);
- playhead_cursor = new Cursor (*this, "red", &Editor::canvas_playhead_cursor_event);
-
- track_canvas.signal_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::on_realize ()
{
+ Window::on_realize ();
+
/* Even though we're not using acceleration, we want the
labels to show up.
*/
- 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);
-
track_context_menu.accelerate (*this->get_toplevel());
track_region_context_menu.accelerate (*this->get_toplevel());
- Window::on_realize ();
-
+ 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::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 (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 Gnome::Canvas::Text (*track_canvas.root());
- first_action_message->set_property ("font_desc", font);
- first_action_message->set_property ("fill_color_rgba", color_map[cFirstActionMessage]);
- first_action_message->set_property ("x", (gdouble) (canvas_width - pixel_width) / 2.0);
- first_action_message->set_property ("y", (gdouble) (canvas_height/2.0) - (2.0 * (pixel_height)));
- first_action_message->set_property ("anchor", GTK_ANCHOR_NORTH_WEST);
- first_action_message->set_property ("text", ustring (txt));
-
- } else {
- /* center it */
- first_action_message->set_property ("x", (gdouble) (canvas_width - pixel_width) / 2.0),
- first_action_message->set_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 */
+ null_cursor = new Gdk::Cursor(empty_pixmap, empty_bitmap, white, white, 0, 0);
}
-void
-Editor::reset_scrolling_region (Gtk::Allocation* 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->get_height();
- canvas_alloc_width = alloc->get_width();
- } else {
- canvas_alloc_height = track_canvas.get_height();
- canvas_alloc_width = track_canvas.get_width();
- }
-
- canvas_height = max (canvas_height, canvas_alloc_height);
- track_canvas.set_scroll_region ( 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->back().set_x(canvas_height);
- // cerr << "set mlA points, nc = " << marker_drag_line_points->num_points << endl;
- marker_drag_line->set_property("points", marker_drag_line_points);
- }
- if (range_marker_drag_rect) {
- range_marker_drag_rect->set_property("y1", 0.0);
- range_marker_drag_rect->set_property("y2", (double) canvas_height);
- }
-
- if (transport_loop_range_rect) {
- transport_loop_range_rect->set_property("y1", 0.0);
- transport_loop_range_rect->set_property("y2", (double) canvas_height);
- }
-
- if (transport_punch_range_rect) {
- transport_punch_range_rect->set_property("y1", 0.0);
- transport_punch_range_rect->set_property("y2", (double) canvas_height);
- }
-
- if (transport_punchin_line) {
- transport_punchin_line->set_property("y1", 0.0);
- transport_punchin_line->set_property("y2", (double) canvas_height);
- }
-
- if (transport_punchout_line) {
- transport_punchout_line->set_property("y1", 0.0);
- transport_punchout_line->set_property("y2", (double) canvas_height);
- }
-
- update_fixed_rulers ();
-
- if (is_visible() && first_time) {
- tempo_map_changed (Change (0));
- first_time = false;
- } else {
- redisplay_tempo ();
- }
-}
void
Editor::queue_session_control_changed (Session::ControlType t)
redisplay_named_selections ();
//route_list.freeze (); GTK2FIX
- route_display_model.clear ();
+ route_display_model->clear ();
session->foreach_route (this, &Editor::handle_new_route);
// route_list.select_all ();
// GTK2FIX
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);
- }
-
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(static_cast<TimeAxisView*>(*i))->set_samples_per_unit (frames_per_unit);
}
void
Editor::build_cursors ()
{
- Gdk::Color fg ("#ff0000"); /* Red. */
- Gdk::Color bg ("#0000ff"); /* Blue. */
-
- {
- Glib::RefPtr <Gdk::Pixmap> source, mask;
- source = Gdk::Pixmap::create_from_data (source, hand_bits,
- hand_width, hand_height, 1, fg, bg);
- Gdk::Pixmap::create_from_data(mask, handmask_bits,
- handmask_width, handmask_height, 1, fg, bg);
- grabber_cursor = new Gdk::Cursor (source, mask, fg, bg, hand_x_hot, hand_y_hot);
- }
-
+ using namespace Gdk;
+
Gdk::Color mbg ("#000000" ); /* Black */
Gdk::Color mfg ("#0000ff" ); /* Blue. */
{
- Glib::RefPtr <Gdk::Pixmap> source, mask;
-
- Gdk::Pixmap::create_from_data (source, mag_bits,
- mag_width, mag_height, 1, fg, bg);
- Gdk::Pixmap::create_from_data (mask, magmask_bits,
- mag_width, mag_height, 1, fg, bg);
+ 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);
}
Gdk::Color ffg ("#000000" );
{
- Glib::RefPtr <Gdk::Pixmap> source, mask;
+ RefPtr<Bitmap> source, mask;
- Gdk::Pixmap::create_from_data (source, fader_cursor_bits,
- fader_cursor_width, fader_cursor_height, 1, fg, bg);
- Gdk::Pixmap::create_from_data (mask, fader_cursor_mask_bits,
- fader_cursor_width, fader_cursor_height, 1, fg, bg);
+ 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);
}
-
+
{
- Glib::RefPtr <Gdk::Pixmap> source, mask;
- Gdk::Pixmap::create_from_data (source,speaker_cursor_bits,
- speaker_cursor_width, speaker_cursor_height, 1, fg, bg);
- Gdk::Pixmap::create_from_data (mask, speaker_cursor_mask_bits,
- speaker_cursor_width, speaker_cursor_height, 1, fg, bg);
+ 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);
}
- 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
-Editor::popup_fade_context_menu (int button, int32_t time, Gnome::Canvas::Item* 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);
}
}
}
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.set_text ("1");
set_size_request_to_display_given_text (entry, X_("12345678"), 20, 15);
entry.select_region (0, entry.get_text_length());
+ entry.grab_focus ();
- win.set_position (Gtk::WIN_POS_MOUSE);
- // GTK2FIX
- // win.realize ();
+ // GTK2FIX
// win.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
- entry.grab_focus ();
-
- win.run ();
- if (win.run_status() != 0) {
+ switch (win.run ()) {
+ case RESPONSE_ACCEPT:
+ break;
+ default:
return;
}
/* XXX get origin of canvas relative to root window,
add x and y and check compared to gdk_screen_{width,height}
*/
- verbose_canvas_cursor->set_property("text", txt.c_str());
- verbose_canvas_cursor->set_property("x", x);
- verbose_canvas_cursor->set_property("y", y);
+ 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)
{
- verbose_canvas_cursor->set_property("text", txt.c_str());
+ verbose_canvas_cursor->property_text() = txt.c_str();
}
void
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));
// 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&
"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));
-
- // GTK2FIX
- // dialog.realize ();
- // dialog.get_window()->set_decorations (Gdk::WMDecoration (Gdk::DECOR_BORDER|Gdk::DECOR_RESIZEH));
+ dialog.get_vbox()->pack_start (label);
- dialog.run ();
+ dialog.add_button (_("Delete playlist"), RESPONSE_ACCEPT);
+ dialog.add_button (_("Keep playlist"), RESPONSE_CANCEL);
+ dialog.add_button (_("Cancel"), RESPONSE_CANCEL);
- 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
projects / ardour.git / blobdiff