Ticket #4384: 0001-Add-a-message-box-while-the-PDF-is-being-downloaded-.patch

new file icons/book.svg

@@ +1 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
+        <!ENTITY stroke_color "#010101">
+        <!ENTITY fill_color "#FFFFFF">
+]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="activity-read">
+        <path d="M27.904,11.023h-0.002   c0-0.002-1.71-2.053-9.376-2.504C10.86,8.07,6.843,10.121,6.84,10.122c-1.898,0.619-3.495,1.735-3.495,3.494v27.702   c0,2.025,1.235,3.494,3.495,3.494c0.003,0,4.41-1.35,10.004-1.35c5.589-0.001,11.061,2.253,11.061,2.253" display="inline" fill="&fill_color;" stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+        <path d="M27.898,11.023   L27.898,11.023c0-0.002,1.715-2.053,9.377-2.504c7.668-0.449,11.686,1.602,11.688,1.603c1.897,0.619,3.494,1.735,3.494,3.494   v27.702c0,2.025-1.233,3.494-3.494,3.494c-0.003,0-4.409-1.35-10.004-1.35c-5.589-0.001-11.062,2.253-11.062,2.253" display="inline" fill="&fill_color;" stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
+
+                <line display="inline" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5" x1="27.898" x2="27.9" y1="11.023" y2="45.717"/>
+        <path d="   M32.566,44.275c0,0-0.031,2.906-4.666,2.906c-4.632,0-4.663-2.906-4.663-2.906" display="inline" fill="none" stroke="&stroke_color;" stroke-linecap="round" stroke-linejoin="round" stroke-width="3.5"/>
+</g></svg>
+

pdfviewer.py

@@ -29 +29 @@
 
 from sugar3.graphics.toolbarbox import ToolbarBox
 from sugar3.graphics.toolbutton import ToolButton
+from sugar3.graphics.icon import Icon
+from sugar3.graphics.iconprogress import IconProgress
+from sugar3.graphics import style
 from sugar3.datastore import datastore
 from sugar3.activity import activity
 
@@ -279 +282 @@
         pass
 
 
+class PDFMessageBox(Gtk.EventBox):
+    def __init__(self, message, button_callback):
+        Gtk.EventBox.__init__(self)
+
+        self.modify_bg(Gtk.StateType.NORMAL,
+                       style.COLOR_WHITE.get_gdk_color())
+
+        alignment = Gtk.Alignment.new(0.5, 0.5, 0.1, 0.1)
+        self.add(alignment)
+        alignment.show()
+
+        box = Gtk.VBox()
+        alignment.add(box)
+        box.show()
+
+        icon = IconProgress(icon_name='book',
+                            pixel_size=style.LARGE_ICON_SIZE,
+                            stroke_color=style.COLOR_BUTTON_GREY.get_svg(),
+                            fill_color=style.COLOR_SELECTION_GREY.get_svg())
+        self.icon_progress = icon
+
+        box.pack_start(icon, expand=True, fill=False, padding=0)
+        icon.show()
+
+        label = Gtk.Label()
+        color = style.COLOR_BUTTON_GREY.get_html()
+        label.set_markup('<span weight="bold" color="%s">%s</span>' % ( \
+                color, GLib.markup_escape_text(message)))
+        box.pack_start(label, expand=True, fill=False, padding=0)
+        label.show()
+
+        button_box = Gtk.HButtonBox()
+        button_box.set_layout(Gtk.ButtonBoxStyle.CENTER)
+        box.pack_start(button_box, False, True, 0)
+        button_box.show()
+
+        button = Gtk.Button(label=_('Cancel'))
+        button.connect('clicked', button_callback)
+        button.props.image = Icon(icon_name='dialog-cancel',
+                                  icon_size=Gtk.IconSize.BUTTON)
+        button_box.pack_start(button, expand=True, fill=False, padding=0)
+        button.show()
+
+
 class PDFTabPage(Gtk.HBox):
     """Shows a basic PDF viewer, download the file first if the PDF is
     in a remote location.
 
+    When the file is remote, display a message while downloading.
+
     """
     def __init__(self):
         GObject.GObject.__init__(self)
@@ -358 +407 @@
     def _download_from_http(self, remote_uri):
         """Download the PDF from a remote location to a temporal file."""
 
+        # Display a message
+        message_box = PDFMessageBox(
+            message=_("Downloading document..."),
+            button_callback=self.cancel_download)
+        self.pack_start(message_box, True, True, 0)
+        message_box.show()
+
         # Figure out download URI
         temp_path = os.path.join(activity.get_activity_root(), 'instance')
         if not os.path.exists(temp_path):
@@ -381 +437 @@
         progress = download.get_progress()
         self._browser.props.progress = progress
 
+        # Update progress in the message box too
+        message_box = self.get_children()[0]
+        message_box.icon_progress.update(progress)
+
     def __download_status_cb(self, download, data):
         status = download.get_status()
         if status == WebKit.DownloadStatus.STARTED:
             self._browser.props.load_status = WebKit.LoadStatus.PROVISIONAL
         elif status == WebKit.DownloadStatus.FINISHED:
             self._browser.props.load_status = WebKit.LoadStatus.FINISHED
+
+            # Remove the message box
+            message_box = self.get_children()[0]
+            self.remove(message_box)
+
             self._show_pdf()
         elif status == WebKit.DownloadStatus.CANCELLED:
             logging.debug('Download PDF canceled')
@@ -395 +460 @@
         logging.debug('Download error! code %s, detail %s: %s' % \
                           (err_code, err_detail, reason))
 
-    def cancel_download(self):
+    def cancel_download(self, button=None):
         self._download.cancel()
         self._browser.emit_close_tab()