X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2Fmatita.glade;h=103e27673fe8ee2076b2b3908739e52f28ef81af;hb=5e8e0400fe58e71bfae91eb2cb7327ec11ce9cbc;hp=5aac61297e8e608cc757d4d8adad918a07a23d54;hpb=190e42f1030ea3d459c4040bb0e8503a7c096820;p=helm.git

diff --git a/helm/matita/matita.glade b/helm/matita/matita.glade
index 5aac61297..103e27673 100644
--- a/helm/matita/matita.glade
+++ b/helm/matita/matita.glade
@@ -51,7 +51,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image128">
+			    <widget class="GtkImage" id="image182">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-new</property>
 			      <property name="icon_size">1</property>
@@ -70,6 +70,7 @@
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">_Proof or definition ...</property>
 				  <property name="use_underline">True</property>
+				  <accelerator key="n" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 				</widget>
 			      </child>
 
@@ -93,7 +94,7 @@
 			  <accelerator key="o" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image129">
+			    <widget class="GtkImage" id="image183">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -114,7 +115,7 @@
 			  <accelerator key="s" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image130">
+			    <widget class="GtkImage" id="image184">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-save</property>
 			      <property name="icon_size">1</property>
@@ -134,7 +135,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image131">
+			    <widget class="GtkImage" id="image185">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-save-as</property>
 			      <property name="icon_size">1</property>
@@ -161,7 +162,7 @@
 			  <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image132">
+			    <widget class="GtkImage" id="image186">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-quit</property>
 			      <property name="icon_size">1</property>
@@ -233,6 +234,21 @@
 			  <accelerator key="F5" modifiers="0" signal="activate"/>
 			</widget>
 		      </child>
+
+		      <child>
+			<widget class="GtkSeparatorMenuItem" id="separator3">
+			  <property name="visible">True</property>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="ShowConsoleMenuItem">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Toggle console</property>
+			  <property name="use_underline">True</property>
+			  <accelerator key="x" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -292,31 +308,14 @@
 	      <property name="position">450</property>
 
 	      <child>
-		<widget class="GtkScrolledWindow" id="ScrolledSequents">
+		<widget class="GtkNotebook" id="SequentsNotebook">
 		  <property name="visible">True</property>
-		  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-		  <child>
-		    <widget class="GtkViewport" id="viewport1">
-		      <property name="visible">True</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-
-		      <child>
-			<widget class="GtkNotebook" id="SequentsNotebook">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="show_tabs">True</property>
-			  <property name="show_border">True</property>
-			  <property name="tab_pos">GTK_POS_TOP</property>
-			  <property name="scrollable">False</property>
-			  <property name="enable_popup">False</property>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
+		  <property name="can_focus">True</property>
+		  <property name="show_tabs">True</property>
+		  <property name="show_border">True</property>
+		  <property name="tab_pos">GTK_POS_TOP</property>
+		  <property name="scrollable">False</property>
+		  <property name="enable_popup">False</property>
 		</widget>
 		<packing>
 		  <property name="shrink">True</property>
@@ -331,22 +330,75 @@
 		  <property name="above_child">False</property>
 
 		  <child>
-		    <widget class="GtkScrolledWindow" id="ScrolledConsole">
+		    <widget class="GtkHBox" id="ConsoleHBox">
 		      <property name="visible">True</property>
-		      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-		      <property name="shadow_type">GTK_SHADOW_IN</property>
-		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
 
 		      <child>
-			<placeholder/>
+			<widget class="GtkVBox" id="vbox6">
+			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
+			  <child>
+			    <widget class="GtkButton" id="HideConsoleButton">
+			      <property name="visible">True</property>
+			      <property name="tooltip" translatable="yes">Hide console</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="image169">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-close</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>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkScrolledWindow" id="ScrolledConsole">
+			  <property name="visible">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
 		      </child>
 		    </widget>
 		  </child>
 		</widget>
 		<packing>
 		  <property name="shrink">True</property>
-		  <property name="resize">True</property>
+		  <property name="resize">False</property>
 		</packing>
 	      </child>
 	    </widget>
@@ -398,9 +450,9 @@
       <child>
 	<widget class="GtkScrolledWindow" id="ScrolledProof">
 	  <property name="visible">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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>
 
 	  <child>
@@ -449,7 +501,7 @@
 </widget>
 
 <widget class="GtkWindow" id="ToolBarWin">
