Dialog buttons on the right

Follow typical GUI conventions by placing dialog buttons on the right edge. This leaves space for additional actions on the left.

6 files changed, 174 insertions, 53 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7e7ac79f..69461901 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1645,10 +1645,8 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iFalse;
     }
     else if (equal_Command(cmd, "document.info") && d == document_App()) {
-        const char *unchecked      = red_ColorEscape "\u2610";
-        const char *checked        = green_ColorEscape "\u2611";
-        const char *actionLabels[] = { uiTextCaution_ColorEscape "Trust", "Copy Fingerprint", "Dismiss" };
-        const char *actionCmds[]   = { "server.trustcert", "server.copycert", "message.ok" };
+        const char *unchecked       = red_ColorEscape "\u2610";
+        const char *checked         = green_ColorEscape "\u2611";
         const iBool haveFingerprint = (d->certFlags & haveFingerprint_GmCertFlag) != 0;
         const iBool canTrust =
             (d->certFlags == (available_GmCertFlag | haveFingerprint_GmCertFlag |
@@ -1692,11 +1690,23 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                       uiText_ColorEscape,
                       d->certFlags & trusted_GmCertFlag ? "Trusted" : "Not trusted");
         setFocus_Widget(NULL);
+        iArray *items = new_Array(sizeof(iMenuItem));
+        if (canTrust) {
+            pushBack_Array(
+                items, &(iMenuItem){ uiTextCaution_ColorEscape "Trust", 0, 0, "server.trustcert" });
+        }
+        if (haveFingerprint) {
+            pushBack_Array(items, &(iMenuItem){ "Copy Fingerprint", 0, 0, "server.copycert" });
+        }
+        if (!isEmpty_Array(items)) {
+            pushBack_Array(items, &(iMenuItem){ "---", 0, 0, 0 });
+        }
+        pushBack_Array(items, &(iMenuItem){ "Dismiss", 0, 0, "message.ok" });
         iWidget *dlg = makeQuestion_Widget(uiHeading_ColorEscape "PAGE INFORMATION",
                                            cstr_String(msg),
-                                           actionLabels + (canTrust ? 0 : haveFingerprint ? 1 : 2),
-                                           actionCmds + (canTrust ? 0 : haveFingerprint ? 1 : 2),
-                                           canTrust ? 3 : haveFingerprint ? 2 : 1);
+                                           data_Array(items),
+                                           size_Array(items));
+        delete_Array(items);
         /* Enforce a minimum size. */
         iWidget *sizer = new_Widget();
         setSize_Widget(sizer, init_I2(gap_UI * 90, 1));
@@ -2072,11 +2082,18 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 makeQuestion_Widget(
                     uiHeading_ColorEscape "IMPORT BOOKMARKS",
                     format_CStr("Found %d new link%s on the page.", size_PtrArray(links), plural),
-                    (const char *[]){ "Cancel",
-                                      format_CStr(uiTextAction_ColorEscape "Add %d Bookmark%s",
-                                                  size_PtrArray(links), plural) },
-                    (const char *[]){ "cancel", "bookmark.links" },
+                    (iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                   { format_CStr(uiTextAction_ColorEscape "Add %d Bookmark%s",
+                                                 size_PtrArray(links),
+                                                 plural), 0, 0, "bookmark.links" } },
                     2);
+
+                //                    (const char *[]){ "Cancel",
+                //                                      format_CStr(uiTextAction_ColorEscape "Add %d
+                //                                      Bookmark%s",
+                //                                                  size_PtrArray(links), plural) },
+                //                    (const char *[]){ "cancel", "bookmark.links" },
+                //                    2);
             }
             else {
                 iConstForEach(PtrArray, j, links) {
@@ -2669,9 +2686,10 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                 "Open this link in the default browser?\n" uiTextAction_ColorEscape
                                 "%s",
                                 cstr_String(url)),
-                            (const char *[]){ "Cancel", uiTextCaution_ColorEscape "Open Link" },
-                            (const char *[]){
-                                "cancel", format_CStr("!open default:1 url:%s", cstr_String(url)) },
+                            (iMenuItem[]){
+                                { "Cancel", 0, 0, NULL },
+                                { uiTextCaution_ColorEscape "Open Link",
+                                  0, 0, format_CStr("!open default:1 url:%s", cstr_String(url)) } },
                             2);
                     }
                 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5441381a..24ace92a 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -937,11 +937,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                 uiTextCaution_ColorEscape "UNSUBSCRIBE",
                                 format_CStr("Really unsubscribe from feed\n\"%s\"?",
                                             cstr_String(&feedBookmark->title)),
