Index: gnome-control-center//capplets/ui-properties/ChangeLog
===================================================================
RCS file: /export/cvs/gnome-2.0/gnome-control-center/capplets/ui-properties/ChangeLog,v
retrieving revision 1.48
diff -p -u -5 -r1.48 ChangeLog
--- gnome-control-center//capplets/ui-properties/ChangeLog	2003/01/21 06:53:34	1.48
+++ gnome-control-center//capplets/ui-properties/ChangeLog	2003/02/11 11:21:18
@@ -0,0 +1,14 @@
+2003-02-11  Rajkumar Sivasamy  <rajkumar.siva@wipro.com>
+
+	* gnome-ui-properties.c:
+	  gnome-ui-properties.glade:
+	  - s/Button Labels/Button labels
+	  - s/detached and moved around/detached
+	  - Reverse Menus and Toolbar UI positioning
+	  - s/Icons Only/Icons only
+	  - s/Text Beside Icons/Text for important icons
+	  - s/Text Below Icons/Text for all icons
+	  - s/Text Only/Text only
+
+	  Fix for UI review bug 99537
+
 Tue Jan 21 01:15:14 2003  Jonathan Blandford  <jrb@gnome.org>
 
 	* Release 2.2.0
 
 Thu Jan 16 02:41:09 2003  Jonathan Blandford  <jrb@gnome.org>
Index: gnome-control-center//capplets/ui-properties/gnome-ui-properties.c
===================================================================
RCS file: /export/cvs/gnome-2.0/gnome-control-center/capplets/ui-properties/gnome-ui-properties.c,v
retrieving revision 1.24
diff -p -u -5 -r1.24 gnome-ui-properties.c
--- gnome-control-center//capplets/ui-properties/gnome-ui-properties.c	2002/10/01 15:18:37	1.24
+++ gnome-control-center//capplets/ui-properties/gnome-ui-properties.c	2003/02/11 11:21:18
@@ -35,13 +35,13 @@ enum
 	RESPONSE_APPLY = 1,
 	RESPONSE_CLOSE
 };
 
 static GConfEnumStringPair toolbar_style_enums[] = {
-  { 0, "both" },
+  { 0, "icons" },
   { 1, "both_horiz" },
-  { 2, "icons" },
+  { 2, "both" },
   { 3, "text" },
   { -1, NULL }
 };
 
 static GConfValue *
