diff mbox

[Branch,~linaro-image-tools/linaro-image-tools/trunk] Rev 436: Add hwpack info dialog to fetch-image-ui.

Message ID 20110922204812.13810.91831.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Mattias Backman Sept. 22, 2011, 8:48 p.m. UTC
Merge authors:
  Andy Doan (doanac)
Related merge proposals:
  https://code.launchpad.net/~doanac/linaro-image-tools/hwpack-description-support-v2/+merge/74424
  proposed by: Andy Doan (doanac)
  review: Approve - James Tunnicliffe (dooferlad)
------------------------------------------------------------
revno: 436 [merge]
committer: Mattias Backman <mattias.backman@linaro.org>
branch nick: linaro-image-tools
timestamp: Thu 2011-09-22 22:46:55 +0200
message:
  Add hwpack info dialog to fetch-image-ui.
modified:
  linaro-fetch-image-ui
  linaro_image_tools/fetch_image_settings.yaml


--
lp:linaro-image-tools
https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk

You are subscribed to branch lp:linaro-image-tools.
To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'linaro-fetch-image-ui'
--- linaro-fetch-image-ui	2011-08-20 12:44:34 +0000
+++ linaro-fetch-image-ui	2011-09-06 20:59:09 +0000
@@ -21,6 +21,7 @@ 
 # USA.
 
 import wx
+import wx.html
 import wx.wizard
 import wx.wizard as wiz
 import sys
@@ -987,6 +988,14 @@ 
                   0,
                   wx.ALIGN_LEFT | wx.LEFT | wx.RIGHT | wx.TOP,
                   5)
+        desc_link = wx.HyperlinkCtrl(
+                                pane, id=-1, url="",
+                                label="Hardware pack descriptions")
+        self.Bind(wx.EVT_HYPERLINK, self.event_hwpack_link, desc_link)
+        grid1.Add(desc_link,
+                  0,
+                  wx.ALIGN_LEFT | wx.LEFT | wx.RIGHT | wx.TOP,
+                  5)
 
         self.box.Add(grid1, 0, alignment, 0)
         pane.SetSizer(self.box)
@@ -1078,6 +1087,19 @@ 
     def event_combo_box_rootfs(self, evt):
         self.settings['rootfs'] = evt.GetString().encode('ascii').lower()
 
+    def event_hwpack_link(self, event):
+        hw_desc = self.settings['UI']['hwpack-descriptions']
+        body = "<h3>%s</h3><ul>" % self.settings['hardware']
+        for hwpack in self.cb_hwpacks.GetItems():
+            desc = ''
+            if hw_desc.has_key(hwpack):
+                desc = " - %s" % hw_desc[hwpack]
+            body += "<li><b>%s</b><i>%s</i></li>" % (hwpack, desc)
+        body += "</ul>"
+        HtmlDialog( event.GetEventObject().GetParent(),
+                    "Hardware Pack Descriptions: %s",
+                    body)
+
     def event_radio_button_select(self, event):
         """Search the label of the button that has been selected to work out
         what we are writing to."""
@@ -1120,6 +1142,15 @@ 
     def event_swap_size(self, event):
         self.settings['swap_file'] = str(self.image_size_spinner.GetValue())
 
+class HtmlDialog(wx.Dialog):
+    def __init__(self, parent, title, content):
+        wx.Dialog.__init__(self, parent, -1, title)
+        html = wx.html.HtmlWindow(self)
+
+        html.SetPage(content)
+        self.SetSize(wx.Size(500,450))
+        self.ShowModal()
+        self.Destroy()
 
 class DevChoser(wx.Dialog):
     def __init__(self, parent, id, title, settings):

=== modified file 'linaro_image_tools/fetch_image_settings.yaml'
--- linaro_image_tools/fetch_image_settings.yaml	2011-08-24 10:26:01 +0000
+++ linaro_image_tools/fetch_image_settings.yaml	2011-09-06 20:59:09 +0000
@@ -16,6 +16,18 @@ 
     ubuntu-desktop: 'LEB: Linaro Ubuntu Desktop'
     ubuntu-desktop::long: Linux for humans on low power machines
     ubuntu-desktop::release_note: Shiny!
+  hwpack-descriptions:
+    omap3: Basic support for Beagle boards
+    omap3-x11-base: Includes support for 3D acceleration
+    overo: Same kernel as omap3.
+    panda: Basic support for Panda from linux-linaro-3.0
+    panda-x11-base: Basic support for Panda from linux-linaro-3.0 plus support for 3D acceleration
+    bsp-omap4: (DEPRECATED) - Used in Maverick release
+    lt-panda: TI Landing Team kernel (kernel-tilt.git)
+    lt-panda-x11-base-natty: TI Landing Team kernel (kernel-tilt.git) plus support for 3D acceleration
+    s5pv310: Basic support from linux-linaro-3.0
+    lt-s5pv310: Samsung Landing Team kernel
+
   help:
     latest snapshot: Latest Snapshot help text
     release: Release help text