Re: [PATCH 2/3] Hob: add '--select a machine--' and '--select a base image--' to GUI

["An, LimingX L" <limingx.l.an@intel.com>]

I will followed your advice to change it. Thanks!

-----Original Message-----
From: Xu, Dongxiao 
Sent: Wednesday, May 16, 2012 2:36 PM
To: An, LimingX L; bitbake-devel@lists.openembedded.org
Subject: RE: [bitbake-devel] [PATCH 2/3] Hob: add '--select a machine--' and '--select a base image--' to GUI

Hi Liming,

I simply tried this patch, and I saw the "--select a base image--" is listed in the bottom part of the combo menu.

I think it should be the first one?

Thanks,
Dongxiao

> -----Original Message-----
> From: bitbake-devel-bounces@lists.openembedded.org
> [mailto:bitbake-devel-bounces@lists.openembedded.org] On Behalf Of 
> Liming An
> Sent: Monday, May 14, 2012 8:52 PM
> To: bitbake-devel@lists.openembedded.org
> Subject: [bitbake-devel] [PATCH 2/3] Hob: add '--select a machine--' 
> and '--select a base image--' to GUI
> 
> [YOCTO #2175]
> 
> Signed-off-by: Liming An <limingx.l.an@intel.com>
> ---
>  bitbake/lib/bb/ui/crumbs/builder.py                |    6 ++--
>  bitbake/lib/bb/ui/crumbs/hoblistmodel.py           |    6 ++--
>  bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py |   35
> +++++++++++++++----
>  bitbake/lib/bb/ui/crumbs/recipeselectionpage.py    |    2 +-
>  4 files changed, 34 insertions(+), 15 deletions(-)
> 
> diff --git a/bitbake/lib/bb/ui/crumbs/builder.py
> b/bitbake/lib/bb/ui/crumbs/builder.py
> index 42d0f2c..eb60b89 100755
> --- a/bitbake/lib/bb/ui/crumbs/builder.py
> +++ b/bitbake/lib/bb/ui/crumbs/builder.py
> @@ -438,7 +438,7 @@ class Builder(gtk.Window):
>          toolchain_packages = []
>          if self.configuration.toolchain_build:
>              toolchain_packages =
> self.package_model.get_selected_packages_toolchain()
> -        if self.configuration.selected_image ==
> self.recipe_model.__dummy_image__:
> +        if self.configuration.selected_image ==
> self.recipe_model.__custom_image__:
>              packages = self.package_model.get_selected_packages()
>              image = self.hob_image
>          else:
> @@ -752,7 +752,7 @@ class Builder(gtk.Window):
>              fraction = 1.0
>              self.parameters.image_names = []
>              selected_image = self.recipe_model.get_selected_image()
> -            if selected_image == self.recipe_model.__dummy_image__:
> +            if selected_image == self.recipe_model.__custom_image__:
>                  linkname = 'hob-image-' + self.configuration.curr_mach
>              else:
>                  linkname = selected_image + '-' + 
> self.configuration.curr_mach @@ -890,7 +890,7 @@ class
> Builder(gtk.Window):
>          selected_packages = 
> self.package_model.get_selected_packages()
> or []
> 
>          # If no base image and no selected packages don't build anything
> -        if not (selected_packages or selected_image !=
> self.recipe_model.__dummy_image__):
> +        if not (selected_packages or selected_image !=
> self.recipe_model.__custom_image__):
>              lbl = "<b>No selections made</b>\nYou have not made any 
> selections"
>              lbl = lbl + " so there isn't anything to bake at this time."
>              dialog = CrumbsMessageDialog(self, lbl,
> gtk.STOCK_DIALOG_INFO) diff --git 
> a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
> b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
> index 0b54f91..37cee78 100644
> --- a/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
> +++ b/bitbake/lib/bb/ui/crumbs/hoblistmodel.py
> @@ -456,7 +456,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, COL_FADE_INC) =
> range(12)
> 
> -    __dummy_image__ = "Create your own image"
> +    __custom_image__ = "Create your own image"
> 
>      __gsignals__ = {
>          "recipe-selection-changed" : (gobject.SIGNAL_RUN_LAST, @@
> -565,14 +565,14 @@ class RecipeListModel(gtk.ListStore):
>          self.clear()
> 
>          # dummy image for prompt
> -        self.set(self.append(), self.COL_NAME, self.__dummy_image__,
> +        self.set(self.append(), self.COL_NAME, self.__custom_image__,
>                   self.COL_DESC, "Use the 'View recipes' and 'View 
> packages' " \
>                                  "options to select what you want to 
> include " \
>                                  "in your image.",
>                   self.COL_LIC, "", self.COL_GROUP, "",
>                   self.COL_DEPS, "", self.COL_BINB, "",
>                   self.COL_TYPE, "image", self.COL_INC, False,
> -                 self.COL_IMG, False, self.COL_INSTALL, "", self.COL_PN,
> self.__dummy_image__)
> +                 self.COL_IMG, False, self.COL_INSTALL, "", 
> + self.COL_PN, self.__custom_image__)
> 
>          for item in event_model["pn"]:
>              name = item
> diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> index 7d19912..51594b3 100644
> --- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> +++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
> @@ -33,6 +33,9 @@ from bb.ui.crumbs.hobpages import HobPage  #  class 
> ImageConfigurationPage (HobPage):
> 
> +    __dummy_machine__ = "--select a machine--"
> +    __dummy_image__   = "--select a base image--"
> +
>      def __init__(self, builder):
>          super(ImageConfigurationPage, self).__init__(builder, "Image
> configuration")
> 
> @@ -261,9 +264,15 @@ class ImageConfigurationPage (HobPage):
> 
>      def machine_combo_changed_cb(self, machine_combo):
>          combo_item = machine_combo.get_active_text()
> -        if not combo_item:
> +        if not combo_item or combo_item == self.__dummy_machine__:
>              return
> 
> +        # remove __dummy_machine__ item from the store list after 
> + first
> user selection
> +        # because it is no longer valid
> +        combo_store = machine_combo.get_model()
> +        if len(combo_store) and (combo_store[0][0] ==
> self.__dummy_machine__):
> +            machine_combo.remove_text(0)
> +
>          self.builder.configuration.curr_mach = combo_item
>          if self.machine_combo_changed_by_manual:
>              self.builder.configuration.clear_selection()
> @@ -274,13 +283,13 @@ class ImageConfigurationPage (HobPage):
>          self.builder.populate_recipe_package_info_async()
> 
>      def update_machine_combo(self):
> -        all_machines = self.builder.parameters.all_machines
> +        all_machines = [self.__dummy_machine__] + 
> + self.builder.parameters.all_machines
> 
>          model = self.machine_combo.get_model()
>          model.clear()
>          for machine in all_machines:
>              self.machine_combo.append_text(machine)
> -        self.machine_combo.set_active(-1)
> +        self.machine_combo.set_active(0)
> 
>      def switch_machine_combo(self):
>          self.machine_combo_changed_by_manual = False @@ -291,7
> +300,7 @@ class ImageConfigurationPage (HobPage):
>                  self.machine_combo.set_active(active)
>                  return
>              active += 1
> -        self.machine_combo.set_active(-1)
> +        self.machine_combo.set_active(0)
> 
>      def update_image_desc(self, selected_image):
>          desc = ""
> @@ -311,9 +320,15 @@ class ImageConfigurationPage (HobPage):
>      def image_combo_changed_cb(self, combo):
>          self.builder.window_sensitive(False)
>          selected_image = self.image_combo.get_active_text()
> -        if not selected_image:
> +        if not selected_image or (selected_image ==
> self.__dummy_image__):
>              return
> 
> +        # remove __dummy_image__ item from the store list after first
> user selection
> +        # because it is no longer valid
> +        combo_store = combo.get_model()
> +        if len(combo_store) and (combo_store[0][0] ==
> self.__dummy_image__):
> +            combo.remove_text(0)
> +
>          self.builder.customized = False
> 
>          selected_recipes = []
> @@ -356,14 +371,14 @@ class ImageConfigurationPage (HobPage):
>              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__:
> +            if image_name ==
> self.builder.recipe_model.__custom_image__:
>                  continue
>              self.image_combo.append_text(image_name)
>              if image_name == selected_image:
>                  active = cnt
>              cnt = cnt + 1
> -
> self.image_combo.append_text(self.builder.recipe_model.__dummy_image__)
> -        if selected_image == self.builder.recipe_model.__dummy_image__:
> +
> self.image_combo.append_text(self.builder.recipe_model.__custom_image_
> _)
> +        if selected_image == self.builder.recipe_model.__custom_image__:
>              active = cnt
> 
>          self.image_combo.set_active(-1) @@ -371,6 +386,10 @@ class 
> ImageConfigurationPage (HobPage):
> 
>          if active != -1:
>              self.show_baseimg_selected()
> +        else:
> +            # Set a indicator text to combo store when first open
> +            self.image_combo.insert_text(0, self.__dummy_image__)
> +            self.image_combo.set_active(0)
> 
>          self._image_combo_connect_signal()
> 
> diff --git a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
> b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
> index 6bc9c16..5164999 100755
> --- a/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
> +++ b/bitbake/lib/bb/ui/crumbs/recipeselectionpage.py
> @@ -219,7 +219,7 @@ class RecipeSelectionPage (HobPage):
>          self.refresh_selection()
>          if not self.builder.customized:
>              self.builder.customized = True
> -            self.builder.configuration.selected_image =
> self.recipe_model.__dummy_image__
> +            self.builder.configuration.selected_image = 
> + self.recipe_model.__custom_image__
>              self.builder.rcppkglist_populated()
> 
>          self.builder.window_sensitive(True)
> --
> 1.7.5.4
> 
> 
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/bitbake-devel