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

diff --git a/xournal.glade b/xournal.glade
index c7ea714..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="image500">
+			<widget class="GtkImage" id="image623">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -101,6 +101,97 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkMenuItem" id="fileRecentFiles">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Recent Files</property>
+		      <property name="use_underline">True</property>
+
+		      <child>
+			<widget class="GtkMenu" id="fileRecentFiles_menu">
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru0">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">0</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:09:19 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru1">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">1</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:09:19 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru2">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">2</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:09:19 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru3">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">3</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:10:17 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru4">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">4</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:10:17 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru5">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">5</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:10:17 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru6">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">6</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:10:17 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="mru7">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">7</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_mru_activate" last_modification_time="Fri, 02 Jun 2006 19:10:17 GMT"/>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator22">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkImageMenuItem" id="filePrintOptions">
 		      <property name="visible">True</property>
@@ -109,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="image501">
+			<widget class="GtkImage" id="image624">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -134,7 +225,7 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="filePrintPDF">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Print to PDF</property>
+		      <property name="label" translatable="yes">Export to PDF</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_filePrintPDF_activate" last_modification_time="Wed, 30 Nov 2005 18:44:18 GMT"/>
 		    </widget>
@@ -285,48 +376,70 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkImageMenuItem" id="viewZoomIn">
+		    <widget class="GtkMenuItem" id="menuViewZoom">
 		      <property name="visible">True</property>
-		      <property name="label">gtk-zoom-in</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_viewZoomIn_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
-		    </widget>
-		  </child>
+		      <property name="label" translatable="yes">_Zoom</property>
+		      <property name="use_underline">True</property>
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="viewZoomOut">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-zoom-out</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_viewZoomOut_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
-		    </widget>
-		  </child>
+		      <child>
+			<widget class="GtkMenu" id="menuViewZoom_menu">
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="viewNormalSize">
-		      <property name="visible">True</property>
-		      <property name="label">gtk-zoom-100</property>
-		      <property name="use_stock">True</property>
-		      <signal name="activate" handler="on_viewNormalSize_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
-		    </widget>
-		  </child>
+			  <child>
+			    <widget class="GtkImageMenuItem" id="viewZoomIn">
+			      <property name="visible">True</property>
+			      <property name="label">gtk-zoom-in</property>
+			      <property name="use_stock">True</property>
+			      <signal name="activate" handler="on_viewZoomIn_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+			    </widget>
+			  </child>
 
-		  <child>
-		    <widget class="GtkImageMenuItem" id="viewPageWidth">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Page Width</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_viewPageWidth_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+			  <child>
+			    <widget class="GtkImageMenuItem" id="viewZoomOut">
+			      <property name="visible">True</property>
+			      <property name="label">gtk-zoom-out</property>
+			      <property name="use_stock">True</property>
+			      <signal name="activate" handler="on_viewZoomOut_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+			    </widget>
+			  </child>
 
-		      <child internal-child="image">
-			<widget class="GtkImage" id="image502">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-zoom-fit</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>
+			  <child>
+			    <widget class="GtkImageMenuItem" id="viewNormalSize">
+			      <property name="visible">True</property>
+			      <property name="label">gtk-zoom-100</property>
+			      <property name="use_stock">True</property>
+			      <signal name="activate" handler="on_viewNormalSize_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkImageMenuItem" id="viewPageWidth">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Page Width</property>
+			      <property name="use_underline">True</property>
+			      <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="image625">
+				  <property name="visible">True</property>
+				  <property name="stock">gtk-zoom-fit</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>
+
+			  <child>
+			    <widget class="GtkMenuItem" id="viewSetZoom">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Set Zoom</property>
+			      <property name="use_underline">True</property>
+			      <signal name="activate" handler="on_viewSetZoom_activate" last_modification_time="Sat, 22 Jul 2006 21:30:29 GMT"/>
+			    </widget>
+			  </child>
 			</widget>
 		      </child>
 		    </widget>
@@ -346,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="image503">
+			<widget class="GtkImage" id="image626">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-first</property>
 			  <property name="icon_size">1</property>
@@ -367,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="image504">
+			<widget class="GtkImage" id="image627">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -388,9 +501,9 @@
 		      <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="image505">
+			<widget class="GtkImage" id="image628">
 			  <property name="visible">True</property>
