smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 15:25:01 +01:00
Code Issues Projects Releases Wiki Activity

Various fixups to bundle manager. Add a separator between the benign and more serious menu options on the port matrix context menu. Finally (maybe) fix port matrix sizing issues relatively nicely.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5409 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-07-22 01:28:31 +00:00
parent 7186593442
commit 272cad6241
14 changed files with 80 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

37
gtk2_ardour/port_matrix.cc
View file

@ -24,6 +24,7 @@
#include <gtkmm/menu.h>
#include <gtkmm/menushell.h>
#include <gtkmm/menu_elems.h>
#include <gtkmm/window.h>
#include "ardour/bundle.h"
#include "ardour/types.h"
#include "ardour/session.h"
@ -42,9 +43,10 @@ using namespace ARDOUR;
* @param session Our session.
* @param type Port type that we are handling.
*/
PortMatrix::PortMatrix (Session& session, DataType type)
PortMatrix::PortMatrix (Window* parent, Session& session, DataType type)
: Table (2, 2),
_session (session),
_parent (parent),
_type (type),
_menu (0),
_arrangement (TOP_TO_RIGHT),
@ -280,15 +282,6 @@ PortMatrix::popup_menu (
sub.push_back (MenuElem (buf, bind (mem_fun (*this, &PortMatrix::add_channel_proxy), w)));
}
if (can_remove_channels (bc[dim].bundle)) {
snprintf (buf, sizeof (buf), _("Remove '%s'"), bc[dim].bundle->channel_name (bc[dim].channel).c_str());
sub.push_back (
MenuElem (
buf,
bind (mem_fun (*this, &PortMatrix::remove_channel_proxy), w, bc[dim].channel)
)
);
}
if (can_rename_channels (bc[dim].bundle)) {
snprintf (buf, sizeof (buf), _("Rename '%s'..."), bc[dim].bundle->channel_name (bc[dim].channel).c_str());
@ -299,7 +292,19 @@ PortMatrix::popup_menu (
)
);
}
sub.push_back (SeparatorElem ());
if (can_remove_channels (bc[dim].bundle)) {
snprintf (buf, sizeof (buf), _("Remove '%s'"), bc[dim].bundle->channel_name (bc[dim].channel).c_str());
sub.push_back (
MenuElem (
buf,
bind (mem_fun (*this, &PortMatrix::remove_channel_proxy), w, bc[dim].channel)
)
);
}
if (_show_only_bundles) {
snprintf (buf, sizeof (buf), _("%s all"), disassociation_verb().c_str());
} else {
@ -473,7 +478,17 @@ PortMatrix::max_size () const
void
PortMatrix::setup_max_size ()
{
MaxSizeChanged ();
if (!_parent) {
return;
}
pair<uint32_t, uint32_t> const m = max_size ();
GdkGeometry g;
g.max_width = m.first;
g.max_height = m.second;
_parent->set_geometry_hints (*this, g, Gdk::HINT_MAX_SIZE);
}
bool