Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/deskbar-applet/ChangeLog,v
retrieving revision 1.78
diff -u -p -r1.78 ChangeLog
--- ChangeLog	16 Oct 2005 21:05:07 -0000	1.78
+++ ChangeLog	16 Oct 2005 22:42:23 -0000
@@ -1,3 +1,14 @@
+2005-10-16  Dennis Cranston  <dennis_cranston@yahoo.com>
+
+	* data/Deskbar_Applet.server.in.in: Do not expose "Applet" terminology 
+	to user.
+	* data/prefs-dialog.glade:  GNOME HIG changes: fix typo; fix
+	border width; rephrase and move handler comment; fix a broken
+	mnemonic.
+	* deskbar/about.py:  Do not expose "Applet" terminology  to user.
+	* deskbar/preferences.py:  Toggle sensitivity of the width label, 
+	spinner, and units.
+
 2005-10-16  Raphael Slinckx  <rslinckx@cvs.gnome.org>
 
 	* TODO:
Index: data/Deskbar_Applet.server.in.in
===================================================================
RCS file: /cvs/gnome/deskbar-applet/data/Deskbar_Applet.server.in.in,v
retrieving revision 1.3
diff -u -p -r1.3 Deskbar_Applet.server.in.in
--- data/Deskbar_Applet.server.in.in	19 Sep 2005 15:13:30 -0000	1.3
+++ data/Deskbar_Applet.server.in.in	16 Oct 2005 22:42:23 -0000
@@ -5,7 +5,7 @@
                 <item value="IDL:Bonobo/GenericFactory:1.0"/>
                 <item value="IDL:Bonobo/Unknown:1.0"/>
         </oaf_attribute>
-        <oaf_attribute name="name" type="string" _value="Deskbar Applet"/>
+        <oaf_attribute name="name" type="string" _value="Deskbar"/>
         <oaf_attribute name="description" type="string" _value="An all-in-one search bar"/>
 </oaf_server>
 
@@ -16,7 +16,7 @@
                 <item value="IDL:Bonobo/Control:1.0"/>
                 <item value="IDL:Bonobo/Unknown:1.0"/>
         </oaf_attribute>
-        <oaf_attribute name="name" type="string" _value="Deskbar Applet"/>
+        <oaf_attribute name="name" type="string" _value="Deskbar"/>
         <oaf_attribute name="description" type="string" _value="An all-in-one search bar"/>
         <oaf_attribute name="panel:category" type="string" value="Accessories"/>
         <oaf_attribute name="panel:icon" type="string" value="deskbar-applet.png"/>
Index: data/prefs-dialog.glade
===================================================================
RCS file: /cvs/gnome/deskbar-applet/data/prefs-dialog.glade,v
retrieving revision 1.6
diff -u -p -r1.6 prefs-dialog.glade
--- data/prefs-dialog.glade	16 Oct 2005 20:09:30 -0000	1.6
+++ data/prefs-dialog.glade	16 Oct 2005 22:42:23 -0000
@@ -5,7 +5,7 @@
 
 <widget class="GtkDialog" id="preferences">
   <property name="border_width">5</property>
-  <property name="title" translatable="yes">Preferences</property>
+  <property name="title" translatable="yes">Deskbar Preferences</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
   <property name="modal">True</property>
@@ -57,6 +56,7 @@
 
       <child>
 	<widget class="GtkVBox" id="width_box">
+	  <property name="border_width">5</property>
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">18</property>
@@ -148,7 +148,7 @@
 			      <property name="spacing">12</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label1243">
+				<widget class="GtkLabel" id="width_label">
 				  <property name="visible">True</property>
 				  <property name="label" translatable="yes">_Width:</property>
 				  <property name="use_underline">True</property>
@@ -160,6 +160,7 @@
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">width</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -176,7 +177,7 @@
 				<widget class="GtkHBox" id="hbox183">
 				  <property name="visible">True</property>
 				  <property name="homogeneous">False</property>
-				  <property name="spacing">12</property>
+				  <property name="spacing">6</property>
 
 				  <child>
 				    <widget class="GtkSpinButton" id="width">
@@ -198,9 +199,9 @@
 				  </child>
 
 				  <child>
-				    <widget class="GtkLabel" id="label1309">
+				    <widget class="GtkLabel" id="width_units">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">caracters</property>
+				      <property name="label" translatable="yes">characters</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">False</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -301,12 +302,32 @@
 		    <widget class="GtkVBox" id="vbox156">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
+		      <property name="spacing">6</property>
+
+		      <child>
+			<widget class="GtkScrolledWindow" id="handlers">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+			  <property name="shadow_type">GTK_SHADOW_IN</property>
+			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+			  <child>
+			    <placeholder/>
+			  </child>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
 
 		      <child>
 			<widget class="GtkLabel" id="label1311">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;i&gt;Move a handler to the top to prioritize it.&lt;/i&gt;</property>
+			  <property name="label" translatable="yes">&lt;i&gt;&lt;small&gt;&lt;b&gt;Note:&lt;/b&gt; Drag and drop a handler to change its priority.&lt;/small&gt;&lt;/i&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -325,26 +346,6 @@
 			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkScrolledWindow" id="handlers">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <placeholder/>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
Index: deskbar/about.py
===================================================================
RCS file: /cvs/gnome/deskbar-applet/deskbar/about.py,v
retrieving revision 1.7
diff -u -p -r1.7 about.py
--- deskbar/about.py	11 Oct 2005 19:50:50 -0000	1.7
+++ deskbar/about.py	16 Oct 2005 22:42:23 -0000
@@ -23,7 +23,7 @@ except gobject.GError, msg:
 def show_about():
 	about = gtk.AboutDialog()
 	infos = {
-		"name" : _("Deskbar Applet"),
+		"name" : _("Deskbar"),
 		"logo" : deskbar_logo,
 		"version" : VERSION,
 		"comments" : _("An all-in-one search bar."),
Index: deskbar/preferences.py
===================================================================
RCS file: /cvs/gnome/deskbar-applet/deskbar/preferences.py,v
retrieving revision 1.8
diff -u -p -r1.8 preferences.py
--- deskbar/preferences.py	16 Oct 2005 17:20:09 -0000	1.8
+++ deskbar/preferences.py	16 Oct 2005 22:42:23 -0000
@@ -23,6 +23,9 @@ class PrefsDialog:
 		self.width_spin.connect('value-changed', self.on_spin_width_change)
 		self.width_notify_id = deskbar.GCONF_CLIENT.notify_add(deskbar.GCONF_WIDTH, lambda x, y, z, a: self.on_config_width(z.value))
 
+		self.width_label = self.glade.get_widget("width_label")
+		self.width_units = self.glade.get_widget("width_units")
+
 		self.expand_toggle = self.glade.get_widget("expand")
 		self.expand_toggle.connect('toggled', self.on_expand_toggle)
 		self.expand_notify_id = deskbar.GCONF_CLIENT.notify_add(deskbar.GCONF_EXPAND, lambda x, y, z, a: self.on_config_expand(z.value))
@@ -49,6 +52,8 @@ class PrefsDialog:
 	
 	def sync_ui(self):
 		self.width_spin.set_sensitive(not self.expand)
+		self.width_label.set_sensitive(not self.expand)
+		self.width_units.set_sensitive(not self.expand)
 		self.width_spin.set_value(self.width)
 		self.expand_toggle.set_property('active', self.expand)
 		
