split out sndfile manager code into its own file; move a couple of utility functions into gtkmm2ext ; add knob PNG generating tool ; break appearance of monitor section for now

git-svn-id: svn://localhost/ardour2/branches/3.0@7160 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 4 insertions, 99 deletions

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 6d29737b86..49ac38d405 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -186,16 +186,3 @@ ActionManager::map_some_state (const char* group, const char* action, sigc::slot
 	}
 }
 
-string
-ActionManager::get_key_representation (const string& accel_path, AccelKey& key)
-{
-	bool known = lookup_entry (accel_path, key);
-	
-	if (known) {
-		uint32_t k = possibly_translate_legal_accelerator_to_real_key (key.get_key());
-		key = AccelKey (k, Gdk::ModifierType (key.get_mod()));
-		return ui_manager->get_accel_group()->name (key.get_key(), Gdk::ModifierType (key.get_mod()));
-	} 
-	
-	return unbound_string;
-}
diff --git a/gtk2_ardour/icons/bigknob.png b/gtk2_ardour/icons/bigknob.png
index b4fa02aad4..1511d23127 100644
--- a/gtk2_ardour/icons/bigknob.png
+++ b/gtk2_ardour/icons/bigknob.png
diff --git a/gtk2_ardour/icons/littleknob.png b/gtk2_ardour/icons/littleknob.png
index a48f222204..76544e1399 100644
--- a/gtk2_ardour/icons/littleknob.png
+++ b/gtk2_ardour/icons/littleknob.png
diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc
index 96a9857412..2a72adb5dd 100644
--- a/gtk2_ardour/keyeditor.cc
+++ b/gtk2_ardour/keyeditor.cc
@@ -8,6 +8,8 @@
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
 
+#include "gtkmm2ext/utils.h"
+
 #include "pbd/strsplit.h"
 #include "pbd/replace_all.h"
 
@@ -173,7 +175,7 @@ KeyEditor::on_key_release_event (GdkEventKey* ev)
 		}
 
 		cerr << "real lkeyval: " << ev->keyval << endl;
-		possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
+                Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (ev->keyval);
 		cerr << "using keyval = " << ev->keyval << endl;
 
 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index e96137ee2c..ac43d06e59 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -684,7 +684,7 @@ key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev)
 
 		uint32_t fakekey = ev->keyval;
 
-		if (possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
+		if (Gtkmm2ext::possibly_translate_keyval_to_make_legal_accelerator (fakekey)) {
 			if (allow_activating && gtk_accel_groups_activate(G_OBJECT(win), fakekey, GdkModifierType(ev->state))) {
 				return true;
 			}
@@ -916,88 +916,6 @@ reset_dpi ()
 	DPIReset();//Emit Signal
 }
 
-bool
-possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval)
-{
-	int fakekey = GDK_VoidSymbol;
-
-	switch (keyval) {
-	case GDK_Tab:
-	case GDK_ISO_Left_Tab:
-		fakekey = GDK_nabla;
-		break;
-
-	case GDK_Up:
-		fakekey = GDK_uparrow;
-		break;
-
-	case GDK_Down:
-		fakekey = GDK_downarrow;
-		break;
-
-	case GDK_Right:
-		fakekey = GDK_rightarrow;
-		break;
-
-	case GDK_Left:
-		fakekey = GDK_leftarrow;
-		break;
-
-	case GDK_Return:
-		fakekey = GDK_3270_Enter;
-		break;
-
-	case GDK_KP_Enter:
-		fakekey = GDK_F35;
-		break;
-
-	default:
-		break;
-	}
-
-	if (fakekey != GDK_VoidSymbol) {
-		keyval = fakekey;
-		return true;
-	}
-
-	return false;
-}
-
-uint32_t
-possibly_translate_legal_accelerator_to_real_key (uint32_t keyval)
-{
-	switch (keyval) {
-	case GDK_nabla:
-		return GDK_Tab;
-		break;
-
-	case GDK_uparrow:
-		return GDK_Up;
-		break;
-
-	case GDK_downarrow:
-		return GDK_Down;
-		break;
-
-	case GDK_rightarrow:
-		return GDK_Right;
-		break;
-
-	case GDK_leftarrow:
-		return GDK_Left;
-		break;
-
-	case GDK_3270_Enter:
-		return GDK_Return;
-
-	case GDK_F35:
-		return GDK_KP_Enter;
-		break;
-	}
-
-	return keyval;
-}
-
 
 
 inline guint8
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index bfde7807d5..cac21b4ffa 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -75,8 +75,6 @@ void set_color (Gdk::Color&, int);
 bool relay_key_press (GdkEventKey* ev, Gtk::Window* win);
 bool forward_key_press (GdkEventKey* ev);
 bool key_press_focus_accelerator_handler (Gtk::Window& window, GdkEventKey* ev);
-bool possibly_translate_keyval_to_make_legal_accelerator (uint32_t& keyval);
-uint32_t possibly_translate_legal_accelerator_to_real_key (uint32_t keyval);
 
 Glib::RefPtr<Gdk::Pixbuf> get_xpm (std::string);
 Glib::ustring get_icon_path (const char*);