From f22be488851d51c2b3dd9a3a8690d2c9c4f4e74e Mon Sep 17 00:00:00 2001
From: Jesse van den Kieboom <jessevdk@gmail.com>
Date: Sun, 6 Nov 2005 16:06:03 +0000
Subject: [PATCH] Updated

---
 ui/gm-preferences.glade      | 250 ++++++++++++++++++++++++-----------
 ui/gm-scripts.glade          |   3 +-
 ui/gm-world-properties.glade |  28 ++--
 3 files changed, 186 insertions(+), 95 deletions(-)

diff --git a/ui/gm-preferences.glade b/ui/gm-preferences.glade
index c960671..a592d5c 100644
--- a/ui/gm-preferences.glade
+++ b/ui/gm-preferences.glade
@@ -3,7 +3,7 @@
 
 <glade-interface>
 
-<widget class="GtkDialog" id="dlgPreferences">
+<widget class="GtkDialog" id="gm_preferences_dialog">
   <property name="width_request">500</property>
   <property name="height_request">450</property>
   <property name="visible">True</property>
@@ -18,8 +18,10 @@
   <property name="skip_pager_hint">True</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="urgency_hint">False</property>
   <property name="has_separator">True</property>
-  <signal name="delete_event" handler="on_dlgPreferences_delete" last_modification_time="Thu, 02 Jun 2005 09:54:40 GMT"/>
+  <signal name="delete_event" handler="on_gm_preferences_dialog_delete" last_modification_time="Thu, 02 Jun 2005 09:54:40 GMT"/>
 
   <child internal-child="vbox">
     <widget class="GtkVBox" id="dialog-vbox5">
@@ -80,7 +82,7 @@
       </child>
 
       <child>
-	<widget class="GtkNotebook" id="notePreferences">
+	<widget class="GtkNotebook" id="notebook_preferences">
 	  <property name="border_width">12</property>
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
@@ -100,12 +102,12 @@
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frameFont">
+		<widget class="GtkFrame" id="frame_font">
 		  <property name="border_width">3</property>
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
 		    <widget class="GtkTable" id="table4">
@@ -118,9 +120,9 @@
 		      <property name="column_spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="lblFontFamily">
+			<widget class="GtkLabel" id="label_font_description">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Font-family:</property>
+			  <property name="label" translatable="yes">Font description:</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -130,6 +132,10 @@
 			  <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="left_attach">0</property>
@@ -142,7 +148,7 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkFontButton" id="cmdFont">
+			<widget class="GtkFontButton" id="font_button_font">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="show_style">True</property>
@@ -163,11 +169,11 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="lblFont">
+		    <widget class="GtkLabel" id="label_font">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Font</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Font&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
@@ -175,6 +181,10 @@
 		      <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="type">label_item</property>
@@ -207,6 +217,10 @@
 	      <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="type">tab</property>
@@ -221,7 +235,7 @@
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkFrame" id="frame11">
+		<widget class="GtkFrame" id="frame14">
 		  <property name="border_width">3</property>
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
@@ -229,7 +243,7 @@
 		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
-		    <widget class="GtkAlignment" id="alignment26">
+		    <widget class="GtkAlignment" id="alignment28">
 		      <property name="visible">True</property>
 		      <property name="xalign">0.5</property>
 		      <property name="yalign">0.5</property>
@@ -241,25 +255,58 @@
 		      <property name="right_padding">0</property>
 
 		      <child>
-			<widget class="GtkCheckButton" id="chkBold">
+			<widget class="GtkHBox" id="hbox26">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">Use high colors for bold text</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="homogeneous">False</property>
+			  <property name="spacing">3</property>
+
+			  <child>
+			    <widget class="GtkLabel" id="label109">
+			      <property name="visible">True</property>
+			      <property name="label" translatable="yes">Select scheme:</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.5</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">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkComboBox" id="combo_box_scheme">
+			      <property name="visible">True</property>
+			      <property name="items" translatable="yes"></property>
+			      <property name="add_tearoffs">False</property>
+			      <property name="focus_on_click">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
 			</widget>
 		      </child>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label101">