-			  <property name="stock">gtk-media-forward</property>
+			  <property name="stock">gtk-go-forward</property>
 			  <property name="icon_size">1</property>
 			  <property name="xalign">0.5</property>
 			  <property name="yalign">0.5</property>
@@ -409,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="image506">
+			<widget class="GtkImage" id="image629">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-last</property>
 			  <property name="icon_size">1</property>
@@ -436,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="image507">
+			<widget class="GtkImage" id="image630">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -457,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="image508">
+			<widget class="GtkImage" id="image631">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-remove</property>
 			  <property name="icon_size">1</property>
@@ -730,6 +843,22 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="journalApplyAllPages">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Apply To All Pages</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_journalApplyAllPages_activate" last_modification_time="Wed, 30 Nov 2005 19:58:26 GMT"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator23">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkImageMenuItem" id="journalLoadBackground">
 		      <property name="visible">True</property>
@@ -738,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="image509">
+			<widget class="GtkImage" id="image632">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -760,15 +889,6 @@
 		    </widget>
 		  </child>
 
-		  <child>
-		    <widget class="GtkMenuItem" id="journalApplyAllPages">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Apply To All Pages</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_journalApplyAllPages_activate" last_modification_time="Wed, 30 Nov 2005 19:58:26 GMT"/>
-		    </widget>
-		  </child>
-
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator19">
 		      <property name="visible">True</property>
@@ -888,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>
@@ -901,7 +1032,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image510">
+			<widget class="GtkImage" id="image633">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-color</property>
 			  <property name="icon_size">1</property>
@@ -1268,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="image511">
+			<widget class="GtkImage" id="image634">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-font</property>
 			  <property name="icon_size">1</property>
@@ -1352,32 +1483,314 @@
 	    </widget>
 	  </child>
 
-	  <child>
-	    <widget class="GtkMenuItem" id="menuOptions">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Options</property>
-	      <property name="use_underline">True</property>
+	  <child>
+	    <widget class="GtkMenuItem" id="menuOptions">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">_Options</property>
+	      <property name="use_underline">True</property>
+
+	      <child>
+		<widget class="GtkMenu" id="menuOptions_menu">
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="optionsUseXInput">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Use XInput</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_optionsUseXInput_activate" last_modification_time="Wed, 07 Dec 2005 22:54:39 GMT"/>
+		    </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>
+		      <property name="label" translatable="yes">Eraser Tip</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_optionsButtonMappings_activate" last_modification_time="Thu, 26 Jan 2006 03:45:32 GMT"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="button2_mapping">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Button 2 Mapping</property>
+		      <property name="use_underline">True</property>
+
+		      <child>
+			<widget class="GtkMenu" id="button2_mapping_menu">
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Pen">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Pen</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <signal name="activate" handler="on_button2Pen_activate" last_modification_time="Sun, 04 Jun 2006 14:18:50 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Eraser">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Eraser</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2Eraser_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Highlighter">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Highlighter</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2Highlighter_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Text">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Text</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2Text_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2SelectRegion">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Select Region</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2SelectRegion_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2SelectRectangle">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Select Rectangle</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2SelectRectangle_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2VerticalSpace">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Vertical Space</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2VerticalSpace_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </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>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2LinkBrush">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Link to Primary Brush</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <signal name="activate" handler="on_button2LinkBrush_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2CopyBrush">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Copy of Current Brush</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2LinkBrush</property>
+			      <signal name="activate" handler="on_button2CopyBrush_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2NABrush">
+			      <property name="label" translatable="yes">NA</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2LinkBrush</property>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkMenuItem" id="button3_mapping">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Button 3 Mapping</property>
+		      <property name="use_underline">True</property>
+
+		      <child>
+			<widget class="GtkMenu" id="button3_mapping_menu">
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Pen">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Pen</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <signal name="activate" handler="on_button3Pen_activate" last_modification_time="Sun, 04 Jun 2006 14:18:50 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Eraser">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Eraser</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3Eraser_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Highlighter">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Highlighter</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3Highlighter_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Text">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Text</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3Text_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3SelectRegion">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Select Region</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3SelectRegion_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3SelectRectangle">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Select Rectangle</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3SelectRectangle_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3VerticalSpace">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Vertical Space</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3VerticalSpace_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </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>
+			    </widget>
+			  </child>
 
