3 files changed, 30 insertions, 144 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 1aca895c..a1992967 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1257,7 +1257,7 @@ static const char *zipPageHeading_(const iRangecc mime) {
         return book_Icon " Gempub";
     }
     else if (equalCase_Rangecc(mime, mimeType_FontPack)) {
-        return "\U0001f520 Fontpack";
+        return fontpack_Icon " Fontpack";
     }
     iRangecc type = iNullRange;
     nextSplit_Rangecc(mime, "/", &type); /* skip the part before the slash */
@@ -1435,13 +1435,6 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
             }
         }
     }
-    /* Local fontpacks are automatically shown. */
-    if (preloadLocalFontpackForPreview_Fonts(d->doc)) {
-        documentRunsInvalidated_DocumentWidget_(d);
-        redoLayout_GmDocument(d->doc);
-        updateVisible_DocumentWidget_(d);
-        invalidate_DocumentWidget_(d);
-    }
 }
 
 static void updateDocument_DocumentWidget_(iDocumentWidget *d,
@@ -1503,6 +1496,25 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                     appendFormat_String(&str,
                                         cstr_Lang("doc.archive"),
                                         cstr_Rangecc(baseName_Path(d->mod.url)));
+                    if (isRequestFinished) {
+                        if (equal_Rangecc(param, mimeType_FontPack)) {
+                            /* Show some information about fontpacks, and set up footer actions. */
+                            iArchive *zip = iClob(new_Archive());
+                            if (openData_Archive(zip, &d->sourceContent)) {
+                                iFontPack *fp = new_FontPack();
+                                setUrl_FontPack(fp, d->mod.url);
+                                setStandalone_FontPack(fp, iTrue);
+                                if (loadArchive_FontPack(fp, zip)) {
+                                    appendFormat_String(&str, "\n\n%s",
+                                                        cstrCollect_String(infoText_FontPack(fp)));
+                                }
+                                const iArray *actions = actions_FontPack(fp);
+                                makeFooterButtons_DocumentWidget_(d, constData_Array(actions),
+                                                                  size_Array(actions));
+                                delete_FontPack(fp);
+                            }
+                        }
+                    }
                     appendCStr_String(&str, "\n\n");
                     iString *localPath = localFilePathFromUrl_String(d->mod.url);
                     if (!localPath) {
@@ -2916,27 +2928,6 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         updateMedia_DocumentWidget_(d);
         return iFalse;
     }
-    else if (equal_Command(cmd, "media.fontpack.updated")) {
-        iMedia *media = pointerLabel_Command(cmd, "media");
-        if (media == media_GmDocument(d->doc)) {
-            /*iGmMediaInfo info;
-            if (info_Media(media,
-                           (iMediaId){ fontpack_MediaType, argU32Label_Command(cmd, "id")},
-                           &info)) {
-                
-            }*/
-            
-//            findCachedContent_App(<#const iString *url#>, <#iString *mime_out#>, <#iBlock *data_out#>)
-//            setData_Media(media,
-        }
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "media.fontpack.install")) {
-        if (pointerLabel_Command(cmd, "media") == media_GmDocument(d->doc)) {
-            /* TODO: This is ours, we may have a MediaRequest with the data in memory. */
-        }
-        return iFalse;
-    }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
         if (cancelRequest_DocumentWidget_(d, iTrue /* navigate back */)) {
             return iTrue;
@@ -3253,7 +3244,16 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return handleSwipe_DocumentWidget_(d, cmd);
     }
     else if (equal_Command(cmd, "document.setmediatype") && document_App() == d) {
-        setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"), &d->sourceContent);
+        if (!isRequestOngoing_DocumentWidget(d)) {
+            setUrlAndSource_DocumentWidget(d, d->mod.url, string_Command(cmd, "mime"),
+                                           &d->sourceContent);
+        }
+        return iTrue;
+    }
+    else if (equalWidget_Command(cmd, w, "fontpack.install")) {
+        const iString *id = idFromUrl_FontPack(d->mod.url);
+        install_Fonts(id, &d->sourceContent);
+        postCommandf_App("open gotoheading:%s url:about:fonts", cstr_String(id));
         return iTrue;
     }
     return iFalse;
