2006-08-31 Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>

* debian/changelog:
	* hildon-widgets/hildon-wizard-dialog.c: Changing the orded of the
	buttons in the wizard dialog to be: finish, previous, next, cancel.
	Fixes #NB34613.

diff --git a/ChangeLog b/ChangeLog
index 86821e4..3735ea7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2006-08-31  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
 
-       * debian/control:
+       * debian/changelog:
+       * hildon-widgets/hildon-wizard-dialog.c: Changing the orded of the
+       buttons in the wizard dialog to be: finish, previous, next, cancel.
+       Fixes #NB34613.
+
+2006-08-31  Michael Dominic Kostrzewa  <michael.kostrzewa@nokia.com> 
+
+       * debian/changelog:
        * hildon-widgets/hildon-name-password-dialog.c: Applying a patch by
        Fernando to fix the autocaptialization for username/password entries.
        Fixes #NB37467.

diff --git a/debian/changelog b/debian/changelog
index 457e2aa..5c5983b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ hildon-libs (0.14.0) unstable; urgency=low
   * fixes NB#33217 - No borders for the custom defined color boxes in hildon color selector
   * fixes NB#37172 - Colour selector for background color shows logical string
   * fixes NB#37467 - Hildon name password dialog with autocapitalization
+  * fixes NB#34613 - 'Cancel' and 'Finish' in wrong order in Wizard widget
 
   * Merging the new color selector branch (0.13.1) with the main trunk code.
   * Maintainer change: Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>
@@ -17,6 +18,7 @@ hildon-libs (0.14.0) unstable; urgency=low
   function (documented).
   * Removing the Johan's new key handling (introduced in 0.13.1.3) for the
   time being. That requires a fix at a different level.
+  * Changing the order of the buttons in the wizard dialog
 
  -- Michael Dominic Kostrzewa <michael.kostrzewa@nokia.com>  Wed, 30 Aug 2006 14:30:00 +0300
 

diff --git a/hildon-widgets/hildon-wizard-dialog.c b/hildon-widgets/hildon-wizard-dialog.c
index d1454b4..4e61878 100644 (file)
--- a/hildon-widgets/hildon-wizard-dialog.c
+++ b/hildon-widgets/hildon-wizard-dialog.c
@@ -229,11 +229,11 @@ init (HildonWizardDialog *wizard_dialog)
     gtk_box_pack_start_defaults (GTK_BOX (priv->box), GTK_WIDGET (vbox));
     gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0);
 
-    /* Add response buttons: cancel, previous, next, finish */
-    gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_cancel"), HILDON_WIZARD_DIALOG_CANCEL);
+    /* Add response buttons: finish, previous, next, cancel */
+    gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_finish"), HILDON_WIZARD_DIALOG_FINISH);
     gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_previous"), HILDON_WIZARD_DIALOG_PREVIOUS);
     gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_next"), HILDON_WIZARD_DIALOG_NEXT);
-    gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_finish"), HILDON_WIZARD_DIALOG_FINISH);
+    gtk_dialog_add_button (dialog, _("ecdg_bd_wizard_cancel"), HILDON_WIZARD_DIALOG_CANCEL);
 
     /* Set initial button states: previous and finish buttons are disabled */
     make_buttons_sensitive (wizard_dialog, FALSE, FALSE, TRUE);