hob2: update DeployImageDialog for seperated tool
Part of [Yocto 2388] Update class DeployImageDialog to get ready for a standalone deploy image tool. The standalone tool can be run directly without hob, and add a button to select image file. So adjust the layout of DeployImageDialog. (Bitbake rev: 399cfbaf36ccd4b934e25f915e64b87f32a3eb82) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
87ce7bdfd5
commit
7828e9eee2
|
@ -749,21 +749,28 @@ class DeployImageDialog (CrumbsDialog):
|
||||||
|
|
||||||
__dummy_usb__ = "--select a usb drive--"
|
__dummy_usb__ = "--select a usb drive--"
|
||||||
|
|
||||||
def __init__(self, title, image_path, parent, flags, buttons=None):
|
def __init__(self, title, image_path, parent, flags, buttons=None, standalone=False):
|
||||||
super(DeployImageDialog, self).__init__(title, parent, flags, buttons)
|
super(DeployImageDialog, self).__init__(title, parent, flags, buttons)
|
||||||
|
|
||||||
self.image_path = image_path
|
self.image_path = image_path
|
||||||
|
self.standalone = standalone
|
||||||
|
|
||||||
self.create_visual_elements()
|
self.create_visual_elements()
|
||||||
self.connect("response", self.response_cb)
|
self.connect("response", self.response_cb)
|
||||||
|
|
||||||
def create_visual_elements(self):
|
def create_visual_elements(self):
|
||||||
|
self.set_size_request(600, 400)
|
||||||
label = gtk.Label()
|
label = gtk.Label()
|
||||||
label.set_alignment(0.0, 0.5)
|
label.set_alignment(0.0, 0.5)
|
||||||
markup = "<span font_desc='12'>The image to be written into usb drive:</span>"
|
markup = "<span font_desc='12'>The image to be written into usb drive:</span>"
|
||||||
label.set_markup(markup)
|
label.set_markup(markup)
|
||||||
self.vbox.pack_start(label, expand=False, fill=False, padding=2)
|
self.vbox.pack_start(label, expand=False, fill=False, padding=2)
|
||||||
|
|
||||||
|
table = gtk.Table(2, 10, False)
|
||||||
|
table.set_col_spacings(5)
|
||||||
|
table.set_row_spacings(5)
|
||||||
|
self.vbox.pack_start(table, expand=True, fill=True)
|
||||||
|
|
||||||
scroll = gtk.ScrolledWindow()
|
scroll = gtk.ScrolledWindow()
|
||||||
scroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
|
scroll.set_policy(gtk.POLICY_NEVER, gtk.POLICY_AUTOMATIC)
|
||||||
scroll.set_shadow_type(gtk.SHADOW_IN)
|
scroll.set_shadow_type(gtk.SHADOW_IN)
|
||||||
|
@ -771,11 +778,26 @@ class DeployImageDialog (CrumbsDialog):
|
||||||
tv.set_editable(False)
|
tv.set_editable(False)
|
||||||
tv.set_wrap_mode(gtk.WRAP_WORD)
|
tv.set_wrap_mode(gtk.WRAP_WORD)
|
||||||
tv.set_cursor_visible(False)
|
tv.set_cursor_visible(False)
|
||||||
buf = gtk.TextBuffer()
|
self.buf = gtk.TextBuffer()
|
||||||
buf.set_text(self.image_path)
|
self.buf.set_text(self.image_path)
|
||||||
tv.set_buffer(buf)
|
tv.set_buffer(self.buf)
|
||||||
scroll.add(tv)
|
scroll.add(tv)
|
||||||
self.vbox.pack_start(scroll, expand=True, fill=True)
|
table.attach(scroll, 0, 10, 0, 1)
|
||||||
|
|
||||||
|
if self.standalone:
|
||||||
|
gobject.signal_new("select_image_clicked", self, gobject.SIGNAL_RUN_FIRST,
|
||||||
|
gobject.TYPE_NONE, ())
|
||||||
|
icon = gtk.Image()
|
||||||
|
pix_buffer = gtk.gdk.pixbuf_new_from_file(hic.ICON_IMAGES_DISPLAY_FILE)
|
||||||
|
icon.set_from_pixbuf(pix_buffer)
|
||||||
|
button = gtk.Button("Select Image")
|
||||||
|
button.set_image(icon)
|
||||||
|
button.set_size_request(140, 50)
|
||||||
|
table.attach(button, 9, 10, 1, 2, gtk.FILL, 0, 0, 0)
|
||||||
|
button.connect("clicked", self.select_image_button_clicked_cb)
|
||||||
|
|
||||||
|
separator = gtk.HSeparator()
|
||||||
|
self.vbox.pack_start(separator, expand=False, fill=False, padding=10)
|
||||||
|
|
||||||
self.usb_desc = gtk.Label()
|
self.usb_desc = gtk.Label()
|
||||||
self.usb_desc.set_alignment(0.0, 0.5)
|
self.usb_desc.set_alignment(0.0, 0.5)
|
||||||
|
@ -790,7 +812,7 @@ class DeployImageDialog (CrumbsDialog):
|
||||||
for usb in self.find_all_usb_devices():
|
for usb in self.find_all_usb_devices():
|
||||||
self.usb_combo.append_text("/dev/" + usb)
|
self.usb_combo.append_text("/dev/" + usb)
|
||||||
self.usb_combo.set_active(0)
|
self.usb_combo.set_active(0)
|
||||||
self.vbox.pack_start(self.usb_combo, expand=True, fill=True)
|
self.vbox.pack_start(self.usb_combo, expand=False, fill=False)
|
||||||
self.vbox.pack_start(self.usb_desc, expand=False, fill=False, padding=2)
|
self.vbox.pack_start(self.usb_desc, expand=False, fill=False, padding=2)
|
||||||
|
|
||||||
self.progress_bar = HobProgressBar()
|
self.progress_bar = HobProgressBar()
|
||||||
|
@ -801,6 +823,12 @@ class DeployImageDialog (CrumbsDialog):
|
||||||
self.vbox.show_all()
|
self.vbox.show_all()
|
||||||
self.progress_bar.hide()
|
self.progress_bar.hide()
|
||||||
|
|
||||||
|
def set_image_text_buffer(self, image_path):
|
||||||
|
self.buf.set_text(image_path)
|
||||||
|
|
||||||
|
def set_image_path(self, image_path):
|
||||||
|
self.image_path = image_path
|
||||||
|
|
||||||
def popen_read(self, cmd):
|
def popen_read(self, cmd):
|
||||||
tmpout, errors = bb.process.run("%s" % cmd)
|
tmpout, errors = bb.process.run("%s" % cmd)
|
||||||
return tmpout.strip()
|
return tmpout.strip()
|
||||||
|
@ -816,6 +844,9 @@ class DeployImageDialog (CrumbsDialog):
|
||||||
(self.popen_read('cat /sys/class/block/%s/device/vendor' % dev),
|
(self.popen_read('cat /sys/class/block/%s/device/vendor' % dev),
|
||||||
self.popen_read('cat /sys/class/block/%s/device/model' % dev))
|
self.popen_read('cat /sys/class/block/%s/device/model' % dev))
|
||||||
|
|
||||||
|
def select_image_button_clicked_cb(self, button):
|
||||||
|
self.emit('select_image_clicked')
|
||||||
|
|
||||||
def usb_combo_changed_cb(self, usb_combo):
|
def usb_combo_changed_cb(self, usb_combo):
|
||||||
combo_item = self.usb_combo.get_active_text()
|
combo_item = self.usb_combo.get_active_text()
|
||||||
if not combo_item or combo_item == self.__dummy_usb__:
|
if not combo_item or combo_item == self.__dummy_usb__:
|
||||||
|
|
Loading…
Reference in New Issue