X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=xournal.glade;h=1752fffed024ac01dfa00ee91fb7634ddcf1c2f5;hb=64fbee630efe4a6a731bcc7b68855d933946b050;hp=45b5d67e95bdb2db69ac8e367e924e36c38c90b5;hpb=78c2f8fa93f7adcb9157699c92b1498d878f66b2;p=xournal.git

diff --git a/xournal.glade b/xournal.glade
index 45b5d67..1752fff 100644
--- a/xournal.glade
+++ b/xournal.glade
@@ -55,7 +55,7 @@
 		      <signal name="activate" handler="on_fileNewBackground_activate" last_modification_time="Wed, 30 Nov 2005 18:39:59 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image599">
+			<widget class="GtkImage" id="image623">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -200,7 +200,7 @@
 		      <signal name="activate" handler="on_filePrintOptions_activate" last_modification_time="Wed, 30 Nov 2005 18:44:18 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image600">
+			<widget class="GtkImage" id="image624">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -419,7 +419,7 @@
 			      <signal name="activate" handler="on_viewPageWidth_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
 
 			      <child internal-child="image">
-				<widget class="GtkImage" id="image612">
+				<widget class="GtkImage" id="image625">
 				  <property name="visible">True</property>
 				  <property name="stock">gtk-zoom-fit</property>
 				  <property name="icon_size">1</property>
@@ -459,7 +459,7 @@
 		      <signal name="activate" handler="on_viewFirstPage_activate" last_modification_time="Wed, 30 Nov 2005 19:33:03 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image602">
+			<widget class="GtkImage" id="image626">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-first</property>
 			  <property name="icon_size">1</property>
@@ -480,7 +480,7 @@
 		      <signal name="activate" handler="on_viewPreviousPage_activate" last_modification_time="Wed, 30 Nov 2005 19:35:41 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image603">
+			<widget class="GtkImage" id="image627">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -501,7 +501,7 @@
 		      <signal name="activate" handler="on_viewNextPage_activate" last_modification_time="Wed, 30 Nov 2005 19:35:41 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image604">
+			<widget class="GtkImage" id="image628">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-forward</property>
 			  <property name="icon_size">1</property>
@@ -522,7 +522,7 @@
 		      <signal name="activate" handler="on_viewLastPage_activate" last_modification_time="Wed, 30 Nov 2005 19:35:41 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image605">
+			<widget class="GtkImage" id="image629">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-last</property>
 			  <property name="icon_size">1</property>
@@ -549,7 +549,7 @@
 		      <signal name="activate" handler="on_viewShowLayer_activate" last_modification_time="Wed, 30 Nov 2005 19:40:23 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image606">
+			<widget class="GtkImage" id="image630">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -570,7 +570,7 @@
 		      <signal name="activate" handler="on_viewHideLayer_activate" last_modification_time="Wed, 30 Nov 2005 19:40:23 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image607">
+			<widget class="GtkImage" id="image631">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-remove</property>
 			  <property name="icon_size">1</property>
@@ -867,7 +867,7 @@
 		      <signal name="activate" handler="on_journalLoadBackground_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image608">
+			<widget class="GtkImage" id="image632">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1008,6 +1008,17 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkRadioMenuItem" id="toolsHand">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Hand Tool</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <property name="group">toolsPen</property>
+		      <signal name="activate" handler="on_toolsHand_activate" last_modification_time="Wed, 20 Sep 2006 02:20:48 GMT"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator16">
 		      <property name="visible">True</property>
@@ -1021,7 +1032,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image609">
+			<widget class="GtkImage" id="image633">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-color</property>
 			  <property name="icon_size">1</property>
@@ -1388,7 +1399,7 @@
 		      <signal name="activate" handler="on_toolsTextFont_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image610">
+			<widget class="GtkImage" id="image634">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-font</property>
 			  <property name="icon_size">1</property>
@@ -1491,6 +1502,16 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="optionsDiscardCoreEvents">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Discard Core Events</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_optionsDiscardCore_activate" last_modification_time="Wed, 07 Dec 2005 22:54:39 GMT"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkCheckMenuItem" id="optionsButtonMappings">
 		      <property name="visible">True</property>
