Skip to contentSkip to conversation

Hob fixes

PATCH New Shane Wang 1 participant 3 messages Apr 12, 2012

lore
Share & tools
lore

Shane Wang

author
#0 lore raw

cover Hob fixes

The two patche are going to fix:
- Hob can not be launched because a function is missing when being merged.
- Walkaround for exit Hob issue when Hob is parsing recipes.

The following changes since commit 58d2ff3955f5ab8712516651ad6cc51d86bc1ba1:

package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path issues (2012-04-12 08:22:00 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib shane/hob_0412
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=shane/hob_0412

Shane Wang (2):
Hob: fix the missing functions
Hob: forbid users to exit Hob directly when Hob is busy

 bitbake/lib/bb/ui/crumbs/builder.py              |    6 ++++++
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py |    8 ++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/2 Hob: fix the missing functions

The patch is to correct 7e5d41ab223b73c1c7b2cf7e4dd13289a2dc2e8b (Bitbake rev: b6e68019494044305ab28492a517d1eafea851c3) to fix the missing functions.

[Yocto #2281]

Signed-off-by Shane Wang <[email protected]>
---
 bitbake/lib/bb/ui/crumbs/packageselectionpage.py |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
bitbake/lib/bb/ui/crumbs/packageselectionpage.py +6 -2
index dce4874..104d49d 100755
@@ -239,7 +239,11 @@ class PackageSelectionPage (HobPage):
         if (not cell) or (not tree):
             return
         to_render_cells = []
+        view_model = tree.get_model()
+        self.get_excluded_rows(to_render_cells, view_model, view_model.get_iter_first())
 
-    def after_fadeout_checkin_include(self, table, ctrl, cell, tree):
-        tree.set_model(self.recipe_model.tree_model(self.pages[0]['filter']))
+        cell.fadeout(tree, 1000, to_render_cells)
 
+    def after_fadeout_checkin_include(self, table, ctrl, cell, tree):
+        tree.set_model(self.package_model.tree_model(self.pages[0]['filter']))
+        tree.expand_all()
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/2 Hob: forbid users to exit Hob directly when Hob is busy

When Hob is busy with generating data, exiting Hob is not allowed. That should be reasonable because at that time the mouse cursor is not a pointer. If users want to exit, they can click "Stop" first and then do exit.

That is also a walkaround for [Yocto #2142]

Signed-off-by Shane Wang <[email protected]>
---
 bitbake/lib/bb/ui/crumbs/builder.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
bitbake/lib/bb/ui/crumbs/builder.py +6 -0
index 10b9a77..e3f2d40 100755
@@ -274,6 +274,9 @@ class Builder(gtk.Window):
         # Indicate whether user has customized the image
         self.customized = False
 
+        # Indicate whether the UI is working
+        self.sensitive = True
+
         # create visual elements
         self.create_visual_elements()
 

@@ -584,6 +587,7 @@ class Builder(gtk.Window):
             self.get_root_window().set_cursor(gtk.gdk.Cursor(gtk.gdk.LEFT_PTR))
         else:
             self.get_root_window().set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
+        self.sensitive = sensitive
 
 
     def handler_generating_data_cb(self, handler):

@@ -738,6 +742,8 @@ class Builder(gtk.Window):
         self.build_details_page.show_issues()
 
     def destroy_window_cb(self, widget, event):
+        if not self.sensitive:
+            return True
         lbl = "<b>Do you really want to exit the Hob image creator?</b>"
         dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_INFO)
         button = dialog.add_button("Cancel", gtk.RESPONSE_NO)
Signature · 1 line
1.7.6