allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

more GUI tweaks

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3728 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2008-09-14 19:52:34 +00:00
parent 8b84681a08
commit 3bcc2896b6
5 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gtk2_ardour/editor.cc
View File

@@ -502,8 +502,26 @@ Editor::Editor ()
edit_packer.set_homogeneous (false);
edit_packer.set_border_width (0);
edit_packer.set_name ("EditorWindow");
#ifndef THE_OLD_WAY
edit_packer.attach (ruler_label_event_box, 0, 1, 0, 1, FILL, SHRINK, 0, 0);
edit_packer.attach (time_button_event_box, 0, 1, 1, 2, FILL, SHRINK, 0, 0);
edit_packer.attach (time_canvas_event_box, 1, 2, 0, 1, FILL|EXPAND, FILL, 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, 1, 3, FILL|EXPAND, FILL|EXPAND, 0, 0);
edit_packer.attach (zoom_box, 0, 1, 3, 4, FILL, FILL, 0, 0);
edit_packer.attach (edit_hscrollbar, 1, 2, 3, 4, FILL|EXPAND, FILL, 0, 0);
edit_packer.attach (edit_vscrollbar, 3, 4, 2, 3, FILL, FILL|EXPAND, 0, 0);
#else
edit_packer.attach (edit_vscrollbar, 0, 1, 0, 4, FILL, FILL|EXPAND, 0, 0);
edit_packer.attach (ruler_label_event_box, 1, 2, 0, 1, FILL, SHRINK, 0, 0);
edit_packer.attach (time_button_event_box, 1, 2, 1, 2, FILL, SHRINK, 0, 0);
edit_packer.attach (time_canvas_event_box, 2, 3, 0, 1, FILL|EXPAND, FILL, 0, 0);
@@ -513,6 +531,7 @@ Editor::Editor ()
edit_packer.attach (zoom_box, 1, 2, 3, 4, FILL, FILL, 0, 0);
edit_packer.attach (edit_hscrollbar, 2, 3, 3, 4, FILL|EXPAND, FILL, 0, 0);
#endif
bottom_hbox.set_border_width (2);
bottom_hbox.set_spacing (3);

23
gtk2_ardour/editor_canvas.cc
View File

@@ -167,38 +167,37 @@ Editor::initialize_canvas ()
_trackview_group = new ArdourCanvas::Group (*_master_group);
_region_motion_group = new ArdourCanvas::Group (*_master_group);
meter_bar_group = new ArdourCanvas::Group (*track_canvas->root());
meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, 100, timebar_height);
/* el barrio */
meter_bar_group = new ArdourCanvas::Group (*track_canvas->root());
meter_bar = new ArdourCanvas::SimpleRect (*meter_bar_group, 0.0, 0.0, max_canvas_coordinate, timebar_height-1.0);
meter_bar->property_outline_what() = (0x1 | 0x8);
meter_bar->property_outline_pixels() = 1;
tempo_bar_group = new ArdourCanvas::Group (*track_canvas->root());
tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, 100, (timebar_height));
tempo_bar = new ArdourCanvas::SimpleRect (*tempo_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0));
tempo_bar->property_outline_what() = (0x1 | 0x8);
tempo_bar->property_outline_pixels() = 0;
tempo_bar->property_outline_pixels() = 1;
range_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
range_marker_bar = new ArdourCanvas::SimpleRect (*range_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0));
range_marker_bar->property_outline_what() = (0x1 | 0x8);
range_marker_bar->property_outline_pixels() = 1;
transport_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
transport_marker_bar = new ArdourCanvas::SimpleRect (*transport_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0));
transport_marker_bar->property_outline_what() = (0x1 | 0x8);
transport_marker_bar->property_outline_pixels() = 1;
marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, 100, (timebar_height));
marker_bar = new ArdourCanvas::SimpleRect (*marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0));
marker_bar->property_outline_what() = (0x1 | 0x8);
marker_bar->property_outline_pixels() = 0;
marker_bar->property_outline_pixels() = 1;
cd_marker_bar_group = new ArdourCanvas::Group (*track_canvas->root());
cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, 100, (timebar_height));
cd_marker_bar = new ArdourCanvas::SimpleRect (*cd_marker_bar_group, 0.0, 0.0, max_canvas_coordinate, (timebar_height-1.0));
cd_marker_bar->property_outline_what() = (0x1 | 0x8);
cd_marker_bar->property_outline_pixels() = 0;
cd_marker_bar->property_outline_pixels() = 1;
/* a group to hold time (measure) lines */

1
gtk2_ardour/editor_route_list.cc
View File

@@ -352,6 +352,7 @@ Editor::redisplay_route_list ()
if (visible) {
tv->set_marked_for_display (true);
cerr << tv->name() << " will be at " << position << endl;
position += tv->show_at (position, n, &edit_controls_vbox);
} else {
tv->hide ();

5
gtk2_ardour/streamview.cc
View File

@@ -69,8 +69,9 @@ StreamView::StreamView (RouteTimeAxisView& tv, ArdourCanvas::Group* group)
canvas_rect->property_y2() = (double) tv.current_height();
// DR-way
// canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom
canvas_rect->property_outline_what() = (guint32) (0x2|0x8); // outline RHS and bottom
// 2.0 way
//canvas_rect->property_outline_what() = (guint32) (0x1|0x2|0x8); // outline ends and bottom
// (Fill/Outline colours set in derived classes)
canvas_rect->signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_stream_view_event), canvas_rect, &_trackview));

15
gtk2_ardour/time_axis_view.cc
View File

@@ -154,7 +154,10 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
resizer.show ();
resizer_box.show();
HSeparator* separator = manage (new HSeparator());
controls_vbox.pack_start (controls_table, false, false);
controls_vbox.pack_end (*separator, false, false);
controls_vbox.pack_end (resizer_box, false, true);
controls_vbox.show ();
@@ -169,10 +172,10 @@ TimeAxisView::TimeAxisView (ARDOUR::Session& sess, PublicEditor& ed, TimeAxisVie
controls_hbox.pack_start (controls_ebox,true,true);
controls_hbox.show ();
//controls_frame.add (controls_hbox);
//controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
//controls_vbox.set_name ("TimeAxisViewControlsBaseUnselected");
//controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
// controls_frame.add (controls_hbox);
// controls_frame.set_name ("TimeAxisViewControlsBaseUnselected");
// controls_vbox.set_name ("TimeAxisViewControlsBaseUnselected");
// controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
ColorsChanged.connect (mem_fun (*this, &TimeAxisView::color_handler));
}
@@ -231,6 +234,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
parent->pack_start (controls_hbox, false, false);
parent->reorder_child (controls_hbox, nth);
}
//controls_frame.show ();
controls_hbox.show ();
controls_ebox.show ();
@@ -254,8 +258,9 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
_hidden = false;
/* height in pixels depends on _order, so update it now we've changed _order */
set_height (height);
effective_height = current_height();
/* now show children */