-  <property name="width_request">150</property>
+  <property name="width_request">155</property>
   <property name="height_request">450</property>
   <property name="visible">True</property>
   <property name="title" translatable="yes">Tactics</property>
@@ -493,6 +545,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="introsButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Intros</property>
 		      <property name="can_focus">True</property>
@@ -518,6 +571,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="applyButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Apply</property>
 		      <property name="can_focus">True</property>
@@ -543,6 +597,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="exactButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Exact</property>
 		      <property name="can_focus">True</property>
@@ -583,6 +638,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="elimButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Elim</property>
 		      <property name="can_focus">True</property>
@@ -608,6 +664,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="elimTypeButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">ElimType</property>
 		      <property name="can_focus">True</property>
@@ -648,6 +705,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="splitButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Split</property>
 		      <property name="can_focus">True</property>
@@ -673,10 +731,11 @@
 
 		  <child>
 		    <widget class="GtkButton" id="leftButton">
+		      <property name="width_request">25</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Left</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">left</property>
+		      <property name="label" translatable="yes">L</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -698,10 +757,11 @@
 
 		  <child>
 		    <widget class="GtkButton" id="rightButton">
+		      <property name="width_request">25</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Right</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">right</property>
+		      <property name="label" translatable="yes">R</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -723,6 +783,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="existsButton">
+		      <property name="width_request">25</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Exists</property>
 		      <property name="can_focus">True</property>
@@ -763,6 +824,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="reflexivityButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Reflexivity</property>
 		      <property name="can_focus">True</property>
@@ -788,6 +850,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="symmetryButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Symmetry</property>
 		      <property name="can_focus">True</property>
@@ -813,6 +876,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="transitivityButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Transitivity</property>
 		      <property name="can_focus">True</property>
@@ -837,7 +901,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolbar" id="toolbar6">
+	    <widget class="GtkToolbar" id="toolbar8">
 	      <property name="visible">True</property>
 	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 	      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
@@ -845,18 +909,19 @@
 	      <property name="show_arrow">True</property>
 
 	      <child>
-		<widget class="GtkToolItem" id="toolitem17">
+		<widget class="GtkToolItem" id="toolitem22">
 		  <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="assumptionButton">
+		    <widget class="GtkButton" id="simplifyButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Assumption</property>
+		      <property name="tooltip" translatable="yes">Simplify</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">assum</property>
+		      <property name="label" translatable="yes">simpl</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -870,18 +935,19 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkToolItem" id="toolitem18">
+		<widget class="GtkToolItem" id="toolitem23">
 		  <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="searchButton">
+		    <widget class="GtkButton" id="reduceButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Search</property>
+		      <property name="tooltip" translatable="yes">Reduce</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">search</property>
+		      <property name="label" translatable="yes">red</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
@@ -895,7 +961,74 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkToolItem" id="toolitem19">
+		<widget class="GtkToolItem" id="toolitem24">
+		  <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="whdButton">
+		      <property name="width_request">50</property>
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Whd</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">whd</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</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>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolbar" id="toolbar6">
+	      <property name="visible">True</property>
+	      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	      <property name="tooltips">True</property>
+	      <property name="show_arrow">True</property>
+
+	      <child>
+		<widget class="GtkToolItem" id="toolitem17">
+		  <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="assumptionButton">
+		      <property name="width_request">50</property>
+		      <property name="visible">True</property>
+		      <property name="tooltip" translatable="yes">Assumption</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">asum</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolItem" id="toolitem18">
 		  <property name="visible">True</property>
 		  <property name="visible_horizontal">True</property>
 		  <property name="visible_vertical">True</property>
@@ -903,6 +1036,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="autoButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Auto</property>
 		      <property name="can_focus">True</property>
@@ -943,6 +1077,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="cutButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Cut</property>
 		      <property name="can_focus">True</property>
@@ -968,6 +1103,7 @@
 
 		  <child>
 		    <widget class="GtkButton" id="replaceButton">
+		      <property name="width_request">50</property>
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Replace</property>
 		      <property name="can_focus">True</property>
@@ -1724,9 +1860,9 @@ Copyright (C) 2004,
 	<widget class="GtkScrolledWindow" id="ScrolledCheck">
 	  <property name="visible">True</property>
 	  <property name="can_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_NONE</property>
+	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</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>
 
 	  <child>