packaging tweaks for OS X

[ardour.git] / gtk2_ardour / region_editor.cc

diff --git a/gtk2_ardour/region_editor.cc b/gtk2_ardour/region_editor.cc
index b80698e6ed34e8718566d0d27e198157ce1392ca..622223047a8a142a2d18293f8d4d0dae0e2547d2 100755 (executable)
--- a/gtk2_ardour/region_editor.cc
+++ b/gtk2_ardour/region_editor.cc
@@ -49,15 +49,15 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
         , _table_row (0)
         , _region (r)
         , name_label (_("Name:"))
-        , audition_button (_("Play"))
+        , audition_button (_("Audition"))
         , _clock_group (new ClockGroup)
-        , position_clock (X_("regionposition"), true, X_("RegionEditorClock"), true, false)
-        , end_clock (X_("regionend"), true, X_("RegionEditorClock"), true, false)
-        , length_clock (X_("regionlength"), true, X_("RegionEditorClock"), true, false, true)
-        , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, X_("RegionEditorClock"), true, false)
-        , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, X_("RegionEditorClock"), true, false)
+        , position_clock (X_("regionposition"), true, "", true, false)
+        , end_clock (X_("regionend"), true, "", true, false)
+        , length_clock (X_("regionlength"), true, "", true, false, true)
+        , sync_offset_relative_clock (X_("regionsyncoffsetrelative"), true, "", true, false)
+        , sync_offset_absolute_clock (X_("regionsyncoffsetabsolute"), true, "", true, false)
           /* XXX cannot file start yet */
-        , start_clock (X_("regionstart"), true, X_("RegionEditorClock"), false, false)
+        , start_clock (X_("regionstart"), true, "", false, false)
         , _sources (1)
 {
        set_session (s);
@@ -121,38 +121,38 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
        Gtk::HBox* nb = Gtk::manage (new Gtk::HBox);
        nb->set_spacing (6);
        nb->pack_start (name_entry);
-       nb->pack_start (audition_button);
+       nb->pack_start (audition_button, false, false);
 
        _table.attach (name_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (*nb, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (position_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (position_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (end_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (end_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (length_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (length_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (sync_relative_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (sync_offset_relative_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (sync_absolute_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (sync_offset_absolute_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (start_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (start_clock, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        _table.attach (_sources_label, 0, 1, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
-       _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL, Gtk::FILL);
+       _table.attach (_sources, 1, 2, _table_row, _table_row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::FILL);
        ++_table_row;
 
        get_vbox()->pack_start (_table, true, true);
@@ -189,7 +189,7 @@ RegionEditor::RegionEditor (Session* s, boost::shared_ptr<Region> r)
 
        bounds_changed (change);
 
-       _region->PropertyChanged.connect (state_connection, invalidator (*this), ui_bind (&RegionEditor::region_changed, this, _1), gui_context());
+       _region->PropertyChanged.connect (state_connection, invalidator (*this), boost::bind (&RegionEditor::region_changed, this, _1), gui_context());
 
        spin_arrow_grab = false;
 
@@ -266,7 +266,7 @@ RegionEditor::connect_editor_events ()
 
        audition_button.signal_toggled().connect (sigc::mem_fun(*this, &RegionEditor::audition_button_toggled));
 
-       _session->AuditionActive.connect (audition_connection, invalidator (*this), ui_bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
+       _session->AuditionActive.connect (audition_connection, invalidator (*this), boost::bind (&RegionEditor::audition_state_changed, this, _1), gui_context());
 }
 
 void