Edge label toggling.

Made state properties dialog actually work.
Other things...


git-svn-id: http://svn.drobilla.net/lad/machina@390 a436a847-0d15-0410-975c-d299462d15a1

8 files changed, 93 insertions, 20 deletions

diff --git a/src/gui/EdgeView.cpp b/src/gui/EdgeView.cpp
index fccf8d5..d8e11a9 100644
--- a/src/gui/EdgeView.cpp
+++ b/src/gui/EdgeView.cpp
@@ -42,11 +42,26 @@ EdgeView::length_hint() const
 
 
 void
+EdgeView::show_label(bool show)
+{
+	if (show) {
+		char label[4];
+		snprintf(label, 4, "%3f", _edge->probability());
+		set_label(label);
+	} else {
+		set_label("");
+	}
+}
+
+
+void
 EdgeView::update_label()
 {
-	char label[4];
-	snprintf(label, 4, "%3f", _edge->probability());
-	set_label(label);
+	if (_label) {
+		char label[4];
+		snprintf(label, 4, "%3f", _edge->probability());
+		set_label(label);
+	}
 }
 
 
diff --git a/src/gui/EdgeView.hpp b/src/gui/EdgeView.hpp
index c394d49..61de52f 100644
--- a/src/gui/EdgeView.hpp
+++ b/src/gui/EdgeView.hpp
@@ -33,11 +33,12 @@ public:
 
 	SharedPtr<Machina::Edge> edge() { return _edge; }
 
-	void update_label();
+	void show_label(bool show);
 	
 	virtual double length_hint() const;
 
 private:
+	void update_label();
 	bool on_event(GdkEvent* ev);
 
 	SharedPtr<Machina::Edge> _edge;
diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp
index 3ddb13f..4098ff8 100644
--- a/src/gui/MachinaGUI.cpp
+++ b/src/gui/MachinaGUI.cpp
@@ -29,6 +29,7 @@
 #include "MachinaGUI.hpp"
 #include "MachinaCanvas.hpp"
 #include "NodeView.hpp"
+#include "EdgeView.hpp"
 
 
 MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
@@ -58,6 +59,7 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 	xml->get_widget("export_midi_menuitem", _menu_export_midi);
 	xml->get_widget("export_graphviz_menuitem", _menu_export_graphviz);
 	xml->get_widget("view_toolbar_menuitem", _menu_view_toolbar);
+	xml->get_widget("view_labels_menuitem", _menu_view_labels);
 	//xml->get_widget("view_refresh_menuitem", _menu_view_refresh);
 	//xml->get_widget("view_messages_menuitem", _menu_view_messages);
 	xml->get_widget("help_about_menuitem", _menu_help_about);
@@ -115,6 +117,8 @@ MachinaGUI::MachinaGUI(SharedPtr<Machina::Engine> engine)
 	//	sigc::mem_fun(this, &MachinaGUI::menu_view_refresh));
 	_menu_view_toolbar->signal_toggled().connect(
 		sigc::mem_fun(this, &MachinaGUI::show_toolbar_toggled));
