5 files changed, 212 insertions, 36 deletions

diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index 6e818137..a8346e19 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -107,17 +107,8 @@ void init_CertImportWidget(iCertImportWidget *d) {
     init_Widget(w);
     setId_Widget(w, "certimport");
     d->cert = NULL;
-    /* This should behave similar to sheets. */  {
-        setPadding1_Widget(w, 3 * gap_UI);
-        setFrameColor_Widget(w, uiSeparator_ColorId);
-        setBackgroundColor_Widget(w, uiBackground_ColorId);
-        setFlags_Widget(w,
-                        mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
-                            arrangeSize_WidgetFlag | centerHorizontal_WidgetFlag |
-                            parentCannotResize_WidgetFlag |
-                            overflowScrollable_WidgetFlag,
-                        iTrue);
-    }
+    /* This should behave similar to sheets. */ 
+    useSheetStyle_Widget(w);
     addChildFlags_Widget(
         w,
         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.certimport}", NULL)),
@@ -168,7 +159,6 @@ void init_CertImportWidget(iCertImportWidget *d) {
                          "certimport.accept" } },
         2);
     addChild_Widget(w, iClob(buttons));
-//    arrange_Widget(w);
     if (deviceType_App() != desktop_AppDeviceType) {
         /* Try auto-pasting. */
         postCommand_App("certimport.paste");
@@ -263,8 +253,7 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
 }
 
 static void draw_CertImportWidget_(const iCertImportWidget *d) {
-    const iWidget *w = constAs_Widget(d);
-    draw_Widget(w);
+    draw_Widget(constAs_Widget(d));
 }
 
 iBeginDefineSubclass(CertImportWidget, Widget)
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
new file mode 100644
index 00000000..036571a5
--- /dev/null
+++ b/src/ui/uploadwidget.c
@@ -0,0 +1,148 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "uploadwidget.h"
+#include "labelwidget.h"
+#include "inputwidget.h"
+#include "documentwidget.h"
+#include "color.h"
+#include "gmrequest.h"
+#include "app.h"
+
+iDefineObjectConstruction(UploadWidget)
+
+struct Impl_UploadWidget {
+    iWidget          widget;
+    iString          url;
+    iDocumentWidget *viewer;
+    iGmRequest *     request;
+    iLabelWidget *   info;
+    iInputWidget *   mime;
+    iInputWidget *   token;
+    iInputWidget *   input;
+};
+
+void init_UploadWidget(iUploadWidget *d) {
+    iWidget *w = as_Widget(d);
+    init_Widget(w);
+    setId_Widget(w, "upload");
+    useSheetStyle_Widget(w);
+    init_String(&d->url);
+    d->viewer = NULL;
+    d->request = NULL;
+    addChildFlags_Widget(w,
+                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.upload}", NULL)),
+                         frameless_WidgetFlag);
+    d->info = addChildFlags_Widget(w, iClob(new_LabelWidget("", NULL)), frameless_WidgetFlag);
+    /* Tabs for input data. */
+    iWidget *tabs = makeTabs_Widget(w);
+    iWidget *headings, *values;
+    setBackgroundColor_Widget(findChild_Widget(tabs, "tabs.buttons"), uiBackgroundSidebar_ColorId);
+    setId_Widget(tabs, "upload.tabs");
+//    const int bigGap = lineHeight_Text(uiLabel_FontId) * 3 / 4;
+    /* Text input. */ {
+        //appendTwoColumnTabPage_Widget(tabs, "${heading.upload.text}", '1', &headings, &values);
+        iWidget *page = new_Widget();
+        setFlags_Widget(page, arrangeSize_WidgetFlag, iTrue);
+        d->input = new_InputWidget(0);
+        setEnterInsertsLF_InputWidget(d->input, iTrue);
+        setFixedSize_Widget(as_Widget(d->input), init_I2(120 * gap_UI, -1));
+        addChild_Widget(page, iClob(d->input));
+        appendTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);
+    }
+    /* File content. */ {
+        appendTwoColumnTabPage_Widget(tabs, "${heading.upload.file}", '2', &headings, &values);        
+//        iWidget *pad = addChild_Widget(headings, iClob(makePadding_Widget(0)));
+//        iWidget *hint = addChild_Widget(values, iClob(new_LabelWidget("${upload.file.drophint}", NULL)));
+//        pad->sizeRef = hint;
+        addChild_Widget(headings, iClob(new_LabelWidget("${upload.file.name}", NULL)));
+        addChild_Widget(values, iClob(new_LabelWidget("filename.ext", NULL)));
+        addChild_Widget(headings, iClob(new_LabelWidget("${upload.file.size}", NULL)));        
+        addChild_Widget(values, iClob(new_LabelWidget("0 KB", NULL)));
+        d->mime = new_InputWidget(0);
+        setFixedSize_Widget(as_Widget(d->mime), init_I2(50 * gap_UI, -1));
+        addTwoColumnDialogInputField_Widget(headings, values, "${upload.mime}", "upload.mime", iClob(d->mime));
+    }
+    /* Token. */ {
+        addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
+        iWidget *page = makeTwoColumns_Widget(&headings, &values);
+        d->token = addTwoColumnDialogInputField_Widget(
+            headings, values, "${upload.token}", "upload.token", iClob(new_InputWidget(0)));
+        setHint_InputWidget(d->token, "${hint.upload.token}");
+        setFixedSize_Widget(as_Widget(d->token), init_I2(50 * gap_UI, -1));
+        addChild_Widget(w, iClob(page));
+    }
+    /* Buttons. */ {
+        addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
+        iWidget *buttons =
+            makeDialogButtons_Widget((iMenuItem[]){ { "${cancel}", SDLK_ESCAPE, 0, "upload.cancel" },
+                                                    { uiTextAction_ColorEscape "${dlg.upload.send}",
+                                                      SDLK_RETURN,
+                                                      KMOD_PRIMARY,
+                                                      "upload.accept" } },
+                                     2);
+        addChild_Widget(w, iClob(buttons));
+    }
+    resizeToLargestPage_Widget(tabs);
+    setFocus_Widget(as_Widget(d->token));
+}
+
+void deinit_UploadWidget(iUploadWidget *d) {
+    deinit_String(&d->url);
+    iRelease(d->request);
+}
+
+void setUrl_UploadWidget(iUploadWidget *d, const iString *url) {
+    set_String(&d->url, url);
+    setText_LabelWidget(d->info, &d->url);
+}
+
+void setResponseViewer_UploadWidget(iUploadWidget *d, iDocumentWidget *doc) {
+    d->viewer = doc;
+}
+
+static iBool processEvent_UploadWidget_(iUploadWidget *d, const SDL_Event *ev) {
+    iWidget *w = as_Widget(d);
+    if (isCommand_Widget(w, ev, "upload.cancel")) {
+        /* TODO: If text has been entered, ask for confirmation. */
+        setupSheetTransition_Mobile(w, iFalse);
+        destroy_Widget(w);
+        return iTrue;
+    }
+    if (isCommand_Widget(w, ev, "upload.accept")) {
+        /* Make a GmRequest and send the data. */
+        /* The dialog will remain open until the request finishes, showing upload progress. */
+    }
+    if (ev->type == SDL_DROPFILE) {
+        /* Switch to File tab. */
+    }
+    return processEvent_Widget(w, ev);
+}
+
+static void draw_UploadWidget_(const iUploadWidget *d) {
+    draw_Widget(constAs_Widget(d));
+}
+
+iBeginDefineSubclass(UploadWidget, Widget)
+    .processEvent = (iAny *) processEvent_UploadWidget_,
+    .draw         = (iAny *) draw_UploadWidget_,
+iEndDefineSubclass(UploadWidget)
diff --git a/src/ui/uploadwidget.h b/src/ui/uploadwidget.h
new file mode 100644
index 00000000..5a7de45e
--- /dev/null
+++ b/src/ui/uploadwidget.h
@@ -0,0 +1,33 @@
+/* Copyright 2021 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include "widget.h"
+
+iDeclareWidgetClass(UploadWidget)
+iDeclareObjectConstruction(UploadWidget)
+    
+iDeclareType(DocumentWidget)
+    
+void    setUrl_UploadWidget             (iUploadWidget *, const iString *url);
+void    setResponseViewer_UploadWidget  (iUploadWidget *, iDocumentWidget *doc);
diff --git a/src/ui/util.c b/src/ui/util.c
index 220e3a50..6bc358de 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1118,20 +1118,22 @@ size_t tabCount_Widget(const iWidget *tabs) {
 
 /*-----------------------------------------------------------------------------------------------*/
 
