X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fpatch_change.cc;h=3070011380f9edcc96f7bc780acab52305adb23a;hb=54aa82cd4be12e48580c3e6bc17a580b8fd86d0c;hp=1bcf8d940ee684d0e4b36329be2d739068daa5ef;hpb=00e59940c8182f32d945c476b90816550e6bce28;p=ardour.git

diff --git a/gtk2_ardour/patch_change.cc b/gtk2_ardour/patch_change.cc
index 1bcf8d940e..3070011380 100644
--- a/gtk2_ardour/patch_change.cc
+++ b/gtk2_ardour/patch_change.cc
@@ -24,17 +24,18 @@
 #include <glibmm/regex.h>
 
 #include "gtkmm2ext/keyboard.h"
+#include "gtkmm2ext/menu_elems.h"
 #include "gtkmm2ext/utils.h"
 
 #include "midi++/midnam_patch.h"
 
 #include "canvas/debug.h"
 
-#include "ardour_ui.h"
 #include "editor.h"
 #include "editor_drag.h"
 #include "midi_region_view.h"
 #include "patch_change.h"
+#include "ui_config.h"
 
 using namespace MIDI::Name;
 using namespace std;
@@ -49,7 +50,9 @@ PatchChange::PatchChange(MidiRegionView&                   region,
                          double                            x,
                          double                            y,
                          ARDOUR::InstrumentInfo&           info,
-                         ARDOUR::MidiModel::PatchChangePtr patch)
+                         ARDOUR::MidiModel::PatchChangePtr patch,
+			 ArdourCanvas::Color               outline_color,
+			 ArdourCanvas::Color               fill_color)
 	: _region (region)
 	, _info (info)
 	, _patch (patch)
@@ -58,15 +61,15 @@ PatchChange::PatchChange(MidiRegionView&                   region,
 	_flag = new ArdourCanvas::Flag (
 		parent,
 		height,
-		ARDOUR_UI::config()->color ("midi patch change outline"),
-		ARDOUR_UI::config()->color_mod ("midi patch change fill", "midi patch change fill"),
+		outline_color,
+		fill_color,
 		ArdourCanvas::Duple (x, y),
 		true);
-	
+
 	CANVAS_DEBUG_NAME (_flag, text);
 
 	_flag->Event.connect (sigc::mem_fun (*this, &PatchChange::event_handler));
-	_flag->set_font_description (ARDOUR_UI::config()->get_SmallFont());
+	_flag->set_font_description (UIConfiguration::instance().get_SmallFont());
 	_flag->set_text(text);
 }
 
@@ -82,7 +85,7 @@ PatchChange::initialize_popup_menus()
 
 	boost::shared_ptr<ChannelNameSet> channel_name_set = _info.get_patches (_patch->channel());
 
-	if (!channel_name_set) {
+	if (!channel_name_set || channel_name_set->patch_banks().size () == 0) {
 		return;
 	}
 
@@ -98,12 +101,12 @@ PatchChange::initialize_popup_menus()
 		     ++bank) {
 			Glib::RefPtr<Glib::Regex> underscores = Glib::Regex::create("_");
 			std::string replacement(" ");
-			
+
 			Gtk::Menu& patch_bank_menu = *manage(new Gtk::Menu());
-			
+
 			const PatchNameList& patches = (*bank)->patch_name_list();
 			Gtk::Menu::MenuList& patch_menus = patch_bank_menu.items();
-		
+
 			for (PatchNameList::const_iterator patch = patches.begin();
 			     patch != patches.end();
 			     ++patch) {
@@ -131,18 +134,12 @@ PatchChange::initialize_popup_menus()
 
 		const PatchNameList& patches = patch_banks.front()->patch_name_list();
 		Gtk::Menu::MenuList& patch_menus = _popup.items();
-		
+
 		for (PatchNameList::const_iterator patch = patches.begin();
 		     patch != patches.end();
 		     ++patch) {
-			std::string name = (*patch)->name();
-			boost::replace_all (name, "_", " ");
-			
-			patch_menus.push_back (
-				Gtk::Menu_Helpers::MenuElem (
-					name,
-					sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected),
-					            (*patch)->patch_primary_key())));
+			patch_menus.push_back (Gtkmm2ext::MenuElemNoMnemonic ((*patch)->name(),
+						sigc::bind (sigc::mem_fun(*this, &PatchChange::on_patch_menu_selected), (*patch)->patch_primary_key())));
 		}
 	}
 }
@@ -158,7 +155,7 @@ PatchChange::event_handler (GdkEvent* ev)
 {
 	/* XXX: icky dcast */
 	Editor* e = dynamic_cast<Editor*> (&_region.get_time_axis_view().editor());
-	
+
 	if (!e->internal_editing()) {
 		return false;
 	}
@@ -176,14 +173,14 @@ PatchChange::event_handler (GdkEvent* ev)
 
 				_region.edit_patch_change (this);
 				return true;
-				
+
 			} else if (ev->button.button == 1) {
 				e->drags()->set (new PatchChangeDrag (e, this, &_region), ev);
 				return true;
 			}
 		}
 
-		if (ev->button.button == 3) {
+		if (Gtkmm2ext::Keyboard::is_context_menu_event (&ev->button)) {
 			if (!_popup_initialized) {
 				initialize_popup_menus();
 				_popup_initialized = true;