+	_menu_view_labels->signal_toggled().connect(
+		sigc::mem_fun(this, &MachinaGUI::show_labels_toggled));
 	//_menu_view_messages->signal_toggled().connect(
 	//	sigc::mem_fun(this, &MachinaGUI::show_messages_toggled));
 	_menu_help_about->signal_activate().connect(
@@ -346,7 +350,8 @@ MachinaGUI::menu_file_open()
 	const int result = dialog.run();
 
 	if (result == Gtk::RESPONSE_OK) {
-		SharedPtr<Machina::Machine> new_machine = _engine->load_machine(dialog.get_uri());
+		//SharedPtr<Machina::Machine> new_machine = _engine->load_machine(dialog.get_uri());
+		SharedPtr<Machina::Machine> new_machine = _engine->import_machine(dialog.get_uri());
 		if (new_machine) {
 			_canvas->destroy();
 			_canvas->build(new_machine);
@@ -596,6 +601,21 @@ MachinaGUI::show_toolbar_toggled()
 		_toolbar->hide();
 }
 
+
+void
+MachinaGUI::show_labels_toggled()
+{
+	const bool show = _menu_view_labels->get_active();
+
+	for (ConnectionList::iterator c = _canvas->connections().begin();
+			c != _canvas->connections().end(); ++c) {
+		const SharedPtr<EdgeView> ev = PtrCast<EdgeView>(*c);
+		if (ev)
+			ev->show_label(show);
+	}
+}
+
+
 /*
 void
 MachinaGUI::menu_view_refresh() 
@@ -643,7 +663,7 @@ MachinaGUI::stop_clicked()
 		_engine->driver()->finish_record();
 	} else {
 		_engine->machine()->deactivate();
-		_engine->machine()->reset();
+		_engine->driver()->reset();
 	}
 
 	update_toolbar();
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp
index 96fb772..eba8a93 100644
--- a/src/gui/MachinaGUI.hpp
+++ b/src/gui/MachinaGUI.hpp
@@ -64,6 +64,7 @@ protected:
 	void menu_export_graphviz();
 	//void show_messages_toggled();
 	void show_toolbar_toggled();
+	void show_labels_toggled();
 	//void menu_view_refresh();
 	void menu_help_about();
 	void menu_help_help();
@@ -110,9 +111,10 @@ protected:
 	Gtk::MenuItem*         _menu_export_midi;
 	Gtk::MenuItem*         _menu_export_graphviz;
 	Gtk::MenuItem*         _menu_help_about;
+	Gtk::CheckMenuItem*    _menu_view_labels;
 	Gtk::CheckMenuItem*    _menu_view_toolbar;
 	//Gtk::CheckMenuItem*    _menu_view_messages;
-	Gtk::MenuItem*         _menu_view_refresh;
+	//Gtk::MenuItem*         _menu_view_refresh;
 	Gtk::MenuItem*         _menu_help_help;
 	Gtk::ScrolledWindow*   _canvas_scrolledwindow;
 	Gtk::TextView*         _status_text;
diff --git a/src/gui/NodePropertiesWindow.cpp b/src/gui/NodePropertiesWindow.cpp
index 151c602..6ba3e47 100644
--- a/src/gui/NodePropertiesWindow.cpp
+++ b/src/gui/NodePropertiesWindow.cpp
@@ -34,11 +34,13 @@ NodePropertiesWindow::NodePropertiesWindow(BaseObjectType* cobject, const Glib::
 
 	xml->get_widget("node_properties_note_spinbutton", _note_spinbutton);
 	xml->get_widget("node_properties_duration_spinbutton", _duration_spinbutton);
+	xml->get_widget("node_properties_apply_button", _apply_button);
 	xml->get_widget("node_properties_cancel_button", _cancel_button);
 	xml->get_widget("node_properties_ok_button", _ok_button);
 
-	_ok_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::ok_clicked));
+	_apply_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::apply_clicked));
 	_cancel_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::cancel_clicked));
+	_ok_button->signal_clicked().connect(sigc::mem_fun(this, &NodePropertiesWindow::ok_clicked));
 }
 
 
@@ -48,11 +50,10 @@ NodePropertiesWindow::~NodePropertiesWindow()
 
 
 void
-NodePropertiesWindow::ok_clicked()
+NodePropertiesWindow::apply_clicked()
 {
-	assert(this == _instance);
-	delete _instance;
-	_instance = NULL;
+	double duration = _duration_spinbutton->get_value();
+	_node->set_duration(duration);
 }
 
 	
@@ -64,6 +65,14 @@ NodePropertiesWindow::cancel_clicked()
 	_instance = NULL;
 }
 
+	
+void
+NodePropertiesWindow::ok_clicked()
+{
+	apply_clicked();
+	cancel_clicked();
+}
+
 
 void
 NodePropertiesWindow::set_node(SharedPtr<Machina::Node> node)
diff --git a/src/gui/NodePropertiesWindow.hpp b/src/gui/NodePropertiesWindow.hpp
index 461b51b..51ab42b 100644
--- a/src/gui/NodePropertiesWindow.hpp
+++ b/src/gui/NodePropertiesWindow.hpp
@@ -34,8 +34,9 @@ private:
 
 	void set_node(SharedPtr<Machina::Node> node);
 
-	void ok_clicked();
+	void apply_clicked();
 	void cancel_clicked();
+	void ok_clicked();
 	
 	static NodePropertiesWindow* _instance;
 
@@ -43,6 +44,7 @@ private:
 
 	Gtk::SpinButton* _note_spinbutton;
 	Gtk::SpinButton* _duration_spinbutton;
+	Gtk::Button*     _apply_button;
 	Gtk::Button*     _cancel_button;
 	Gtk::Button*     _ok_button;
 };
diff --git a/src/gui/machina.glade b/src/gui/machina.glade
index fb61bd8..b5349be 100644
--- a/src/gui/machina.glade
+++ b/src/gui/machina.glade
@@ -46,6 +46,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="open_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Open a saved machine</property>
 		      <property name="label">gtk-open</property>
 		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_open_session_menuitem_activate" last_modification_time="Sun, 01 Oct 2006 07:00:37 GMT"/>
@@ -55,6 +56,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="save_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Save machine</property>
 		      <property name="label">gtk-save</property>
 		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_save_session_menuitem_activate" last_modification_time="Sun, 01 Oct 2006 07:01:40 GMT"/>
@@ -64,6 +66,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="save_as_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Save machine to file</property>
 		      <property name="label">gtk-save-as</property>
 		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_save_session_as_menuitem_activate" last_modification_time="Sun, 01 Oct 2006 07:01:40 GMT"/>
@@ -79,6 +82,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="import_midi_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Import a MIDI file</property>
 		      <property name="label" translatable="yes">_Import MIDI...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_learn_midi_menuitem_activate" last_modification_time="Fri, 02 Mar 2007 21:00:16 GMT"/>
@@ -101,6 +105,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="export_midi_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Export a MIDI file</property>
 		      <property name="label" translatable="yes">_Export MIDI...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_export_midi_menuitem_activate" last_modification_time="Fri, 02 Mar 2007 20:59:46 GMT"/>
@@ -129,7 +134,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="export_graphviz_menuitem">
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Export a DOT file for rendering diagram with the GraphViz suite of tools</property>
+		      <property name="tooltip" translatable="yes">Export a DOT file for rendering with GraphViz</property>
 		      <property name="label" translatable="yes">Export _GraphViz...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_export_graphviz_menuitem_activate" last_modification_time="Mon, 12 Mar 2007 19:47:58 GMT"/>
@@ -158,6 +163,7 @@
 		  <child>
 		    <widget class="GtkImageMenuItem" id="quit_menuitem">
 		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Exit Machina</property>
 		      <property name="label">gtk-quit</property>
 		      <property name="use_stock">True</property>
 		      <signal name="activate" handler="on_quit1_activate" last_modification_time="Sat, 11 Sep 2004 20:05:11 GMT"/>
@@ -836,12 +842,12 @@ Connect some nodes up and double click one.  You'll get it.</property>
 
 <widget class="GtkDialog" id="node_properties_dialog">
   <property name="border_width">8</property>
-  <property name="title" translatable="yes">Node Properties</property>
+  <property name="title" translatable="yes">dialog1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">False</property>
-  <property name="destroy_with_parent">True</property>
+  <property name="destroy_with_parent">False</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">True</property>
   <property name="skip_pager_hint">True</property>
@@ -852,17 +858,30 @@ Connect some nodes up and double click one.  You'll get it.</property>
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
+    <widget class="GtkVBox" id="dialog-vbox3">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">8</property>
 
       <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
+	<widget class="GtkHButtonBox" id="dialog-action_area3">
 	  <property name="visible">True</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
+	    <widget class="GtkButton" id="node_properties_apply_button">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-apply</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-10</property>
+	    </widget>
+	  </child>
+
+	  <child>
 	    <widget class="GtkButton" id="node_properties_cancel_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
@@ -879,6 +898,7 @@ Connect some nodes up and double click one.  You'll get it.</property>
 	    <widget class="GtkButton" id="node_properties_ok_button">
 	      <property name="visible">True</property>
 	      <property name="can_default">True</property>
+	      <property name="has_default">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
@@ -908,7 +928,6 @@ Connect some nodes up and double click one.  You'll get it.</property>
 	  <child>
 	    <widget class="GtkSpinButton" id="node_properties_note_spinbutton">
 	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
 	      <property name="can_focus">True</property>
 	      <property name="climb_rate">1</property>
 	      <property name="digits">0</property>
@@ -986,8 +1005,8 @@ Connect some nodes up and double click one.  You'll get it.</property>
 	  <child>
 	    <widget class="GtkSpinButton" id="node_properties_duration_spinbutton">
 	      <property name="visible">True</property>
-	      <property name="sensitive">False</property>
 	      <property name="can_focus">True</property>
+	      <property name="has_focus">True</property>
 	      <property name="climb_rate">1</property>
 	      <property name="digits">2</property>
 	      <property name="numeric">True</property>
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index c522898..e1e86ea 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -51,6 +51,11 @@ main(int argc, char** argv)
 			cout << "No quantization." << endl;
 			machine = file_driver->learn(filename);
 		}
+
+		if (!machine) {
+			cout << "Not a MIDI file.  Attempting to load as Machina file." << endl;
+			machine = Loader().load(filename);
+		}
 	}
 
 	if (!machine)