@@ -3302,15 +3302,6 @@ static iBool processMediaEvents_DocumentWidget_(iDocumentWidget *d, const SDL_Ev
     const iInt2 mouse = init_I2(ev->button.x, ev->button.y);
     iConstForEach(PtrArray, i, &d->visibleMedia) {
         const iGmRun *run  = i.ptr;
-        if (run->mediaType == fontpack_MediaType) {
-            iFontpackUI ui;
-            init_FontpackUI(&ui, media_GmDocument(d->doc), run->mediaId,
-                            runRect_DocumentWidget_(d, run));
-            if (processEvent_FontpackUI(&ui, ev)) {
-                refresh_Widget(d);
-                return iTrue;
-            }
-        }
         if (run->mediaType != audio_MediaType) {
             continue;
         }
@@ -4685,12 +4676,6 @@ static void drawMedia_DocumentWidget_(const iDocumentWidget *d, iPaint *p) {
                             runRect_DocumentWidget_(d, run));
             draw_DownloadUI(&ui, p);
         }
-        else if (run->mediaType == fontpack_MediaType) {
-            iFontpackUI ui;
-            init_FontpackUI(&ui, constMedia_GmDocument(d->doc), run->mediaId,
-                            runRect_DocumentWidget_(d, run));
-            draw_FontpackUI(&ui, p);
-        }
     }
 }
 
diff --git a/src/ui/mediaui.c b/src/ui/mediaui.c
index ac9475dd..d85d0df9 100644
--- a/src/ui/mediaui.c
+++ b/src/ui/mediaui.c
@@ -279,85 +279,3 @@ void draw_DownloadUI(const iDownloadUI *d, iPaint *p) {
                        translateCStr_Lang("\u2014 ${mb.per.sec}"));
     }
 }
