summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2012-03-13 14:32:30 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-15 10:35:16 +0000
commit552672abba5e0e1909178f4e40e190a84d1979d9 (patch)
tree514acf13e59492fba9a45df1f23581181c9e0dac /bitbake/lib
parent1dd648e9419501b911cd1d9a0d335ff3cfc8683a (diff)
downloadpoky-552672abba5e0e1909178f4e40e190a84d1979d9.tar.gz
Hob: Remove the indication in machine/base image combobox
Remove the "--select a machine--" prompt in machine selection. Also change "--select a base image--" to "Start from scratch" for base image selection. (Bitbake rev: ac36d218ed6793d6fbf3edfadaf193629ea1e46d) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hoblistmodel.py2
-rw-r--r--bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py20
2 files changed, 8 insertions, 14 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
index 037882814f..c19aaa8191 100644
--- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
+++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
@@ -422,7 +422,7 @@ class RecipeListModel(gtk.ListStore):
422 """ 422 """
423 (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN) = range(11) 423 (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN) = range(11)
424 424
425 __dummy_image__ = "--select a base image--" 425 __dummy_image__ = "Start from scratch"
426 426
427 __gsignals__ = { 427 __gsignals__ = {
428 "recipelist-populated" : (gobject.SIGNAL_RUN_LAST, 428 "recipelist-populated" : (gobject.SIGNAL_RUN_LAST,
diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index f029bf8e61..3b1201e908 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -33,8 +33,6 @@ from bb.ui.crumbs.hobpages import HobPage
33# 33#
34class ImageConfigurationPage (HobPage): 34class ImageConfigurationPage (HobPage):
35 35
36 __dummy_machine__ = "--select a machine--"
37
38 def __init__(self, builder): 36 def __init__(self, builder):
39 super(ImageConfigurationPage, self).__init__(builder, "Image configuration") 37 super(ImageConfigurationPage, self).__init__(builder, "Image configuration")
40 38
@@ -236,22 +234,18 @@ class ImageConfigurationPage (HobPage):
236 234
237 def machine_combo_changed_cb(self, machine_combo): 235 def machine_combo_changed_cb(self, machine_combo):
238 combo_item = machine_combo.get_active_text() 236 combo_item = machine_combo.get_active_text()
239 if not combo_item or combo_item == self.__dummy_machine__: 237 self.builder.configuration.curr_mach = combo_item
240 self.builder.configuration.curr_mach = "" 238 # Do reparse recipes
241 self.builder.switch_page(self.builder.MACHINE_SELECTION) 239 self.builder.switch_page(self.builder.RCPPKGINFO_POPULATING)
242 else:
243 self.builder.configuration.curr_mach = combo_item
244 # Do reparse recipes
245 self.builder.switch_page(self.builder.RCPPKGINFO_POPULATING)
246 240
247 def update_machine_combo(self): 241 def update_machine_combo(self):
248 all_machines = [self.__dummy_machine__] + self.builder.parameters.all_machines 242 all_machines = self.builder.parameters.all_machines
249 243
250 model = self.machine_combo.get_model() 244 model = self.machine_combo.get_model()
251 model.clear() 245 model.clear()
252 for machine in all_machines: 246 for machine in all_machines:
253 self.machine_combo.append_text(machine) 247 self.machine_combo.append_text(machine)
254 self.machine_combo.set_active(0) 248 self.machine_combo.set_active(-1)
255 249
256 def switch_machine_combo(self): 250 def switch_machine_combo(self):
257 model = self.machine_combo.get_model() 251 model = self.machine_combo.get_model()
@@ -261,7 +255,7 @@ class ImageConfigurationPage (HobPage):
261 self.machine_combo.set_active(active) 255 self.machine_combo.set_active(active)
262 return 256 return
263 active += 1 257 active += 1
264 self.machine_combo.set_active(0) 258 self.machine_combo.set_active(-1)
265 259
266 def image_combo_changed_idle_cb(self, selected_image, selected_recipes, selected_packages): 260 def image_combo_changed_idle_cb(self, selected_image, selected_recipes, selected_packages):
267 self.builder.update_recipe_model(selected_image, selected_recipes) 261 self.builder.update_recipe_model(selected_image, selected_recipes)
@@ -302,7 +296,7 @@ class ImageConfigurationPage (HobPage):
302 # populate image combo 296 # populate image combo
303 filter = {RecipeListModel.COL_TYPE : ['image']} 297 filter = {RecipeListModel.COL_TYPE : ['image']}
304 image_model = recipe_model.tree_model(filter) 298 image_model = recipe_model.tree_model(filter)
305 active = 0 299 active = -1
306 cnt = 0 300 cnt = 0
307 301
308 it = image_model.get_iter_first() 302 it = image_model.get_iter_first()