@@ -1586,6 +1607,17 @@
 			    </widget>
 			  </child>
 
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Hand">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Hand Tool</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2Hand_activate" last_modification_time="Wed, 20 Sep 2006 02:20:48 GMT"/>
+			    </widget>
+			  </child>
+
 			  <child>
 			    <widget class="GtkSeparatorMenuItem" id="separator24">
 			      <property name="visible">True</property>
@@ -1711,6 +1743,17 @@
 			    </widget>
 			  </child>
 
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Hand">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Hand Tool</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3Hand_activate" last_modification_time="Wed, 20 Sep 2006 02:20:48 GMT"/>
+			    </widget>
+			  </child>
+
 			  <child>
 			    <widget class="GtkSeparatorMenuItem" id="separator25">
 			      <property name="visible">True</property>
@@ -1777,6 +1820,16 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="optionsPrintRuling">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Print Paper Ruling</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_optionsPrintRuling_activate" last_modification_time="Sat, 25 Nov 2006 03:42:27 GMT"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator21">
 		      <property name="visible">True</property>
@@ -1843,14 +1896,14 @@
 	  <property name="show_arrow">True</property>
 
 	  <child>
-	    <widget class="GtkToolButton" id="newButton">
+	    <widget class="GtkToolButton" id="saveButton">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">New</property>
-	      <property name="stock_id">gtk-new</property>
+	      <property name="tooltip" translatable="yes">Save</property>
+	      <property name="stock_id">gtk-save</property>
 	      <property name="visible_horizontal">True</property>
 	      <property name="visible_vertical">True</property>
 	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_fileNew_activate" last_modification_time="Thu, 10 Aug 2006 15:14:10 GMT"/>
+	      <signal name="clicked" handler="on_fileSave_activate" last_modification_time="Fri, 02 Dec 2005 02:19:52 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
@@ -1859,14 +1912,14 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolButton" id="openButton">
+	    <widget class="GtkToolButton" id="newButton">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Open</property>
-	      <property name="stock_id">gtk-open</property>
+	      <property name="tooltip" translatable="yes">New</property>
+	      <property name="stock_id">gtk-new</property>
 	      <property name="visible_horizontal">True</property>
 	      <property name="visible_vertical">True</property>
 	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_fileOpen_activate" last_modification_time="Thu, 10 Aug 2006 15:14:42 GMT"/>
+	      <signal name="clicked" handler="on_fileNew_activate" last_modification_time="Thu, 10 Aug 2006 15:14:10 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
@@ -1875,14 +1928,14 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkToolButton" id="saveButton">
+	    <widget class="GtkToolButton" id="openButton">
 	      <property name="visible">True</property>
-	      <property name="tooltip" translatable="yes">Save</property>
-	      <property name="stock_id">gtk-save</property>
+	      <property name="tooltip" translatable="yes">Open</property>
+	      <property name="stock_id">gtk-open</property>
 	      <property name="visible_horizontal">True</property>
 	      <property name="visible_vertical">True</property>
 	      <property name="is_important">False</property>
-	      <signal name="clicked" handler="on_fileSave_activate" last_modification_time="Fri, 02 Dec 2005 02:19:52 GMT"/>
+	      <signal name="clicked" handler="on_fileOpen_activate" last_modification_time="Thu, 10 Aug 2006 15:14:42 GMT"/>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
@@ -2401,6 +2454,25 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <widget class="GtkRadioToolButton" id="buttonHand">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Hand Tool</property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">hand.png</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <property name="active">False</property>
+	      <property name="group">buttonPen</property>
+	      <signal name="toggled" handler="on_toolsHand_activate" last_modification_time="Wed, 20 Sep 2006 02:21:25 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="toolitem16">
 	      <property name="visible">True</property>
@@ -3393,7 +3465,7 @@ points</property>
       <child>
 	<widget class="GtkImage" id="image387">
 	  <property name="visible">True</property>
-	  <property name="pixbuf">notepad.png</property>
+	  <property name="pixbuf">xournal.png</property>
 	  <property name="xalign">0.5</property>
 	  <property name="yalign">0.5</property>
 	  <property name="xpad">0</property>
@@ -3435,7 +3507,7 @@ points</property>
 	<widget class="GtkLabel" id="labelInfo">
 	  <property name="visible">True</property>
 	  <property name="label" translatable="yes">Written by Denis Auroux
-http://math.mit.edu/~auroux/software/xournal/</property>
+       http://xournal.sourceforge.net/       </property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">False</property>
 	  <property name="justify">GTK_JUSTIFY_CENTER</property>