X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=xournal.glade;h=ebfef27141dc04de4ffbd9e3a8ee80014123f9a4;hb=7210dbf830593e28677e77e3cad980804ad4f66f;hp=af6c0d4212bbe90f66d9a7e7ceeb5dd75f5ed94b;hpb=59df9eb838b273295a6b86ce9f522dc4ad71dc4d;p=xournal.git

diff --git a/xournal.glade b/xournal.glade
index af6c0d4..ebfef27 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>
@@ -376,62 +376,75 @@
 		  </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="image601">
-			  <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>
 		  </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>
-
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator5">
 		      <property name="visible">True</property>
@@ -446,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>
@@ -467,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>
@@ -488,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>
@@ -509,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>
@@ -536,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>
@@ -557,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>
@@ -854,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>
@@ -995,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>
@@ -1008,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>
@@ -1375,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>
@@ -1573,6 +1597,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>
@@ -1698,6 +1733,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>
@@ -1845,6 +1891,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>
@@ -2356,6 +2434,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>