gnome-bluetooth r597 - trunk/wizard

[hadess svn gnome org]

Author: hadess
Date: Thu Apr  9 22:41:28 2009
New Revision: 597
URL: http://svn.gnome.org/viewvc/gnome-bluetooth?rev=597&view=rev

Log:
Fix display of labels on the passkey page, fix display of the passkey options dialogue


Modified:
   trunk/wizard/main.c
   trunk/wizard/wizard.ui

Modified: trunk/wizard/main.c
==============================================================================
--- trunk/wizard/main.c	(original)
+++ trunk/wizard/main.c	Thu Apr  9 22:41:28 2009
@@ -438,7 +438,9 @@
 	oldpin = user_pincode;
 	user_pincode = NULL;
 
-	gtk_window_present(GTK_WINDOW(passkey_dialog));
+	gtk_window_set_transient_for (GTK_WINDOW (passkey_dialog),
+				      GTK_WINDOW (window_assistant));
+	gtk_window_present (GTK_WINDOW (passkey_dialog));
 
 	/* When reopening, try to guess where the pincode was set */
 	if (oldpin == NULL)
@@ -593,7 +595,7 @@
 	g_signal_connect (gtk_builder_get_object(builder, "passkey_option_button"), "clicked",
 			  G_CALLBACK (passkey_option_button_clicked), assistant);
 
-	gtk_widget_show_all(GTK_WIDGET(assistant));
+	gtk_widget_show (GTK_WIDGET(assistant));
 
 	gtk_assistant_update_buttons_state(GTK_ASSISTANT(assistant));
 

Modified: trunk/wizard/wizard.ui
==============================================================================
--- trunk/wizard/wizard.ui	(original)
+++ trunk/wizard/wizard.ui	Thu Apr  9 22:41:28 2009
@@ -20,8 +20,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Welcome to the Bluetooth device setup wizard&lt;/b&gt;
-</property>
+            <property name="label" translatable="yes">&lt;b&gt;Welcome to the Bluetooth device setup wizard&lt;/b&gt;</property>
             <property name="use_markup">True</property>
           </object>
           <packing>
@@ -36,9 +35,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">The device wizard will walk you through the process of configuring Bluetooth enabled devices for use with this computer.
-
-</property>
+            <property name="label" translatable="yes">The device wizard will walk you through the process of configuring Bluetooth enabled devices for use with this computer.</property>
             <property name="wrap">True</property>
           </object>
           <packing>
@@ -91,8 +88,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Setting up new device&lt;/b&gt;
-</property>
+            <property name="label" translatable="yes">&lt;b&gt;Setting up new device&lt;/b&gt;</property>
             <property name="use_markup">True</property>
           </object>
           <packing>
@@ -107,7 +103,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label">label_setup</property>
+            <property name="label"></property>
             <property name="wrap">True</property>
           </object>
           <packing>
@@ -120,7 +116,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label">label_passkey_help</property>
+            <property name="label"></property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -129,7 +125,7 @@
         </child>
         <child>
           <object class="GtkLabel" id="label_passkey">
-            <property name="label">label_passkey</property>
+            <property name="label"></property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -151,8 +147,7 @@
             <property name="visible">True</property>
             <property name="xalign">0</property>
             <property name="yalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Successfully configured new device&lt;/b&gt;
-</property>
+            <property name="label" translatable="yes">&lt;b&gt;Successfully configured new device&lt;/b&gt;</property>
             <property name="use_markup">True</property>
           </object>
           <packing>
@@ -334,5 +329,4 @@
       <action-widget response="-3">button1</action-widget>
     </action-widgets>
   </object>
-
 </interface>