GUI pimpifications.

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

3 files changed, 153 insertions, 312 deletions

diff --git a/src/Patchage.cpp b/src/Patchage.cpp
index 84d9024..66c5732 100644
--- a/src/Patchage.cpp
+++ b/src/Patchage.cpp
@@ -147,9 +147,9 @@ Patchage::Patchage(int argc, char** argv)
 	xml->get_widget("file_quit_menuitem", _menu_file_quit);
 	xml->get_widget("view_refresh_menuitem", _menu_view_refresh);
 	xml->get_widget("view_messages_menuitem", _menu_view_messages);
-	xml->get_widget("view_jack_toolbar_menuitem", _menu_view_jack_toolbar);
+	xml->get_widget("view_toolbar_menuitem", _menu_view_toolbar);
 	xml->get_widget("help_about_menuitem", _menu_help_about);
-	xml->get_widget("jack_toolbar", _jack_toolbar);
+	xml->get_widget("toolbar", _toolbar);
 	xml->get_widget("canvas_scrolledwindow", _canvas_scrolledwindow);
 	xml->get_widget("zoom_scale", _zoom_slider);
 	xml->get_widget("status_text", _status_text);
@@ -162,15 +162,14 @@ Patchage::Patchage(int argc, char** argv)
 	xml->get_widget("zoom_normal_but", _zoom_normal_button);
 	//xml->get_widget("main_statusbar", _status_bar);
 	//xml->get_widget("main_load_progress", _load_progress_bar);
-	xml->get_widget("main_jack_connect_toggle", _jack_connect_toggle);
-	xml->get_widget("main_jack_realtime_check", _jack_realtime_check);
+	//xml->get_widget("main_jack_connect_toggle", _jack_connect_toggle);
+	//xml->get_widget("main_jack_realtime_check", _jack_realtime_check);
 	xml->get_widget("main_buffer_size_combo", _buffer_size_combo);
 	xml->get_widget("main_sample_rate_label", _sample_rate_label);
 	xml->get_widget("main_xrun_progress", _xrun_progress_bar);
-	xml->get_widget("main_xrun_counter", _xrun_counter);
 	xml->get_widget("main_clear_load_button", _clear_load_button);
 	
-	gtkmm_set_width_for_given_text(*_buffer_size_combo, "4096", 40);
+	gtkmm_set_width_for_given_text(*_buffer_size_combo, "4096 frames", 40);
 	//gtkmm_set_width_for_given_text(*m_sample_rate_combo, "44.1", 40);
 
 	_canvas_scrolledwindow->add(*_canvas);
@@ -180,11 +179,11 @@ Patchage::Patchage(int argc, char** argv)
 
 	_zoom_slider->signal_value_changed().connect(sigc::mem_fun(this, &Patchage::zoom_changed));
 	
-	_jack_connect_toggle->signal_toggled().connect(sigc::mem_fun(this, &Patchage::jack_connect_changed));
+	//_jack_connect_toggle->signal_toggled().connect(sigc::mem_fun(this, &Patchage::jack_connect_changed));
 
 	_buffer_size_combo->signal_changed().connect(sigc::mem_fun(this, &Patchage::buffer_size_changed));
 	//m_sample_rate_combo->signal_changed().connect(sigc::mem_fun(this, &Patchage::sample_rate_changed));
-	_jack_realtime_check->signal_toggled().connect(sigc::mem_fun(this, &Patchage::realtime_changed));
+	//_jack_realtime_check->signal_toggled().connect(sigc::mem_fun(this, &Patchage::realtime_changed));
 	
 	_rewind_button->signal_clicked().connect(sigc::mem_fun(_jack_driver, &JackDriver::rewind_transport));
 	_play_button->signal_clicked().connect(sigc::mem_fun(_jack_driver, &JackDriver::start_transport));
@@ -220,7 +219,7 @@ Patchage::Patchage(int argc, char** argv)
 	_menu_store_positions->signal_activate().connect(sigc::mem_fun(this, &Patchage::menu_store_positions));
 	_menu_file_quit->signal_activate().connect(      sigc::mem_fun(this, &Patchage::menu_file_quit));
 	_menu_view_refresh->signal_activate().connect(   sigc::mem_fun(this, &Patchage::menu_view_refresh));
