X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=xournal.glade;h=1dacfe5df01d4ee27499eb6c0a23f7b5e4aa8423;hb=69037d6ddbe7e90d13d8a7a088d8c209a926190e;hp=47f31a55a8437e7643460e33bc12d72602046f92;hpb=62e6c9d87f653624015e8dacd4c5e5abbec4cffa;p=xournal.git

diff --git a/xournal.glade b/xournal.glade
index 47f31a5..1dacfe5 100644
--- a/xournal.glade
+++ b/xournal.glade
@@ -607,7 +607,7 @@
 	  <child>
 	    <widget class="GtkMenuItem" id="menuJournal">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">_Journal</property>
+	      <property name="label" translatable="yes">_Page</property>
 	      <property name="use_underline">True</property>
 
 	      <child>
@@ -772,13 +772,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkRadioMenuItem" id="papercolorOther">
+			    <widget class="GtkMenuItem" id="papercolorOther">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">other...</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
-			      <property name="group">papercolorWhite</property>
-			      <signal name="toggled" handler="on_papercolorOther_activate" last_modification_time="Thu, 01 Dec 2005 22:00:06 GMT"/>
+			      <signal name="activate" handler="on_papercolorOther_activate" last_modification_time="Sun, 27 Sep 2009 22:00:06 GMT"/>
 			    </widget>
 			  </child>
 
@@ -990,6 +988,46 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkRadioMenuItem" id="toolsImage">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Image</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">True</property>
+		      <property name="group">toolsPen</property>
+		      <signal name="toggled" handler="on_toolsImage_activate" last_modification_time="Wed, 27 Jun 2012 20:54:08 GMT"/>
+		      <accelerator key="I" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkSeparatorMenuItem" id="separator15">
+		      <property name="visible">True</property>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="toolsReco">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">_Shape Recognizer</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_toolsReco_activate" last_modification_time="Fri, 21 Mar 2008 16:36:05 GMT"/>
+		      <accelerator key="S" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+		    </widget>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="toolsRuler">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Ru_ler</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_toolsRuler_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
+		      <accelerator key="L" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator9">
 		      <property name="visible">True</property>
@@ -1198,13 +1236,11 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkRadioMenuItem" id="colorOther">
+			    <widget class="GtkMenuItem" id="colorOther">
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">other...</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
-			      <property name="group">colorBlack</property>
-			      <signal name="toggled" handler="on_colorOther_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
+			      <signal name="activate" handler="on_colorOther_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
 			  </child>
 
@@ -1483,28 +1519,11 @@
 		  <child>
 		    <widget class="GtkMenuItem" id="toolsSetAsDefault">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Set As Default</property>
+		      <property name="label" translatable="yes">Set As Default</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="on_toolsSetAsDefault_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 		    </widget>
 		  </child>
-
-		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator15">
-		      <property name="visible">True</property>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckMenuItem" id="toolsRuler">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Ru_ler</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="toggled" handler="on_toolsRuler_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
-		      <accelerator key="L" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
-		    </widget>
-		  </child>
 		</widget>
 	      </child>
 	    </widget>
@@ -1530,22 +1549,22 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsDiscardCoreEvents">
+		    <widget class="GtkCheckMenuItem" id="optionsButtonMappings">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Discard _Core Events</property>
+		      <property name="label" translatable="yes">_Eraser Tip</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"/>
+		      <signal name="activate" handler="on_optionsButtonMappings_activate" last_modification_time="Thu, 26 Jan 2006 03:45:32 GMT"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsButtonMappings">
+		    <widget class="GtkCheckMenuItem" id="optionsPressureSensitive">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Eraser Tip</property>
+		      <property name="label" translatable="yes">_Pressure sensitivity</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"/>
+		      <signal name="activate" handler="on_optionsPressureSensitive_activate" last_modification_time="Fri, 21 Mar 2008 19:00:32 GMT"/>
 		    </widget>
 		  </child>
 
@@ -1601,6 +1620,17 @@
 			    </widget>
 			  </child>
 
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button2Image">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Image</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button2Pen</property>
+			      <signal name="activate" handler="on_button2Image_activate" last_modification_time="Wed, 27 Jun 2012 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="button2SelectRegion">
 			      <property name="visible">True</property>
@@ -1737,6 +1767,17 @@
 			    </widget>
 			  </child>
 
+			  <child>
+			    <widget class="GtkRadioMenuItem" id="button3Image">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">_Image</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">True</property>
+			      <property name="group">button3Pen</property>
+			      <signal name="activate" handler="on_button3Image_activate" last_modification_time="Wed, 27 Jun 2012 14:33:10 GMT"/>
+			    </widget>
+			  </child>
+
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="button3SelectRegion">
 			      <property name="visible">True</property>