+		    <widget class="GtkLabel" id="label108">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Bold</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Schemes&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -269,6 +316,10 @@
 		      <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="type">label_item</property>
@@ -325,6 +376,10 @@
 			      <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="left_attach">0</property>
@@ -349,6 +404,10 @@
 			      <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="left_attach">0</property>
@@ -361,7 +420,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgDefault">
+			    <widget class="GtkColorButton" id="color_button_fg_default">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Foreground</property>
 			      <property name="can_focus">True</property>
@@ -379,7 +438,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgDefaultH">
+			    <widget class="GtkColorButton" id="color_button_fg_default_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Foreground High</property>
 			      <property name="can_focus">True</property>
@@ -397,7 +456,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgDefault">
+			    <widget class="GtkColorButton" id="color_button_bg_default">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Background</property>
 			      <property name="can_focus">True</property>
@@ -421,7 +480,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label92">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Default</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Default&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -431,6 +490,10 @@
 		      <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="type">label_item</property>
@@ -475,7 +538,7 @@
 			  <property name="column_spacing">3</property>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgBlack">
+			    <widget class="GtkColorButton" id="color_button_fg_black">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Black</property>
 			      <property name="can_focus">True</property>
@@ -493,7 +556,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgRed">
+			    <widget class="GtkColorButton" id="color_button_fg_red">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Red</property>
 			      <property name="can_focus">True</property>
@@ -511,7 +574,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgRedH">
+			    <widget class="GtkColorButton" id="color_button_fg_red_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Red High</property>
 			      <property name="can_focus">True</property>
@@ -529,7 +592,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgGreen">
+			    <widget class="GtkColorButton" id="color_button_fg_green">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Green</property>
 			      <property name="can_focus">True</property>
@@ -547,7 +610,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgGreenH">
+			    <widget class="GtkColorButton" id="color_button_fg_green_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Green High</property>
 			      <property name="can_focus">True</property>
@@ -565,7 +628,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgYellow">
+			    <widget class="GtkColorButton" id="color_button_fg_yellow">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Yellow</property>
 			      <property name="can_focus">True</property>
@@ -583,7 +646,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgYellowH">
+			    <widget class="GtkColorButton" id="color_button_fg_yellow_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Yellow High</property>
 			      <property name="can_focus">True</property>
@@ -601,7 +664,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgBlue">
+			    <widget class="GtkColorButton" id="color_button_fg_blue">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Blue</property>
 			      <property name="can_focus">True</property>
@@ -619,7 +682,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgBlueH">
+			    <widget class="GtkColorButton" id="color_button_fg_blue_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Blue High</property>
 			      <property name="can_focus">True</property>
@@ -637,7 +700,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgPurple">
+			    <widget class="GtkColorButton" id="color_button_fg_purple">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Purple</property>
 			      <property name="can_focus">True</property>
@@ -655,7 +718,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgPurpleH">
+			    <widget class="GtkColorButton" id="color_button_fg_purple_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Purple High</property>
 			      <property name="can_focus">True</property>
@@ -673,7 +736,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgCyan">
+			    <widget class="GtkColorButton" id="color_button_fg_cyan">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Cyan</property>
 			      <property name="can_focus">True</property>
@@ -691,7 +754,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgCyanH">
+			    <widget class="GtkColorButton" id="color_button_fg_cyan_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Cyan High</property>
 			      <property name="can_focus">True</property>
@@ -709,7 +772,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgWhite">
+			    <widget class="GtkColorButton" id="color_button_fg_white">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">White</property>
 			      <property name="can_focus">True</property>
@@ -727,7 +790,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgWhiteH">
+			    <widget class="GtkColorButton" id="color_button_fg_white_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">White High</property>
 			      <property name="can_focus">True</property>
@@ -745,7 +808,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbFgBlackH">
+			    <widget class="GtkColorButton" id="color_button_fg_black_h">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Black High</property>
 			      <property name="can_focus">True</property>
@@ -769,7 +832,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label97">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Foreground</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Foreground&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -779,6 +842,10 @@
 		      <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="type">label_item</property>