@@ -128,11 +128,11 @@ show_handlebar (GladeXML *dialog, gboole
 
 static void
 set_toolbar_style (GladeXML *dialog, const char *value)
 {
   static const GtkToolbarStyle gtk_toolbar_styles[] = 
-    { GTK_TOOLBAR_BOTH, GTK_TOOLBAR_BOTH_HORIZ, GTK_TOOLBAR_ICONS, GTK_TOOLBAR_TEXT };
+    { GTK_TOOLBAR_ICONS, GTK_TOOLBAR_BOTH_HORIZ, GTK_TOOLBAR_BOTH, GTK_TOOLBAR_TEXT };
 
   int enum_val;
 
   if (!gconf_string_to_enum (toolbar_style_enums, value, &enum_val))
 	  enum_val = 0;
@@ -266,11 +266,11 @@ setup_dialog (GladeXML *dialog, GConfCha
 					 NULL));
 
   toolbar_style = gconf_client_get_string (gconf_client_get_default (),
 					   "/desktop/gnome/interface/toolbar_style", 
 					   NULL);
-  
+
   set_toolbar_style (dialog, toolbar_style);
 
   g_free (toolbar_style);
 
   gtk_window_set_resizable (GTK_WINDOW (widget), FALSE);
Index: gnome-control-center//capplets/ui-properties/gnome-ui-properties.glade
===================================================================
RCS file: /export/cvs/gnome-2.0/gnome-control-center/capplets/ui-properties/gnome-ui-properties.glade,v
retrieving revision 1.14
diff -p -u -5 -r1.14 gnome-ui-properties.glade
--- gnome-control-center//capplets/ui-properties/gnome-ui-properties.glade	2002/10/01 15:18:37	1.14
+++ gnome-control-center//capplets/ui-properties/gnome-ui-properties.glade	2003/02/11 11:21:20
@@ -66,11 +66,11 @@
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">8</property>
 
 	  <child>
-	    <widget class="GtkFrame" id="frame4">
+	    <widget class="GtkFrame" id="frame3">
 	      <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>
 
@@ -80,242 +80,10 @@
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">8</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox1">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label5">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Button Labels: </property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">toolbar_style_omenu</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkOptionMenu" id="toolbar_style_omenu">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="history">0</property>
-			  <accessibility>
-			    <atkaction action_name="press" description="Select the toolbar style."/>
-			  </accessibility>
-
-			  <child internal-child="menu">
-			    <widget class="GtkMenu" id="convertwidget1">
-			      <property name="visible">True</property>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget2">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Text Below Icons</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget3">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Text Beside Icons</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="convertwidget4">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Icons Only</property>
-				  <property name="use_underline">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="text_only1">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">Text Only</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_text_only1_activate" last_modification_time="Mon, 06 May 2002 07:03:54 GMT"/>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkCheckButton" id="detachable_toolbars_toggle">
-		      <property name="visible">True</property>
-		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">Toolbars can be _detached and moved around</property>
-		      <property name="use_underline">True</property>
-		      <property name="relief">GTK_RELIEF_NORMAL</property>
-		      <property name="active">True</property>
-		      <property name="inconsistent">False</property>
-		      <property name="draw_indicator">True</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkFrame" id="toolbar_frame">
-		      <property name="visible">True</property>
-		      <property name="label_xalign">0</property>
-		      <property name="label_yalign">0.5</property>
-		      <property name="shadow_type">GTK_SHADOW_NONE</property>
-		      <accessibility>
-			<atkproperty name="AtkObject::accessible_description" translatable="yes">A preview of what a toolbar looks like with these settings.</atkproperty>
-		      </accessibility>
-
-		      <child>
-			<widget class="GtkHandleBox" id="toolbar_handlebox">
-			  <property name="visible">True</property>
-			  <property name="shadow_type">GTK_SHADOW_OUT</property>
-			  <property name="handle_position">GTK_POS_LEFT</property>
-			  <property name="snap_edge">GTK_POS_TOP</property>
-
-			  <child>
-			    <widget class="GtkToolbar" id="toolbar_toolbar">
-			      <property name="border_width">1</property>
-			      <property name="visible">True</property>
-			      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-			      <property name="tooltips">True</property>
-
-			      <child>
-				<widget class="button" id="button7">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">New File</property>
-				  <property name="label">gtk-new</property>
-				  <property name="use_stock">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="button" id="button8">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Open File</property>
-				  <property name="label">gtk-open</property>
-				  <property name="use_stock">True</property>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="button" id="button9">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Save File</property>
-				  <property name="label">gtk-save</property>
-				  <property name="use_stock">True</property>
-				</widget>
-			      </child>
-			    </widget>
-			  </child>
-			</widget>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label6">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Sample toolbar:</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>
-			</widget>
-			<packing>
-			  <property name="type">label_item</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-	      </child>
-
-	      <child>
-		<widget class="GtkLabel" id="label1">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Toolbar</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>
-		</widget>
-		<packing>
-		  <property name="type">label_item</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkFrame" id="frame5">
-	      <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>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox4">
-		  <property name="border_width">8</property>
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">8</property>
-
-		  <child>
 		    <widget class="GtkCheckButton" id="menu_icons_toggle">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">Show _icons in menus</property>
 		      <property name="use_underline">True</property>
@@ -330,11 +98,11 @@
 		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 
 		  <child>
-		    <widget class="GtkFrame" id="frame3">
+		    <widget class="GtkFrame" id="frame4">
 		      <property name="visible">True</property>
 		      <property name="label_xalign">0</property>
 		      <property name="label_yalign">0.5</property>
 		      <property name="shadow_type">GTK_SHADOW_NONE</property>
 		      <accessibility>
@@ -582,10 +350,242 @@
 
 	      <child>
 		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">Menus</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>
+		</widget>
+		<packing>
+		  <property name="type">label_item</property>
+		</packing>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkFrame" id="frame5">
+	      <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>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox4">
+		  <property name="border_width">8</property>
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">8</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox1">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
+		      <child>
+			<widget class="GtkLabel" id="label5">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">_Button labels: </property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">toolbar_style_omenu</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkOptionMenu" id="toolbar_style_omenu">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="history">3</property>
+			  <accessibility>
+			    <atkaction action_name="press" description="Select the toolbar style."/>
+			  </accessibility>
+
+			  <child internal-child="menu">
+			    <widget class="GtkMenu" id="convertwidget1">
+			      <property name="visible">True</property>
+
+			      <child>
+				<widget class="GtkMenuItem" id="convertwidget4">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Icons only</property>
+				  <property name="use_underline">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="convertwidget3">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Text for important  icons</property>
+				  <property name="use_underline">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="convertwidget2">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Text for all icons</property>
+				  <property name="use_underline">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="GtkMenuItem" id="text_only1">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">Text only</property>
+				  <property name="use_underline">True</property>
+				  <signal name="activate" handler="on_text_only1_activate" last_modification_time="Mon, 06 May 2002 07:03:54 GMT"/>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="detachable_toolbars_toggle">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">Toolbars can be _detached</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="active">True</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkFrame" id="toolbar_frame">
+		      <property name="visible">True</property>
+		      <property name="label_xalign">0</property>
+		      <property name="label_yalign">0.5</property>
+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
+		      <accessibility>
+			<atkproperty name="AtkObject::accessible_description" translatable="yes">A preview of what a toolbar looks like with these settings.</atkproperty>
+		      </accessibility>
+
+		      <child>
+			<widget class="GtkHandleBox" id="toolbar_handlebox">
+			  <property name="visible">True</property>
+			  <property name="shadow_type">GTK_SHADOW_OUT</property>
+			  <property name="handle_position">GTK_POS_LEFT</property>
+			  <property name="snap_edge">GTK_POS_TOP</property>
+
+			  <child>
+			    <widget class="GtkToolbar" id="toolbar_toolbar">
+			      <property name="border_width">1</property>
+			      <property name="visible">True</property>
+			      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+			      <property name="tooltips">True</property>
+
+			      <child>
+				<widget class="button" id="button7">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">New File</property>
+				  <property name="label">gtk-new</property>
+				  <property name="use_stock">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="button" id="button8">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Open File</property>
+				  <property name="label">gtk-open</property>
+				  <property name="use_stock">True</property>
+				</widget>
+			      </child>
+
+			      <child>
+				<widget class="button" id="button9">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Save File</property>
+				  <property name="label">gtk-save</property>
+				  <property name="use_stock">True</property>
+				</widget>
+			      </child>
+			    </widget>
+			  </child>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label6">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Sample toolbar:</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>
+			</widget>
+			<packing>
+			  <property name="type">label_item</property>
+			</packing>
+		      </child>
+		    </widget>
+		    <packing>
+		      <property name="padding">0</property>
+		      <property name="expand">False</property>
+		      <property name="fill">True</property>
+		    </packing>
+		  </child>
+		</widget>
+	      </child>
+
+	      <child>
+		<widget class="GtkLabel" id="label1">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">Toolbar</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>
