X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=xournal.glade;h=c73ca4d4ae72bdd7404ae43d02eac49a3748ae90;hb=ddd27893ae44eb5eb62c80e5751a6943a4782fe2;hp=d0afe62dea5036c0a1417779e66dee2035519bba;hpb=a78b442e4b673ac29d7dd29cfb2c9bca6f07130a;p=xournal.git

diff --git a/xournal.glade b/xournal.glade
index d0afe62..c73ca4d 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="image533">
+			<widget class="GtkImage" id="image577">
 			  <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="image534">
+			<widget class="GtkImage" id="image578">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-preferences</property>
 			  <property name="icon_size">1</property>
@@ -337,7 +337,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Continuous</property>
 		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="active">False</property>
 		      <signal name="toggled" handler="on_viewContinuous_activate" last_modification_time="Wed, 30 Nov 2005 19:31:48 GMT"/>
 		    </widget>
 		  </child>
@@ -410,7 +410,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="image535">
+			<widget class="GtkImage" id="image579">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-zoom-fit</property>
 			  <property name="icon_size">1</property>
@@ -437,7 +437,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="image536">
+			<widget class="GtkImage" id="image580">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-first</property>
 			  <property name="icon_size">1</property>
@@ -458,7 +458,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="image537">
+			<widget class="GtkImage" id="image581">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -479,7 +479,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="image538">
+			<widget class="GtkImage" id="image582">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-forward</property>
 			  <property name="icon_size">1</property>
@@ -500,7 +500,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="image539">
+			<widget class="GtkImage" id="image583">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-goto-last</property>
 			  <property name="icon_size">1</property>
@@ -527,7 +527,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="image540">
+			<widget class="GtkImage" id="image584">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-add</property>
 			  <property name="icon_size">1</property>
@@ -548,7 +548,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="image541">
+			<widget class="GtkImage" id="image585">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-remove</property>
 			  <property name="icon_size">1</property>
@@ -672,7 +672,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">white paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_papercolorWhite_activate" last_modification_time="Wed, 30 Nov 2005 19:58:26 GMT"/>
 			    </widget>
 			  </child>
@@ -682,7 +682,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">yellow paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorYellow_activate" last_modification_time="Wed, 30 Nov 2005 19:58:26 GMT"/>
 			    </widget>
@@ -693,7 +693,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">pink paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorPink_activate" last_modification_time="Wed, 30 Nov 2005 19:58:26 GMT"/>
 			    </widget>
@@ -704,7 +704,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">orange paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorOrange_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -715,7 +715,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">blue paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorBlue_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -726,7 +726,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">green paper</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorGreen_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -737,7 +737,7 @@
 			      <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="active">False</property>
 			      <property name="group">papercolorWhite</property>
 			      <signal name="toggled" handler="on_papercolorOther_activate" last_modification_time="Thu, 01 Dec 2005 22:00:06 GMT"/>
 			    </widget>
@@ -770,7 +770,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">plain</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_paperstylePlain_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
 			  </child>
@@ -780,7 +780,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">lined</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">paperstylePlain</property>
 			      <signal name="toggled" handler="on_paperstyleLined_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -791,7 +791,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">ruled</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">paperstylePlain</property>
 			      <signal name="toggled" handler="on_paperstyleRuled_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -802,7 +802,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">graph</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">paperstylePlain</property>
 			      <signal name="toggled" handler="on_paperstyleGraph_activate" last_modification_time="Wed, 30 Nov 2005 20:06:31 GMT"/>
 			    </widget>
@@ -821,6 +821,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>
@@ -829,7 +845,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="image542">
+			<widget class="GtkImage" id="image586">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -851,15 +867,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>
@@ -902,7 +909,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Pen</property>
 		      <property name="use_underline">True</property>
-		      <property name="active">True</property>
+		      <property name="active">False</property>
 		      <signal name="toggled" handler="on_toolsPen_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 		    </widget>
 		  </child>
@@ -912,7 +919,7 @@
 		      <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="active">False</property>
 		      <property name="group">toolsPen</property>
 		      <signal name="toggled" handler="on_toolsEraser_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 		    </widget>
@@ -923,7 +930,7 @@
 		      <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="active">False</property>
 		      <property name="group">toolsPen</property>
 		      <signal name="toggled" handler="on_toolsHighlighter_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 		    </widget>