@@ -823,7 +890,7 @@
 			  <property name="column_spacing">3</property>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgBlack">
+			    <widget class="GtkColorButton" id="color_button_bg_black">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Black</property>
 			      <property name="can_focus">True</property>
@@ -841,7 +908,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgRed">
+			    <widget class="GtkColorButton" id="color_button_bg_red">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Red</property>
 			      <property name="can_focus">True</property>
@@ -859,7 +926,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgGreen">
+			    <widget class="GtkColorButton" id="color_button_bg_green">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Green</property>
 			      <property name="can_focus">True</property>
@@ -877,7 +944,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgYellow">
+			    <widget class="GtkColorButton" id="color_button_bg_yellow">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Yellow</property>
 			      <property name="can_focus">True</property>
@@ -895,7 +962,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgBlue">
+			    <widget class="GtkColorButton" id="color_button_bg_blue">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Blue</property>
 			      <property name="can_focus">True</property>
@@ -913,7 +980,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgPurple">
+			    <widget class="GtkColorButton" id="color_button_bg_purple">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Purple</property>
 			      <property name="can_focus">True</property>
@@ -931,7 +998,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgCyan">
+			    <widget class="GtkColorButton" id="color_button_bg_cyan">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Cyan</property>
 			      <property name="can_focus">True</property>
@@ -949,7 +1016,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkColorButton" id="clbBgWhite">
+			    <widget class="GtkColorButton" id="color_button_bg_white">
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">White</property>
 			      <property name="can_focus">True</property>
@@ -973,7 +1040,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label98">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Background</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -983,6 +1050,10 @@
 		      <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="type">label_item</property>
@@ -1015,6 +1086,10 @@
 	      <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="type">tab</property>
@@ -1055,7 +1130,7 @@
 			  <property name="spacing">3</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="chkPrefAltEditor">
+			    <widget class="GtkCheckButton" id="check_button_alt_editor">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="label" translatable="yes">Use alternative editor</property>
@@ -1065,7 +1140,7 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <signal name="clicked" handler="on_chkPrefAltEditor_clicked" last_modification_time="Thu, 10 Jun 2004 18:08:25 GMT"/>
+			      <signal name="clicked" handler="on_check_button_alt_editor_clicked" last_modification_time="Thu, 10 Jun 2004 18:08:25 GMT"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1075,7 +1150,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkEntry" id="entryPrefEditor">
+			    <widget class="GtkEntry" id="entry_alt_editor">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="editable">True</property>
@@ -1094,7 +1169,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="chkPrefEmbedEditor">
+			    <widget class="GtkCheckButton" id="check_button_embed_editor">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="label" translatable="yes">Embed editor into GnoeMoe (implies terminal)</property>
@@ -1104,7 +1179,7 @@
 			      <property name="active">False</property>
 			      <property name="inconsistent">False</property>
 			      <property name="draw_indicator">True</property>
-			      <signal name="clicked" handler="on_chkPrefEmbedEditor_clicked" last_modification_time="Thu, 10 Jun 2004 19:08:43 GMT"/>
+			      <signal name="clicked" handler="on_check_button_embed_editor_clicked" last_modification_time="Thu, 10 Jun 2004 19:08:43 GMT"/>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -1114,7 +1189,7 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="chkPrefNeedsTerminal">
+			    <widget class="GtkCheckButton" id="check_button_needs_terminal">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
 			      <property name="label" translatable="yes">Needs terminal</property>
@@ -1139,7 +1214,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label90">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Program</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Program&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1149,6 +1224,10 @@
 		      <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="type">label_item</property>
@@ -1190,7 +1269,7 @@
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkScrolledWindow" id="slrWndEditColors">
+			    <widget class="GtkScrolledWindow" id="scrolled_window_editor_colors">
 			      <property name="width_request">200</property>
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
@@ -1200,13 +1279,16 @@
 			      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 			      <child>
-				<widget class="GtkTreeView" id="tvEditorColors">
+				<widget class="GtkTreeView" id="tree_view_editor_colors">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="headers_visible">False</property>
 				  <property name="rules_hint">True</property>
 				  <property name="reorderable">False</property>
 				  <property name="enable_search">True</property>