-
 iWidget *makeSheet_Widget(const char *id) {
     iWidget *sheet = new_Widget();
     setId_Widget(sheet, id);
-    setPadding1_Widget(sheet, 3 * gap_UI);
-    setFrameColor_Widget(sheet, uiSeparator_ColorId);
-    setBackgroundColor_Widget(sheet, uiBackground_ColorId);
-    setFlags_Widget(sheet,
-                    parentCannotResize_WidgetFlag |
-                        focusRoot_WidgetFlag | mouseModal_WidgetFlag | keepOnTop_WidgetFlag |
-                        arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
+    useSheetStyle_Widget(sheet);
+    return sheet;
+}
+
+void useSheetStyle_Widget(iWidget *d) {
+    setPadding1_Widget(d, 3 * gap_UI);
+    setFrameColor_Widget(d, uiSeparator_ColorId);
+    setBackgroundColor_Widget(d, uiBackground_ColorId);
+    setFlags_Widget(d,
+                    parentCannotResize_WidgetFlag | focusRoot_WidgetFlag | mouseModal_WidgetFlag |
+                        keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
                         centerHorizontal_WidgetFlag | overflowScrollable_WidgetFlag,
                     iTrue);
-    return sheet;
 }
 
 static void acceptValueInput_(iWidget *dlg) {
@@ -1435,7 +1437,7 @@ static void appendFramelessTabPage_(iWidget *tabs, iWidget *page, const char *ti
         iTrue);
 }
 
-static iWidget *makeTwoColumnWidget_(iWidget **headings, iWidget **values) {
+iWidget *makeTwoColumns_Widget(iWidget **headings, iWidget **values) {
     iWidget *page = new_Widget();
     setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
     *headings = addChildFlags_Widget(
@@ -1445,8 +1447,8 @@ static iWidget *makeTwoColumnWidget_(iWidget **headings, iWidget **values) {
     return page;
 }
 
-static iWidget *appendTwoColumnPage_(iWidget *tabs, const char *title, int shortcut, iWidget **headings,
-                                     iWidget **values) {
+iWidget *appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int shortcut, iWidget **headings,
+                                       iWidget **values) {
     /* TODO: Use `makeTwoColumnWidget_()`, see above. */
     iWidget *page = new_Widget();
     setFlags_Widget(page, arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
@@ -1600,7 +1602,7 @@ iWidget *makePreferences_Widget(void) {
     iWidget *headings, *values;
     const int bigGap = lineHeight_Text(uiLabel_FontId) * 3 / 4;
     /* General preferences. */ {
-        appendTwoColumnPage_(tabs, "${heading.prefs.general}", '1', &headings, &values);
+        appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.general}", '1', &headings, &values);
 #if defined (LAGRANGE_ENABLE_DOWNLOAD_EDIT)
         addPrefsInputWithHeading_(headings, values, "prefs.downloads", iClob(new_InputWidget(0)));
 #endif
@@ -1668,7 +1670,7 @@ iWidget *makePreferences_Widget(void) {
         }
     }
     /* User Interface. */ {
-        appendTwoColumnPage_(tabs, "${heading.prefs.interface}", '2', &headings, &values);
+        appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.interface}", '2', &headings, &values);
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.customframe}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.customframe")));
@@ -1711,7 +1713,7 @@ iWidget *makePreferences_Widget(void) {
         }
     }
     /* Colors. */ {
-        appendTwoColumnPage_(tabs, "${heading.prefs.colors}", '3', &headings, &values);
+        appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.colors}", '3', &headings, &values);
         makeTwoColumnHeading_("${heading.prefs.uitheme}", headings, values);
 #if defined (iPlatformApple) || defined (iPlatformMSys)
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.ostheme}")));
@@ -1766,7 +1768,7 @@ iWidget *makePreferences_Widget(void) {
         addChildFlags_Widget(values, iClob(sats), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     }
     /* Fonts. */ {
-        setId_Widget(appendTwoColumnPage_(tabs, "${heading.prefs.fonts}", '4', &headings, &values), "prefs.page.fonts");
+        setId_Widget(appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.fonts}", '4', &headings, &values), "prefs.page.fonts");
         /* Fonts. */ {
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.headingfont}")));
             addFontButtons_(values, "headingfont");
@@ -1815,7 +1817,7 @@ iWidget *makePreferences_Widget(void) {
         }        
     }
     /* Style. */ {
-        setId_Widget(appendTwoColumnPage_(tabs, "${heading.prefs.style}", '5', &headings, &values), "prefs.page.style");
+        setId_Widget(appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.style}", '5', &headings, &values), "prefs.page.style");
 //        makeTwoColumnHeading_("${heading.prefs.paragraph}", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.linewidth}")));
         iWidget *widths = new_Widget();
@@ -1850,7 +1852,7 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.centershort")));
     }
     /* Network. */ {
-        appendTwoColumnPage_(tabs, "${heading.prefs.network}", '6', &headings, &values);
+        appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.network}", '6', &headings, &values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.decodeurls}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.decodeurls")));
         /* Cache size. */ {
@@ -1908,7 +1910,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
                      frameless_WidgetFlag),
                  "bmed.heading");
     iWidget *headings, *values;
