manually fix up various cases where Gtk:Frame foo_frame had been changed to foo_sample
This commit is contained in:
parent
d381714510
commit
ea5fa64c0b
|
@ -205,11 +205,11 @@ You may select:\n \
|
|||
desc_scroller->add (trk_template_desc);
|
||||
|
||||
//this is the outer sample that surrounds the description and the settings-table
|
||||
trk_template_outer_sample.set_name (X_("TextHighlightFrame"));
|
||||
trk_template_outer_frame.set_name (X_("TextHighlightFrame"));
|
||||
|
||||
//this is the "inner frame" that surrounds the description text
|
||||
trk_template_desc_sample.set_name (X_("TextHighlightFrame"));
|
||||
trk_template_desc_sample.add (*desc_scroller);
|
||||
trk_template_desc_frame.set_name (X_("TextHighlightFrame"));
|
||||
trk_template_desc_frame.add (*desc_scroller);
|
||||
|
||||
/* template_chooser is the treeview showing available templates */
|
||||
trk_template_model = TreeStore::create (track_template_columns);
|
||||
|
@ -238,14 +238,14 @@ You may select:\n \
|
|||
settings_table->set_border_width (12);
|
||||
|
||||
VBox* settings_vbox = manage (new VBox);
|
||||
settings_vbox->pack_start(trk_template_desc_sample , true, true);
|
||||
settings_vbox->pack_start(trk_template_desc_frame , true, true);
|
||||
settings_vbox->pack_start(*settings_table , true, true);
|
||||
settings_vbox->set_border_width (4);
|
||||
|
||||
trk_template_outer_sample.add (*settings_vbox);
|
||||
trk_template_outer_frame.add (*settings_vbox);
|
||||
|
||||
template_hbox->pack_start (*template_scroller, true, true);
|
||||
template_hbox->pack_start (trk_template_outer_sample, true, true);
|
||||
template_hbox->pack_start (trk_template_outer_frame, true, true);
|
||||
|
||||
vbox->pack_start (*template_hbox, true, true);
|
||||
|
||||
|
|
|
@ -141,8 +141,8 @@ private:
|
|||
void trk_template_row_selected ();
|
||||
|
||||
Gtk::TextView trk_template_desc;
|
||||
Gtk::Frame trk_template_outer_sample;
|
||||
Gtk::Frame trk_template_desc_sample;
|
||||
Gtk::Frame trk_template_outer_frame;
|
||||
Gtk::Frame trk_template_desc_frame;
|
||||
|
||||
void reset_template_option_visibility ();
|
||||
void new_group_dialog_finished (int, RouteGroupDialog*);
|
||||
|
|
|
@ -445,7 +445,7 @@ private:
|
|||
/* Transport Control */
|
||||
|
||||
Gtk::Table transport_table;
|
||||
Gtk::Frame transport_sample;
|
||||
Gtk::Frame transport_frame;
|
||||
Gtk::HBox transport_hbox;
|
||||
|
||||
ArdourWidgets::ArdourVSpacer* secondary_clock_spacer;
|
||||
|
|
|
@ -456,8 +456,8 @@ ARDOUR_UI::setup_transport ()
|
|||
transport_table.set_row_spacings (4);
|
||||
transport_table.set_border_width (2);
|
||||
|
||||
transport_sample.set_name ("TransportFrame");
|
||||
transport_sample.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
transport_frame.set_name ("TransportFrame");
|
||||
transport_frame.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
|
||||
/* An event box to hold the table. We use this because we want specific
|
||||
control over the background color, and without this event box,
|
||||
|
@ -468,7 +468,7 @@ ARDOUR_UI::setup_transport ()
|
|||
the parent, "TransportFrame".
|
||||
*/
|
||||
Gtk::EventBox* ebox = manage (new Gtk::EventBox);
|
||||
transport_sample.add (*ebox);
|
||||
transport_frame.add (*ebox);
|
||||
ebox->add (transport_table);
|
||||
|
||||
/* transport controls sub-group */
|
||||
|
|
|
@ -298,7 +298,7 @@ ARDOUR_UI::setup_windows ()
|
|||
|
||||
/* now add the transport sample to the top of main window */
|
||||
|
||||
main_vpacker.pack_start (transport_sample, false, false);
|
||||
main_vpacker.pack_start (transport_frame, false, false);
|
||||
main_vpacker.pack_start (_tabs, true, true);
|
||||
|
||||
#ifdef TOP_MENUBAR
|
||||
|
@ -336,7 +336,7 @@ ARDOUR_UI::setup_windows ()
|
|||
*/
|
||||
|
||||
_main_window.add (main_vpacker);
|
||||
transport_sample.show_all ();
|
||||
transport_frame.show_all ();
|
||||
|
||||
const XMLNode* mnode = main_window_settings ();
|
||||
|
||||
|
|
|
@ -93,10 +93,10 @@ AudioTimeAxisView::set_route (boost::shared_ptr<Route> rt)
|
|||
|
||||
if (is_audio_track()) {
|
||||
controls_ebox.set_name ("AudioTrackControlsBaseUnselected");
|
||||
time_axis_sample.set_name ("AudioTrackControlsBaseUnselected");
|
||||
time_axis_frame.set_name ("AudioTrackControlsBaseUnselected");
|
||||
} else { // bus
|
||||
controls_ebox.set_name ("AudioBusControlsBaseUnselected");
|
||||
time_axis_sample.set_name ("AudioBusControlsBaseUnselected");
|
||||
time_axis_frame.set_name ("AudioBusControlsBaseUnselected");
|
||||
}
|
||||
|
||||
/* if set_state above didn't create a gain automation child, we need to make one */
|
||||
|
@ -308,10 +308,10 @@ AudioTimeAxisView::update_control_names ()
|
|||
|
||||
if (selected()) {
|
||||
controls_ebox.set_name (controls_base_selected_name);
|
||||
time_axis_sample.set_name (controls_base_selected_name);
|
||||
time_axis_frame.set_name (controls_base_selected_name);
|
||||
} else {
|
||||
controls_ebox.set_name (controls_base_unselected_name);
|
||||
time_axis_sample.set_name (controls_base_unselected_name);
|
||||
time_axis_frame.set_name (controls_base_unselected_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -275,7 +275,7 @@ AutomationTimeAxisView::AutomationTimeAxisView (
|
|||
controls_base_unselected_name = X_("AutomationTrackControlsBase");
|
||||
|
||||
controls_ebox.set_name (controls_base_unselected_name);
|
||||
time_axis_sample.set_name (controls_base_unselected_name);
|
||||
time_axis_frame.set_name (controls_base_unselected_name);
|
||||
|
||||
/* ask for notifications of any new RegionViews */
|
||||
if (show_regions) {
|
||||
|
|
|
@ -194,7 +194,7 @@ private:
|
|||
|
||||
Gtk::Menu* _menu;
|
||||
Gtk::ScrolledWindow _scroller;
|
||||
Gtk::Frame _sample;
|
||||
Gtk::Frame _frame;
|
||||
|
||||
Gtkmm2ext::DnDTreeView<boost::shared_ptr<ARDOUR::Region> > _display;
|
||||
|
||||
|
|
|
@ -1330,10 +1330,10 @@ MidiTimeAxisView::update_control_names ()
|
|||
|
||||
if (selected()) {
|
||||
controls_ebox.set_name (controls_base_selected_name);
|
||||
time_axis_sample.set_name (controls_base_selected_name);
|
||||
time_axis_frame.set_name (controls_base_selected_name);
|
||||
} else {
|
||||
controls_ebox.set_name (controls_base_unselected_name);
|
||||
time_axis_sample.set_name (controls_base_unselected_name);
|
||||
time_axis_frame.set_name (controls_base_unselected_name);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -335,11 +335,11 @@ MixerStrip::init ()
|
|||
global_vpacker.pack_end (spacer, false, false);
|
||||
#endif
|
||||
|
||||
global_sample.add (global_vpacker);
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_sample.set_name ("BaseFrame");
|
||||
global_frame.add (global_vpacker);
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_frame.set_name ("BaseFrame");
|
||||
|
||||
add (global_sample);
|
||||
add (global_frame);
|
||||
|
||||
/* force setting of visible selected status */
|
||||
|
||||
|
@ -734,7 +734,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt)
|
|||
|
||||
width_button.show();
|
||||
width_hide_box.show();
|
||||
global_sample.show();
|
||||
global_frame.show();
|
||||
global_vpacker.show();
|
||||
mute_solo_table.show();
|
||||
bottom_button_table.show();
|
||||
|
@ -1835,14 +1835,14 @@ MixerStrip::set_selected (bool yn)
|
|||
AxisView::set_selected (yn);
|
||||
|
||||
if (selected()) {
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
|
||||
global_sample.set_name ("MixerStripSelectedFrame");
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
|
||||
global_frame.set_name ("MixerStripSelectedFrame");
|
||||
} else {
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_sample.set_name ("MixerStripFrame");
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_frame.set_name ("MixerStripFrame");
|
||||
}
|
||||
|
||||
global_sample.queue_draw ();
|
||||
global_frame.queue_draw ();
|
||||
|
||||
// if (!yn)
|
||||
// processor_box.deselect_all_processors();
|
||||
|
|
|
@ -168,7 +168,7 @@ private:
|
|||
void hide_clicked();
|
||||
bool width_button_pressed (GdkEventButton *);
|
||||
|
||||
Gtk::Frame global_sample;
|
||||
Gtk::Frame global_frame;
|
||||
Gtk::VBox global_vpacker;
|
||||
|
||||
ProcessorBox processor_box;
|
||||
|
|
|
@ -213,9 +213,9 @@ Mixer_UI::Mixer_UI ()
|
|||
group_display_vbox.pack_start (group_display_scroller, true, true);
|
||||
group_display_vbox.pack_start (*route_group_display_button_box, false, false);
|
||||
|
||||
group_display_sample.set_name ("BaseFrame");
|
||||
group_display_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
group_display_sample.add (group_display_vbox);
|
||||
group_display_frame.set_name ("BaseFrame");
|
||||
group_display_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
group_display_frame.add (group_display_vbox);
|
||||
|
||||
|
||||
list<TargetEntry> target_list;
|
||||
|
@ -244,15 +244,15 @@ Mixer_UI::Mixer_UI ()
|
|||
favorite_plugins_scroller.add (favorite_plugins_display);
|
||||
favorite_plugins_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
|
||||
|
||||
favorite_plugins_sample.set_name ("BaseFrame");
|
||||
favorite_plugins_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
favorite_plugins_sample.add (favorite_plugins_scroller);
|
||||
favorite_plugins_frame.set_name ("BaseFrame");
|
||||
favorite_plugins_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
favorite_plugins_frame.add (favorite_plugins_scroller);
|
||||
|
||||
rhs_pane1.add (favorite_plugins_sample);
|
||||
rhs_pane1.add (track_display_sample);
|
||||
rhs_pane1.add (favorite_plugins_frame);
|
||||
rhs_pane1.add (track_display_frame);
|
||||
|
||||
rhs_pane2.add (rhs_pane1);
|
||||
rhs_pane2.add (group_display_sample);
|
||||
rhs_pane2.add (group_display_frame);
|
||||
|
||||
list_vpacker.pack_start (rhs_pane2, true, true);
|
||||
|
||||
|
@ -331,8 +331,8 @@ Mixer_UI::Mixer_UI ()
|
|||
group_display_scroller.show();
|
||||
favorite_plugins_scroller.show();
|
||||
group_display_vbox.show();
|
||||
group_display_sample.show();
|
||||
favorite_plugins_sample.show();
|
||||
group_display_frame.show();
|
||||
favorite_plugins_frame.show();
|
||||
rhs_pane1.show();
|
||||
rhs_pane2.show();
|
||||
strip_packer.show();
|
||||
|
@ -2358,12 +2358,12 @@ Mixer_UI::setup_track_display ()
|
|||
|
||||
v->pack_start (*b, false, false);
|
||||
|
||||
track_display_sample.set_name("BaseFrame");
|
||||
track_display_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
track_display_sample.add (*v);
|
||||
track_display_frame.set_name("BaseFrame");
|
||||
track_display_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
track_display_frame.add (*v);
|
||||
|
||||
track_display_scroller.show();
|
||||
track_display_sample.show();
|
||||
track_display_frame.show();
|
||||
track_display.show();
|
||||
}
|
||||
|
||||
|
|
|
@ -151,9 +151,9 @@ private:
|
|||
Gtk::ScrolledWindow group_display_scroller;
|
||||
Gtk::ScrolledWindow favorite_plugins_scroller;
|
||||
Gtk::VBox group_display_vbox;
|
||||
Gtk::Frame track_display_sample;
|
||||
Gtk::Frame group_display_sample;
|
||||
Gtk::Frame favorite_plugins_sample;
|
||||
Gtk::Frame track_display_frame;
|
||||
Gtk::Frame group_display_frame;
|
||||
Gtk::Frame favorite_plugins_frame;
|
||||
ArdourWidgets::VPane rhs_pane1;
|
||||
ArdourWidgets::VPane rhs_pane2;
|
||||
ArdourWidgets::HPane inner_pane;
|
||||
|
|
|
@ -70,9 +70,9 @@ RouteParams_UI::RouteParams_UI ()
|
|||
|
||||
using namespace Notebook_Helpers;
|
||||
|
||||
input_sample.set_shadow_type(Gtk::SHADOW_NONE);
|
||||
output_sample.set_shadow_type(Gtk::SHADOW_NONE);
|
||||
latency_sample.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
input_frame.set_shadow_type(Gtk::SHADOW_NONE);
|
||||
output_frame.set_shadow_type(Gtk::SHADOW_NONE);
|
||||
latency_frame.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
|
||||
notebook.set_show_tabs (true);
|
||||
notebook.set_show_border (true);
|
||||
|
@ -96,16 +96,16 @@ RouteParams_UI::RouteParams_UI ()
|
|||
route_select_scroller.add(route_display);
|
||||
route_select_scroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
|
||||
|
||||
route_select_sample.set_name("RouteSelectBaseFrame");
|
||||
route_select_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
route_select_sample.add(route_select_scroller);
|
||||
route_select_frame.set_name("RouteSelectBaseFrame");
|
||||
route_select_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
route_select_frame.add(route_select_scroller);
|
||||
|
||||
list_vpacker.pack_start (route_select_sample, true, true);
|
||||
list_vpacker.pack_start (route_select_frame, true, true);
|
||||
|
||||
notebook.pages().push_back (TabElem (input_sample, _("Inputs")));
|
||||
notebook.pages().push_back (TabElem (output_sample, _("Outputs")));
|
||||
notebook.pages().push_back (TabElem (input_frame, _("Inputs")));
|
||||
notebook.pages().push_back (TabElem (output_frame, _("Outputs")));
|
||||
notebook.pages().push_back (TabElem (redir_hpane, _("Plugins, Inserts & Sends")));
|
||||
notebook.pages().push_back (TabElem (latency_sample, _("Latency")));
|
||||
notebook.pages().push_back (TabElem (latency_frame, _("Latency")));
|
||||
|
||||
notebook.set_name ("InspectorNotebook");
|
||||
|
||||
|
@ -117,9 +117,8 @@ RouteParams_UI::RouteParams_UI ()
|
|||
delay_label.set_alignment (0, 0.5);
|
||||
|
||||
// changeable area
|
||||
route_param_sample.set_name("RouteParamsBaseFrame");
|
||||
route_param_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
|
||||
route_param_frame.set_name("RouteParamsBaseFrame");
|
||||
route_param_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
|
||||
route_hpacker.pack_start (notebook, true, true);
|
||||
|
||||
|
@ -276,10 +275,10 @@ RouteParams_UI::refresh_latency ()
|
|||
}
|
||||
|
||||
void
|
||||
RouteParams_UI::cleanup_latency_sample ()
|
||||
RouteParams_UI::cleanup_latency_frame ()
|
||||
{
|
||||
if (latency_widget) {
|
||||
latency_sample.remove ();
|
||||
latency_frame.remove ();
|
||||
latency_packer.remove (*latency_widget);
|
||||
latency_packer.remove (latency_button_box);
|
||||
latency_packer.remove (delay_label);
|
||||
|
@ -293,7 +292,7 @@ RouteParams_UI::cleanup_latency_sample ()
|
|||
}
|
||||
|
||||
void
|
||||
RouteParams_UI::setup_latency_sample ()
|
||||
RouteParams_UI::setup_latency_frame ()
|
||||
{
|
||||
latency_widget = new LatencyGUI (*(_route->output()), _session->sample_rate(), AudioEngine::instance()->samples_per_cycle());
|
||||
|
||||
|
@ -309,8 +308,8 @@ RouteParams_UI::setup_latency_sample ()
|
|||
_route->signal_latency_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
|
||||
_route->initial_delay_changed.connect (latency_connections, invalidator (*this), boost::bind (&RouteParams_UI::refresh_latency, this), gui_context());
|
||||
|
||||
latency_sample.add (latency_packer);
|
||||
latency_sample.show_all ();
|
||||
latency_frame.add (latency_packer);
|
||||
latency_frame.show_all ();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -321,14 +320,14 @@ RouteParams_UI::setup_io_samples()
|
|||
// input
|
||||
_input_iosel = new IOSelector (this, _session, _route->input());
|
||||
_input_iosel->setup ();
|
||||
input_sample.add (*_input_iosel);
|
||||
input_sample.show_all();
|
||||
input_frame.add (*_input_iosel);
|
||||
input_frame.show_all();
|
||||
|
||||
// output
|
||||
_output_iosel = new IOSelector (this, _session, _route->output());
|
||||
_output_iosel->setup ();
|
||||
output_sample.add (*_output_iosel);
|
||||
output_sample.show_all();
|
||||
output_frame.add (*_output_iosel);
|
||||
output_frame.show_all();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -336,7 +335,7 @@ RouteParams_UI::cleanup_io_samples()
|
|||
{
|
||||
if (_input_iosel) {
|
||||
_input_iosel->Finished (IOSelector::Cancelled);
|
||||
input_sample.remove();
|
||||
input_frame.remove();
|
||||
delete _input_iosel;
|
||||
_input_iosel = 0;
|
||||
}
|
||||
|
@ -344,7 +343,7 @@ RouteParams_UI::cleanup_io_samples()
|
|||
if (_output_iosel) {
|
||||
_output_iosel->Finished (IOSelector::Cancelled);
|
||||
|
||||
output_sample.remove();
|
||||
output_frame.remove();
|
||||
delete _output_iosel;
|
||||
_output_iosel = 0;
|
||||
}
|
||||
|
@ -432,7 +431,7 @@ RouteParams_UI::session_going_away ()
|
|||
cleanup_io_samples();
|
||||
cleanup_view();
|
||||
cleanup_processor_boxes();
|
||||
cleanup_latency_sample ();
|
||||
cleanup_latency_frame ();
|
||||
|
||||
_route.reset ((Route*) 0);
|
||||
_processor.reset ((Processor*) 0);
|
||||
|
@ -460,7 +459,7 @@ RouteParams_UI::route_selected()
|
|||
cleanup_processor_boxes();
|
||||
cleanup_view();
|
||||
cleanup_io_samples();
|
||||
cleanup_latency_sample ();
|
||||
cleanup_latency_frame ();
|
||||
}
|
||||
|
||||
// update the other panes with the correct info
|
||||
|
@ -469,7 +468,7 @@ RouteParams_UI::route_selected()
|
|||
|
||||
setup_io_samples();
|
||||
setup_processor_boxes();
|
||||
setup_latency_sample ();
|
||||
setup_latency_frame ();
|
||||
|
||||
route->processors_changed.connect (_route_processors_connection, invalidator (*this), boost::bind (&RouteParams_UI::processors_changed, this, _1), gui_context());
|
||||
|
||||
|
@ -486,7 +485,7 @@ RouteParams_UI::route_selected()
|
|||
cleanup_io_samples();
|
||||
cleanup_view();
|
||||
cleanup_processor_boxes();
|
||||
cleanup_latency_sample ();
|
||||
cleanup_latency_frame ();
|
||||
|
||||
_route.reset ((Route*) 0);
|
||||
_processor.reset ((Processor*) 0);
|
||||
|
|
|
@ -71,11 +71,11 @@ private:
|
|||
Gtk::ScrolledWindow route_select_scroller;
|
||||
|
||||
Gtk::Notebook notebook;
|
||||
Gtk::Frame input_sample;
|
||||
Gtk::Frame output_sample;
|
||||
Gtk::Frame input_frame;
|
||||
Gtk::Frame output_frame;
|
||||
ArdourWidgets::HPane redir_hpane;
|
||||
|
||||
Gtk::Frame route_select_sample;
|
||||
Gtk::Frame route_select_frame;
|
||||
|
||||
Gtk::HBox route_hpacker;
|
||||
Gtk::VBox route_vpacker;
|
||||
|
@ -86,11 +86,11 @@ private:
|
|||
|
||||
ArdourWidgets::HPane right_hpane;
|
||||
|
||||
Gtk::Frame route_param_sample;
|
||||
Gtk::Frame route_param_frame;
|
||||
|
||||
Gtk::VBox choice_vpacker;
|
||||
|
||||
Gtk::Frame latency_sample;
|
||||
Gtk::Frame latency_frame;
|
||||
Gtk::VBox latency_packer;
|
||||
Gtk::HButtonBox latency_button_box;
|
||||
Gtk::Button latency_apply_button;
|
||||
|
@ -163,8 +163,8 @@ private:
|
|||
void setup_io_samples();
|
||||
void cleanup_io_samples();
|
||||
void cleanup_view(bool stopupdate = true);
|
||||
void cleanup_latency_sample ();
|
||||
void setup_latency_sample ();
|
||||
void cleanup_latency_frame ();
|
||||
void setup_latency_frame ();
|
||||
|
||||
void processors_changed (ARDOUR::RouteProcessorChange);
|
||||
|
||||
|
|
|
@ -99,10 +99,10 @@ SessionDialog::SessionDialog (bool require_new, const std::string& session_name,
|
|||
* and invisible most of the time.
|
||||
*/
|
||||
|
||||
info_sample.set_shadow_type(SHADOW_ETCHED_OUT);
|
||||
info_sample.set_no_show_all (true);
|
||||
info_sample.set_border_width (12);
|
||||
get_vbox()->pack_start (info_sample, false, false);
|
||||
info_frame.set_shadow_type(SHADOW_ETCHED_OUT);
|
||||
info_frame.set_no_show_all (true);
|
||||
info_frame.set_border_width (12);
|
||||
get_vbox()->pack_start (info_frame, false, false);
|
||||
|
||||
setup_new_session_page ();
|
||||
|
||||
|
@ -453,9 +453,9 @@ SessionDialog::setup_initial_choice_box ()
|
|||
|
||||
info_box->pack_start (*updates_button, false, false);
|
||||
|
||||
info_sample.add (*info_box);
|
||||
info_frame.add (*info_box);
|
||||
info_box->show_all ();
|
||||
info_sample.show ();
|
||||
info_frame.show ();
|
||||
}
|
||||
|
||||
/* recent session scroller */
|
||||
|
@ -698,9 +698,9 @@ SessionDialog::setup_new_session_page ()
|
|||
|
||||
template_hbox->pack_start (*template_scroller, true, true);
|
||||
|
||||
template_desc_sample.set_name (X_("TextHighlightFrame"));
|
||||
template_desc_sample.add (*desc_scroller);
|
||||
template_hbox->pack_start (template_desc_sample, true, true);
|
||||
template_desc_frame.set_name (X_("TextHighlightFrame"));
|
||||
template_desc_frame.add (*desc_scroller);
|
||||
template_hbox->pack_start (template_desc_frame, true, true);
|
||||
}
|
||||
|
||||
//template_desc is the textview that displays the currently selected template's description
|
||||
|
|
|
@ -84,7 +84,7 @@ private:
|
|||
bool back_button_pressed (GdkEventButton*);
|
||||
bool open_button_pressed (GdkEventButton*);
|
||||
|
||||
Gtk::Frame info_sample;
|
||||
Gtk::Frame info_frame;
|
||||
|
||||
/* initial choice page */
|
||||
|
||||
|
@ -175,7 +175,7 @@ private:
|
|||
void template_row_selected ();
|
||||
|
||||
Gtk::TextView template_desc;
|
||||
Gtk::Frame template_desc_sample;
|
||||
Gtk::Frame template_desc_frame;
|
||||
|
||||
Gtk::VBox session_new_vbox;
|
||||
Gtk::VBox session_existing_vbox;
|
||||
|
|
|
@ -62,12 +62,12 @@ SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) :
|
|||
file_hbox.pack_start (file_entry, true, true);
|
||||
file_hbox.pack_start (file_browse_button, false, false);
|
||||
|
||||
file_sample.add (file_hbox);
|
||||
file_sample.set_border_width (5);
|
||||
file_sample.set_name ("ImportFrom");
|
||||
file_sample.set_label (_("Import from Session"));
|
||||
file_frame.add (file_hbox);
|
||||
file_frame.set_border_width (5);
|
||||
file_frame.set_name ("ImportFrom");
|
||||
file_frame.set_label (_("Import from Session"));
|
||||
|
||||
get_vbox()->pack_start (file_sample, false, false);
|
||||
get_vbox()->pack_start (file_frame, false, false);
|
||||
|
||||
// Session browser
|
||||
session_tree = TreeStore::create (sb_cols);
|
||||
|
|
|
@ -78,7 +78,7 @@ private:
|
|||
XMLTree tree;
|
||||
|
||||
// GUI
|
||||
Gtk::Frame file_sample;
|
||||
Gtk::Frame file_frame;
|
||||
Gtk::HBox file_hbox;
|
||||
Gtk::Entry file_entry;
|
||||
Gtk::Button file_browse_button;
|
||||
|
|
|
@ -153,10 +153,10 @@ SoundFileBox::SoundFileBox (bool /*persistent*/)
|
|||
|
||||
preview_label.set_markup (_("<b>Sound File Information</b>"));
|
||||
|
||||
border_sample.set_label_widget (preview_label);
|
||||
border_sample.add (main_box);
|
||||
border_frame.set_label_widget (preview_label);
|
||||
border_frame.add (main_box);
|
||||
|
||||
pack_start (border_sample, true, true);
|
||||
pack_start (border_frame, true, true);
|
||||
set_border_width (6);
|
||||
|
||||
main_box.set_border_width (6);
|
||||
|
|
|
@ -96,7 +96,7 @@ protected:
|
|||
AudioClock length_clock;
|
||||
AudioClock timecode_clock;
|
||||
|
||||
Gtk::Frame border_sample;
|
||||
Gtk::Frame border_frame;
|
||||
Gtk::Label preview_label;
|
||||
|
||||
Gtk::TextView tags_entry;
|
||||
|
|
|
@ -34,7 +34,7 @@ using namespace Gtkmm2ext;
|
|||
|
||||
SpeakerDialog::SpeakerDialog ()
|
||||
: ArdourWindow (_("Speaker Configuration"))
|
||||
, aspect_sample ("", 0.5, 0.5, 1.5, false)
|
||||
, aspect_frame ("", 0.5, 0.5, 1.5, false)
|
||||
, azimuth_adjustment (0, 0.0, 360.0, 10.0, 1.0)
|
||||
, azimuth_spinner (azimuth_adjustment)
|
||||
, add_speaker_button (_("Add Speaker"))
|
||||
|
@ -49,13 +49,13 @@ SpeakerDialog::SpeakerDialog ()
|
|||
side_vbox.set_spacing (6);
|
||||
side_vbox.pack_start (add_speaker_button, false, false);
|
||||
|
||||
aspect_sample.set_size_request (300, 200);
|
||||
aspect_sample.set_shadow_type (SHADOW_NONE);
|
||||
aspect_sample.add (darea);
|
||||
aspect_frame.set_size_request (300, 200);
|
||||
aspect_frame.set_shadow_type (SHADOW_NONE);
|
||||
aspect_frame.add (darea);
|
||||
|
||||
hbox.set_spacing (6);
|
||||
hbox.set_border_width (6);
|
||||
hbox.pack_start (aspect_sample, true, true);
|
||||
hbox.pack_start (aspect_frame, true, true);
|
||||
hbox.pack_start (side_vbox, false, false);
|
||||
|
||||
HBox* current_speaker_hbox = manage (new HBox);
|
||||
|
|
|
@ -42,7 +42,7 @@ private:
|
|||
boost::weak_ptr<ARDOUR::Speakers> _speakers;
|
||||
Gtk::HBox hbox;
|
||||
Gtk::VBox side_vbox;
|
||||
Gtk::AspectFrame aspect_sample;
|
||||
Gtk::AspectFrame aspect_frame;
|
||||
Gtk::DrawingArea darea;
|
||||
Gtk::Adjustment azimuth_adjustment;
|
||||
Gtk::SpinButton azimuth_spinner;
|
||||
|
|
|
@ -199,9 +199,9 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||
controls_ebox.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave));
|
||||
controls_ebox.show ();
|
||||
|
||||
time_axis_sample.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
time_axis_sample.add(top_hbox);
|
||||
time_axis_sample.show();
|
||||
time_axis_frame.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
time_axis_frame.add(top_hbox);
|
||||
time_axis_frame.show();
|
||||
|
||||
HSeparator* separator = manage (new HSeparator());
|
||||
separator->set_name("TrackSeparator");
|
||||
|
@ -213,7 +213,7 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess, PublicEditor& ed, TimeAxisVie
|
|||
midi_scroomer_size_group->add_widget (scroomer_placeholder);
|
||||
|
||||
time_axis_vbox.pack_start (*separator, false, false);
|
||||
time_axis_vbox.pack_start (time_axis_sample, true, true);
|
||||
time_axis_vbox.pack_start (time_axis_frame, true, true);
|
||||
time_axis_vbox.show();
|
||||
time_axis_hbox.pack_start (time_axis_vbox, true, true);
|
||||
time_axis_hbox.show();
|
||||
|
@ -757,14 +757,14 @@ TimeAxisView::set_selected (bool yn)
|
|||
AxisView::set_selected (yn);
|
||||
|
||||
if (_selected) {
|
||||
time_axis_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
time_axis_sample.set_name ("MixerStripSelectedFrame");
|
||||
time_axis_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
time_axis_frame.set_name ("MixerStripSelectedFrame");
|
||||
controls_ebox.set_name (controls_base_selected_name);
|
||||
controls_vbox.set_name (controls_base_selected_name);
|
||||
time_axis_vbox.set_name (controls_base_selected_name);
|
||||
} else {
|
||||
time_axis_sample.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
time_axis_sample.set_name (controls_base_unselected_name);
|
||||
time_axis_frame.set_shadow_type (Gtk::SHADOW_NONE);
|
||||
time_axis_frame.set_name (controls_base_unselected_name);
|
||||
controls_ebox.set_name (controls_base_unselected_name);
|
||||
controls_vbox.set_name (controls_base_unselected_name);
|
||||
time_axis_vbox.set_name (controls_base_unselected_name);
|
||||
|
@ -772,7 +772,7 @@ TimeAxisView::set_selected (bool yn)
|
|||
hide_selection ();
|
||||
}
|
||||
|
||||
time_axis_sample.show();
|
||||
time_axis_frame.show();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -818,8 +818,9 @@ TimeAxisView::show_selection (TimeSelection& ts)
|
|||
double x1;
|
||||
double x2;
|
||||
double y2;
|
||||
SelectionRect *rect; time_axis_sample.show();
|
||||
SelectionRect *rect;
|
||||
|
||||
time_axis_frame.show();
|
||||
|
||||
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
|
||||
if (!(*i)->selected () && !(*i)->propagate_time_selection ()) {
|
||||
|
|
|
@ -231,7 +231,7 @@ class TimeAxisView : public virtual AxisView
|
|||
Gtk::VBox controls_vbox;
|
||||
Gtk::VBox time_axis_vbox;
|
||||
Gtk::HBox time_axis_hbox;
|
||||
Gtk::Frame time_axis_sample;
|
||||
Gtk::Frame time_axis_frame;
|
||||
Gtk::HBox top_hbox;
|
||||
Gtk::Fixed scroomer_placeholder;
|
||||
bool _name_editing;
|
||||
|
|
|
@ -124,14 +124,14 @@ VCAMasterStrip::VCAMasterStrip (Session* s, boost::shared_ptr<VCA> v)
|
|||
global_vpacker.pack_start (gain_meter.gain_automation_state_button, false, false, 1);
|
||||
global_vpacker.pack_start (bottom_padding, false, false, 0);
|
||||
|
||||
global_sample.add (global_vpacker);
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_sample.set_name ("BaseFrame");
|
||||
global_frame.add (global_vpacker);
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_frame.set_name ("BaseFrame");
|
||||
|
||||
add (global_sample);
|
||||
add (global_frame);
|
||||
|
||||
global_vpacker.show ();
|
||||
global_sample.show ();
|
||||
global_frame.show ();
|
||||
top_padding.show ();
|
||||
vertical_button.show ();
|
||||
hide_button.show ();
|
||||
|
@ -305,14 +305,14 @@ VCAMasterStrip::set_selected (bool yn)
|
|||
AxisView::set_selected (yn);
|
||||
|
||||
if (_selected) {
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
|
||||
global_sample.set_name ("MixerStripSelectedFrame");
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
|
||||
global_frame.set_name ("MixerStripSelectedFrame");
|
||||
} else {
|
||||
global_sample.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_sample.set_name ("MixerStripFrame");
|
||||
global_frame.set_shadow_type (Gtk::SHADOW_IN);
|
||||
global_frame.set_name ("MixerStripFrame");
|
||||
}
|
||||
|
||||
global_sample.queue_draw ();
|
||||
global_frame.queue_draw ();
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
@ -63,7 +63,7 @@ private:
|
|||
boost::shared_ptr<ARDOUR::VCA> _vca;
|
||||
GainMeter gain_meter;
|
||||
|
||||
Gtk::Frame global_sample;
|
||||
Gtk::Frame global_frame;
|
||||
Gtk::VBox global_vpacker;
|
||||
Gtk::HBox top_padding;
|
||||
Gtk::HBox bottom_padding;
|
||||
|
|
|
@ -111,7 +111,7 @@ VCATimeAxisView::VCATimeAxisView (PublicEditor& ed, Session* s, ArdourCanvas::Ca
|
|||
gain_meter.get_gain_slider().show ();
|
||||
|
||||
controls_ebox.set_name (controls_base_unselected_name);
|
||||
time_axis_sample.set_name (controls_base_unselected_name);
|
||||
time_axis_frame.set_name (controls_base_unselected_name);
|
||||
|
||||
s->config.ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
|
||||
Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&VCATimeAxisView::parameter_changed, this, _1), gui_context());
|
||||
|
|
Loading…
Reference in New Issue