misc changes

1 files changed, 711 insertions, 652 deletions

diff --git a/mixgtk/mixgtk.glade b/mixgtk/mixgtk.glade
index 3b4979c..aaac693 100644
--- a/mixgtk/mixgtk.glade
+++ b/mixgtk/mixgtk.glade
@@ -45,10 +45,10 @@
 		      <property name="label" translatable="yes">_Load...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_file_open_activate"/>
-		      <accelerator key="F3" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="O" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image227">
+			<widget class="GtkImage" id="image362">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -68,10 +68,10 @@
 		      <property name="label" translatable="yes">_Edit...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_file_edit_activate"/>
-		      <accelerator key="F4" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="E" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image228">
+			<widget class="GtkImage" id="image363">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-justify-fill</property>
 			  <property name="icon_size">1</property>
@@ -91,10 +91,10 @@
 		      <property name="label" translatable="yes">_Compile...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_file_compile_activate"/>
-		      <accelerator key="F5" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="B" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image229">
+			<widget class="GtkImage" id="image364">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-execute</property>
 			  <property name="icon_size">1</property>
@@ -120,10 +120,10 @@
 		      <property name="label" translatable="yes">E_xit</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_file_exit_activate"/>
-		      <accelerator key="Q" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK | GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image230">
+			<widget class="GtkImage" id="image365">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -156,10 +156,10 @@
 		      <property name="label" translatable="yes">_Run</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_debug_run_activate"/>
-		      <accelerator key="R" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="R" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image231">
+			<widget class="GtkImage" id="image366">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-forward</property>
 			  <property name="icon_size">1</property>
@@ -179,10 +179,10 @@
 		      <property name="label" translatable="yes">_Next</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_debug_next_activate"/>
-		      <accelerator key="N" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image232">
+			<widget class="GtkImage" id="image367">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-last</property>
 			  <property name="icon_size">1</property>
@@ -202,10 +202,10 @@
 		      <property name="label" translatable="yes">_Clear breakpoints</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_clear_breakpoints_activate"/>
-		      <accelerator key="C" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="C" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image233">
+			<widget class="GtkImage" id="image368">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-clear</property>
 			  <property name="icon_size">1</property>
@@ -225,10 +225,10 @@
 		      <property name="label" translatable="yes">_Symbols...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_symbols_activate"/>
-		      <accelerator key="Y" modifiers="GDK_MOD1_MASK" signal="activate"/>
+		      <accelerator key="Y" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image234">
+			<widget class="GtkImage" id="image369">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-index</property>
 			  <property name="icon_size">1</property>
@@ -246,13 +246,87 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkMenuItem" id="settings1">
+	    <widget class="GtkMenuItem" id="view1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Vie_w</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="view1_menu">
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="show_toolbars">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Toolbars</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkImageMenuItem" id=" ">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Detached windows</property>
+		      <property name="use_underline">True</property>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image370">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-dnd-multiple</property>
+			  <property name="icon_size">1</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>
+
+		      <child>
+			<widget class="GtkMenu" id=" _menu">
+
+			  <child>
+			    <widget class="GtkCheckMenuItem" id="detach_vm">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Virtual machine</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckMenuItem" id="detach_source">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Source</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckMenuItem" id="detach_dev">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Devices</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkMenuItem" id="settings2">
 	      <property name="visible">True</property>
 	      <property name="label" translatable="yes">S_ettings</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
-		<widget class="GtkMenu" id="settings1_menu">
+		<widget class="GtkMenu" id="settings2_menu">
 
 		  <child>
 		    <widget class="GtkImageMenuItem" id="fonts1">
@@ -261,7 +335,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image235">
+			<widget class="GtkImage" id="image371">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-font</property>
 			  <property name="icon_size">1</property>
@@ -333,7 +407,7 @@
 		      <signal name="activate" handler="on_devform_activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image236">
+			<widget class="GtkImage" id="image372">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-zoom-100</property>
 			  <property name="icon_size">1</property>
@@ -354,7 +428,7 @@
 		      <signal name="activate" handler="on_devdir_activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image237">
+			<widget class="GtkImage" id="image373">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-home</property>
 			  <property name="icon_size">1</property>
@@ -375,7 +449,7 @@
 		      <signal name="activate" handler="on_external_programs_activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image238">
