summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-02-29 22:15:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-01 15:51:33 +0000
commit1f57d6c180d01ecba4a4dd840168986fac9a4734 (patch)
tree77b52fd992e1061022539a05882c99ae66426eeb
parent7ccdd2007b57628a25a28f8f69310b246bf539bb (diff)
downloadpoky-1f57d6c180d01ecba4a4dd840168986fac9a4734.tar.gz
crumbs: fix button order in several dialogues
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. (Bitbake rev: e90828680e3bc655db54ed2797cad4587e8796d0) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py39
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig.py12
2 files changed, 25 insertions, 26 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 38e4c30cfb..d14d89b9c2 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -589,9 +589,9 @@ class Builder(gtk.Window):
589 def destroy_window_cb(self, widget, event): 589 def destroy_window_cb(self, widget, event):
590 lbl = "<b>Do you really want to exit the Hob image creator?</b>" 590 lbl = "<b>Do you really want to exit the Hob image creator?</b>"
591 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO) 591 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
592 dialog.add_button(gtk.STOCK_YES, gtk.RESPONSE_YES) 592 dialog.add_button("Keep using Hob", gtk.RESPONSE_NO)
593 dialog.add_button(gtk.STOCK_NO, gtk.RESPONSE_NO) 593 dialog.add_button("Exit Hob", gtk.RESPONSE_YES)
594 dialog.set_default_response(gtk.RESPONSE_NO) 594 dialog.set_default_response(gtk.RESPONSE_YES)
595 response = dialog.run() 595 response = dialog.run()
596 dialog.destroy() 596 dialog.destroy()
597 if response == gtk.RESPONSE_YES: 597 if response == gtk.RESPONSE_YES:
@@ -654,8 +654,8 @@ class Builder(gtk.Window):
654 flags = gtk.DIALOG_MODAL 654 flags = gtk.DIALOG_MODAL
655 | gtk.DIALOG_DESTROY_WITH_PARENT 655 | gtk.DIALOG_DESTROY_WITH_PARENT
656 | gtk.DIALOG_NO_SEPARATOR, 656 | gtk.DIALOG_NO_SEPARATOR,
657 buttons = (gtk.STOCK_OK, gtk.RESPONSE_YES, 657 buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
658 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 658 gtk.STOCK_OK, gtk.RESPONSE_YES))
659 response = dialog.run() 659 response = dialog.run()
660 if response == gtk.RESPONSE_YES: 660 if response == gtk.RESPONSE_YES:
661 self.configuration.layers = dialog.layers 661 self.configuration.layers = dialog.layers
@@ -666,9 +666,9 @@ class Builder(gtk.Window):
666 666
667 def show_load_template_dialog(self): 667 def show_load_template_dialog(self):
668 dialog = gtk.FileChooserDialog("Load Template Files", self, 668 dialog = gtk.FileChooserDialog("Load Template Files", self,
669 gtk.FILE_CHOOSER_ACTION_SAVE, 669 gtk.FILE_CHOOSER_ACTION_OPEN,
670 (gtk.STOCK_OPEN, gtk.RESPONSE_YES, 670 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
671 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 671 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
672 filter = gtk.FileFilter() 672 filter = gtk.FileFilter()
673 filter.set_name("Hob Files") 673 filter.set_name("Hob Files")
674 filter.add_pattern("*.hob") 674 filter.add_pattern("*.hob")
@@ -683,8 +683,8 @@ class Builder(gtk.Window):
683 def show_save_template_dialog(self): 683 def show_save_template_dialog(self):
684 dialog = gtk.FileChooserDialog("Save Template Files", self, 684 dialog = gtk.FileChooserDialog("Save Template Files", self,
685 gtk.FILE_CHOOSER_ACTION_SAVE, 685 gtk.FILE_CHOOSER_ACTION_SAVE,
686 (gtk.STOCK_SAVE, gtk.RESPONSE_YES, 686 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
687 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 687 gtk.STOCK_SAVE, gtk.RESPONSE_YES))
688 dialog.set_current_name("hob") 688 dialog.set_current_name("hob")
689 response = dialog.run() 689 response = dialog.run()
690 if response == gtk.RESPONSE_YES: 690 if response == gtk.RESPONSE_YES:
@@ -696,9 +696,8 @@ class Builder(gtk.Window):
696 dialog = ImageSelectionDialog(self.parameters.image_addr, self.parameters.image_types, 696 dialog = ImageSelectionDialog(self.parameters.image_addr, self.parameters.image_types,
697 "Open My Images", self, 697 "Open My Images", self,
698 gtk.FILE_CHOOSER_ACTION_SAVE, 698 gtk.FILE_CHOOSER_ACTION_SAVE,
699 (gtk.STOCK_OPEN, gtk.RESPONSE_YES, 699 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
700 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 700 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
701
702 response = dialog.run() 701 response = dialog.run()
703 if response == gtk.RESPONSE_YES: 702 if response == gtk.RESPONSE_YES:
704 if not dialog.image_names: 703 if not dialog.image_names:
@@ -729,8 +728,8 @@ class Builder(gtk.Window):
729 flags = gtk.DIALOG_MODAL 728 flags = gtk.DIALOG_MODAL
730 | gtk.DIALOG_DESTROY_WITH_PARENT 729 | gtk.DIALOG_DESTROY_WITH_PARENT
731 | gtk.DIALOG_NO_SEPARATOR, 730 | gtk.DIALOG_NO_SEPARATOR,
732 buttons = ("Save", gtk.RESPONSE_YES, 731 buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
733 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 732 "Save", gtk.RESPONSE_YES))
734 response = dialog.run() 733 response = dialog.run()
735 if response == gtk.RESPONSE_YES: 734 if response == gtk.RESPONSE_YES:
736 self.configuration = dialog.configuration 735 self.configuration = dialog.configuration
@@ -758,8 +757,8 @@ class Builder(gtk.Window):
758 flags = gtk.DIALOG_MODAL 757 flags = gtk.DIALOG_MODAL
759 | gtk.DIALOG_DESTROY_WITH_PARENT 758 | gtk.DIALOG_DESTROY_WITH_PARENT
760 | gtk.DIALOG_NO_SEPARATOR, 759 | gtk.DIALOG_NO_SEPARATOR,
761 buttons = ("Make usb image", gtk.RESPONSE_YES, 760 buttons = ("Close", gtk.RESPONSE_NO,
762 "Close", gtk.RESPONSE_NO)) 761 "Make usb image", gtk.RESPONSE_YES))
763 response = dialog.run() 762 response = dialog.run()
764 dialog.destroy() 763 dialog.destroy()
765 764
@@ -774,8 +773,8 @@ class Builder(gtk.Window):
774 773
775 dialog = gtk.FileChooserDialog("Load Kernel Files", self, 774 dialog = gtk.FileChooserDialog("Load Kernel Files", self,
776 gtk.FILE_CHOOSER_ACTION_SAVE, 775 gtk.FILE_CHOOSER_ACTION_SAVE,
777 (gtk.STOCK_OPEN, gtk.RESPONSE_YES, 776 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
778 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 777 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
779 filter = gtk.FileFilter() 778 filter = gtk.FileFilter()
780 filter.set_name("Kernel Files") 779 filter.set_name("Kernel Files")
781 filter.add_pattern("*.bin") 780 filter.add_pattern("*.bin")
@@ -817,8 +816,8 @@ class Builder(gtk.Window):
817 lbl = "<b>Package list may be incomplete!</b>\nDo you want to build selected recipes" 816 lbl = "<b>Package list may be incomplete!</b>\nDo you want to build selected recipes"
818 lbl = lbl + " to get a full list (Yes) or just view the existing packages (No)?" 817 lbl = lbl + " to get a full list (Yes) or just view the existing packages (No)?"
819 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO) 818 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
820 dialog.add_button(gtk.STOCK_YES, gtk.RESPONSE_YES)
821 dialog.add_button(gtk.STOCK_NO, gtk.RESPONSE_NO) 819 dialog.add_button(gtk.STOCK_NO, gtk.RESPONSE_NO)
820 dialog.add_button(gtk.STOCK_YES, gtk.RESPONSE_YES)
822 dialog.set_default_response(gtk.RESPONSE_YES) 821 dialog.set_default_response(gtk.RESPONSE_YES)
823 response = dialog.run() 822 response = dialog.run()
824 dialog.destroy() 823 dialog.destroy()
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py
index fdff10b522..ec9dbec64c 100644
--- a/bitbake/lib/bb/ui/crumbs/hig.py
+++ b/bitbake/lib/bb/ui/crumbs/hig.py
@@ -162,8 +162,8 @@ class AdvancedSettingDialog (CrumbsDialog):
162 def entry_widget_select_path_cb(self, action, parent, entry): 162 def entry_widget_select_path_cb(self, action, parent, entry):
163 dialog = gtk.FileChooserDialog("", parent, 163 dialog = gtk.FileChooserDialog("", parent,
164 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, 164 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
165 (gtk.STOCK_OK, gtk.RESPONSE_YES, 165 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
166 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 166 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
167 response = dialog.run() 167 response = dialog.run()
168 if response == gtk.RESPONSE_YES: 168 if response == gtk.RESPONSE_YES:
169 path = dialog.get_filename() 169 path = dialog.get_filename()
@@ -823,8 +823,8 @@ class LayerSelectionDialog (CrumbsDialog):
823 def layer_widget_add_clicked_cb(self, action, layer_store, parent): 823 def layer_widget_add_clicked_cb(self, action, layer_store, parent):
824 dialog = gtk.FileChooserDialog("Add new layer", parent, 824 dialog = gtk.FileChooserDialog("Add new layer", parent,
825 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, 825 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
826 (gtk.STOCK_OK, gtk.RESPONSE_YES, 826 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
827 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 827 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
828 label = gtk.Label("Select the layer you wish to add") 828 label = gtk.Label("Select the layer you wish to add")
829 label.show() 829 label.show()
830 dialog.set_extra_widget(label) 830 dialog.set_extra_widget(label)
@@ -1068,8 +1068,8 @@ class ImageSelectionDialog (CrumbsDialog):
1068 def select_path_cb(self, action, parent, entry): 1068 def select_path_cb(self, action, parent, entry):
1069 dialog = gtk.FileChooserDialog("", parent, 1069 dialog = gtk.FileChooserDialog("", parent,
1070 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, 1070 gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
1071 (gtk.STOCK_OK, gtk.RESPONSE_YES, 1071 (gtk.STOCK_CANCEL, gtk.RESPONSE_NO,
1072 gtk.STOCK_CANCEL, gtk.RESPONSE_NO)) 1072 gtk.STOCK_OPEN, gtk.RESPONSE_YES))
1073 response = dialog.run() 1073 response = dialog.run()
1074 if response == gtk.RESPONSE_YES: 1074 if response == gtk.RESPONSE_YES:
1075 path = dialog.get_filename() 1075 path = dialog.get_filename()