remove close buttons from Bundle Manager (rely on WM provided button)

[ardour.git] / gtk2_ardour / bundle_manager.cc

diff --git a/gtk2_ardour/bundle_manager.cc b/gtk2_ardour/bundle_manager.cc
index 6367eb6560d0f30058f082de86d616421dd03ba8..3ae74d3a2c818dffdfefee3110ad2d4c3e29ea35 100644 (file)
--- a/gtk2_ardour/bundle_manager.cc
+++ b/gtk2_ardour/bundle_manager.cc
@@ -27,14 +27,14 @@
 
 #include "ardour/session.h"
 #include "ardour/user_bundle.h"
-#include "ardour/audioengine.h"
 #include "bundle_manager.h"
 #include "gui_thread.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 #include "utils.h"
 
 using namespace std;
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 
 BundleEditorMatrix::BundleEditorMatrix (Gtk::Window* parent, Session* session, boost::shared_ptr<Bundle> bundle)
        : PortMatrix (parent, session, DataType::NIL)
@@ -60,7 +60,7 @@ BundleEditorMatrix::setup_ports (int dim)
                   otherwise in some cases the basic system IO ports may be hidden, making
                   the bundle editor useless */
 
-               _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true);
+               _ports[OTHER].gather (_session, DataType::NIL, _bundle->ports_are_inputs(), true, show_only_bundles ());
                _ports[OTHER].remove_bundle (_bundle);
                _ports[OTHER].resume_signals ();
        }
@@ -101,13 +101,13 @@ BundleEditorMatrix::get_state (BundleChannel c[2]) const
 }
 
 bool
-BundleEditorMatrix::can_add_channel (boost::shared_ptr<Bundle> b) const
+BundleEditorMatrix::can_add_channels (boost::shared_ptr<Bundle> b) const
 {
        if (b == _bundle) {
                return true;
        }
 
-       return PortMatrix::can_add_channel (b);
+       return PortMatrix::can_add_channels (b);
 }
 
 void
@@ -116,7 +116,6 @@ BundleEditorMatrix::add_channel (boost::shared_ptr<Bundle> b, DataType t)
        if (b == _bundle) {
 
                NameChannelDialog d;
-               d.set_position (Gtk::WIN_POS_MOUSE);
 
                if (d.run () != Gtk::RESPONSE_ACCEPT) {
                        return;
@@ -163,7 +162,6 @@ void
 BundleEditorMatrix::rename_channel (BundleChannel bc)
 {
        NameChannelDialog d (bc.bundle, bc.channel);
-       d.set_position (Gtk::WIN_POS_MOUSE);
 
        if (d.run () != Gtk::RESPONSE_ACCEPT) {
                return;
@@ -205,13 +203,13 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
        a = new Gtk::Alignment (0, 0.5, 0, 1);
        a->add (_input_or_output);
        t->attach (*Gtk::manage (a), 1, 2, 1, 2);
-       _input_or_output.append_text (_("Input"));
-       _input_or_output.append_text (_("Output"));
+       _input_or_output.append_text (_("Destination"));
+       _input_or_output.append_text (_("Source"));
 
        if (bundle->ports_are_inputs()) {
-               _input_or_output.set_active_text (_("Input"));
+               _input_or_output.set_active_text (_("Source"));
        } else {
-               _input_or_output.set_active_text (_("Output"));
+               _input_or_output.set_active_text (_("Destination"));
        }
 
        _input_or_output.signal_changed().connect (sigc::mem_fun (*this, &BundleEditor::input_or_output_changed));
@@ -220,8 +218,9 @@ BundleEditor::BundleEditor (Session* session, boost::shared_ptr<UserBundle> bund
        get_vbox()->pack_start (_matrix);
        get_vbox()->set_spacing (4);
 
-       add_button (Gtk::Stock::CLOSE, Gtk::RESPONSE_ACCEPT);
        show_all ();
+
+       signal_key_press_event().connect (sigc::mem_fun (_matrix, &BundleEditorMatrix::key_press));
 }
 
 void
@@ -243,7 +242,7 @@ BundleEditor::input_or_output_changed ()
 {
        _bundle->remove_ports_from_channels ();
 
-       if (_input_or_output.get_active_text() == _("Output")) {
+       if (_input_or_output.get_active_text() == _("Source")) {
                _bundle->set_ports_are_outputs ();
        } else {
                _bundle->set_ports_are_inputs ();
@@ -287,7 +286,7 @@ BundleManager::BundleManager (Session* session)
        edit_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::EDIT, Gtk::ICON_SIZE_BUTTON)));
        edit_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::edit_clicked));
        buttons->pack_start (edit_button, false, false);
-       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::Stock::DELETE, Gtk::ICON_SIZE_BUTTON)));
+       delete_button.set_image (*Gtk::manage (new Gtk::Image (Gtk::StockID(GTK_STOCK_DELETE), Gtk::ICON_SIZE_BUTTON)));
        delete_button.signal_clicked().connect (sigc::mem_fun (*this, &BundleManager::delete_clicked));
        buttons->pack_start (delete_button, false, false);
 
@@ -374,7 +373,7 @@ BundleManager::add_bundle (boost::shared_ptr<Bundle> b)
        (*i)[_list_model_columns.name] = u->name ();
        (*i)[_list_model_columns.bundle] = u;
 
-       u->Changed.connect (bundle_connections, invalidator (*this), ui_bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
+       u->Changed.connect (bundle_connections, invalidator (*this), boost::bind (&BundleManager::bundle_changed, this, _1, u), gui_context());
 }
 
 void
@@ -421,7 +420,6 @@ NameChannelDialog::NameChannelDialog ()
 NameChannelDialog::NameChannelDialog (boost::shared_ptr<Bundle> b, uint32_t c)
        : ArdourDialog (_("Rename Channel")),
          _bundle (b),
-         _channel (c),
          _adding (false)
 {
        _name.set_text (b->channel_name (c));