summaryrefslogtreecommitdiff
path: root/src/ui/util.c
diff options
context:
space:
mode:
authorJaakko Keränen <jaakko.keranen@iki.fi>2021-03-04 14:26:15 +0200
committerJaakko Keränen <jaakko.keranen@iki.fi>2021-03-04 22:24:43 +0200
commitb1b4b6458548e42656045cad9d0552e30b45678d (patch)
tree0fe8d88862f2212f685447d2f2f8d3f0049e9bc9 /src/ui/util.c
parent92dd2e36482beb8f9d651f8f3956950f173ff8a7 (diff)
Fixed buttons in Import Identity dialog
Diffstat (limited to 'src/ui/util.c')
-rw-r--r--src/ui/util.c14
1 files changed, 7 insertions, 7 deletions
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) {
939 return iFalse; 939 return iFalse;
940} 940}
941 941
942static iWidget *makeDialogButtons_(const iMenuItem *actions, size_t numActions) { 942iWidget *makeDialogButtons_Widget(const iMenuItem *actions, size_t numActions) {
943 iWidget *div = new_Widget(); 943 iWidget *div = new_Widget();
944 setFlags_Widget(div, 944 setFlags_Widget(div,
945 arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag | 945 arrangeHorizontal_WidgetFlag | arrangeHeight_WidgetFlag |
@@ -1016,7 +1016,7 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
1016 addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI))); 1016 addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
1017 addChild_Widget( 1017 addChild_Widget(
1018 dlg, 1018 dlg,
1019 iClob(makeDialogButtons_( 1019 iClob(makeDialogButtons_Widget(
1020 (iMenuItem[]){ { "Cancel", 0, 0, NULL }, { acceptLabel, 0, 0, "valueinput.accept" } }, 1020 (iMenuItem[]){ { "Cancel", 0, 0, NULL }, { acceptLabel, 0, 0, "valueinput.accept" } },
1021 2))); 1021 2)));
1022 centerSheet_Widget(dlg); 1022 centerSheet_Widget(dlg);
@@ -1062,7 +1062,7 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg,
1062 addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag); 1062 addChildFlags_Widget(dlg, iClob(new_LabelWidget(title, NULL)), frameless_WidgetFlag);
1063 addChildFlags_Widget(dlg, iClob(new_LabelWidget(msg, NULL)), frameless_WidgetFlag); 1063 addChildFlags_Widget(dlg, iClob(new_LabelWidget(msg, NULL)), frameless_WidgetFlag);
1064 addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI))); 1064 addChild_Widget(dlg, iClob(makePadding_Widget(gap_UI)));
1065 addChild_Widget(dlg, iClob(makeDialogButtons_(items, numItems))); 1065 addChild_Widget(dlg, iClob(makeDialogButtons_Widget(items, numItems)));
1066 addChild_Widget(get_Window()->root, iClob(dlg)); 1066 addChild_Widget(get_Window()->root, iClob(dlg));
1067 arrange_Widget(dlg); /* BUG: This extra arrange shouldn't be needed but the dialog won't 1067 arrange_Widget(dlg); /* BUG: This extra arrange shouldn't be needed but the dialog won't
1068 be arranged correctly unless it's here. */ 1068 be arranged correctly unless it's here. */
@@ -1347,7 +1347,7 @@ iWidget *makePreferences_Widget(void) {
1347 expandInputFieldWidth_(findChild_Widget(tabs, "prefs.proxy.http")); 1347 expandInputFieldWidth_(findChild_Widget(tabs, "prefs.proxy.http"));
1348 } 1348 }
1349 addChild_Widget(dlg, 1349 addChild_Widget(dlg,
1350 iClob(makeDialogButtons_( 1350 iClob(makeDialogButtons_Widget(
1351 (iMenuItem[]){ { "Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1))); 1351 (iMenuItem[]){ { "Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
1352 addChild_Widget(get_Window()->root, iClob(dlg)); 1352 addChild_Widget(get_Window()->root, iClob(dlg));
1353 centerSheet_Widget(dlg); 1353 centerSheet_Widget(dlg);
@@ -1384,7 +1384,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
1384 } 1384 }
1385 addChild_Widget( 1385 addChild_Widget(
1386 dlg, 1386 dlg,
1387 iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL }, 1387 iClob(makeDialogButtons_Widget((iMenuItem[]){ { "Cancel", 0, 0, NULL },
1388 { uiTextCaution_ColorEscape "Save Bookmark", 1388 { uiTextCaution_ColorEscape "Save Bookmark",
1389 SDLK_RETURN, 1389 SDLK_RETURN,
1390 KMOD_PRIMARY, 1390 KMOD_PRIMARY,
@@ -1518,7 +1518,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
1518 addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag); 1518 addChildFlags_Widget(values, iClob(types), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
1519 iWidget *buttons = 1519 iWidget *buttons =
1520 addChild_Widget(dlg, 1520 addChild_Widget(dlg,
1521 iClob(makeDialogButtons_( 1521 iClob(makeDialogButtons_Widget(
1522 (iMenuItem[]){ { "Cancel", 0, 0, NULL }, 1522 (iMenuItem[]){ { "Cancel", 0, 0, NULL },
1523 { bookmarkId ? uiTextCaution_ColorEscape "Save Settings" 1523 { bookmarkId ? uiTextCaution_ColorEscape "Save Settings"
1524 : uiTextCaution_ColorEscape "Subscribe", 1524 : uiTextCaution_ColorEscape "Subscribe",
@@ -1600,7 +1600,7 @@ iWidget *makeIdentityCreation_Widget(void) {
1600 } 1600 }
1601 addChild_Widget( 1601 addChild_Widget(
1602 dlg, 1602 dlg,
1603 iClob(makeDialogButtons_((iMenuItem[]){ { "Cancel", 0, 0, NULL }, 1603 iClob(makeDialogButtons_Widget((iMenuItem[]){ { "Cancel", 0, 0, NULL },
1604 { uiTextAction_ColorEscape "Create Identity", 1604 { uiTextAction_ColorEscape "Create Identity",
1605 SDLK_RETURN, 1605 SDLK_RETURN,
1606 KMOD_PRIMARY, 1606 KMOD_PRIMARY,