@@ -1822,18 +1863,18 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkSeparatorMenuItem" id="separator18">
+		    <widget class="GtkCheckMenuItem" id="optionsButtonSwitchMapping">
 		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Buttons Switch Mappings</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="toggled" handler="on_optionsButtonsSwitchMappings_activate" last_modification_time="Sun, 20 Sep 2009 22:54:39 GMT"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsAntialiasBG">
+		    <widget class="GtkSeparatorMenuItem" id="separator18">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">_Antialiased Bitmaps</property>
-		      <property name="use_underline">True</property>
-		      <property name="active">False</property>
-		      <signal name="activate" handler="on_optionsAntialiasBG_activate" last_modification_time="Thu, 26 Jan 2006 03:42:27 GMT"/>
 		    </widget>
 		  </child>
 
@@ -1857,6 +1898,16 @@
 		    </widget>
 		  </child>
 
+		  <child>
+		    <widget class="GtkCheckMenuItem" id="optionsAutoloadPdfXoj">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Autoload pdf.xoj</property>
+		      <property name="use_underline">True</property>
+		      <property name="active">False</property>
+		      <signal name="activate" handler="on_optionsAutoloadPdfXoj_activate" last_modification_time="Sat, 25 Nov 2006 03:42:27 GMT"/>
+		    </widget>
+		  </child>
+
 		  <child>
 		    <widget class="GtkCheckMenuItem" id="optionsLeftHanded">
 		      <property name="visible">True</property>
@@ -2413,6 +2464,45 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <widget class="GtkRadioToolButton" id="buttonImage">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Image</property>
+	      <property name="label" translatable="yes">Image</property>
+	      <property name="use_underline">True</property>
+	      <property name="stock_id">gtk-orientation-portrait</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_toolsImage_activate" last_modification_time="Wed, 27 Jun 2012 20:49:10 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkToggleToolButton" id="buttonReco">
+	      <property name="visible">True</property>
+	      <property name="tooltip" translatable="yes">Shape Recognizer</property>
+	      <property name="label" translatable="yes">Shape Recognizer</property>
+	      <property name="use_underline">True</property>
+	      <property name="icon">shapes.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>
+	      <signal name="toggled" handler="on_toolsReco_activate" last_modification_time="Thu, 08 Dec 2005 20:49:10 GMT"/>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">True</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkToggleToolButton" id="buttonRuler">
 	      <property name="visible">True</property>
@@ -2936,6 +3026,31 @@
 	    </packing>
 	  </child>
 
+	  <child>
+	    <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="GtkColorButton" id="buttonColorChooser">
+		  <property name="border_width">2</property>
+		  <property name="width_request">34</property>
+		  <property name="height_request">32</property>
+		  <property name="visible">True</property>
+		  <property name="use_alpha">False</property>
+		  <property name="focus_on_click">True</property>
+		  <signal name="color_set" handler="on_buttonColorChooser_set" last_modification_time="Wed, 16 Sep 2009 23:45:14 GMT"/>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="expand">False</property>
+	      <property name="homogeneous">False</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="toolitem21">
 	      <property name="visible">True</property>
@@ -3041,7 +3156,6 @@
 
 	  <child>
 	    <widget class="GtkSpinButton" id="spinPageNo">
-	      <property name="width_request">39</property>
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Set page number</property>
 	      <property name="can_focus">True</property>
@@ -3051,7 +3165,7 @@
 	      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
 	      <property name="snap_to_ticks">True</property>
 	      <property name="wrap">False</property>
-	      <property name="adjustment">1 1 1 1 1 1</property>
+	      <property name="adjustment">1 1 1 1 0 0</property>
 	      <signal name="value_changed" handler="on_spinPageNo_value_changed" last_modification_time="Tue, 13 Dec 2005 21:15:21 GMT"/>
 	    </widget>
 	    <packing>
@@ -3139,7 +3253,7 @@
 	  <child>
 	    <widget class="GtkStatusbar" id="statusbar">
 	      <property name="visible">True</property>
-	      <property name="has_resize_grip">True</property>
+	      <property name="has_resize_grip">False</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -3497,6 +3611,7 @@ points</property>
 	<widget class="GtkLabel" id="labelInfo">
 	  <property name="visible">True</property>
 	  <property name="label" translatable="yes">Written by Denis Auroux
+and other contributors
        http://xournal.sourceforge.net/       </property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">False</property>
@@ -3641,7 +3756,7 @@ points</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>
+		  <property name="adjustment">100 10 1500 5 0 0</property>
 		  <signal name="value_changed" handler="on_spinZoom_value_changed" last_modification_time="Sat, 22 Jul 2006 21:04:21 GMT"/>
 		</widget>
 		<packing>