-    addChild_Widget(dlg, iClob(makeTwoColumnWidget_(&headings, &values)));
+    addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
     iInputWidget *inputs[4];
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.title}", "bmed.title", iClob(inputs[0] = new_InputWidget(0)));
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.url}",   "bmed.url",   iClob(inputs[1] = new_InputWidget(0)));
@@ -1917,7 +1919,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
     addDialogInputWithHeading_(headings, values, "${dlg.bookmark.icon}",  "bmed.icon",  iClob(inputs[3] = new_InputWidget(1)));
     /* Buttons for special tags. */
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-    addChild_Widget(dlg, iClob(makeTwoColumnWidget_(&headings, &values)));
+    addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
     makeTwoColumnHeading_("SPECIAL TAGS", headings, values);
     addChild_Widget(headings, iClob(makeHeading_Widget("${bookmark.tag.home}")));
     addChild_Widget(values, iClob(makeToggle_Widget("bmed.tag.home")));
@@ -2048,7 +2050,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
                      frameless_WidgetFlag),
                  "feedcfg.heading");
     iWidget *headings, *values;
-    addChild_Widget(dlg, iClob(makeTwoColumnWidget_(&headings, &values)));
+    addChild_Widget(dlg, iClob(makeTwoColumns_Widget(&headings, &values)));
     iInputWidget *input = new_InputWidget(0);
     addDialogInputWithHeading_(headings, values, "${dlg.feed.title}", "feedcfg.title", iClob(input));
     addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.feed.entrytype}")));