+			<widget class="GtkImage" id="image374">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -389,67 +463,6 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id=" ">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Detached _windows</property>
-		      <property name="use_underline">True</property>
-
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image239">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-dnd-multiple</property>
-			  <property name="icon_size">1</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>
-
-		      <child>
-			<widget class="GtkMenu" id=" _menu">
-
-			  <child>
-			    <widget class="GtkCheckMenuItem" id="detach_vm">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Virtual machine</property>
-			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckMenuItem" id="detach_source">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Source</property>
-			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
-			    </widget>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckMenuItem" id="detach_dev">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Devices</property>
-			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="show_toolbars">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Show toolbars</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		    </widget>
-		  </child>
-
-		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator3">
 		      <property name="visible">True</property>
 		    </widget>
@@ -464,7 +477,7 @@
 		      <signal name="activate" handler="on_save_activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image240">
+			<widget class="GtkImage" id="image375">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-save</property>
 			  <property name="icon_size">1</property>
@@ -502,11 +515,23 @@
 		<widget class="GtkMenu" id="help_menu">
 
 		  <child>
-		    <widget class="GtkMenuItem" id="about">
+		    <widget class="GtkImageMenuItem" id="about">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_About...</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_about_activate"/>
+
+		      <child internal-child="image">
+			<widget class="GtkImage" id="image376">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-help</property>
+			  <property name="icon_size">1</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>
@@ -522,235 +547,261 @@
       </child>
 
       <child>
-	<widget class="GtkToolbar" id="main_toolbar">
+	<widget class="GtkHandleBox" id="tb_handle">
 	  <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>
-	  <property name="show_arrow">True</property>
+	  <property name="shadow_type">GTK_SHADOW_OUT</property>
+	  <property name="handle_position">GTK_POS_LEFT</property>
+	  <property name="snap_edge">GTK_POS_TOP</property>
 
 	  <child>
-	    <widget class="GtkToolButton" id="load_button">
+	    <widget class="GtkToolbar" id="main_toolbar">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Load MIX program</property>
-	      <property name="label" translatable="yes">Open</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-open</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_file_open_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
 
-	  <child>
-	    <widget class="GtkToolButton" id="compile_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Compile MIXAL source</property>
-	      <property name="label" translatable="yes">Compile</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-execute</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_file_compile_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="load_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Load MIX program</property>
+		  <property name="label" translatable="yes">Open</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-open</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_file_open_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="edit_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Edit MIXAL source</property>
-	      <property name="label" translatable="yes">Edit</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-justify-fill</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_file_edit_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="compile_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Compile MIXAL source</property>
+		  <property name="label" translatable="yes">Compile</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-execute</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_file_compile_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="run_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Run</property>
-	      <property name="label" translatable="yes">Run</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-go-forward</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_debug_run_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="edit_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Edit MIXAL source</property>
+		  <property name="label" translatable="yes">Edit</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-justify-fill</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_file_edit_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="step_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Next</property>
-	      <property name="label" translatable="yes">Next</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-goto-last</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_debug_next_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="run_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Run</property>
+		  <property name="label" translatable="yes">Run</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-go-forward</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_debug_run_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="clear_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Clear breakpoints</property>
-	      <property name="label" translatable="yes">Clear</property>
-	      <property name="use_underline">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">True</property>
-	      <signal name="clicked" handler="on_clear_breakpoints_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="step_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Next</property>
+		  <property name="label" translatable="yes">Next</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-goto-last</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_debug_next_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="symbols_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Symbol table</property>
-	      <property name="label" translatable="yes">Symbols</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-index</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_symbols_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="clear_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Clear breakpoints</property>
+		  <property name="label" translatable="yes">Clear</property>
+		  <property name="use_underline">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">True</property>
+		  <signal name="clicked" handler="on_clear_breakpoints_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem2">
-	      <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="symbols_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Symbol table</property>
+		  <property name="label" translatable="yes">Symbols</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-index</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_symbols_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button28">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Device directory</property>
-	      <property name="label" translatable="yes">Devdir</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-home</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_devdir_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem2">
+		  <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="button30">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Output format</property>
-	      <property name="label" translatable="yes">Format</property>
-	      <property name="use_underline">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>
-	      <signal name="clicked" handler="on_devform_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="button28">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Device directory</property>
+		  <property name="label" translatable="yes">Devdir</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-home</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		  <signal name="clicked" handler="on_devdir_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button31">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">External programs</property>
-	      <property name="label" translatable="yes">Programs</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-properties</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_external_programs_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="button30">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Output format</property>
+		  <property name="label" translatable="yes">Format</property>
+		  <property name="use_underline">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>
+		  <signal name="clicked" handler="on_devform_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem8">
-	      <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="button31">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">External programs</property>
+		  <property name="label" translatable="yes">Programs</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-properties</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		  <signal name="clicked" handler="on_external_programs_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="toolbutton1">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Detach window</property>
-	      <property name="label" translatable="yes">Detach</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-dnd-multiple</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_detach_clicked" last_modification_time="Tue, 29 Jun 2004 22:14:37 GMT"/>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem8">
+		  <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="toolbutton1">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Detach window</property>
+		  <property name="label" translatable="yes">Detach</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-dnd-multiple</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+		  <signal name="clicked" handler="on_detach_clicked" last_modification_time="Tue, 29 Jun 2004 22:14:37 GMT"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolButton" id="toolbutton3">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-dnd</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_attach_all_clicked" last_modification_time="Thu, 01 Jul 2004 22:00:12 GMT"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
 	  </child>
 	</widget>
 	<packing>