+				  <property name="fixed_height_mode">False</property>
+				  <property name="hover_selection">False</property>
+				  <property name="hover_expand">False</property>
 				</widget>
 			      </child>
 			    </widget>
@@ -1231,7 +1313,7 @@
 				  <property name="spacing">6</property>
 
 				  <child>
-				    <widget class="GtkToggleButton" id="cmdBold">
+				    <widget class="GtkToggleButton" id="toggle_button_bold">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="tooltip" translatable="yes">Bold</property>
@@ -1240,7 +1322,7 @@
 				      <property name="focus_on_click">True</property>
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
-				      <signal name="clicked" handler="on_cmdBold_clicked" last_modification_time="Thu, 01 Jul 2004 19:29:50 GMT"/>
+				      <signal name="clicked" handler="on_toggle_button_bold_clicked" last_modification_time="Thu, 01 Jul 2004 19:29:50 GMT"/>
 
 				      <child>
 					<widget class="GtkImage" id="image297">
@@ -1262,7 +1344,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkToggleButton" id="cmdItalic">
+				    <widget class="GtkToggleButton" id="toggle_button_style">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="tooltip" translatable="yes">Italic</property>
@@ -1271,7 +1353,7 @@
 				      <property name="focus_on_click">True</property>
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
-				      <signal name="clicked" handler="on_cmdItalic_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:01 GMT"/>
+				      <signal name="clicked" handler="on_toggle_button_style_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:01 GMT"/>
 
 				      <child>
 					<widget class="GtkImage" id="image301">
@@ -1293,7 +1375,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkToggleButton" id="cmdUnderline">
+				    <widget class="GtkToggleButton" id="toggle_button_underline">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="tooltip" translatable="yes">Underline</property>
@@ -1302,7 +1384,7 @@
 				      <property name="focus_on_click">True</property>
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
-				      <signal name="clicked" handler="on_cmdUnderline_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:09 GMT"/>
+				      <signal name="clicked" handler="on_toggle_button_underline_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:09 GMT"/>
 
 				      <child>
 					<widget class="GtkImage" id="image302">
@@ -1324,7 +1406,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkToggleButton" id="cmdStrikethrough">
+				    <widget class="GtkToggleButton" id="toggle_button_strike_through">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="tooltip" translatable="yes">Strikethrough</property>
@@ -1333,7 +1415,7 @@
 				      <property name="focus_on_click">True</property>
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
-				      <signal name="clicked" handler="on_cmdStrikethrough_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:15 GMT"/>
+				      <signal name="clicked" handler="on_toggle_button_strike_through_clicked" last_modification_time="Thu, 01 Jul 2004 19:30:15 GMT"/>
 
 				      <child>
 					<widget class="GtkImage" id="image300">
@@ -1372,7 +1454,7 @@
 				  <property name="column_spacing">6</property>
 
 				  <child>
-				    <widget class="GtkCheckButton" id="chkForeground">
+				    <widget class="GtkCheckButton" id="check_button_fg">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="can_focus">True</property>
@@ -1383,7 +1465,7 @@
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
 				      <property name="draw_indicator">True</property>
-				      <signal name="clicked" handler="on_chkForeground_clicked" last_modification_time="Thu, 01 Jul 2004 17:58:36 GMT"/>
+				      <signal name="clicked" handler="on_check_button_fg_clicked" last_modification_time="Thu, 01 Jul 2004 17:58:36 GMT"/>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1396,7 +1478,7 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkCheckButton" id="chkBackground">
+				    <widget class="GtkCheckButton" id="check_button_bg">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="can_focus">True</property>
@@ -1407,7 +1489,7 @@
 				      <property name="active">False</property>
 				      <property name="inconsistent">False</property>
 				      <property name="draw_indicator">True</property>
-				      <signal name="clicked" handler="on_chkBackground_clicked" last_modification_time="Thu, 01 Jul 2004 17:58:41 GMT"/>
+				      <signal name="clicked" handler="on_check_button_bg_clicked" last_modification_time="Thu, 01 Jul 2004 17:58:41 GMT"/>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">0</property>
@@ -1420,13 +1502,13 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkColorButton" id="clbForeground">
+				    <widget class="GtkColorButton" id="color_button_fg">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="can_focus">True</property>
 				      <property name="use_alpha">False</property>
 				      <property name="focus_on_click">True</property>