@@ -934,7 +941,7 @@
 		      <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="active">False</property>
 		      <property name="group">toolsPen</property>
 		      <signal name="toggled" handler="on_toolsText_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
 		    </widget>
@@ -951,7 +958,7 @@
 		      <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="active">False</property>
 		      <property name="group">toolsPen</property>
 		      <signal name="toggled" handler="on_toolsSelectRegion_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
 		    </widget>
@@ -962,7 +969,7 @@
 		      <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="active">False</property>
 		      <property name="group">toolsPen</property>
 		      <signal name="toggled" handler="on_toolsSelectRectangle_activate" last_modification_time="Thu, 01 Dec 2005 20:54:08 GMT"/>
 		    </widget>
@@ -992,7 +999,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image543">
+			<widget class="GtkImage" id="image587">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-color</property>
 			  <property name="icon_size">1</property>
@@ -1011,7 +1018,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">black</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_colorBlack_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
 			  </child>
@@ -1021,7 +1028,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">blue</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorBlue_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1032,7 +1039,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">red</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorRed_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1043,7 +1050,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">green</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorGreen_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1054,7 +1061,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">gray</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorGray_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1071,7 +1078,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">light blue</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorLightBlue_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1082,7 +1089,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">light green</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorLightGreen_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1093,7 +1100,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">magenta</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorMagenta_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1104,7 +1111,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">orange</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorOrange_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1115,7 +1122,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">yellow</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorYellow_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1126,7 +1133,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">white</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorWhite_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1137,7 +1144,7 @@
 			      <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="active">False</property>
 			      <property name="group">colorBlack</property>
 			      <signal name="toggled" handler="on_colorOther_activate" last_modification_time="Thu, 01 Dec 2005 21:56:57 GMT"/>
 			    </widget>
@@ -1170,7 +1177,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">very fine</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_penthicknessVeryFine_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
 			  </child>
@@ -1180,7 +1187,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">fine</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">penthicknessVeryFine</property>
 			      <signal name="toggled" handler="on_penthicknessFine_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
@@ -1191,7 +1198,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">medium</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">penthicknessVeryFine</property>
 			      <signal name="toggled" handler="on_penthicknessMedium_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 			    </widget>
@@ -1202,7 +1209,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">thick</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">penthicknessVeryFine</property>
 			      <signal name="toggled" handler="on_penthicknessThick_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 			    </widget>
@@ -1237,7 +1244,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">fine</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_eraserFine_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
 			  </child>
@@ -1247,7 +1254,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">medium</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">eraserFine</property>
 			      <signal name="toggled" handler="on_eraserMedium_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
@@ -1275,7 +1282,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">standard</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_eraserStandard_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
 			  </child>
@@ -1285,7 +1292,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">whiteout</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">eraserStandard</property>
 			      <signal name="toggled" handler="on_eraserWhiteout_activate" last_modification_time="Thu, 01 Dec 2005 19:29:18 GMT"/>
 			    </widget>
@@ -1320,7 +1327,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">fine</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <signal name="toggled" handler="on_highlighterFine_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 			    </widget>
 			  </child>
@@ -1330,7 +1337,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">medium</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">highlighterFine</property>
 			      <signal name="toggled" handler="on_highlighterMedium_activate" last_modification_time="Thu, 01 Dec 2005 05:36:05 GMT"/>
 			    </widget>
@@ -1359,7 +1366,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="image544">
+			<widget class="GtkImage" id="image588">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-select-font</property>
 			  <property name="icon_size">1</property>
@@ -1463,12 +1470,262 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="optionsEmulateEraser">
+		    <widget class="GtkCheckMenuItem" id="optionsButtonMappings">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Emulate Eraser</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_optionsEmulateEraser_activate" last_modification_time="Thu, 26 Jan 2006 03:45:32 GMT"/>
+		      <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">False</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">False</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">False</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">False</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">False</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">False</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="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">False</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">False</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">False</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">False</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">False</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">False</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">False</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">False</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">False</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="GtkSeparatorMenuItem" id="separator25">
+			      <property name="visible">True</property>
+			    </widget>
+			  </child>
+
+			  <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">False</property>
+			      <signal name="activate" handler="on_button3LinkBrush_activate" last_modification_time="Sun, 04 Jun 2006 14:33:10 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">False</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="GtkRadioMenuItem" id="button3NABrush">
+			      <property name="label" translatable="yes">NA</property>
+			      <property name="use_underline">True</property>
+			      <property name="active">False</property>
+			      <property name="group">button3LinkBrush</property>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>