@@ -764,7 +815,7 @@
 	<widget class="GtkVPaned" id="main_panel">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
-	  <property name="position">0</property>
+	  <property name="position">1</property>
 
 	  <child>
 	    <widget class="GtkNotebook" id="main_notebook">
@@ -775,18 +826,10 @@
 	      <property name="tab_pos">GTK_POS_TOP</property>
 	      <property name="scrollable">False</property>
 	      <property name="enable_popup">False</property>
-
-	      <child>
-		<placeholder/>
-	      </child>
-
-	      <child>
-		<placeholder/>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="shrink">False</property>
-	      <property name="resize">False</property>
+	      <property name="resize">True</property>
 	    </packing>
 	  </child>
 
@@ -800,7 +843,7 @@
 		<widget class="GtkScrolledWindow" id="mixlog_scrolledwindow">
 		  <property name="visible">True</property>
 		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 		  <property name="shadow_type">GTK_SHADOW_IN</property>
 		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
@@ -812,12 +855,12 @@
 		      <property name="accepts_tab">True</property>
 		      <property name="justification">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap_mode">GTK_WRAP_WORD</property>
-		      <property name="cursor_visible">False</property>
+		      <property name="cursor_visible">True</property>
 		      <property name="pixels_above_lines">0</property>
 		      <property name="pixels_below_lines">0</property>
 		      <property name="pixels_inside_wrap">0</property>
-		      <property name="left_margin">0</property>
-		      <property name="right_margin">0</property>
+		      <property name="left_margin">3</property>
+		      <property name="right_margin">4</property>
 		      <property name="indent">0</property>
 		      <property name="text" translatable="yes"></property>
 		    </widget>
@@ -910,49 +953,44 @@
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox5">
+	    <widget class="GtkButton" id="word_cancel">
 	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-	      <property name="spacing">10</property>
-
-	      <child>
-		<widget class="GtkButton" id="word_reset">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-clear</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_word_reset_clicked"/>
-		</widget>
-	      </child>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</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">-6</property>
+	      <signal name="clicked" handler="on_word_cancel_clicked" last_modification_time="Thu, 01 Jul 2004 22:25:09 GMT"/>
+	    </widget>
+	  </child>
 
-	      <child>
-		<widget class="GtkButton" id="word_ok">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-ok</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_word_ok_clicked"/>
-		</widget>
-	      </child>
+	  <child>
+	    <widget class="GtkButton" id="word_reset">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-clear</property>
+	      <property name="use_stock">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">False</property>
+	      <property name="response_id">0</property>
+	      <signal name="clicked" handler="on_word_reset_clicked" last_modification_time="Thu, 01 Jul 2004 22:28:00 GMT"/>
+	    </widget>
+	  </child>
 
-	      <child>
-		<widget class="GtkButton" id="word_cancel">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-cancel</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_word_cancel_clicked"/>
-		</widget>
-	      </child>
+	  <child>
+	    <widget class="GtkButton" id="word_ok">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-ok</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">-5</property>
+	      <signal name="clicked" handler="on_word_ok_clicked" last_modification_time="Thu, 01 Jul 2004 22:26:25 GMT"/>
 	    </widget>
 	  </child>
 	</widget>
@@ -1230,8 +1268,8 @@
       <property name="visible">True</property>
       <property name="width">250</property>
       <property name="height">150</property>
