Mobile: Revised more dialogs

6 files changed, 156 insertions, 86 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index b84e17f4..03595d1a 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -551,10 +551,12 @@ void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
 }
 
 void updateTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
-    setCStr_String(&d->label, text);
-    set_String(&d->srcLabel, &d->label);
-    replaceVariables_LabelWidget_(d);
-    refresh_Widget(&d->widget);
+    if (d) {
+        setCStr_String(&d->label, text);
+        set_String(&d->srcLabel, &d->label);
+        replaceVariables_LabelWidget_(d);
+        refresh_Widget(&d->widget);
+    }
 }
 
 void updateTextAndResizeWidthCStr_LabelWidget(iLabelWidget *d, const char *text) {
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index f3e23e06..daa1fa1a 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -498,16 +498,18 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
     }
     else if (equal_Command(spec, "button")) {
         widget = as_Widget(heading = makePanelButton_(label, item->command));
+        setFlags_Widget(widget, selected_WidgetFlag, argLabel_Command(spec, "selected") != 0);
     }
     else if (equal_Command(spec, "label")) {
         iLabelWidget *lab = new_LabelWidget(label, NULL);
         widget = as_Widget(lab);
         setWrap_LabelWidget(lab, iTrue);
-        setFlags_Widget(widget, frameless_WidgetFlag, iTrue);
+        setFlags_Widget(widget, fixedHeight_WidgetFlag | frameless_WidgetFlag, iTrue);
     }
     else if (equal_Command(spec, "padding")) {
         widget = makePadding_Widget(lineHeight_Text(labelFont_()) * 1.5f);
     }
