3 files changed, 28 insertions, 19 deletions

diff --git a/src/ui/certimportwidget.c b/src/ui/certimportwidget.c
index c0f041b9..0c1cf674 100644
--- a/src/ui/certimportwidget.c
+++ b/src/ui/certimportwidget.c
@@ -151,17 +151,18 @@ void init_CertImportWidget(iCertImportWidget *d) {
     setSize_Widget(as_Widget(d->crtLabel), init_I2(width_Widget(w) - 6.5 * gap_UI, gap_UI * 12));
     setSize_Widget(as_Widget(d->keyLabel), init_I2(width_Widget(w) - 6.5 * gap_UI, gap_UI * 12));
     /* Buttons. */
-    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(
-                uiTextAction_ColorEscape "Import", SDLK_RETURN, KMOD_PRIMARY, "certimport.accept")));
-        setFont_LabelWidget(accept, uiLabelBold_FontId);
-    }
-    addChild_Widget(w, iClob(div));
+    addChild_Widget(w, iClob(makePadding_Widget(gap_UI)));
+    iWidget *buttons = makeDialogButtons_Widget(
+        (iMenuItem[]){
+            { "Cancel", 0, 0, NULL },
+            { uiTextAction_ColorEscape "Import", SDLK_RETURN, KMOD_PRIMARY, "certimport.accept" } },
+        2);
+    addChild_Widget(w, iClob(buttons));
     arrange_Widget(w);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        /* Try auto-pasting. */
+        postCommand_App("certimport.paste");
+    }
 }
 
 void deinit_CertImportWidget(iCertImportWidget *d) {
@@ -186,14 +187,17 @@ void setPageContent_CertImportWidget(iCertImportWidget *d, const iBlock *content
     arrange_Widget(as_Widget(d));
 }
 
+static iBool tryImportFromClipboard_CertImportWidget_(iCertImportWidget *d) {
+    return tryImport_CertImportWidget_(d, collect_Block(newCStr_Block(SDL_GetClipboardText())));
+}
+
 static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     if (ev->type == SDL_KEYDOWN) {
         const int key  = ev->key.keysym.sym;
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         if (key == SDLK_v && mods == KMOD_PRIMARY) {
-            if (!tryImport_CertImportWidget_(
-                    d, collect_Block(newCStr_Block(SDL_GetClipboardText())))) {
+            if (!tryImportFromClipboard_CertImportWidget_(d)) {
                 makeMessage_Widget(uiTextCaution_ColorEscape "PASTED FROM CLIPBOARD",
                                    "No certificate or private key was found.");
             }
@@ -201,6 +205,10 @@ static iBool processEvent_CertImportWidget_(iCertImportWidget *d, const SDL_Even
             return iTrue;
         }
     }
+    if (isCommand_UserEvent(ev, "certimport.paste")) {
+        tryImportFromClipboard_CertImportWidget_(d);
+        return iTrue;
+    }
     if (isCommand_Widget(w, ev, "cancel")) {
         destroy_Widget(w);
         return iTrue;
diff --git a/src/ui/util.c b/src/ui/util.c
index 934a6d9b..055191c7 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -939,7 +939,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     return iFalse;
 }
 
-static iWidget *makeDialogButtons_(const iMenuItem *actions, size_t numActions) {
+iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
     iWidget *div = new_Widget();
     setFlags_Widget(div,
                     arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
@@ -1016,7 +1016,7 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
     addChild_Widget(
         dlg,
-        iClob(makeDialogButtons_(
+        iClob(makeDialogButtons_Widget(
             (iMenuItem[]){ { "Cancel", 0, 0, NULL }, { acceptLabel, 0, 0, "valueinput.accept" } },
             2)));
     centerSheet_Widget(dlg);
@@ -1062,7 +1062,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
     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)));
-    addChild_Widget(dlg, iClob(makeDialogButtons_(items, numItems)));
+    addChild_Widget(dlg, iClob(makeDialogButtons_Widget(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. */
@@ -1347,7 +1347,7 @@ iWidget *makePreferences_Widget(void) {
         expandInputFieldWidth_(findChild_Widget(tabs, "prefs.proxy.http"));
     }
     addChild_Widget(dlg,
-                    iClob(makeDialogButtons_(
+                    iClob(makeDialogButtons_Widget(
                         (iMenuItem[]){ { "Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(get_Window()->root, iClob(dlg));
     centerSheet_Widget(dlg);
@@ -1384,7 +1384,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
     }
     addChild_Widget(
         dlg,
-        iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL },
+        iClob(makeDialogButtons_Widget((iMenuItem[]){ { "Cancel", 0, 0, NULL },
                                                 { uiTextCaution_ColorEscape "Save Bookmark",
                                                   SDLK_RETURN,
                                                   KMOD_PRIMARY,
@@ -1518,7 +1518,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
     addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *buttons =
         addChild_Widget(dlg,
-                        iClob(makeDialogButtons_(
+                        iClob(makeDialogButtons_Widget(
                             (iMenuItem[]){ { "Cancel", 0, 0, NULL },
                                            { bookmarkId ? uiTextCaution_ColorEscape "Save Settings"
                                                         : uiTextCaution_ColorEscape "Subscribe",
@@ -1600,7 +1600,7 @@ iWidget *makeIdentityCreation_Widget(void) {
     }
     addChild_Widget(
         dlg,
-        iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL },
+        iClob(makeDialogButtons_Widget((iMenuItem[]){ { "Cancel", 0, 0, NULL },
                                                 { uiTextAction_ColorEscape "Create Identity",
                                                   SDLK_RETURN,
                                                   KMOD_PRIMARY,
diff --git a/src/ui/util.h b/src/ui/util.h
index 9e45f369..40fd0c69 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -194,6 +194,7 @@ size_t          tabCount_Widget         (const iWidget *tabs);
 
 iWidget *   makeSheet_Widget        (const char *id);
 void        centerSheet_Widget      (iWidget *sheet);
+iWidget *   makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions);
 
 void        makeFilePath_Widget     (iWidget *parent, const iString *initialPath, const char *title,
                                      const char *acceptLabel, const char *command);