Merge lp:~rohangarg/ubuntu-release-upgrader/kubuntu into lp:ubuntu-release-upgrader

[Rohan Garg]

I've modified the KDE release notes ui so that it :

a) Shows the HTML notes in a QWebView
b) Uses an icon for the window

[lp:~rohangarg/ubuntu-release-upgrader/kubuntu]

2726. By Rohan Garg on 2014-01-28

Use the HTML release notes and a QWebView instead of the regular text release notes

[Harald Sitter (apachelogger)]

19 + self.dialogue.releaseNotesBrowser.setUrl(QUrl(uri))
20 + self.dialogue.releaseNotesBrowser.loadFinished.connect(self.releaseNotesLoaded)

connect first

I am wondering whether there isn't a way to preserve the full error handling the distinction between not being able to get a http reply and not being able to reach the server seems rather useful.

also, was this tested on precise? I am not certain of the webview quality in that relese.

review: Needs Fixing

[Rohan Garg (rohangarg)]

> 19 + self.dialogue.releaseNotesBrowser.setUrl(QUrl(uri))
> 20 + self.dialogue.releaseNotesBrowser.loadFinished.connect(self.releas
> eNotesLoaded)
>
> connect first
>

Will do.

> I am wondering whether there isn't a way to preserve the full error handling
> the distinction between not being able to get a http reply and not being able
> to reach the server seems rather useful.
>

QWebView doesn't offer a detailed error message unfortunately. Though I only had a cursory glance at the API.

> also, was this tested on precise? I am not certain of the webview quality in
> that relese.

Yep. This was tested on precise. Works fine there.

[Rohan Garg (rohangarg)]

Poke?

[Harald Sitter (apachelogger)]

> Poke?

I still only see the same proposal.

FWIW though, ::page() should give you access to most handy error hanlding in qwebview.

[Julian Andres Klode (juliank)]

If there is still something going on, please resubmit a new merge proposal. I rejected that now as it has not seen any activity in 4 years.

Unmerged revisions

2726. By Rohan Garg on 2014-01-28

Use the HTML release notes and a QWebView instead of the regular text release notes

2725. By Rohan Garg on 2014-01-28

Release note fetcher should have an icon

2724. By Launchpad Translations on behalf of ubuntu-core-dev on 2014-01-25

Launchpad automatic translations update.

=== modified file 'DistUpgrade/DistUpgradeFetcherKDE.py'
--- DistUpgrade/DistUpgradeFetcherKDE.py	2013-11-15 23:36:53 +0000
+++ DistUpgrade/DistUpgradeFetcherKDE.py	2014-01-28 18:32:42 +0000
@@ -103,26 +103,15 @@
         cancelButton.setIcon(KIcon("dialog-cancel"))
         self.dialogue.setWindowTitle(_("Release Notes"))
         self.dialogue.show()
-        if self.new_dist.releaseNotesURI is not None:
-            uri = self._expandUri(self.new_dist.releaseNotesURI)
+        if self.new_dist.releaseNotesHtmlUri != None:
+            uri = self._expandUri(self.new_dist.releaseNotesHtmlUri)
             # download/display the release notes
             # FIXME: add some progress reporting here
             result = None
             try:
-                release_notes = urlopen(uri)
-                notes = release_notes.read().decode("UTF-8", "replace")
-                self.dialogue.scrolled_notes.setText(notes)
+                self.dialogue.releaseNotesBrowser.setUrl(QUrl(uri))
+                self.dialogue.releaseNotesBrowser.loadFinished.connect(self.releaseNotesLoaded)
                 result = self.dialogue.exec_()
-            except HTTPError:
-                primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                          _("Could not find the release notes")
-                secondary = _("The server may be overloaded. ")
-                KMessageBox.sorry(None, primary + "<br />" + secondary, "")
-            except IOError:
-                primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
-                          _("Could not download the release notes")
-                secondary = _("Please check your internet connection.")
-                KMessageBox.sorry(None, primary + "<br />" + secondary, "")
             # user clicked cancel
             if result == QDialog.Accepted:
                 self.progressDialogue.show()
@@ -135,6 +124,13 @@
             sys.exit()
         return False
 
+    def releaseNotesLoaded(self, ok):
+        if not ok:
+            primary = "<span weight=\"bold\" size=\"larger\">%s</span>" % \
+                          _("Could not load the release notes")
+            secondary = _("The server may be overloaded. ")
+            KMessageBox.sorry(None, primary + "<br />" + secondary, "")
+
 
 class KDEAcquireProgressAdapter(apt.progress.base.AcquireProgress):
     def __init__(self, progress, label, parent):
@@ -197,6 +193,7 @@
                            license, copyright, text, homePage, bugEmail)
 
     aboutData.addAuthor(ki18n("Jonathan Riddell"), ki18n("Author"))
+    aboutData.setProgramIconName("system-software-update")
 
     options = KCmdLineOptions()
 

=== modified file 'DistUpgrade/dialog_release_notes.ui'
--- DistUpgrade/dialog_release_notes.ui	2012-06-28 16:12:09 +0000
+++ DistUpgrade/dialog_release_notes.ui	2014-01-28 18:32:42 +0000
@@ -14,10 +14,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
-    <widget class="QTextEdit" name="scrolled_notes" >
-     <property name="readOnly" >
-      <bool>true</bool>
-     </property>
+    <widget class="QWebView" name="releaseNotesBrowser" >
     </widget>
    </item>
    <item row="1" column="0" >