+    /* Apply common styling to the heading. */
     if (heading) {
         setRemoveTrailingColon_LabelWidget(heading, iTrue);
         const iChar icon = toInt_String(string_Command(item->label, "icon"));
@@ -536,7 +538,7 @@ static const iMenuItem *findDialogCancelAction_(const iMenuItem *items, size_t n
     if (n <= 1) {
         return NULL;
     }
-    for (size_t i = 0; i < n - 1; i++) {
+    for (size_t i = 0; i < n; i++) {
         if (!iCmpStr(items[i].label, "${cancel}")) {
             return &items[i];
         }
@@ -547,6 +549,13 @@ static const iMenuItem *findDialogCancelAction_(const iMenuItem *items, size_t n
 iWidget *makePanels_Mobile(const char *id,
                            const iMenuItem *itemsNullTerminated,
                            const iMenuItem *actions, size_t numActions) {
+    return makePanelsParent_Mobile(get_Root()->widget, id, itemsNullTerminated, actions, numActions);
+}
+
+iWidget *makePanelsParent_Mobile(iWidget *parentWidget,
+                                 const char *id,
+                                 const iMenuItem *itemsNullTerminated,
+                                 const iMenuItem *actions, size_t numActions) {
     /* A multipanel widget has a top panel and one or more detail panels. In a horizontal layout,
        the detail panels slide in from the right and cover the top panel. In a landscape layout,
        the detail panels are always visible on the side. */
@@ -637,7 +646,7 @@ iWidget *makePanels_Mobile(const char *id,
         const iMenuItem *cancelItem = findDialogCancelAction_(actions, numActions);
         const iMenuItem *defaultItem = &actions[numActions - 1];
         iAssert(defaultItem);
-        if (!cancelItem) {
+        if (defaultItem && !cancelItem) {
             updateTextCStr_LabelWidget(naviBack, defaultItem->label);
             setCommand_LabelWidget(naviBack, collectNewCStr_String(defaultItem->command));
             setFlags_Widget(as_Widget(naviBack), alignLeft_WidgetFlag, iFalse);
@@ -645,7 +654,7 @@ iWidget *makePanels_Mobile(const char *id,
             setIcon_LabelWidget(naviBack, 0);
             setFont_LabelWidget(naviBack, labelBoldFont_());            
         }
-        else {
+        else if (defaultItem && defaultItem != cancelItem) {
             updateTextCStr_LabelWidget(naviBack, cancelItem->label);
             setCommand_LabelWidget(naviBack, collectNewCStr_String(cancelItem->command
                                                                     ? cancelItem->command
@@ -667,8 +676,12 @@ iWidget *makePanels_Mobile(const char *id,
             if (act == cancelItem || act == defaultItem) {
                 continue;
             }
-            if (!iCmpStr(act->label, "---")) {
-                continue;
+            const char *label = act->label;
+            if (*label == '*' || *label == '&') {
+                continue; /* Special value selection items for a Question dialog. */
+            }
+            if (!iCmpStr(label, "---")) {
+                continue; /* Separator. */
             }
             if (needPadding) {
                 makePanelItem_Mobile(topPanel, &(iMenuItem){ "padding" });
@@ -680,7 +693,7 @@ iWidget *makePanels_Mobile(const char *id,
         }
     }
     /* Finalize the layout. */
-    addChild_Widget(sheet->root->widget, iClob(sheet));
+    addChild_Widget(parentWidget, iClob(sheet));
     mainDetailSplitHandler_(mainDetailSplit, "window.resized"); /* make it resize the split */
     updatePanelSheetMetrics_(sheet);
     arrange_Widget(sheet);
diff --git a/src/ui/mobile.h b/src/ui/mobile.h
index 4d742a0a..30679c7c 100644
--- a/src/ui/mobile.h
+++ b/src/ui/mobile.h
@@ -31,7 +31,11 @@ iBool       isUsingPanelLayout_Mobile   (void);
 iWidget *   makePanels_Mobile           (const char *id,
                                          const iMenuItem *itemsNullTerminated,
                                          const iMenuItem *actions, size_t numActions);
-    
+iWidget *   makePanelsParent_Mobile     (iWidget *parent,
+                                         const char *id,                                         
+                                         const iMenuItem *itemsNullTerminated,
+                                         const iMenuItem *actions, size_t numActions);
+
 void        setupMenuTransition_Mobile  (iWidget *menu, iBool isIncoming);
 void        setupSheetTransition_Mobile (iWidget *sheet, iBool isIncoming);
 
diff --git a/src/ui/translation.c b/src/ui/translation.c
index 3ffa961b..cef68dce 100644
--- a/src/ui/translation.c
+++ b/src/ui/translation.c
@@ -424,19 +424,18 @@ static iBool processResult_Translation_(iTranslation *d) {
 }
 
 static iLabelWidget *acceptButton_Translation_(const iTranslation *d) {
-    iWidget *buttonParent = findChild_Widget(d->dlg, "dialogbuttons");
-//    if (!buttonParent) {
-//        buttonParent = findChild_Widget(d->dlg, "panel.back");
-//    }
-    return (iLabelWidget *) lastChild_Widget(buttonParent);
+    return dialogAcceptButton_Widget(d->dlg);
 }
 
 iBool handleCommand_Translation(iTranslation *d, const char *cmd) {
     iWidget *w = as_Widget(d->doc);
     if (equalWidget_Command(cmd, w, "translation.submit")) {
         if (status_TlsRequest(d->request) == initialized_TlsRequestStatus) {
-            iWidget *langs = findChild_Widget(d->dlg, "xlt.langs");
-            setFlags_Widget(langs, hidden_WidgetFlag, iTrue);
+            iWidget *langs = findChild_Widget(d->dlg, "xlt.langs");            
+//            setFlags_Widget(langs, hidden_WidgetFlag, iTrue);
+            setFlags_Widget(findChild_Widget(d->dlg, "xlt.from"), hidden_WidgetFlag, iTrue);
+            setFlags_Widget(findChild_Widget(d->dlg, "xlt.to"),   hidden_WidgetFlag, iTrue);
+            if (!langs) langs = d->dlg;
             iLabelWidget *acceptButton = acceptButton_Translation_(d);
             updateTextCStr_LabelWidget(acceptButton, "00:00");
             setFlags_Widget(as_Widget(acceptButton), disabled_WidgetFlag, iTrue);
diff --git a/src/ui/util.c b/src/ui/util.c
index abe6f22e..6df4e980 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1394,6 +1394,28 @@ iWidget *makeMessage_Widget(const char *title, const char *msg, const iMenuItem
 iWidget *makeQuestion_Widget(const char *title, const char *msg,
                              const iMenuItem *items, size_t numItems) {
     processEvents_App(postedEventsOnly_AppEventMode);
+    if (isUsingPanelLayout_Mobile()) {
+        iArray *panelItems = collectNew_Array(sizeof(iMenuItem));
+        pushBackN_Array(panelItems, (iMenuItem[]){
+            { format_CStr("title text:%s", title) },
+            { format_CStr("label text:%s", msg) },
+            { NULL }
+        }, 3);
+        for (size_t i = 0; i < numItems; i++) {
+            const iMenuItem *item = &items[i];
+            const char first = item->label[0];
+            if (first == '*' || first == '&') {
+                insert_Array(panelItems, size_Array(panelItems) - 1,
+                             &(iMenuItem){ format_CStr("button selected:%d text:%s",
+                                                       first == '&' ? 1 : 0, item->label + 1),
+                                           0, 0, item->command });
+            }
+        }
+        iWidget *dlg = makePanels_Mobile("", data_Array(panelItems), items, numItems);
+        setCommandHandler_Widget(dlg, messageHandler_);
+        setupSheetTransition_Mobile(dlg, iTrue);
+        return dlg;
+    }
     iWidget *dlg = makeSheet_Widget("");
     setCommandHandler_Widget(dlg, messageHandler_);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
@@ -1485,6 +1507,15 @@ iWidget *makeTwoColumns_Widget(iWidget **headings, iWidget **values) {
     return page;
 }
 
+iLabelWidget *dialogAcceptButton_Widget(const iWidget *d) {
+    iWidget *buttonParent = findChild_Widget(d, "dialogbuttons");
+    if (!buttonParent) {
+        iAssert(isUsingPanelLayout_Mobile());
+        buttonParent = findChild_Widget(d, "panel.back");
+    }
+    return (iLabelWidget *) lastChild_Widget(buttonParent);
+}
+
 iWidget *appendTwoColumnTabPage_Widget(iWidget *tabs, const char *title, int shortcut, iWidget **headings,
                                        iWidget **values) {
     /* TODO: Use `makeTwoColumnWidget_()`, see above. */
@@ -2408,25 +2439,25 @@ iWidget *makeIdentityCreation_Widget(void) {
     };
     iWidget *dlg;
     if (isUsingPanelLayout_Mobile()) {
-        dlg = makePanels_Mobile("ident",
-                                (iMenuItem[]){ { "title id:ident.heading text:${heading.newident}" },
-                                               { "label text:${dlg.newident.rsa.selfsign}" },
-                                               { "dropdown id:ident.scope text:${dlg.newident.scope}", 0, 0,
-                                                 (const void *) scopeItems },
-                                               { "input id:ident.until hint:hint.newident.date maxlen:19 text:${dlg.newident.until}" },
-                                               //{ "padding" },
-                                               //{ "toggle id:ident.temp text:${dlg.newident.temp}" },
-                                               //{ "label text:${help.ident.temp}" },
-                                               { "heading id:dlg.newident.commonname" },
-                                               { "input id:ident.common noheading:1" },
-                                               { "padding collapse:1" },
-                                               { "input collapse:1 id:ident.email hint:hint.newident.optional text:${dlg.newident.email}" },
-                                               { "input collapse:1 id:ident.userid hint:hint.newident.optional text:${dlg.newident.userid}" },
-                                               { "input collapse:1 id:ident.domain hint:hint.newident.optional text:${dlg.newident.domain}" },
-                                               { "input collapse:1 id:ident.org hint:hint.newident.optional text:${dlg.newident.org}" },
-                                               { "input collapse:1 id:ident.country hint:hint.newident.optional text:${dlg.newident.country}" },
-                                               { NULL }
-                                }, actions, iElemCount(actions));
+        dlg = makePanels_Mobile("ident", (iMenuItem[]){
+            { "title id:ident.heading text:${heading.newident}" },
+            { "label text:${dlg.newident.rsa.selfsign}" },
+            { "dropdown id:ident.scope text:${dlg.newident.scope}", 0, 0,
+              (const void *) scopeItems },
+            { "input id:ident.until hint:hint.newident.date maxlen:19 text:${dlg.newident.until}" },
+            //{ "padding" },
+            //{ "toggle id:ident.temp text:${dlg.newident.temp}" },
+            //{ "label text:${help.ident.temp}" },
+            { "heading id:dlg.newident.commonname" },
+            { "input id:ident.common noheading:1" },
+            { "padding collapse:1" },
+            { "input collapse:1 id:ident.email hint:hint.newident.optional text:${dlg.newident.email}" },
+            { "input collapse:1 id:ident.userid hint:hint.newident.optional text:${dlg.newident.userid}" },
+            { "input collapse:1 id:ident.domain hint:hint.newident.optional text:${dlg.newident.domain}" },
+            { "input collapse:1 id:ident.org hint:hint.newident.optional text:${dlg.newident.org}" },
+            { "input collapse:1 id:ident.country hint:hint.newident.optional text:${dlg.newident.country}" },
+            { NULL }
+        }, actions, iElemCount(actions));
         setupSheetTransition_Mobile(dlg, iTrue);
     }
     else {
@@ -2513,6 +2544,7 @@ static const iMenuItem languages[] = {
     { "${lang.pt}", 0, 0, "xlt.lang id:pt" },
     { "${lang.ru}", 0, 0, "xlt.lang id:ru" },
     { "${lang.es}", 0, 0, "xlt.lang id:es" },
+    { NULL }
 };
 
 static iBool translationHandler_(iWidget *dlg, const char *cmd) {
@@ -2529,6 +2561,7 @@ static iBool translationHandler_(iWidget *dlg, const char *cmd) {
 
 const char *languageId_String(const iString *menuItemLabel) {
     iForIndices(i, languages) {
+        if (!languages[i].label) break;
         if (!cmp_String(menuItemLabel, translateCStr_Lang(languages[i].label))) {
             return cstr_Rangecc(range_Command(languages[i].command, "id"));
         }
@@ -2538,6 +2571,7 @@ const char *languageId_String(const iString *menuItemLabel) {
 
 int languageIndex_CStr(const char *langId) {
     iForIndices(i, languages) {
+        if (!languages[i].label) break;
         if (equal_Rangecc(range_Command(languages[i].command, "id"), langId)) {
             return (int) i;
         }
@@ -2546,54 +2580,70 @@ int languageIndex_CStr(const char *langId) {
 }
 
 iWidget *makeTranslation_Widget(iWidget *parent) {
-    iWidget *dlg = makeSheet_Widget("xlt");
-    setFlags_Widget(dlg, keepOnTop_WidgetFlag, iFalse);
-    dlg->minSize.x = 70 * gap_UI;
+    const iMenuItem actions[] = {
+        { "${cancel}", SDLK_ESCAPE, 0, "translation.cancel" },
+        { uiTextAction_ColorEscape "${dlg.translate}", SDLK_RETURN, 0, "translation.submit" }                                   
+    };
+    iWidget *dlg;
+    if (isUsingPanelLayout_Mobile()) {
+        dlg = makePanelsParent_Mobile(parent, "xlt", (iMenuItem[]){
+            { "title id:heading.translate" },
+            { "dropdown id:xlt.from text:${dlg.translate.from}", 0, 0, (const void *) languages },
+            { "dropdown id:xlt.to text:${dlg.translate.to}",     0, 0, (const void *) languages },
+            { NULL }                              
+        }, actions, iElemCount(actions));
+    }
+    else {
+        dlg = makeSheet_Widget("xlt");
+        setFlags_Widget(dlg, keepOnTop_WidgetFlag, iFalse);
+        dlg->minSize.x = 70 * gap_UI;
+        addChildFlags_Widget(
+            dlg,
+            iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.translate}", NULL)),
+            frameless_WidgetFlag);
+        addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
+        iWidget *headings, *values;
+        iWidget *page;
+        addChild_Widget(dlg, iClob(page = makeTwoColumns_Widget(&headings, &values)));
+        setId_Widget(page, "xlt.langs");
+        iLabelWidget *fromLang, *toLang;
+        /* Source language. */ {
+            addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.translate.from}")));
+            setId_Widget(
+                addChildFlags_Widget(values,
+                                     iClob(fromLang = makeMenuButton_LabelWidget(
+                                               "${lang.pt}", languages, iElemCount(languages) - 1)),
+                                     alignLeft_WidgetFlag),
+                "xlt.from");
+            setBackgroundColor_Widget(findChild_Widget(as_Widget(fromLang), "menu"),
+                                      uiBackgroundMenu_ColorId);
+        }
+        /* Target language. */ {
+            addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.translate.to}")));
+            setId_Widget(
+                addChildFlags_Widget(values,
+                                     iClob(toLang = makeMenuButton_LabelWidget(
+                                               "${lang.pt}", languages, iElemCount(languages) - 1)),
+                                     alignLeft_WidgetFlag),
+                "xlt.to");
+            setBackgroundColor_Widget(findChild_Widget(as_Widget(toLang), "menu"),
+                                      uiBackgroundMenu_ColorId);
+        }
+        addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
+        addChild_Widget(dlg, iClob(makeDialogButtons_Widget(actions, iElemCount(actions))));
+        addChild_Widget(parent, iClob(dlg));
+        arrange_Widget(dlg);
+    }
+    /* Update choices. */
+    updateText_LabelWidget(
+        findChild_Widget(dlg, "xlt.from"),
+        text_LabelWidget(child_Widget(findChild_Widget(findChild_Widget(dlg, "xlt.from"), "menu"),
+                                      prefs_App()->langFrom)));
+    updateText_LabelWidget(
+        findChild_Widget(dlg, "xlt.to"),
+        text_LabelWidget(child_Widget(findChild_Widget(findChild_Widget(dlg, "xlt.to"), "menu"),
+                                      prefs_App()->langTo)));
     setCommandHandler_Widget(dlg, translationHandler_);
-    addChildFlags_Widget(dlg,
-                         iClob(new_LabelWidget(uiHeading_ColorEscape "${heading.translate}", NULL)),
-                         frameless_WidgetFlag);
-    addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
-    iWidget *headings, *values;
-    iWidget *page;
-    addChild_Widget(dlg, iClob(page = makeTwoColumns_Widget(&headings, &values)));
-    setId_Widget(page, "xlt.langs");
-    iLabelWidget *fromLang, *toLang;
-    /* Source language. */ {
-        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.translate.from}")));
-        setId_Widget(
-            addChildFlags_Widget(values,
-                                 iClob(fromLang = makeMenuButton_LabelWidget(
-                                           "${lang.pt}", languages, iElemCount(languages))),
-                                 alignLeft_WidgetFlag),
-            "xlt.from");
-        iWidget *langMenu = findChild_Widget(as_Widget(fromLang), "menu");
-        updateText_LabelWidget(fromLang,
-                               text_LabelWidget(child_Widget(langMenu, prefs_App()->langFrom)));
-        setBackgroundColor_Widget(langMenu, uiBackgroundMenu_ColorId);
-    }
-    /* Target language. */ {
-        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.translate.to}")));
-        setId_Widget(addChildFlags_Widget(values,
-                                          iClob(toLang = makeMenuButton_LabelWidget(
-                                                    "${lang.pt}", languages, iElemCount(languages))),
-                                          alignLeft_WidgetFlag),
-                     "xlt.to");
-        iWidget *langMenu = findChild_Widget(as_Widget(toLang), "menu");
-        setBackgroundColor_Widget(langMenu, uiBackgroundMenu_ColorId);
-        updateText_LabelWidget(toLang,
-                               text_LabelWidget(child_Widget(langMenu, prefs_App()->langTo)));
-    }
-    addChild_Widget(dlg, iClob(makePadding_Widget(lineHeight_Text(uiLabel_FontId))));
-    addChild_Widget(
-        dlg,
-        iClob(makeDialogButtons_Widget(
-            (iMenuItem[]){
-                { "${cancel}", SDLK_ESCAPE, 0, "translation.cancel" },
-                { uiTextAction_ColorEscape "${dlg.translate}", SDLK_RETURN, 0, "translation.submit" } },
-            2)));
-    addChild_Widget(parent, iClob(dlg));
-    arrange_Widget(dlg);
-    finalizeSheet_Mobile(dlg);
+    setupSheetTransition_Mobile(dlg, iTrue);
     return dlg;
 }
diff --git a/src/ui/util.h b/src/ui/util.h
index 0dff8978..74a95827 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -272,6 +272,8 @@ void        useSheetStyle_Widget        (iWidget *);
 iWidget *   makeDialogButtons_Widget    (const iMenuItem *actions, size_t numActions);
 iWidget *   makeTwoColumns_Widget       (iWidget **headings, iWidget **values);
 
+iLabelWidget *dialogAcceptButton_Widget (const iWidget *);
+
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
                                                   const char *labelText, const char *inputId,
                                                   iInputWidget *input);