diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index 5d0d35c737..2794513d18 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -285,9 +285,6 @@ MixerStrip::init ()
must be the same as those used in RCOptionEditor so that the configuration changes
are recognised when they occur.
*/
- //_visibility.add (&_invert_button_box, X_("PhaseInvert"), _("Phase Invert"));
- //_visibility.add (solo_safe_led, X_("SoloSafe"), _("Solo Safe"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
- //_visibility.add (solo_isolated_led, X_("SoloIsolated"), _("Solo Isolated"), true, boost::bind (&MixerStrip::override_solo_visibility, this));
_visibility.add (&_comment_button, X_("Comments"), _("Comments"));
_visibility.add (&group_button, X_("Group"), _("Group"));
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index e87cb71083..03622be7de 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -83,6 +83,7 @@ RouteUI::RouteUI (ARDOUR::Session* sess, const std::string& layout_script_file)
, monitor_input_button (get_waves_button ("monitor_input_button"))
, monitor_disk_button (get_waves_button ("monitor_disk_button"))
{
+ set_attributes (*this, *xml_tree ()->root (), XMLNodeMap ());
std::cout << "RouteUI::RouteUI (" << layout_script_file << ")" << std::endl;
if (sess) init ();
}
diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 10bafd0288..41296f366e 100644
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -77,7 +77,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
Canvas& /*canvas*/,
WavesUI& ui)
: AxisView (sess)
-// , controls_table (2, 8)
, _name_editing (false)
, height (0)
, display_menu (0)
@@ -97,10 +96,11 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
, _preresize_cursor (0)
, _have_preresize_cursor (false)
, _ebox_release_can_act (true)
- , controls_event_box (ui.get_container ("controls_event_box"))
- , time_axis_box (ui.root())
+ , controls_event_box (ui.root ())//ui.get_container ("controls_event_box"))
+ , time_axis_box (ui.root ())
, name_entry (ui.get_entry ("name_entry"))
, name_label (ui.get_label ("name_label"))
+ , number_label (ui.get_label ("number_label"))
{
std::cout << "TimeAxisView::TimeAxisView ()" << std::endl;
if (extra_height == 0) {
@@ -132,33 +132,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
name_entry.set_text (name_label.get_text());
name_entry.signal_activate().connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisView::end_name_edit), RESPONSE_OK));
-// name_hbox.pack_start (name_label, true, true);
-// name_hbox.show ();
-// name_label.show ();
-
- //controls_table.set_size_request (200);
- //controls_table.set_row_spacings (2);
- //controls_table.set_col_spacings (2);
- //controls_table.set_border_width (2);
- //controls_table.set_homogeneous (true);
-
- //controls_table.attach (name_hbox, 0, 5, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0);
- //controls_table.show_all ();
- //controls_table.set_no_show_all ();
-
- //HSeparator* separator = manage (new HSeparator());
- //separator->set_name("TrackSeparator");
- //separator->set_size_request(-1, 1);
- //separator->show();
-
- //controls_vbox.pack_start (controls_table, false, false);
- //controls_vbox.show ();
-
- //controls_hbox.pack_start (controls_vbox, true, true);
- //controls_hbox.show ();
-
- //controls_ebox.set_name ("TimeAxisViewControlsBaseUnselected");
- //controls_event_box.add (controls_hbox);
controls_event_box.add_events (Gdk::BUTTON_PRESS_MASK|
Gdk::BUTTON_RELEASE_MASK|
Gdk::POINTER_MOTION_MASK|
@@ -174,10 +147,6 @@ TimeAxisView::TimeAxisView (ARDOUR::Session* sess,
controls_event_box.signal_motion_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_motion));
controls_event_box.signal_leave_notify_event().connect (sigc::mem_fun (*this, &TimeAxisView::controls_ebox_leave));
- //time_axis_vbox.pack_start (controls_event_box, true, true, 0);
- //time_axis_vbox.pack_end (*separator, false, false);
- //time_axis_vbox.show();
-
ColorsChanged.connect (sigc::mem_fun (*this, &TimeAxisView::color_handler));
GhostRegion::CatchDeletion.connect (*this, invalidator (*this), boost::bind (&TimeAxisView::erase_ghost, this, _1), gui_context());
@@ -257,6 +226,7 @@ TimeAxisView::hide ()
guint32
TimeAxisView::show_at (double y, int& nth, VBox *parent)
{
+ time_axis_box.show ();
if (control_parent) {
control_parent->reorder_child (time_axis_box, nth);
} else {
@@ -266,6 +236,7 @@ TimeAxisView::show_at (double y, int& nth, VBox *parent)
}
_order = nth;
+ number_label.set_text (string_compose (_("%1"), _order));
if (_y_position != y) {
_canvas_display->set_y_position (y);
@@ -722,20 +693,15 @@ TimeAxisView::set_selected (bool yn)
Selectable::set_selected (yn);
if (_selected) {
- //controls_ebox.set_name (controls_base_selected_name);
- //time_axis_vbox.set_name (controls_base_selected_name);
- //controls_vbox.set_name (controls_base_selected_name);
+ controls_event_box.set_state (Gtk::STATE_ACTIVE);
} else {
- //controls_ebox.set_name (controls_base_unselected_name);
- //time_axis_vbox.set_name (controls_base_unselected_name);
- //controls_vbox.set_name (controls_base_unselected_name);
+ controls_event_box.set_state (Gtk::STATE_NORMAL);
hide_selection ();
/* children will be set for the yn=true case. but when deselecting
the editor only has a list of top-level trackviews, so we
have to do this here.
*/
-
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
(*i)->set_selected (false);
}
@@ -752,7 +718,7 @@ TimeAxisView::build_display_menu ()
display_menu = new Menu;
display_menu->set_name ("ArdourContextMenu");
- // Just let implementing classes define what goes into the manu
+ // Just let implementing classes define what goes into the menu
}
void
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 563937bbaa..d2e066e02c 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -205,12 +205,10 @@ class TimeAxisView : public virtual AxisView
protected:
/* The Standard LHS Controls */
- //Gtk::HBox controls_hbox;
- //Gtk::Table controls_table;
Gtk::Container& controls_event_box;
- //Gtk::VBox controls_vbox;
Gtk::Container& time_axis_box;
Gtk::Label& name_label;
+ Gtk::Label& number_label;
bool _name_editing;
uint32_t height; /* in canvas units */
std::string controls_base_unselected_name;
diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index 4e37825ed2..74c24a5fc1 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -1,78 +1,122 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ font ="Calibri 12"
+ fgnormal="#ffffff"
+ fgactive="#ffffff"/>
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
diff --git a/gtk2_ardour/ui/automation_time_axis.xml b/gtk2_ardour/ui/automation_time_axis.xml
index 67400b8942..a244b5ce9e 100644
--- a/gtk2_ardour/ui/automation_time_axis.xml
+++ b/gtk2_ardour/ui/automation_time_axis.xml
@@ -13,5 +13,6 @@
+
diff --git a/gtk2_ardour/ui/editor_window.xml b/gtk2_ardour/ui/editor_window.xml
index e308a7b066..6f19a45ecb 100644
--- a/gtk2_ardour/ui/editor_window.xml
+++ b/gtk2_ardour/ui/editor_window.xml
@@ -15,7 +15,7 @@
-
+
{
Gtk::Label& get_label (const char* id);
Gtk::Image& get_image (const char* id);
Gtk::ComboBoxText& get_combo_box_text (const char* id);
- Gtk::Entry& get_entry(const char* id);
- Gtkmm2ext::FocusEntry& get_focus_entry(const char* id);
- Gtk::SpinButton& get_spin_button(const char* id);
+ Gtk::Entry& get_entry (const char* id);
+ Gtkmm2ext::FocusEntry& get_focus_entry (const char* id);
+ Gtk::SpinButton& get_spin_button (const char* id);
WavesButton& get_waves_button (const char* id);
Gtkmm2ext::Fader& get_fader (const char* id);
- const XMLTree* xml_tree() { return _xml_tree; }
+ const XMLTree* xml_tree () { return _xml_tree; }
Gtk::Container& root () { return _root_container; }
protected:
@@ -69,7 +69,7 @@ class WavesUI : public std::map {
const std::string _scrip_file_name;
Gtk::Container& _root_container;
- Gtk::Object* get_object(const char *id);
+ Gtk::Object* get_object (const char *id);
const XMLTree* load_layout (const std::string& xml_file_name);
void create_ui (const XMLTree& layout, Gtk::Container& root);
void create_ui (const XMLNodeList& definition, const XMLNodeMap& styles, Gtk::Container& root);