-      <property name="hadjustment">0 0 250 0 209.7 233</property>
-      <property name="vadjustment">0 0 150 0 111.6 124</property>
+      <property name="hadjustment">0 0 250 0 225 250</property>
+      <property name="vadjustment">0 0 150 0 135 150</property>
 
       <child>
 	<widget class="GtkLabel" id="label222">
@@ -1283,7 +1321,10 @@
 	  <property name="height_request">0</property>
 	  <property name="visible">True</property>
 	  <property name="label" translatable="yes"> Copyright (C) 2001, 2002, 2003 , 2004
-Free Software Foundation, Inc.</property>
+Free Software Foundation, Inc.
+
+Please, send bug reports to
+bug-mdk@gnu.org</property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">False</property>
 	  <property name="justify">GTK_JUSTIFY_CENTER</property>
@@ -1296,7 +1337,7 @@ Free Software Foundation, Inc.</property>
 	</widget>
 	<packing>
 	  <property name="x">24</property>
-	  <property name="y">88</property>
+	  <property name="y">80</property>
 	</packing>
       </child>
     </widget>
@@ -1332,36 +1373,29 @@ Free Software Foundation, Inc.</property>
 	  <property name="layout_style">GTK_BUTTONBOX_END</property>
 
 	  <child>
-	    <widget class="GtkHButtonBox" id="hbuttonbox6">
+	    <widget class="GtkButton" id="goto_cancel">
 	      <property name="visible">True</property>
-	      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
-	      <property name="spacing">30</property>
-
-	      <child>
-		<widget class="GtkButton" id="goto_cancel">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-cancel</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_goto_cancel_clicked"/>
-		</widget>
-	      </child>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-cancel</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">-6</property>
+	    </widget>
+	  </child>
 
-	      <child>
-		<widget class="GtkButton" id="goto_ok">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="label">gtk-ok</property>
-		  <property name="use_stock">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="on_goto_ok_clicked"/>
-		</widget>
-	      </child>
+	  <child>
+	    <widget class="GtkButton" id="goto_ok">
+	      <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>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="response_id">-5</property>
 	    </widget>
 	  </child>
 	</widget>
@@ -1412,8 +1446,7 @@ Free Software Foundation, Inc.</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char" translatable="yes">*</property>
-	      <property name="activates_default">False</property>
-	      <signal name="activate" handler="on_goto_ok_clicked"/>
+	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">10</property>
@@ -2073,147 +2106,155 @@ disk7</property>
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkToolbar" id="mixal_toolbar">
-	  <property name="border_width">2</property>
+	<widget class="GtkHandleBox" id="tb_handle">
 	  <property name="visible">True</property>
-	  <property name="can_default">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
+	  <property name="shadow_type">GTK_SHADOW_OUT</property>
+	  <property name="handle_position">GTK_POS_LEFT</property>
+	  <property name="snap_edge">GTK_POS_TOP</property>
 
 	  <child>
-	    <widget class="GtkToolButton" id="button14">
+	    <widget class="GtkToolbar" id="mixal_toolbar">
+	      <property name="border_width">2</property>
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Run</property>
-	      <property name="label" translatable="yes">Run</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-go-forward</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_debug_run_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <property name="can_default">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button15">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Next</property>
-	      <property name="label" translatable="yes">Step</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-goto-last</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_debug_next_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="button14">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Run</property>
+		  <property name="label" translatable="yes">Run</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-go-forward</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_debug_run_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button16">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Clear breakpoints</property>
-	      <property name="label" translatable="yes">Clear</property>
-	      <property name="use_underline">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">True</property>
-	      <signal name="clicked" handler="on_clear_breakpoints_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="button15">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Next</property>
+		  <property name="label" translatable="yes">Step</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-goto-last</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_debug_next_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button18">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Symbol table</property>
-	      <property name="label" translatable="yes">Symbols</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-index</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_symbols_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="button16">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Clear breakpoints</property>
+		  <property name="label" translatable="yes">Clear</property>
+		  <property name="use_underline">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">True</property>
+		  <signal name="clicked" handler="on_clear_breakpoints_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem7">
-	      <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="button18">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Symbol table</property>
+		  <property name="label" translatable="yes">Symbols</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-index</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_symbols_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button22">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Source code font</property>
-	      <property name="label" translatable="yes">Font</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-select-font</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_mixal_font_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem7">
+		  <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="GtkSeparatorToolItem" id="separatortoolitem10">
-	      <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="button22">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Source code font</property>
+		  <property name="label" translatable="yes">Font</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-select-font</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_mixal_font_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="attach_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Attach window</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-dnd</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_mixal_attach" last_modification_time="Wed, 30 Jun 2004 16:16:10 GMT"/>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem10">
+		  <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="attach_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Attach window</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-dnd</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
 	  </child>
 	</widget>
 	<packing>