-
-/*----------------------------------------------------------------------------------------------*/
-
-static iMenuItem action_FontpackUI_(const iFontpackUI *d) {
-    if (d->info.isInstalled) {
-        return (iMenuItem){ d->info.isDisabled ? "${media.fontpack.enable}"
-                                            : close_Icon " ${media.fontpack.disable}",
-            0, 0, format_CStr("media.fontpack.enable arg:%d", d->info.isDisabled) };
-    }
-    return (iMenuItem){ d->info.isInstalled ? close_Icon " ${media.fontpack.disable}"
-                                            : "${media.fontpack.install}",
-            0, 0,
-        d->info.isInstalled ? "media.fontpack.enable arg:0" : "media.fontpack.install" };
-}
-
-void init_FontpackUI(iFontpackUI *d, const iMedia *media, uint16_t mediaId, iRect bounds) {
-    d->media   = media;
-    d->mediaId = mediaId;
-    fontpackInfo_Media(d->media, (iMediaId){ fontpack_MediaType, d->mediaId }, &d->info);
-    d->bounds  = bounds;
-    iMenuItem action = action_FontpackUI_(d);
-    d->buttonRect.size = add_I2(measure_Text(uiLabel_FontId, action.label).bounds.size,
-                                muli_I2(gap2_UI, 3));
-    d->buttonRect.pos.x = right_Rect(d->bounds) - gap_UI - d->buttonRect.size.x;
-    d->buttonRect.pos.y = mid_Rect(d->bounds).y - d->buttonRect.size.y / 2;
-}
-
-iBool processEvent_FontpackUI(iFontpackUI *d, const SDL_Event *ev) {
-    switch (ev->type) {
-        case SDL_MOUSEBUTTONDOWN:
-        case SDL_MOUSEBUTTONUP: {
-            const iInt2 pos = init_I2(ev->button.x, ev->button.y);
-            if (contains_Rect(d->buttonRect, pos)) {
-                if (ev->type == SDL_MOUSEBUTTONUP) {
-                    postCommandf_App("%s media:%p mediaid:%u packid:%s",
-                                     action_FontpackUI_(d).command,
-                                     d->media, d->mediaId, cstr_String(d->info.packId.id));
-                }
-                return iTrue;
-            }
-            break;
-        }
-        case SDL_MOUSEMOTION:
-            if (contains_Rect(d->bounds, init_I2(ev->motion.x, ev->motion.y))) {
-                return iTrue;
-            }
-            break;
-    }
-    return iFalse;
-}
-
-int height_FontpackUI(const iMedia *media, uint16_t mediaId, int width) {
-    const iStringList *names;
-    iFontpackMediaInfo info;
-    fontpackInfo_Media(media, (iMediaId){ fontpack_MediaType, mediaId }, &info);
-    return lineHeight_Text(uiContent_FontId) +
-           lineHeight_Text(uiLabel_FontId) * (1 + size_StringList(info.names));
-}
-
-void draw_FontpackUI(const iFontpackUI *d, iPaint *p) {
-    /* Draw a background box. */
-    fillRect_Paint(p, d->bounds, uiBackground_ColorId);
-    drawRect_Paint(p, d->bounds, uiSeparator_ColorId);
-    iInt2 pos = topLeft_Rect(d->bounds);
-    const char *checks[] = { "\u2610", "\u2611" };
-    draw_Text(uiContentBold_FontId, pos,
-              d->info.isDisabled ? uiText_ColorId : uiHeading_ColorId, "\"%s\" v%d",
-              cstr_String(d->info.packId.id), d->info.packId.version);
-    pos.y += lineHeight_Text(uiContentBold_FontId);
-    draw_Text(uiLabelBold_FontId, pos, uiText_ColorId, "%.1f MB, %d fonts   %s %s   %s",
-              d->info.sizeInBytes / 1.0e6, size_StringList(d->info.names),
-//              checks[info.isValid], info.isValid ? "No errors" : "Errors detected",
-              checks[d->info.isInstalled], d->info.isInstalled ? "Installed" : "Not installed",
-              d->info.isReadOnly ? "Read-Only" : "");
-    pos.y += lineHeight_Text(uiLabelBold_FontId);
-    iConstForEach(StringList, i, d->info.names) {
-        drawRange_Text(uiLabel_FontId, pos, uiText_ColorId, range_String(i.value));
-        pos.y += lineHeight_Text(uiLabel_FontId);
-    }
-    /* Buttons. */
-    drawInlineButton_(p, d->buttonRect, action_FontpackUI_(d).label, uiLabel_FontId);
-}
diff --git a/src/ui/mediaui.h b/src/ui/mediaui.h
index 03ea0afc..3d51e4c9 100644
--- a/src/ui/mediaui.h
+++ b/src/ui/mediaui.h
@@ -59,20 +59,3 @@ struct Impl_DownloadUI {
 void    init_DownloadUI         (iDownloadUI *, const iMedia *media, uint16_t mediaId, iRect bounds);
 iBool   processEvent_DownloadUI (iDownloadUI *, const SDL_Event *ev);
 void    draw_DownloadUI         (const iDownloadUI *, iPaint *p);
-
-/*----------------------------------------------------------------------------------------------*/
-
-iDeclareType(FontpackUI)
-
-struct Impl_FontpackUI {
-    const iMedia *media;
-    uint16_t mediaId;
-    iFontpackMediaInfo info;
-    iRect bounds;
-    iRect buttonRect;
-};
-
-void    init_FontpackUI         (iFontpackUI *, const iMedia *media, uint16_t mediaId, iRect bounds);
-int     height_FontpackUI       (const iMedia *media, uint16_t mediaId, int width);
-iBool   processEvent_FontpackUI (iFontpackUI *, const SDL_Event *ev);
-void    draw_FontpackUI         (const iFontpackUI *, iPaint *p);