-	_menu_view_jack_toolbar->signal_activate().connect(sigc::mem_fun(this, &Patchage::view_jack_toolbar_toggled));
+	_menu_view_toolbar->signal_activate().connect(   sigc::mem_fun(this, &Patchage::view_toolbar_toggled));
 	_menu_view_messages->signal_toggled().connect(   sigc::mem_fun(this, &Patchage::show_messages_toggled));
 	_menu_help_about->signal_activate().connect(     sigc::mem_fun(this, &Patchage::menu_help_about));
 
@@ -337,8 +336,8 @@ Patchage::idle_callback()
 void
 Patchage::update_toolbar()
 {
-	_jack_connect_toggle->set_active(_jack_driver->is_attached());
-	_jack_realtime_check->set_active(_jack_driver->is_realtime());
+	//_jack_connect_toggle->set_active(_jack_driver->is_attached());
+	//_jack_realtime_check->set_active(_jack_driver->is_realtime());
 
 	if (_jack_driver->is_attached()) {
 		_buffer_size_combo->set_active((int)log2f(_jack_driver->buffer_size()) - 5);
@@ -390,8 +389,7 @@ Patchage::update_load()
 		char tmp_buf[8];
 		snprintf(tmp_buf, 8, "%zd", _jack_driver->xruns());
 
-		//m_xrun_progress_bar->set_text(string(tmp_buf) + " XRuns");
-		_xrun_counter->set_text(tmp_buf);
+		_xrun_progress_bar->set_text(string(tmp_buf) + " Dropouts");
 
 		if (max_delay > period) {
 			_xrun_progress_bar->set_fraction(1.0);
@@ -483,16 +481,16 @@ Patchage::connect_widgets()
 	_jack_driver->signal_attached.connect(
 			sigc::mem_fun(this, &Patchage::update_toolbar));
 
-	_jack_driver->signal_attached.connect(sigc::bind(
-			sigc::mem_fun(_jack_connect_toggle, &Gtk::ToggleButton::set_active), true));
+	//_jack_driver->signal_attached.connect(sigc::bind(
+	///		sigc::mem_fun(_jack_connect_toggle, &Gtk::ToggleButton::set_active), true));
 
 	_jack_driver->signal_attached.connect(sigc::bind(
 			sigc::mem_fun(_menu_jack_connect, &Gtk::MenuItem::set_sensitive), false));
 	_jack_driver->signal_attached.connect(sigc::bind(
 			sigc::mem_fun(_menu_jack_disconnect, &Gtk::MenuItem::set_sensitive), true));
 	
-	_jack_driver->signal_detached.connect(sigc::bind(
-			sigc::mem_fun(_jack_connect_toggle, &Gtk::ToggleButton::set_active), false));
+	//_jack_driver->signal_detached.connect(sigc::bind(
+	//		sigc::mem_fun(_jack_connect_toggle, &Gtk::ToggleButton::set_active), false));
 	_jack_driver->signal_detached.connect(sigc::bind(
 			sigc::mem_fun(_menu_jack_connect, &Gtk::MenuItem::set_sensitive), true));
 	_jack_driver->signal_detached.connect(sigc::bind(
@@ -652,6 +650,9 @@ Patchage::on_pane_position_changed()
 void
 Patchage::on_messages_expander_changed()
 {
+	if (!_update_pane_position)
+		return;
+
 	if (!_pane_closed) {
 		// Store pane position for restoring
 		_user_pane_position = _main_paned->get_position();
@@ -694,12 +695,16 @@ Patchage::menu_view_refresh()
 
 
 void
-Patchage::view_jack_toolbar_toggled() 
+Patchage::view_toolbar_toggled() 
 {
-	if (_menu_view_jack_toolbar->get_active())
-		_jack_toolbar->show();
+	_update_pane_position = false;
+
+	if (_menu_view_toolbar->get_active())
+		_toolbar->show();
 	else
-		_jack_toolbar->hide();
+		_toolbar->hide();
+	
+	_update_pane_position = true;
 }
 
 
@@ -776,7 +781,6 @@ Patchage::sample_rate_changed()
 		//m_jack_driver->set_sample_rate(rate);
 	}
 }
-*/
 
 void
 Patchage::realtime_changed()
@@ -784,7 +788,6 @@ Patchage::realtime_changed()
 	_jack_driver->set_realtime(_jack_realtime_check->get_active());
 }
 
-
 void
 Patchage::jack_connect_changed()
 {
@@ -798,4 +801,4 @@ Patchage::jack_connect_changed()
 		}
 	}
 }
-
+*/
diff --git a/src/Patchage.h b/src/Patchage.h
index b240556..9af982a 100644
--- a/src/Patchage.h
+++ b/src/Patchage.h
@@ -72,7 +72,7 @@ protected:
 	void menu_store_positions();
 	void menu_file_quit();
 	void show_messages_toggled();
-	void view_jack_toolbar_toggled();
+	void view_toolbar_toggled();
 	void menu_view_refresh();
 	void menu_help_about();
 	void zoom(double z);
@@ -81,10 +81,10 @@ protected:
 	bool update_load();
 	void update_toolbar();
 
-	void jack_connect_changed();
+	//void jack_connect_changed();
 	void buffer_size_changed();
 	//void sample_rate_changed();
-	void realtime_changed();
+	//void realtime_changed();
 	
 	void on_pane_position_changed();
 	void on_messages_expander_changed();
@@ -138,11 +138,11 @@ protected:
 	Gtk::MenuItem*       _menu_jack_disconnect;
 	Gtk::MenuItem*       _menu_store_positions;
 	Gtk::MenuItem*       _menu_file_quit;
-	Gtk::CheckMenuItem*  _menu_view_jack_toolbar;
+	Gtk::CheckMenuItem*  _menu_view_toolbar;
 	Gtk::CheckMenuItem*  _menu_view_messages;
 	Gtk::MenuItem*       _menu_view_refresh;
 	Gtk::MenuItem*       _menu_help_about;
-	Gtk::Toolbar*        _jack_toolbar;
+	Gtk::Toolbar*        _toolbar;
 	Gtk::ScrolledWindow* _canvas_scrolledwindow;
 	Gtk::HScale*         _zoom_slider;
 	Gtk::TextView*       _status_text;
@@ -151,16 +151,13 @@ protected:
 	Gtk::Button*         _rewind_button;
 	Gtk::Button*         _play_button;
 	Gtk::Button*         _stop_button;
-	Gtk::Button*         _zoom_normal_button;
-	Gtk::Button*         _zoom_full_button;
+	Gtk::ToolButton*     _zoom_normal_button;
+	Gtk::ToolButton*     _zoom_full_button;
 	//Gtk::ProgressBar*    _load_progress_bar;
-	Gtk::ToggleButton*   _jack_connect_toggle;
-	Gtk::ToggleButton*   _jack_realtime_check;
 	Gtk::ComboBox*       _buffer_size_combo;
 	Gtk::Label*          _sample_rate_label;
 	Gtk::ProgressBar*    _xrun_progress_bar;
-	Gtk::Entry*          _xrun_counter;
-	Gtk::Button*         _clear_load_button;
+	Gtk::ToolButton*     _clear_load_button;
 	//Gtk::Statusbar*      _status_bar;
 };
 
diff --git a/src/patchage.glade b/src/patchage.glade
index 399d8fe..71496ff 100644
--- a/src/patchage.glade
+++ b/src/patchage.glade
@@ -375,9 +375,9 @@
 		<widget class="GtkMenu" id="view_menu_menu">
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="view_jack_toolbar_menuitem">
+		    <widget class="GtkCheckMenuItem" id="view_toolbar_menuitem">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Jack Toolbar</property>
+		      <property name="label" translatable="yes">_Toolbar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
 		      <signal name="activate" handler="on_view_jack_toolbar_menuitem_activate" last_modification_time="Thu, 15 Feb 2007 19:41:28 GMT"/>
@@ -453,131 +453,14 @@
       </child>
 
       <child>
-	<widget class="GtkToolbar" id="jack_toolbar">
+	<widget class="GtkToolbar" id="toolbar">
 	  <property name="visible">True</property>
 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
 	  <property name="tooltips">True</property>
 	  <property name="show_arrow">True</property>
 
 	  <child>
-	    <widget class="GtkToolItem" id="toolitem15">
-	      <property name="visible">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-
-	      <child>
-		<widget class="GtkToggleButton" id="main_jack_connect_toggle">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox3">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image621">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-connect</property>
-			      <property name="icon_size">4</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkLabel" id="label5">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">JACK</property>
-			      <property name="use_underline">True</property>
-			      <property name="use_markup">False</property>
-			      <property name="justify">GTK_JUSTIFY_LEFT</property>
-			      <property name="wrap">False</property>
-			      <property name="selectable">False</property>
-			      <property name="xalign">0.5</property>
-			      <property name="yalign">0.5</property>
-			      <property name="xpad">0</property>
-			      <property name="ypad">0</property>
-			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			      <property name="width_chars">-1</property>
-			      <property name="single_line_mode">False</property>
-			      <property name="angle">0</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkToolItem" id="toolitem16">
-	      <property name="visible">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-
-	      <child>
-		<widget class="GtkCheckButton" id="main_jack_realtime_check">
-		  <property name="border_width">1</property>
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="can_focus">True</property>
-		  <property name="label" translatable="yes">Realtime</property>
-		  <property name="use_underline">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <property name="active">False</property>
-		  <property name="inconsistent">False</property>
-		  <property name="draw_indicator">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
-	  </child>
-
-	  <child>
 	    <widget class="GtkToolItem" id="toolitem28">
 	      <property name="visible">True</property>
 	      <property name="visible_horizontal">True</property>
@@ -603,32 +486,9 @@
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkComboBoxEntry" id="main_buffer_size_combo">
-			  <property name="border_width">1</property>
-			  <property name="visible">True</property>
-			  <property name="items" translatable="yes">32
-64
-128
-256
-512
-1024
-2048
-4096</property>
-			  <property name="add_tearoffs">False</property>
-			  <property name="has_frame">True</property>
-			  <property name="focus_on_click">True</property>
-			</widget>
-			<packing>
-			  <property name="padding">1</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="main_frames_at_label">
+			<widget class="GtkLabel" id="label10">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">frames @</property>
+			  <property name="label" translatable="yes">  Latency: </property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -636,7 +496,7 @@
 			  <property name="selectable">False</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
-			  <property name="xpad">1</property>
+			  <property name="xpad">0</property>
 			  <property name="ypad">0</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 			  <property name="width_chars">-1</property>
@@ -644,15 +504,37 @@
 			  <property name="angle">0</property>
 			</widget>
 			<packing>
-			  <property name="padding">1</property>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
 		      </child>
 
 		      <child>
-			<widget class="GtkLabel" id="main_sample_rate_label">
+			<widget class="GtkComboBoxEntry" id="main_buffer_size_combo">
+			  <property name="border_width">1</property>
 			  <property name="visible">True</property>
+			  <property name="items" translatable="yes">32 frames
+64 frames
+128 frames
+256 frames
+512 frames
+1024 frames
+2048 frames
+4096 frames</property>
+			  <property name="add_tearoffs">False</property>
+			  <property name="has_frame">True</property>
+			  <property name="focus_on_click">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">1</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="main_sample_rate_label">
 			  <property name="label" translatable="yes">48</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
@@ -677,7 +559,6 @@
 
 		      <child>
 			<widget class="GtkLabel" id="label9">
-			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">kHz</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
@@ -712,7 +593,7 @@
 
 	  <child>
 	    <widget class="GtkSeparatorToolItem" id="separatortoolitem3">
-	      <property name="border_width">4</property>
+	      <property name="border_width">8</property>
 	      <property name="visible">True</property>
 	      <property name="draw">True</property>
 	      <property name="visible_horizontal">True</property>
@@ -725,36 +606,16 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolItem" id="toolitem22">
+	    <widget class="GtkToolButton" id="main_clear_load_button">
 	      <property name="visible">True</property>
+	      <property name="stock_id">gtk-clear</property>
 	      <property name="visible_horizontal">True</property>
 	      <property name="visible_vertical">True</property>
 	      <property name="is_important">False</property>
-
-	      <child>
-		<widget class="GtkButton" id="main_clear_load_button">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image622">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-clear</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
+	      <property name="homogeneous">True</property>
 	    </packing>
 	  </child>
 
@@ -778,49 +639,16 @@
 		  <property name="right_padding">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox5">
+		    <widget class="GtkProgressBar" id="main_xrun_progress">
 		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkProgressBar" id="main_xrun_progress">
-			  <property name="visible">True</property>
-			  <property name="tooltip" translatable="yes">Delay/XRun Indicator
+		      <property name="tooltip" translatable="yes">Delay/XRun Indicator
 
 The bar represents the maximum processing delay as a fraction of the time available for a cycle.  If the bar reaches 100%, an XRun will occur.</property>
-			  <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
-			  <property name="fraction">0</property>
-			  <property name="pulse_step">0.10000000149</property>
-			  <property name="text" translatable="yes">XRun %</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			</widget>
-			<packing>
-			  <property name="padding">1</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkEntry" id="main_xrun_counter">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="editable">True</property>
-			  <property name="visibility">True</property>
-			  <property name="max_length">0</property>
-			  <property name="text" translatable="yes">0</property>
-			  <property name="has_frame">True</property>
-			  <property name="invisible_char">*</property>
-			  <property name="activates_default">False</property>
-			  <property name="width_chars">3</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
+		      <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+		      <property name="fraction">0</property>
+		      <property name="pulse_step">0.10000000149</property>
+		      <property name="text" translatable="yes">0 Dropouts</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -831,17 +659,85 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="separatortoolitem4">
+	      <property name="border_width">8</property>
+	      <property name="visible">True</property>
+	      <property name="draw">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="zoom_normal_but">
+	      <property name="visible">True</property>
+	      <property name="stock_id">gtk-zoom-100</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="zoom_full_but">
+	      <property name="visible">True</property>
+	      <property name="stock_id">gtk-zoom-fit</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolItem" id="toolitem32">
+	      <property name="visible">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+
+	      <child>
+		<widget class="GtkHScale" id="zoom_scale">
+		  <property name="width_request">180</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="draw_value">False</property>
+		  <property name="value_pos">GTK_POS_TOP</property>
+		  <property name="digits">1</property>
+		  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+		  <property name="inverted">False</property>
+		  <property name="adjustment">1 0.10000000149 2 0 0 0</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">False</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
 	  <property name="expand">False</property>
-	  <property name="fill">False</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
 
       <child>
 	<widget class="GtkToolbar" id="toolbar1">
-	  <property name="visible">True</property>
 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
 	  <property name="tooltips">True</property>
@@ -996,37 +892,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolItem" id="toolitem7">
-	      <property name="visible">True</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-
-	      <child>
-		<widget class="GtkButton" id="zoom_normal_but">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="zoom_normal_but_icon">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-zoom-100</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">False</property>
-	    </packing>
+	    <placeholder/>
 	  </child>
 
 	  <child>
@@ -1037,25 +903,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="is_important">False</property>
 
 	      <child>
-		<widget class="GtkButton" id="zoom_full_but">
-		  <property name="border_width">1</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-
-		  <child>
-		    <widget class="GtkImage" id="image361">
-		      <property name="visible">True</property>
-		      <property name="stock">gtk-zoom-fit</property>
-		      <property name="icon_size">4</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		    </widget>
-		  </child>
-		</widget>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1073,17 +921,7 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	      <property name="is_important">False</property>
 
 	      <child>
-		<widget class="GtkHScale" id="zoom_scale">
-		  <property name="width_request">180</property>
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="draw_value">False</property>
-		  <property name="value_pos">GTK_POS_TOP</property>
-		  <property name="digits">1</property>
-		  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
-		  <property name="inverted">False</property>
-		  <property name="adjustment">1 0.10000000149 2 0 0 0</property>
-		</widget>
+		<placeholder/>
 	      </child>
 	    </widget>
 	    <packing>
@@ -1108,7 +946,10 @@ The bar represents the maximum processing delay as a fraction of the time availa
 	  <child>
 	    <widget class="GtkScrolledWindow" id="canvas_scrolledwindow">
 	      <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="has_focus">True</property>
 	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
 	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
 	      <property name="shadow_type">GTK_SHADOW_IN</property>