X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fkeyeditor.h;h=76e70f10ba43796a7fc1f5d14f1de65d72d5e1ae;hb=23c0452e052fbfb4e2711ef70912f35805f017d5;hp=9fd129ca312c6757d3c6fd5a76afb4cd6f637bfe;hpb=df5cf878ce791175a67f35df0bac5958b8425b1b;p=ardour.git

diff --git a/gtk2_ardour/keyeditor.h b/gtk2_ardour/keyeditor.h
index 9fd129ca31..76e70f10ba 100644
--- a/gtk2_ardour/keyeditor.h
+++ b/gtk2_ardour/keyeditor.h
@@ -1,20 +1,39 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef __ardour_gtk_key_editor_h__
 #define __ardour_gtk_key_editor_h__
 
 #include <string>
 
+#include <gtkmm/buttonbox.h>
 #include <gtkmm/treeview.h>
 #include <gtkmm/treestore.h>
 #include <gtkmm/scrolledwindow.h>
-#include <glibmm/ustring.h>
 
-#include "ardour_dialog.h"
+#include "ardour_window.h"
 
-class KeyEditor : public ArdourDialog
+class KeyEditor : public ArdourWindow
 {
   public:
 	KeyEditor ();
-	
+
   protected:
 	void on_show ();
 	void on_unmap ();
@@ -29,22 +48,32 @@ class KeyEditor : public ArdourDialog
 		    add (path);
 		    add (bindable);
 	    }
-	    Gtk::TreeModelColumn<Glib::ustring> action;
+	    Gtk::TreeModelColumn<std::string> action;
 	    Gtk::TreeModelColumn<std::string> binding;
 	    Gtk::TreeModelColumn<std::string> path;
 	    Gtk::TreeModelColumn<bool> bindable;
 	};
 
+        Gtk::VBox vpacker;
 	Gtk::ScrolledWindow scroller;
 	Gtk::TreeView view;
 	Glib::RefPtr<Gtk::TreeStore> model;
 	KeyEditorColumns columns;
+	Gtk::Button unbind_button;
+	Gtk::HButtonBox unbind_box;
+	Gtk::HBox reset_box;
+	Gtk::Button reset_button;
+	Gtk::Label reset_label;
+
+	void unbind ();
 
 	bool can_bind;
 	guint last_state;
 
 	void action_selected ();
 	void populate ();
+
+	void reset ();
 };
 
 #endif /* __ardour_gtk_key_editor_h__ */