diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/engine/SMFDriver.hpp | 3 | ||||
-rw-r--r-- | src/gui/MachinaGUI.cpp | 7 | ||||
-rw-r--r-- | src/gui/MachinaGUI.hpp | 1 | ||||
-rw-r--r-- | src/gui/machina.ui | 501 |
4 files changed, 339 insertions, 173 deletions
diff --git a/src/engine/SMFDriver.hpp b/src/engine/SMFDriver.hpp index c67186a..df726e8 100644 --- a/src/engine/SMFDriver.hpp +++ b/src/engine/SMFDriver.hpp @@ -32,8 +32,7 @@ namespace machina { class Node; class Machine; -class SMFDriver - : public Driver +class SMFDriver : public Driver { public: SMFDriver(Raul::Forge& forge, Raul::TimeUnit unit); diff --git a/src/gui/MachinaGUI.cpp b/src/gui/MachinaGUI.cpp index d963217..63cbb76 100644 --- a/src/gui/MachinaGUI.cpp +++ b/src/gui/MachinaGUI.cpp @@ -72,7 +72,6 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine) xml->get_widget("help_help_menuitem", _menu_help_help); xml->get_widget("canvas_scrolledwindow", _canvas_scrolledwindow); xml->get_widget("step_record_checkbutton", _step_record_checkbutton); - xml->get_widget("clock_checkbutton", _clock_checkbutton); xml->get_widget("bpm_spinbutton", _bpm_spinbutton); xml->get_widget("quantize_checkbutton", _quantize_checkbutton); xml->get_widget("quantize_spinbutton", _quantize_spinbutton); @@ -139,12 +138,10 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine) sigc::mem_fun(this, &MachinaGUI::menu_help_about)); _menu_help_help->signal_activate().connect( sigc::mem_fun(this, &MachinaGUI::menu_help_help)); - _clock_checkbutton->signal_toggled().connect( + _bpm_spinbutton->signal_changed().connect( sigc::mem_fun(this, &MachinaGUI::tempo_changed)); _quantize_checkbutton->signal_toggled().connect( sigc::mem_fun(this, &MachinaGUI::quantize_changed)); - _quantize_spinbutton->signal_changed().connect( - sigc::mem_fun(this, &MachinaGUI::quantize_changed)); _mutate_button->signal_clicked().connect( sigc::bind(sigc::mem_fun(this, &MachinaGUI::random_mutation), @@ -178,7 +175,6 @@ MachinaGUI::MachinaGUI(SPtr<machina::Engine> engine) _main_window->present(); _step_record_checkbutton->show(); - _clock_checkbutton->set_active(true); _quantize_checkbutton->set_active(false); update_toolbar(); @@ -371,7 +367,6 @@ MachinaGUI::update_toolbar() { _record_button->set_active(_engine->driver()->recording()); _play_button->set_active(_engine->machine()->is_activated()); - _bpm_spinbutton->set_sensitive(_clock_checkbutton->get_active()); _quantize_spinbutton->set_sensitive(_quantize_checkbutton->get_active()); } diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index 2636051..6c85dca 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -151,7 +151,6 @@ protected: Gtk::TextView* _status_text; Gtk::Expander* _messages_expander; Gtk::ToggleToolButton* _step_record_checkbutton; - Gtk::CheckButton* _clock_checkbutton; Gtk::SpinButton* _bpm_spinbutton; Gtk::CheckButton* _quantize_checkbutton; Gtk::SpinButton* _quantize_spinbutton; diff --git a/src/gui/machina.ui b/src/gui/machina.ui index 61e7d95..b48df7d 100644 --- a/src/gui/machina.ui +++ b/src/gui/machina.ui @@ -1,8 +1,131 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="UTF-8"?> <interface> - <!-- interface-requires gtk+ 2.10 --> + <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy toplevel-contextual --> + <object class="GtkAboutDialog" id="about_win"> + <property name="can_focus">False</property> + <property name="destroy_with_parent">True</property> + <property name="type_hint">normal</property> + <property name="copyright" translatable="yes">© 2013 David Robillard <http://drobilla.net></property> + <property name="comments" translatable="yes">A MIDI sequencer based on + probabilistic finite-state automata</property> + <property name="website">http://drobilla.net/software/machina</property> + <property name="website_label" translatable="yes">Website:</property> + <property name="license" translatable="yes">Machina 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. + +Machina 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 Machina; if not, write to the Free Software Foundation, Inc., +51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +</property> + <property name="authors">David Robillard <d@drobilla.net></property> + <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property> + <property name="logo">machina.svg</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox1"> + <property name="can_focus">False</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area1"> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkAdjustment" id="bpm_adjustment"> + <property name="lower">1</property> + <property name="upper">480</property> + <property name="value">120</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkDialog" id="help_dialog"> + <property name="can_focus">False</property> + <property name="border_width">8</property> + <property name="title" translatable="yes">Machina Help</property> + <property name="resizable">False</property> + <property name="window_position">center-on-parent</property> + <property name="icon_name">gtk-help</property> + <property name="type_hint">dialog</property> + <child internal-child="vbox"> + <object class="GtkVBox" id="dialog-vbox2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="dialog-action_area2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="closebutton1"> + <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Initial nodes are shown with a thick border. +Selector nodes are shown in green. + +- Right click canvas to create a new node +- Middle click nodes to learn a MIDI note for that node +- Right click two nodes in succession to connect nodes +- Double click a node to show its properties dialog +- Ctrl+Left click a node to make it an initial node +- Ctrl+Right click a node to make it a selector node +- Ctrl+Left click edge probabilities to decrease +- Ctrl+Right click edge probabilities to increase</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">8</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <action-widgets> + <action-widget response="-7">closebutton1</action-widget> + </action-widgets> + </object> <object class="GtkWindow" id="machina_win"> + <property name="can_focus">False</property> <property name="border_width">1</property> <property name="title" translatable="yes">Machina</property> <property name="default_width">640</property> @@ -11,95 +134,117 @@ <child> <object class="GtkVBox" id="main_vbox"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkMenuBar" id="menubar"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkMenuItem" id="file_menu"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_File</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="file_menu_menu"> + <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="open_menuitem"> <property name="label">gtk-open</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_open_session_menuitem_activate"/> + <signal name="activate" handler="on_open_session_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="save_menuitem"> <property name="label">gtk-save</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_save_session_menuitem_activate"/> + <signal name="activate" handler="on_save_session_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="save_as_menuitem"> <property name="label">gtk-save-as</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_save_session_as_menuitem_activate"/> + <signal name="activate" handler="on_save_session_as_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator5"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="import_midi_menuitem"> <property name="label">_Import MIDI...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="I" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="on_learn_midi_menuitem_activate"/> + <signal name="activate" handler="on_learn_midi_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="export_midi_menuitem"> <property name="label">_Export MIDI...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="E" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="on_export_midi_menuitem_activate"/> + <signal name="activate" handler="on_export_midi_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator7"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="export_graphviz_menuitem"> <property name="label">Export _GraphViz...</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> <accelerator key="G" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="on_export_graphviz_menuitem_activate"/> + <signal name="activate" handler="on_export_graphviz_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkSeparatorMenuItem" id="separator6"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> </child> <child> <object class="GtkImageMenuItem" id="quit_menuitem"> <property name="label">gtk-quit</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_quit1_activate"/> + <signal name="activate" handler="on_quit1_activate" swapped="no"/> </object> </child> </object> @@ -108,14 +253,19 @@ </child> <child> <object class="GtkMenuItem" id="view_menu"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_View</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="view_menu_menu"> + <property name="can_focus">False</property> <child> <object class="GtkCheckMenuItem" id="view_time_edges_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">_Time Based Edges</property> <property name="use_underline">True</property> @@ -123,21 +273,25 @@ </child> <child> <object class="GtkCheckMenuItem" id="view_labels_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Labels</property> <property name="use_underline">True</property> <accelerator key="L" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="on_view_edge_labels_menuitem_activate"/> + <signal name="activate" handler="on_view_edge_labels_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkCheckMenuItem" id="view_toolbar_menuitem"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Toolbar</property> <property name="use_underline">True</property> <property name="active">True</property> <accelerator key="T" signal="activate" modifiers="GDK_CONTROL_MASK"/> - <signal name="activate" handler="on_toolbar2_activate"/> + <signal name="activate" handler="on_toolbar2_activate" swapped="no"/> </object> </child> </object> @@ -146,27 +300,34 @@ </child> <child> <object class="GtkMenuItem" id="help_menu"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes">_Help</property> <property name="use_underline">True</property> <child type="submenu"> <object class="GtkMenu" id="help_menu_menu"> + <property name="can_focus">False</property> <child> <object class="GtkImageMenuItem" id="help_help_menuitem"> <property name="label">gtk-help</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_help_about_menuitem_activate"/> + <signal name="activate" handler="on_help_about_menuitem_activate" swapped="no"/> </object> </child> <child> <object class="GtkImageMenuItem" id="help_about_menuitem"> <property name="label">gtk-about</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="use_underline">True</property> <property name="use_stock">True</property> - <signal name="activate" handler="on_about1_activate"/> + <signal name="activate" handler="on_about1_activate" swapped="no"/> </object> </child> </object> @@ -183,15 +344,20 @@ <child> <object class="GtkHBox" id="hbox2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <child> <object class="GtkToolbar" id="toolbar"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <child> <object class="GtkToggleToolButton" id="record_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Record</property> <property name="stock_id">gtk-media-record</property> </object> <packing> @@ -201,7 +367,10 @@ </child> <child> <object class="GtkToolButton" id="stop_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Stop</property> <property name="stock_id">gtk-media-stop</property> </object> <packing> @@ -211,7 +380,10 @@ </child> <child> <object class="GtkToggleToolButton" id="play_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Play</property> <property name="stock_id">gtk-media-play</property> <property name="active">True</property> </object> @@ -223,6 +395,7 @@ <child> <object class="GtkSeparatorToolItem" id="separatortoolitem4"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -230,8 +403,11 @@ </child> <child> <object class="GtkToggleToolButton" id="step_record_checkbutton"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="tooltip_text" translatable="yes">Step record</property> <property name="stock_id">gtk-add</property> </object> <packing> @@ -242,6 +418,7 @@ <child> <object class="GtkSeparatorToolItem" id="separatortoolitem1"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -249,12 +426,16 @@ </child> <child> <object class="GtkToolItem" id="toolitem1"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox3"> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkCheckButton" id="clock_checkbutton"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -263,6 +444,8 @@ <property name="draw_indicator">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> @@ -270,16 +453,27 @@ <object class="GtkSpinButton" id="bpm_spinbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment"></property> + <property name="tooltip_text" translatable="yes">Playback tempo</property> + <property name="max_length">3</property> + <property name="width_chars">3</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <property name="adjustment">bpm_adjustment</property> <property name="climb_rate">1</property> + <property name="numeric">True</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="label" translatable="yes"> BPM</property> </object> <packing> @@ -298,6 +492,7 @@ <child> <object class="GtkSeparatorToolItem" id="separatortoolitem2"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -305,17 +500,22 @@ </child> <child> <object class="GtkToolItem" id="toolitem3"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <child> <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="border_width">4</property> <child> <object class="GtkCheckButton" id="quantize_checkbutton"> <property name="label" translatable="yes">1/</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Quantization</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> @@ -330,10 +530,17 @@ <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="adjustment"></property> + <property name="tooltip_text" translatable="yes">Quantize note type</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> + <property name="adjustment">quantize_adjustment</property> <property name="climb_rate">1</property> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -347,6 +554,7 @@ <child> <object class="GtkSeparatorToolItem" id="separatortoolitem3"> <property name="visible">True</property> + <property name="can_focus">False</property> </object> <packing> <property name="expand">False</property> @@ -354,7 +562,10 @@ </child> <child> <object class="GtkToolButton" id="zoom_normal_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Normal size</property> <property name="stock_id">gtk-zoom-100</property> </object> <packing> @@ -364,7 +575,10 @@ </child> <child> <object class="GtkToolButton" id="zoom_full_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Zoom to contents</property> <property name="stock_id">gtk-zoom-fit</property> </object> <packing> @@ -374,7 +588,10 @@ </child> <child> <object class="GtkToolButton" id="arrange_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Arrange canvas</property> <property name="stock_id">gtk-refresh</property> </object> <packing> @@ -384,12 +601,15 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkToolbar" id="evolve_toolbar"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> @@ -398,6 +618,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -406,7 +627,9 @@ </child> <child> <object class="GtkToolButton" id="load_target_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock_id">gtk-open</property> </object> @@ -418,6 +641,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton5"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -426,7 +650,9 @@ </child> <child> <object class="GtkToggleToolButton" id="evolve_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Evolve machine (towards target MIDI)</property> <property name="stock_id">gtk-execute</property> @@ -439,6 +665,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton4"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -447,7 +674,9 @@ </child> <child> <object class="GtkToolButton" id="mutate_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock_id">gtk-dialog-warning</property> <accelerator key="m" signal="clicked" modifiers="GDK_CONTROL_MASK"/> @@ -460,6 +689,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -468,7 +698,9 @@ </child> <child> <object class="GtkToolButton" id="compress_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="stock_id">gtk-convert</property> </object> @@ -480,6 +712,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton2"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -488,7 +721,9 @@ </child> <child> <object class="GtkToolButton" id="add_node_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Add Node</property> <property name="stock_id">gtk-new</property> @@ -500,7 +735,9 @@ </child> <child> <object class="GtkToolButton" id="remove_node_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Delete Node</property> <property name="stock_id">gtk-delete</property> @@ -512,7 +749,9 @@ </child> <child> <object class="GtkToolButton" id="adjust_node_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Adjust Node</property> <property name="stock_id">gtk-edit</property> @@ -525,6 +764,7 @@ <child> <object class="GtkSeparatorToolItem" id="toolbutton1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> </object> <packing> @@ -533,7 +773,9 @@ </child> <child> <object class="GtkToolButton" id="add_edge_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Add Edge</property> <property name="stock_id">gtk-connect</property> @@ -545,7 +787,9 @@ </child> <child> <object class="GtkToolButton" id="remove_edge_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Remove Edge</property> <property name="stock_id">gtk-disconnect</property> @@ -557,7 +801,9 @@ </child> <child> <object class="GtkToolButton" id="adjust_edge_but"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="label" translatable="yes">Adjust Edge</property> <property name="stock_id">gtk-select-color</property> @@ -570,12 +816,14 @@ </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="position">1</property> </packing> </child> @@ -592,6 +840,8 @@ </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="padding">2</property> <property name="position">2</property> </packing> @@ -599,83 +849,29 @@ </object> </child> </object> - <object class="GtkAboutDialog" id="about_win"> - <property name="destroy_with_parent">True</property> - <property name="type_hint">normal</property> - <property name="copyright" translatable="yes">© 2007 David Robillard <http://drobilla.net></property> - <property name="comments" translatable="yes">A MIDI sequencer based on - probabilistic finite-state automata</property> - <property name="website">http://drobilla.net/software/machina</property> - <property name="website_label" translatable="yes">Website:</property> - <property name="license" translatable="yes">Machina 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. - -Machina 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 Machina; if not, write to the Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -</property> - <property name="authors">David Robillard <d@drobilla.net></property> - <property name="translator_credits" translatable="yes" comments="TRANSLATORS: Replace this string with your names, one name per line.">translator-credits</property> - <property name="logo">machina.svg</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox1"> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area1"/> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkDialog" id="help_dialog"> + <object class="GtkDialog" id="node_properties_dialog"> + <property name="can_focus">False</property> <property name="border_width">8</property> - <property name="title" translatable="yes">Machina Help</property> + <property name="title" translatable="yes">dialog1</property> <property name="resizable">False</property> - <property name="window_position">center-on-parent</property> - <property name="icon_name">gtk-help</property> + <property name="icon">machina.svg</property> <property name="type_hint">dialog</property> + <property name="skip_taskbar_hint">True</property> + <property name="skip_pager_hint">True</property> <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox2"> + <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Initial nodes are shown with a thick border. -Selector nodes are shown in green. - -- Right click canvas to create a new node -- Middle click nodes to learn a MIDI note for that node -- Right click two nodes in succession to connect nodes -- Double click a node to show its properties dialog -- Ctrl+Left click a node to make it an initial node -- Ctrl+Right click a node to make it a selector node -- Ctrl+Left click edge probabilities to decrease -- Ctrl+Right click edge probabilities to increase</property> - </object> - <packing> - <property name="padding">8</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">False</property> + <property name="spacing">8</property> <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area2"> + <object class="GtkHButtonBox" id="dialog-action_area3"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="closebutton1"> - <property name="label">gtk-close</property> + <object class="GtkButton" id="node_properties_apply_button"> + <property name="label">gtk-apply</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -688,34 +884,51 @@ Selector nodes are shown in green. <property name="position">0</property> </packing> </child> + <child> + <object class="GtkButton" id="node_properties_cancel_button"> + <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="node_properties_ok_button"> + <property name="label">gtk-ok</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> + <property name="fill">True</property> <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> - </object> - </child> - <action-widgets> - <action-widget response="-7">closebutton1</action-widget> - </action-widgets> - </object> - <object class="GtkDialog" id="node_properties_dialog"> - <property name="border_width">8</property> - <property name="title" translatable="yes">dialog1</property> - <property name="resizable">False</property> - <property name="icon">machina.svg</property> - <property name="type_hint">dialog</property> - <property name="skip_taskbar_hint">True</property> - <property name="skip_pager_hint">True</property> - <child internal-child="vbox"> - <object class="GtkVBox" id="dialog-vbox3"> - <property name="visible">True</property> - <property name="spacing">8</property> <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="n_rows">2</property> <property name="n_columns">2</property> <property name="column_spacing">4</property> @@ -725,7 +938,10 @@ Selector nodes are shown in green. <property name="visible">True</property> <property name="can_focus">True</property> <property name="has_focus">True</property> - <property name="adjustment"></property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="digits">2</property> <property name="numeric">True</property> @@ -735,12 +951,13 @@ Selector nodes are shown in green. <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Duration: </property> </object> @@ -748,96 +965,45 @@ Selector nodes are shown in green. <property name="top_attach">1</property> <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> + <property name="can_focus">False</property> <property name="xalign">0</property> <property name="label" translatable="yes">Note: </property> </object> <packing> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> <child> <object class="GtkSpinButton" id="node_properties_note_spinbutton"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="adjustment"></property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_activatable">False</property> + <property name="primary_icon_sensitive">True</property> + <property name="secondary_icon_sensitive">True</property> <property name="climb_rate">1</property> <property name="numeric">True</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options"/> </packing> </child> </object> <packing> + <property name="expand">True</property> + <property name="fill">True</property> <property name="position">2</property> </packing> </child> - <child internal-child="action_area"> - <object class="GtkHButtonBox" id="dialog-action_area3"> - <property name="visible">True</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="node_properties_apply_button"> - <property name="label">gtk-apply</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="node_properties_cancel_button"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="node_properties_ok_button"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> </object> </child> <action-widgets> @@ -846,4 +1012,11 @@ Selector nodes are shown in green. <action-widget response="-5">node_properties_ok_button</action-widget> </action-widgets> </object> + <object class="GtkAdjustment" id="quantize_adjustment"> + <property name="lower">1</property> + <property name="upper">256</property> + <property name="value">16</property> + <property name="step_increment">2</property> + <property name="page_increment">8</property> + </object> </interface> |