From df20012654672a5fc09d903221e23b971e0d21b9 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 21 Mar 2012 11:19:51 +0800 Subject: Hob: Move "Create your own image" to the bottom of image list Move "Create your own image" item to the bottom of base image list. Besides, remove an un-used hob list entry. This fixes [YOCTO #2104] (From Poky rev: f215ce518ad644ca4747ae17279db4b82d0c715d) (Bitbake rev: 7e00723a6508023ffbefed2c2de1bc9c55564faa) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/crumbs/hoblistmodel.py | 3 +-- bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/ui') diff --git a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py index 74b2a17e01..61f2911f89 100644 --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py @@ -412,7 +412,7 @@ class RecipeListModel(gtk.ListStore): """ (COL_NAME, COL_DESC, COL_LIC, COL_GROUP, COL_DEPS, COL_BINB, COL_TYPE, COL_INC, COL_IMG, COL_INSTALL, COL_PN) = range(11) - __dummy_image__ = "Start from scratch" + __dummy_image__ = "Create your own image" __gsignals__ = { "recipe-selection-changed" : (gobject.SIGNAL_RUN_LAST, @@ -434,7 +434,6 @@ class RecipeListModel(gtk.ListStore): gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN, gobject.TYPE_STRING, - gobject.TYPE_STRING, gobject.TYPE_STRING) """ diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py index 076b2c0064..b0f0213091 100644 --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py @@ -330,12 +330,15 @@ class ImageConfigurationPage (HobPage): # append and set active while it: path = image_model.get_path(it) + it = image_model.iter_next(it) image_name = image_model[path][recipe_model.COL_NAME] + if image_name == self.builder.recipe_model.__dummy_image__: + continue self.image_combo.append_text(image_name) if image_name == selected_image: active = cnt - it = image_model.iter_next(it) cnt = cnt + 1 + self.image_combo.append_text(self.builder.recipe_model.__dummy_image__) self._image_combo_connect_signal() self.image_combo.set_active(-1) -- cgit v1.2.3-54-g00ecf