summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2012-08-31 17:10:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-07 12:10:42 +0100
commit399d7f20294766b9bf5d11902725b8167802bb30 (patch)
tree2ecd9122963a823340a0c89e09dbd355756943a9 /bitbake
parent34c4b3a93d037f546c373bbc215ca6e973381520 (diff)
downloadpoky-399d7f20294766b9bf5d11902725b8167802bb30.tar.gz
bitbake: hob/recipe&packageselectionpage: Change "Back" button to "Cancel" button
"Back" button placed on RecipeSelectionPage and PackageSelectionPage was changed to "Cancel" button to avoid any confusion. Also, it was placed next to the other buttons on the page. [YOCTO #3012] (Bitbake rev: 1785b49a1b0b9698851d6e8aea94d1d2aa22c445) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/packageselectionpage.py7
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/recipeselectionpage.py4
2 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
index f2983b2bdd..9eec0e0043 100755
--- a/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/packageselectionpage.py
@@ -162,9 +162,9 @@ class PackageSelectionPage (HobPage):
162 self.build_image_button.connect("clicked", self.build_image_clicked_cb) 162 self.build_image_button.connect("clicked", self.build_image_clicked_cb)
163 self.button_box.pack_end(self.build_image_button, expand=False, fill=False) 163 self.button_box.pack_end(self.build_image_button, expand=False, fill=False)
164 164
165 self.back_button = HobAltButton('<< Back') 165 self.back_button = HobAltButton('Cancel')
166 self.back_button.connect("clicked", self.back_button_clicked_cb) 166 self.back_button.connect("clicked", self.back_button_clicked_cb)
167 self.button_box.pack_start(self.back_button, expand=False, fill=False) 167 self.button_box.pack_end(self.back_button, expand=False, fill=False)
168 168
169 def button_click_cb(self, widget, event): 169 def button_click_cb(self, widget, event):
170 path, col = widget.table_tree.get_cursor() 170 path, col = widget.table_tree.get_cursor()
@@ -183,14 +183,13 @@ class PackageSelectionPage (HobPage):
183 for child in children: 183 for child in children:
184 self.button_box.remove(child) 184 self.button_box.remove(child)
185 # re-packed the buttons as request, add the 'view log' button if build success 185 # re-packed the buttons as request, add the 'view log' button if build success
186 self.button_box.pack_start(self.back_button, expand=False, fill=False)
187 self.button_box.pack_end(self.build_image_button, expand=False, fill=False) 186 self.button_box.pack_end(self.build_image_button, expand=False, fill=False)
188 if log_file: 187 if log_file:
189 view_log_button = HobAltButton("View log") 188 view_log_button = HobAltButton("View log")
190 view_log_button.connect("clicked", self.view_log_clicked_cb, log_file) 189 view_log_button.connect("clicked", self.view_log_clicked_cb, log_file)
191 view_log_button.set_tooltip_text("Open the building log files") 190 view_log_button.set_tooltip_text("Open the building log files")
192 self.button_box.pack_end(view_log_button, expand=False, fill=False) 191 self.button_box.pack_end(view_log_button, expand=False, fill=False)
193 192 self.button_box.pack_end(self.back_button, expand=False, fill=False)
194 self.show_all() 193 self.show_all()
195 194
196 def build_image_clicked_cb(self, button): 195 def build_image_clicked_cb(self, button):
diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
index d8e71b0979..18690077f5 100755
--- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
+++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
@@ -184,9 +184,9 @@ class RecipeSelectionPage (HobPage):
184 self.build_packages_button.connect("clicked", self.build_packages_clicked_cb) 184 self.build_packages_button.connect("clicked", self.build_packages_clicked_cb)
185 button_box.pack_end(self.build_packages_button, expand=False, fill=False) 185 button_box.pack_end(self.build_packages_button, expand=False, fill=False)
186 186
187 self.back_button = HobAltButton('<< Back') 187 self.back_button = HobAltButton('Cancel')
188 self.back_button.connect("clicked", self.back_button_clicked_cb) 188 self.back_button.connect("clicked", self.back_button_clicked_cb)
189 button_box.pack_start(self.back_button, expand=False, fill=False) 189 button_box.pack_end(self.back_button, expand=False, fill=False)
190 190
191 def button_click_cb(self, widget, event): 191 def button_click_cb(self, widget, event):
192 path, col = widget.table_tree.get_cursor() 192 path, col = widget.table_tree.get_cursor()