-                                (const char *[]){ "Cancel",
-                                                  uiTextCaution_ColorEscape "Unsubscribe" },
-                                (const char *[]){
-                                    "cancel",
-                                    format_CStr("!feed.entry.unsubscribe arg:1 ptr:%p", d) },
+                                (iMenuItem[]){
+                                    { "Cancel", 0, 0, NULL },
+                                    { uiTextCaution_ColorEscape "Unsubscribe",
+                                      0,
+                                      0,
+                                      format_CStr("!feed.entry.unsubscribe arg:1 ptr:%p", d) } },
                                 2);
                         }
                         return iTrue;
@@ -1026,9 +1027,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         "%s\n" uiText_ColorEscape
                         "including its certificate and private key files?",
                         cstr_String(&item->label)),
-                    (const char *[]){ "Cancel",
-                                      uiTextCaution_ColorEscape "Delete Identity and Files" },
-                    (const char *[]){ "cancel", format_CStr("!ident.delete confirm:0 ptr:%p", d) },
+                    (iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                   { uiTextCaution_ColorEscape "Delete Identity and Files",
+                                     0, 0, format_CStr("!ident.delete confirm:0 ptr:%p", d) } },
                     2);
                 return iTrue;
             }
@@ -1063,12 +1064,12 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         }
         else if (equal_Command(cmd, "history.clear")) {
             if (argLabel_Command(cmd, "confirm")) {
-                makeQuestion_Widget(
-                    uiTextCaution_ColorEscape "CLEAR HISTORY",
-                    "Do you really want to erase the history of all visited pages?",
-                    (const char *[]){ "Cancel", uiTextCaution_ColorEscape "Clear History" },
-                    (const char *[]){ "cancel", "history.clear confirm:0" },
-                    2);
+                makeQuestion_Widget(uiTextCaution_ColorEscape "CLEAR HISTORY",
+                                    "Do you really want to erase the history of all visited pages?",
+                                    (iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                                   { uiTextCaution_ColorEscape "Clear History",
+                                                     0, 0, "history.clear confirm:0" } },
+                                    2);
             }
             else {
                 clear_Visited(visited_App());
diff --git a/src/ui/util.c b/src/ui/util.c
index 7da68fa5..c2ac41fa 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -823,7 +823,8 @@ iWidget *makeSheet_Widget(const char *id) {
     setFrameColor_Widget(sheet, uiSeparator_ColorId);
     setBackgroundColor_Widget(sheet, uiBackground_ColorId);
     setFlags_Widget(sheet,
-                    focusRoot_WidgetFlag | mouseModal_WidgetFlag | keepOnTop_WidgetFlag |
+                    parentCannotResize_WidgetFlag |
+                        focusRoot_WidgetFlag | mouseModal_WidgetFlag | keepOnTop_WidgetFlag |
                         arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
                         centerHorizontal_WidgetFlag | overflowScrollable_WidgetFlag,
                     iTrue);
@@ -831,7 +832,7 @@ iWidget *makeSheet_Widget(const char *id) {
 }
 
 void centerSheet_Widget(iWidget *sheet) {
-    arrange_Widget(sheet->parent);
+    arrange_Widget(sheet);
     postRefresh_App();
 }
 
@@ -919,11 +920,62 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     return iFalse;
 }
 
+static iWidget *makeDialogButtons_(const iMenuItem *actions, size_t numActions) {
+    iWidget *div = new_Widget();
+    setFlags_Widget(div,
+                    arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
+                        resizeToParentWidth_WidgetFlag |
+                        resizeWidthOfChildren_WidgetFlag,
+                    iTrue);
+    /* If there is no separator, align everything to the right. */
+    iBool haveSep = iFalse;
+    for (size_t i = 0; i < numActions; i++) {
+        if (!iCmpStr(actions[i].label, "---")) {
+            haveSep = iTrue;
+            break;
+        }
+    }
+    if (!haveSep) {
+        addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
+    }
+    for (size_t i = 0; i < numActions; i++) {
+        const char *label     = actions[i].label;
+        const char *cmd       = actions[i].command;
+        int         key       = actions[i].key;
+        int         kmods     = actions[i].kmods;
+        const iBool isDefault = (i == numActions - 1);
+        if (!iCmpStr(label, "---")) {
+            /* Separator.*/
+            addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
+            continue;
+        }
+        if (!iCmpStr(label, "Cancel") && !cmd) {
+            cmd = "cancel";
+            key = SDLK_ESCAPE;
+            kmods = 0;
+        }
+        if (isDefault) {
+            if (!key) {
+                key = SDLK_RETURN;
+                kmods = 0;
+            }
+            if (label == NULL) {
+                label = uiTextAction_ColorEscape " OK ";
+            }
+        }
+        iLabelWidget *button =
+            addChild_Widget(div, iClob(newKeyMods_LabelWidget(actions[i].label, key, kmods, cmd)));
+        if (isDefault) {
+            setFont_LabelWidget(button, uiLabelBold_FontId);
+        }
+    }
+    return div;
+}
+
 iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, const char *title,
                                const char *prompt, const char *acceptLabel, const char *command) {
     if (parent) {
         setFocus_Widget(NULL);
-//        processEvents_App(postedEventsOnly_AppEventMode);
     }
     iWidget *dlg = makeSheet_Widget(command);
     setCommandHandler_Widget(dlg, valueInputHandler_);
@@ -943,18 +995,24 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     setId_Widget(as_Widget(input), "input");
     updateValueInputWidth_(dlg);
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
-    iWidget *div = new_Widget(); {
-        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
-        addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        iLabelWidget *accept = addChild_Widget(
-            div,
-            iClob(newKeyMods_LabelWidget(acceptLabel ? acceptLabel : uiTextAction_ColorEscape "OK",
-                                         SDLK_RETURN,
-                                         0,
-                                         "valueinput.accept")));
-        setFont_LabelWidget(accept, uiLabelBold_FontId);
-    }
-    addChild_Widget(dlg, iClob(div));
+//    iWidget *div = new_Widget(); {
+//        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
+//                        arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag, iTrue);
+//        addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag);
+//        addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
+//        iLabelWidget *accept = addChild_Widget(
+//            div,
+//            iClob(newKeyMods_LabelWidget(acceptLabel ? acceptLabel : uiTextAction_ColorEscape "OK",
+//                                         SDLK_RETURN,
+//                                         0,
+//                                         "valueinput.accept")));
+//        setFont_LabelWidget(accept, uiLabelBold_FontId);
+//    }
+    addChild_Widget(
+        dlg,
+        iClob(makeDialogButtons_(
+            (iMenuItem[]){ { "Cancel", 0, 0, NULL }, { acceptLabel, 0, 0, "valueinput.accept" } },
+            2)));
     centerSheet_Widget(dlg);
     if (parent) {
         setFocus_Widget(as_Widget(input));
@@ -980,24 +1038,25 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
 }
 
 iWidget *makeMessage_Widget(const char *title, const char *msg) {
-    iWidget *dlg = makeQuestion_Widget(
-        title, msg, (const char *[]){ "Continue" }, (const char *[]){ "message.ok" }, 1);
+    iWidget *dlg =
+        makeQuestion_Widget(title, msg, (iMenuItem[]){ { "Continue", 0, 0, "message.ok" } }, 1);
     addAction_Widget(dlg, SDLK_ESCAPE, 0, "message.ok");
     addAction_Widget(dlg, SDLK_SPACE, 0, "message.ok");
     return dlg;
 }
 
-iWidget *makeQuestion_Widget(const char *title, const char *msg, const char *labels[],
-                             const char *commands[], size_t count) {
+iWidget *makeQuestion_Widget(const char *title, const char *msg,
+                             const iMenuItem *items, size_t numItems) {
     processEvents_App(postedEventsOnly_AppEventMode);
     iWidget *dlg = makeSheet_Widget("");
     setCommandHandler_Widget(dlg, messageHandler_);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
     addChildFlags_Widget(dlg, iClob(new_LabelWidget(msg, NULL)), frameless_WidgetFlag);
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
+#if 0
     iWidget *div = new_Widget(); {
-        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
-        for (size_t i = 0; i < count; ++i) {
+        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag, iTrue);
+        for (size_t i = 0; i < numItems; ++i) {
             /* The last one is the default option. */
             const int     key = (i == count - 1 ? SDLK_RETURN : 0);
             iLabelWidget *btn =
@@ -1008,7 +1067,11 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg, const char *lab
         }
     }
     addChild_Widget(dlg, iClob(div));
+#endif
+    iWidget *buttons = addChild_Widget(dlg, iClob(makeDialogButtons_(items, numItems)));
     addChild_Widget(get_Window()->root, iClob(dlg));
+    arrange_Widget(dlg); /* BUG: This extra arrange shouldn't be needed but the dialog won't
+                            be arranged correctly unless it's here. */
     centerSheet_Widget(dlg);
     return dlg;
 }
@@ -1268,6 +1331,7 @@ iWidget *makePreferences_Widget(void) {
         expandInputFieldWidth_(findChild_Widget(tabs, "prefs.proxy.gopher"));
         expandInputFieldWidth_(findChild_Widget(tabs, "prefs.proxy.http"));
     }
+#if 0
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         setFont_LabelWidget(
@@ -1276,6 +1340,10 @@ iWidget *makePreferences_Widget(void) {
             uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
+#endif
+    addChild_Widget(dlg,
+                    iClob(makeDialogButtons_(
+                        (iMenuItem[]){ { "Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);    
     return dlg;
@@ -1307,6 +1375,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
     for (int i = 0; i < 3; ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     }
+#if 0
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
@@ -1317,6 +1386,15 @@ iWidget *makeBookmarkEditor_Widget(void) {
         setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
+#endif
+    addChild_Widget(
+        dlg,
+        iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                                { uiTextCaution_ColorEscape "Save Bookmark",
+                                                  SDLK_RETURN,
+                                                  KMOD_PRIMARY,
+                                                  "bmed.accept" } },
+                                 2)));
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);
     return dlg;
@@ -1440,6 +1518,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         addRadioButton_(types, "feedcfg.type.headings", "New Headings", "feedcfg.type arg:1");
     }
     addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+#if 0
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
@@ -1454,6 +1533,18 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
         setFont_LabelWidget(findChild_Widget(div, "feedcfg.save"), uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
+#endif
+    iWidget *buttons =
+        addChild_Widget(dlg,
+                        iClob(makeDialogButtons_(
+                            (iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                           { bookmarkId ? uiTextCaution_ColorEscape "Save Settings"
+                                                        : uiTextCaution_ColorEscape "Subscribe",
+                                             SDLK_RETURN,
+                                             KMOD_PRIMARY,
+                                             format_CStr("feedcfg.accept bmid:%d", bookmarkId) } },
+                            2)));
+    setId_Widget(child_Widget(buttons, childCount_Widget(buttons) - 1), "feedcfg.save");
     arrange_Widget(dlg);
     as_Widget(input)->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -1525,6 +1616,7 @@ iWidget *makeIdentityCreation_Widget(void) {
     for (size_t i = 0; i < iElemCount(inputs); ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     }
+#if 0
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
@@ -1535,6 +1627,15 @@ iWidget *makeIdentityCreation_Widget(void) {
         setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
+#endif
+    addChild_Widget(
+        dlg,
+        iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL },
+                                                { uiTextAction_ColorEscape "Create Identity",
+                                                  SDLK_RETURN,
+                                                  KMOD_PRIMARY,
+                                                  "ident.accept" } },
+                                 2)));
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);
     return dlg;
diff --git a/src/ui/util.h b/src/ui/util.h
index 829a9c74..96e08e95 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -199,7 +199,7 @@ iWidget *   makeValueInput_Widget   (iWidget *parent, const iString *initialValu
 void        updateValueInput_Widget (iWidget *, const char *title, const char *prompt);
 iWidget *   makeMessage_Widget      (const char *title, const char *msg);
 iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
-                                     const char *labels[], const char *commands[], size_t count);
+                                     const iMenuItem *items, size_t numItems);
 
 iWidget *   makePreferences_Widget      (void);
 iWidget *   makeBookmarkEditor_Widget   (void);
diff --git a/src/ui/widget.c b/src/ui/widget.c
index c0e2feda..bab35d8d 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -369,8 +369,8 @@ void arrange_Widget(iWidget *d) {
             avail = divi_I2(max_I2(zero_I2(), avail), expCount);
             iForEach(ObjectList, j, d->children) {
                 iWidget *child = as_Widget(j.object);
-                if (isCollapsed_Widget_(child)) continue;
-                if (child->flags & fixedPosition_WidgetFlag) {
+                if (isCollapsed_Widget_(child) ||
+                    child->flags & (parentCannotResize_WidgetFlag | fixedPosition_WidgetFlag)) {
                     continue;
                 }
                 if (child->flags & expand_WidgetFlag) {
@@ -405,7 +405,7 @@ void arrange_Widget(iWidget *d) {
             }
             iForEach(ObjectList, i, d->children) {
                 iWidget *child = as_Widget(i.object);
-                if (!isCollapsed_Widget_(child)) {
+                if (!isCollapsed_Widget_(child) && ~child->flags & parentCannotResize_WidgetFlag) {
                     if (dirs.x) setWidth_Widget_(child, childSize.x);
                     if (dirs.y) setHeight_Widget_(child, childSize.y);
                 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 02ee091f..0de0890b 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -98,6 +98,7 @@ enum iWidgetFlag {
 #define drawBackgroundToHorizontalSafeArea_WidgetFlag   iBit64(43)
 #define drawBackgroundToVerticalSafeArea_WidgetFlag     iBit64(44)
 #define visualOffset_WidgetFlag             iBit64(45)
+#define parentCannotResize_WidgetFlag       iBit64(46)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,