Patchwork [bitbake-devel,1/1] Hob:fixed the issue of primary button is not an 'orange hob button'

login
mail settings
Submitter An, LimingX L
Date May 24, 2012, 11:07 a.m.
Message ID <e542927a55e5ef77e6f84ef78eea634a453e4602.1337857307.git.limingx.l.an@intel.com>
Download mbox | patch
Permalink /patch/28603/
State New
Headers show

Comments

An, LimingX L - May 24, 2012, 11:07 a.m.
In image detail page, the primary button should be an 'orange hob
button', there has a primary button is not, so change it.

[YOCTO #2326]

Signed-off-by: Liming An <limingx.l.an@intel.com>
---
 bitbake/lib/bb/ui/crumbs/imagedetailspage.py |   27 +++++++++++++++----------
 meta/conf/machine/include/qemu.inc           |    2 +-
 2 files changed, 17 insertions(+), 12 deletions(-)

Patch

diff --git a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
index 5d85491..9d57dc0 100755
--- a/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/imagedetailspage.py
@@ -411,15 +411,6 @@  class ImageDetailsPage (HobPage):
             self.details_bottom_buttons.pack_end(run_button, expand=False, fill=False)
             created = True
 
-        if not packed:
-            box = gtk.HBox(False, 6)
-            box.show()
-            subbox = gtk.HBox(False, 0)
-            subbox.set_size_request(205, 49)
-            subbox.show()
-            box.add(subbox)
-            self.details_bottom_buttons.pack_end(box, False, False)
-
         name = "Save as template"
         if name in buttonlist:
             if created == True:
@@ -427,14 +418,28 @@  class ImageDetailsPage (HobPage):
                 label = gtk.Label(" or ")
                 self.details_bottom_buttons.pack_end(label, expand=False, fill=False)
 
-            # create button "Save as template"
-            save_button = HobAltButton("Save as template")
+                # create button "Save as template"
+                save_button = HobAltButton("Save as template")
+            else:
+                save_button = HobButton("Save as template")
+                save_button.set_size_request(205, 49)
+                save_button.set_flags(gtk.CAN_DEFAULT)
+                packed = True
             save_button.set_tooltip_text("Save the image configuration for reuse")
             button_id = save_button.connect("clicked", self.save_button_clicked_cb)
             self.button_ids[button_id] = save_button
             self.details_bottom_buttons.pack_end(save_button, expand=False, fill=False)
             create = True
 
+        if not packed:
+            box = gtk.HBox(False, 6)
+            box.show()
+            subbox = gtk.HBox(False, 0)
+            subbox.set_size_request(205, 49)
+            subbox.show()
+            box.add(subbox)
+            self.details_bottom_buttons.pack_end(box, False, False)
+
         name = "Build new image"
         if name in buttonlist:
             # create button "Build new image"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 5d59a7f..dc7f839 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -10,7 +10,7 @@  XSERVER ?= "xserver-xorg \
 
 MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
 
-IMAGE_FSTYPES += "tar.bz2 ext3"
+IMAGE_FSTYPES += "tar.bz2"
 
 ROOT_FLASH_SIZE = "280"