-	      <child>
-		<widget class="GtkMenu" id="menuOptions_menu">
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3LinkBrush">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Link to Primary Brush</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <signal name="activate" handler="on_button3LinkBrush_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
 
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsUseXInput">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Use XInput</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="toggled" handler="on_optionsUseXInput_activate" last_modification_time="Wed, 07 Dec 2005 22:54:39 GMT"/>
-		    </widget>
-		  </child>
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3CopyBrush">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Copy of Current Brush</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3LinkBrush</property>
+			      <signal name="activate" handler="on_button3CopyBrush_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 GMT"/>
+			    </widget>
+			  </child>
 
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsEmulateEraser">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Emulate Eraser</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_optionsEmulateEraser_activate" last_modification_time="Thu, 26 Jan 2006 03:45:32 GMT"/>
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3NABrush">
+			      <property name="label" translatable="yes">NA</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3LinkBrush</property>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 
@@ -1407,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>
@@ -1488,6 +1911,38 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <widget class="GtkToolButton" id="newButton">
+	      <property name="visible">True</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_fileNew_activate" last_modification_time="Thu, 10 Aug 2006 15:14:10 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToolButton" id="openButton">
+	      <property name="visible">True</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_fileOpen_activate" last_modification_time="Thu, 10 Aug 2006 15:14:42 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="toolitem11">
 	      <property name="visible">True</property>
@@ -1772,6 +2227,22 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <widget class="GtkToolButton" id="buttonZoomSet">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Set Zoom</property>
+	      <property name="stock_id">gtk-find</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+	      <signal name="clicked" handler="on_viewSetZoom_activate" last_modification_time="Sat, 22 Jul 2006 21:30:54 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkToggleToolButton" id="buttonFullscreen">
 	      <property name="visible">True</property>
@@ -1983,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>
@@ -2975,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>
@@ -3017,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>
@@ -3042,4 +3532,240 @@ http://math.mit.edu/~auroux/software/xournal/</property>
   </child>
 </widget>
 
+<widget class="GtkDialog" id="zoomDialog">
+  <property name="visible">True</property>
+  <property name="title" translatable="yes">Set Zoom</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="dialog-vbox3">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+	<widget class="GtkHButtonBox" id="dialog-action_area3">
+	  <property name="visible">True</property>
+	  <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+	  <child>
+	    <widget class="GtkButton" id="cancelbutton2">
+	      <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>
+	      <property name="response_id">-6</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button1">
+	      <property name="visible">True</property>
+	      <property name="can_default">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label">gtk-apply</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">-10</property>
+	    </widget>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="button2">
+	      <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>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">False</property>
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkVBox" id="vbox1">
+	  <property name="border_width">8</property>
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">2</property>
+
+	  <child>
+	    <widget class="GtkHBox" id="hbox4">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">0</property>
+
+	      <child>
+		<widget class="GtkRadioButton" id="radioZoom">
+		  <property name="border_width">4</property>
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Zoom: </property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
+		  <property name="draw_indicator">True</property>
+		  <signal name="toggled" handler="on_radioZoom_toggled" last_modification_time="Sat, 22 Jul 2006 21:53:23 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkSpinButton" id="spinZoom">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="climb_rate">1</property>
+		  <property name="digits">0</property>
+		  <property name="numeric">True</property>
+		  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+		  <property name="snap_to_ticks">False</property>
+		  <property name="wrap">False</property>
+		  <property name="adjustment">100 10 1500 5 20 20</property>
+		  <signal name="value_changed" handler="on_spinZoom_value_changed" last_modification_time="Sat, 22 Jul 2006 21:04:21 GMT"/>
+		</widget>
+		<packing>
+		  <property name="padding">5</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label1">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">%</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.479999989271</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">True</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="GtkRadioButton" id="radioZoom100">
+	      <property name="border_width">4</property>
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Normal size (100%)</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	      <property name="group">radioZoom</property>
+	      <signal name="toggled" handler="on_radioZoom100_toggled" last_modification_time="Sat, 22 Jul 2006 21:53:30 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkRadioButton" id="radioZoomWidth">
+	      <property name="border_width">4</property>
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Page Width</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	      <property name="group">radioZoom</property>
+	      <signal name="toggled" handler="on_radioZoomWidth_toggled" last_modification_time="Sat, 22 Jul 2006 21:53:37 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkRadioButton" id="radioZoomHeight">
+	      <property name="border_width">4</property>
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Page Height</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	      <property name="group">radioZoom</property>
+	      <signal name="toggled" handler="on_radioZoomHeight_toggled" last_modification_time="Sat, 22 Jul 2006 21:53:45 GMT"/>
+	    </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>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>