From patchwork Thu Sep 22 20:48:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4282 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C95FC23EFD for ; Thu, 22 Sep 2011 20:48:14 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id B6DE4A1801D for ; Thu, 22 Sep 2011 20:48:14 +0000 (UTC) Received: by fxe23 with SMTP id 23so4422005fxe.11 for ; Thu, 22 Sep 2011 13:48:14 -0700 (PDT) Received: by 10.223.55.136 with SMTP id u8mr789782fag.46.1316724494040; Thu, 22 Sep 2011 13:48:14 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.18.198 with SMTP id y6cs183797lad; Thu, 22 Sep 2011 13:48:13 -0700 (PDT) Received: by 10.227.200.21 with SMTP id eu21mr1160515wbb.12.1316724493159; Thu, 22 Sep 2011 13:48:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id eo12si8218454wbb.35.2011.09.22.13.48.12 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 13:48:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1R6qBo-0002jK-Lf for ; Thu, 22 Sep 2011 20:48:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 95568E1573 for ; Thu, 22 Sep 2011 20:48:12 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 436 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [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> Date: Thu, 22 Sep 2011 20:48:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13996"; Instance="initZopeless config overlay" X-Launchpad-Hash: 93c93fd1ded80bc51010020edc7dfe70e5f4ec68 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 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 === 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 = "

%s

    " % self.settings['hardware'] + for hwpack in self.cb_hwpacks.GetItems(): + desc = '' + if hw_desc.has_key(hwpack): + desc = " - %s" % hw_desc[hwpack] + body += "
  • %s%s
    • " % (hwpack, desc) + body += "
" + 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