@@ -2223,7 +2225,7 @@ iWidget *makeTranslation_Widget(iWidget *parent) {
     addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
     iWidget *headings, *values;
     iWidget *page;
-    addChild_Widget(dlg, iClob(page = makeTwoColumnWidget_(&headings, &values)));
+    addChild_Widget(dlg, iClob(page = makeTwoColumns_Widget(&headings, &values)));
     setId_Widget(page, "xlt.langs");
     iLabelWidget *fromLang, *toLang;
     /* Source language. */ {
diff --git a/src/ui/util.h b/src/ui/util.h
index 43aeb172..5b02a4b3 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -242,6 +242,8 @@ iLabelWidget *  makeMenuButton_LabelWidget  (const char *label, const iMenuItem
 
 iWidget *       makeTabs_Widget         (iWidget *parent);
 void            appendTabPage_Widget    (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);
+iWidget *       appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int shortcut, iWidget **headings,
+                                              iWidget **values);
 void            prependTabPage_Widget   (iWidget *tabs, iWidget *page, const char *label, int key, int kmods);
 iWidget *       removeTabPage_Widget    (iWidget *tabs, size_t index); /* returns the page */
 void            resizeToLargestPage_Widget  (iWidget *tabs);
@@ -258,7 +260,9 @@ size_t          tabCount_Widget         (const iWidget *tabs);
 /*-----------------------------------------------------------------------------------------------*/
 
 iWidget *   makeSheet_Widget            (const char *id);
+void        useSheetStyle_Widget        (iWidget *);
 iWidget *   makeDialogButtons_Widget    (const iMenuItem *actions, size_t numActions);
+iWidget *   makeTwoColumns_Widget       (iWidget **headings, iWidget **values);
 
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
                                                   const char *labelText, const char *inputId,