-				      <signal name="color_set" handler="on_clbForeground_color_set" last_modification_time="Fri, 02 Jul 2004 13:32:46 GMT"/>
+				      <signal name="color_set" handler="on_color_button_fg_color_set" last_modification_time="Fri, 02 Jul 2004 13:32:46 GMT"/>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">1</property>
@@ -1439,13 +1521,13 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkColorButton" id="clbBackground">
+				    <widget class="GtkColorButton" id="color_button_bg">
 				      <property name="visible">True</property>
 				      <property name="sensitive">False</property>
 				      <property name="can_focus">True</property>
 				      <property name="use_alpha">False</property>
 				      <property name="focus_on_click">True</property>
-				      <signal name="color_set" handler="on_clbBackground_color_set" last_modification_time="Fri, 02 Jul 2004 13:32:53 GMT"/>
+				      <signal name="color_set" handler="on_color_button_bg_color_set" last_modification_time="Fri, 02 Jul 2004 13:32:53 GMT"/>
 				    </widget>
 				    <packing>
 				      <property name="left_attach">1</property>
@@ -1478,7 +1560,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label107">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Colors</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Colors&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1488,6 +1570,10 @@
 		      <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="type">label_item</property>
@@ -1520,6 +1606,10 @@
 	      <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="type">tab</property>
diff --git a/ui/gm-scripts.glade b/ui/gm-scripts.glade
index 05a5086..be19e2e 100644
--- a/ui/gm-scripts.glade
+++ b/ui/gm-scripts.glade
@@ -9,7 +9,7 @@
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
-  <property name="default_width">500</property>
+  <property name="default_width">750</property>
   <property name="default_height">400</property>
   <property name="resizable">True</property>
   <property name="destroy_with_parent">False</property>
@@ -20,6 +20,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
   <signal name="delete_event" handler="on_gm_scripts_dialog_delete" last_modification_time="Wed, 05 Oct 2005 14:31:00 GMT"/>
 
   <child>
diff --git a/ui/gm-world-properties.glade b/ui/gm-world-properties.glade
index 92ac6af..c6bc84b 100644
--- a/ui/gm-world-properties.glade
+++ b/ui/gm-world-properties.glade
@@ -91,7 +91,7 @@
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
 		    <widget class="GtkTable" id="table1">
@@ -179,9 +179,9 @@
 		  <child>
 		    <widget class="GtkLabel" id="lblGen">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">General</property>
+		      <property name="label" translatable="yes">&lt;b&gt;General&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
@@ -212,7 +212,7 @@
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
 		    <widget class="GtkTable" id="table2">
@@ -348,9 +348,9 @@
 		  <child>
 		    <widget class="GtkLabel" id="lblServer">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Server</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Server&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
@@ -421,7 +421,7 @@
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
 		    <widget class="GtkTable" id="table3">
@@ -536,9 +536,9 @@
 		  <child>
 		    <widget class="GtkLabel" id="lblLogin">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Auto-login</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Automatic login&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>
@@ -576,7 +576,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="lblAutologin">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Autologin</property>
+	      <property name="label" translatable="yes">Automatic login</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -609,7 +609,7 @@
 		  <property name="visible">True</property>
 		  <property name="label_xalign">0</property>
 		  <property name="label_yalign">0.5</property>
-		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
 
 		  <child>
 		    <widget class="GtkTable" id="table11">
@@ -624,7 +624,7 @@
 		      <child>
 			<widget class="GtkLabel" id="label105">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Charset:</property>
+			  <property name="label" translatable="yes">Character encoding:</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">False</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -670,9 +670,9 @@
 		  <child>
 		    <widget class="GtkLabel" id="label106">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">Language</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Language&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
-		      <property name="use_markup">False</property>
+		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
 		      <property name="wrap">False</property>
 		      <property name="selectable">False</property>