@@ -589,9 +589,9 @@ class Builder(gtk.Window):
def destroy_window_cb(self, widget, event):
lbl = "<b>Do you really want to exit the Hob image creator?</b>"
dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
- dialog.add_button(gtk.STOCK_YES, gtk.RESPONSE_YES)
- dialog.add_button(gtk.STOCK_NO, gtk.RESPONSE_NO)
- dialog.set_default_response(gtk.RESPONSE_NO)
+ dialog.add_button("Keep using Hob", gtk.RESPONSE_NO)
+ dialog.add_button("Exit Hob", gtk.RESPONSE_YES)
+ dialog.set_default_response(gtk.RESPONSE_YES)
response = dialog.run()
dialog.destroy()
if response == gtk.RESPONSE_YES:
@@ -654,8 +654,8 @@ class Builder(gtk.Window):
flags = gtk.DIALOG_MODAL
| gtk.DIALOG_DESTROY_WITH_PARENT
| gtk.DIALOG_NO_SEPARATOR,
- buttons = (gtk.STOCK_OK, gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ gtk.STOCK_OK, gtk.RESPONSE_YES))
response = dialog.run()
if response == gtk.RESPONSE_YES:
self.configuration.layers = dialog.layers
@@ -666,9 +666,9 @@ class Builder(gtk.Window):
def show_load_template_dialog(self):
dialog = gtk.FileChooserDialog("Load Template Files", self,
- gtk.FILE_CHOOSER_ACTION_SAVE,
- (gtk.STOCK_OPEN, gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ gtk.FILE_CHOOSER_ACTION_OPEN,
+ (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ gtk.STOCK_OPEN, gtk.RESPONSE_YES))
filter = gtk.FileFilter()
filter.set_name("Hob Files")
filter.add_pattern("*.hob")
@@ -696,8 +696,8 @@ class Builder(gtk.Window):
dialog = ImageSelectionDialog(self.parameters.image_addr, self.parameters.image_types,
"Open My Images", self,
gtk.FILE_CHOOSER_ACTION_SAVE,
- (gtk.STOCK_OPEN, gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ gtk.STOCK_OPEN, gtk.RESPONSE_YES))
response = dialog.run()
if response == gtk.RESPONSE_YES:
@@ -729,8 +729,8 @@ class Builder(gtk.Window):
flags = gtk.DIALOG_MODAL
| gtk.DIALOG_DESTROY_WITH_PARENT
| gtk.DIALOG_NO_SEPARATOR,
- buttons = ("Save", gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ "Save", gtk.RESPONSE_YES))
response = dialog.run()
if response == gtk.RESPONSE_YES:
self.configuration = dialog.configuration
@@ -609,8 +609,8 @@ class ImageSelectionDialog (CrumbsDialog):
def select_path_cb(self, action, parent, entry):
dialog = gtk.FileChooserDialog("", parent,
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
- (gtk.STOCK_OK, gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ gtk.STOCK_OPEN, gtk.RESPONSE_YES))
response = dialog.run()
if response == gtk.RESPONSE_YES:
path = dialog.get_filename()
@@ -312,8 +312,8 @@ class HobWidget:
def _add_layer_cb(cls, action, layer_store, parent):
dialog = gtk.FileChooserDialog("Add new layer", parent,
gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
- (gtk.STOCK_OK, gtk.RESPONSE_YES,
- gtk.STOCK_CANCEL, gtk.RESPONSE_NO))
+ (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
+ gtk.STOCK_OK, gtk.RESPONSE_YES))
label = gtk.Label("Select the layer you wish to add")
label.show()
dialog.set_extra_widget(label)
GNOME HIG and Gtk+ convention is for the buttons to be ordered <secondary action> <primary action> so that the primary action can be selected easily by navigating to the bottom right of the dialogue. We should try and match the convention and the HIG standard so that we aren't contrasting the rest of the users applications. Signed-off-by: Joshua Lock <josh@linux.intel.com> --- lib/bb/ui/crumbs/builder.py | 24 ++++++++++++------------ lib/bb/ui/crumbs/hig.py | 4 ++-- lib/bb/ui/crumbs/hobwidget.py | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-)