@@ -2280,109 +2321,118 @@ disk7</property>
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkToolbar" id="devices_toolbar">
-	  <property name="border_width">2</property>
+	<widget class="GtkHandleBox" id="tb_handle">
 	  <property name="visible">True</property>
-	  <property name="can_default">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
+	  <property name="shadow_type">GTK_SHADOW_OUT</property>
+	  <property name="handle_position">GTK_POS_LEFT</property>
+	  <property name="snap_edge">GTK_POS_TOP</property>
 
 	  <child>
-	    <widget class="GtkToolButton" id="devdir_button">
+	    <widget class="GtkToolbar" id="devices_toolbar">
+	      <property name="border_width">2</property>
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Device directory</property>
-	      <property name="label" translatable="yes">Directory</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-home</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_devdir_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <property name="can_default">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
 
-	  <child>
-	    <widget class="GtkToolButton" id="output_button">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Output format</property>
-	      <property name="label" translatable="yes">Output</property>
-	      <property name="use_underline">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">True</property>
-	      <signal name="clicked" handler="on_devform_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkToolButton" id="devdir_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Device directory</property>
+		  <property name="label" translatable="yes">Directory</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-home</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_devdir_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem11">
-	      <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="output_button">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Output format</property>
+		  <property name="label" translatable="yes">Output</property>
+		  <property name="use_underline">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">True</property>
+		  <signal name="clicked" handler="on_devform_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="button21">
-	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Output font</property>
-	      <property name="label" translatable="yes">Font</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-select-font</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_devices_font_activate"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem11">
+		  <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="GtkSeparatorToolItem" id="separatortoolitem12">
-	      <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="button21">
+		  <property name="visible">True</property>
+		  <property name="tooltip" translatable="yes">Output font</property>
+		  <property name="label" translatable="yes">Font</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-select-font</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_devices_font_activate"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="attach_button">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-dnd</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem12">
+		  <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="attach_button">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-dnd</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
 	  </child>
 	</widget>
 	<packing>
@@ -2572,58 +2622,67 @@ disk7</property>
       <property name="spacing">0</property>
 
       <child>
-	<widget class="GtkToolbar" id="mixvm_toolbar">
+	<widget class="GtkHandleBox" id="tb_handle">
 	  <property name="visible">True</property>
-	  <property name="can_default">True</property>
-	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
-	  <property name="tooltips">True</property>
-	  <property name="show_arrow">True</property>
+	  <property name="shadow_type">GTK_SHADOW_OUT</property>
+	  <property name="handle_position">GTK_POS_LEFT</property>
+	  <property name="snap_edge">GTK_POS_TOP</property>
 
 	  <child>
-	    <widget class="GtkToolButton" id="toolbutton2">
+	    <widget class="GtkToolbar" id="mixvm_toolbar">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Font</property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-select-font</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
-	      <signal name="clicked" handler="on_mix_font_activate" last_modification_time="Wed, 30 Jun 2004 16:06:57 GMT"/>
-	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
-	  </child>
+	      <property name="can_default">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
 
-	  <child>
-	    <widget class="GtkSeparatorToolItem" id="separatortoolitem9">
-	      <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="toolbutton2">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Font</property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-select-font</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		  <signal name="clicked" handler="on_mix_font_activate" last_modification_time="Wed, 30 Jun 2004 16:06:57 GMT"/>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 
-	  <child>
-	    <widget class="GtkToolButton" id="attach_button">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes"></property>
-	      <property name="use_underline">True</property>
-	      <property name="stock_id">gtk-dnd</property>
-	      <property name="visible_horizontal">True</property>
-	      <property name="visible_vertical">True</property>
-	      <property name="is_important">True</property>
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem9">
+		  <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="attach_button">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes"></property>
+		  <property name="use_underline">True</property>
+		  <property name="stock_id">gtk-dnd</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">True</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">True</property>
+		</packing>
+	      </child>
 	    </widget>
-	    <packing>
-	      <property name="expand">False</property>
-	      <property name="homogeneous">True</property>
-	    </packing>
 	  </child>
 	</widget>
 	<packing>