Merge branch 'dev' into work/typesetter

# Conflicts:
#	src/gmdocument.c
#	src/ui/documentwidget.c
#	src/ui/inputwidget.h

1 files changed, 51 insertions, 16 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 4b35f8f7..c4fb8886 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1176,6 +1176,7 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
                 postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
                 setId_Widget(dlg, ""); /* no further commands to emit */
             }
+            setupSheetTransition_Mobile(dlg, iFalse);
             destroy_Widget(dlg);
             return iTrue;
         }
@@ -1184,11 +1185,13 @@ iBool valueInputHandler_(iWidget *dlg, const char *cmd) {
     else if (equal_Command(cmd, "cancel")) {
         postCommandf_App("valueinput.cancelled id:%s", cstr_String(id_Widget(dlg)));
         setId_Widget(dlg, ""); /* no further commands to emit */
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
     else if (equal_Command(cmd, "valueinput.accept")) {
         acceptValueInput_(dlg);
+        setupSheetTransition_Mobile(dlg, iFalse);        
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -1324,6 +1327,7 @@ static iBool messageHandler_(iWidget *msg, const char *cmd) {
           equal_Command(cmd, "scrollbar.fade") ||
           equal_Command(cmd, "widget.overflow") ||
           startsWith_CStr(cmd, "window."))) {
+        setupSheetTransition_Mobile(msg, iFalse);
         destroy_Widget(msg);
     }
     return iFalse;
@@ -1521,6 +1525,7 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
     static const char *inputIds[] = {
         "prefs.searchurl",
         "prefs.downloads",
+        "prefs.userfont",
         "prefs.ca.file",
         "prefs.ca.path",
         "prefs.proxy.gemini",
@@ -1547,8 +1552,8 @@ void updatePreferencesLayout_Widget(iWidget *prefs) {
     }
 }
 
-static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const char *labelText,
-                                       const char *inputId, iInputWidget *input) {
+static void addDialogInputWithHeadingAndFlags_(iWidget *headings, iWidget *values, const char *labelText,
+                                               const char *inputId, iInputWidget *input, int64_t flags) {
     iLabelWidget *head = addChild_Widget(headings, iClob(makeHeading_Widget(labelText)));
 #if defined (iPlatformMobile)
     /* On mobile, inputs have 2 gaps of extra padding. */
@@ -1560,6 +1565,13 @@ static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const
         /* Ensure that the label has the same height as the input widget. */
         as_Widget(head)->sizeRef = as_Widget(input);
     }
+    setFlags_Widget(as_Widget(head), flags, iTrue);
+    setFlags_Widget(as_Widget(input), flags, iTrue);
+}
+
+static void addDialogInputWithHeading_(iWidget *headings, iWidget *values, const char *labelText,
+                                       const char *inputId, iInputWidget *input) {
+    addDialogInputWithHeadingAndFlags_(headings, values, labelText, inputId, input, 0);
 }
 
 iInputWidget *addTwoColumnDialogInputField_Widget(iWidget *headings, iWidget *values,
@@ -1686,6 +1698,8 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.customframe}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.customframe")));
 #endif
+        addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.animate}")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.animate")));
         makeTwoColumnHeading_("${heading.prefs.scrolling}", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.smoothscroll}")));
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.smoothscroll")));
@@ -1775,6 +1789,7 @@ iWidget *makePreferences_Widget(void) {
                 updateSize_LabelWidget((iLabelWidget *) tog);
             }
             addChildFlags_Widget(values, iClob(boldLink), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+            addPrefsInputWithHeading_(headings, values, "prefs.userfont", iClob(new_InputWidget(0)));
         }
         makeTwoColumnHeading_("${heading.prefs.paragraph}", headings, values);
         addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.linewidth}")));
@@ -1834,7 +1849,7 @@ iWidget *makePreferences_Widget(void) {
     updatePreferencesLayout_Widget(dlg);
     addChild_Widget(dlg,
                     iClob(makeDialogButtons_Widget(
-                        (iMenuItem[]){ { "${dismiss}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
+                        (iMenuItem[]){ { "${close}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(dlg->root->widget, iClob(dlg));
     finalizeSheet_Mobile(dlg);
     setupSheetTransition_Mobile(dlg, iTrue);
@@ -1908,6 +1923,7 @@ static iBool handleBookmarkCreationCommands_SidebarWidget_(iWidget *editor, cons
             }
             postCommand_App("bookmarks.changed");
         }
+        setupSheetTransition_Mobile(editor, iFalse);
         destroy_Widget(editor);
         return iTrue;
     }
@@ -1937,6 +1953,7 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
 
 static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
     if (equal_Command(cmd, "cancel")) {
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -1971,6 +1988,7 @@ static iBool handleFeedSettingCommands_(iWidget *dlg, const char *cmd) {
             }
         }
         postCommand_App("bookmarks.changed");
+        setupSheetTransition_Mobile(dlg, iFalse);
         destroy_Widget(dlg);
         return iTrue;
     }
@@ -2042,7 +2060,21 @@ iWidget *makeIdentityCreation_Widget(void) {
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    setId_Widget(headings, "headings");
+    setId_Widget(values, "values");
     iInputWidget *inputs[6];
+    /* Where will the new identity be active on? */ {
+        addChild_Widget(headings, iClob(makeHeading_Widget("${dlg.newident.scope}")));
+        const iMenuItem items[] = {
+            { "${dlg.newident.scope.domain}", 0, 0, "ident.scope arg:0" },
+            { "${dlg.newident.scope.page}",   0, 0, "ident.scope arg:1" },
+            { "${dlg.newident.scope.none}",   0, 0, "ident.scope arg:2" },
+        };
+        setId_Widget(addChild_Widget(values,
+                                     iClob(makeMenuButton_LabelWidget(
+                                         items[0].label, items, iElemCount(items)))),
+                     "ident.scope");
+    }
     addDialogInputWithHeading_(headings,
                                values,
                                "${dlg.newident.until}",
@@ -2059,32 +2091,35 @@ iWidget *makeIdentityCreation_Widget(void) {
         setFlags_Widget(tmpGroup, arrangeSize_WidgetFlag | arrangeHorizontal_WidgetFlag, iTrue);
         addChild_Widget(tmpGroup, iClob(makeToggle_Widget("ident.temp")));
         setId_Widget(
-            addChildFlags_Widget(
-                tmpGroup,
-                iClob(new_LabelWidget(uiTextCaution_ColorEscape "\u26a0  ${dlg.newident.notsaved}", NULL)),
-                hidden_WidgetFlag | frameless_WidgetFlag),
+            addChildFlags_Widget(tmpGroup,
+                                 iClob(new_LabelWidget(uiTextCaution_ColorEscape warning_Icon
+                                                       "  ${dlg.newident.notsaved}",
+                                                       NULL)),
+                                 hidden_WidgetFlag | frameless_WidgetFlag),
             "ident.temp.note");
         addChild_Widget(values, iClob(tmpGroup));
     }
-    addChild_Widget(headings, iClob(makePadding_Widget(gap_UI)));
-    addChild_Widget(values, iClob(makePadding_Widget(gap_UI)));
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.email}",   "ident.email",   iClob(inputs[1] = newHint_InputWidget(0, "${hint.newident.optional}")));
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.userid}",  "ident.userid",  iClob(inputs[2] = newHint_InputWidget(0, "${hint.newident.optional}")));
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.domain}",  "ident.domain",  iClob(inputs[3] = newHint_InputWidget(0, "${hint.newident.optional}")));
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.org}",     "ident.org",     iClob(inputs[4] = newHint_InputWidget(0, "${hint.newident.optional}")));
-    addDialogInputWithHeading_(headings, values, "${dlg.newident.country}", "ident.country", iClob(inputs[5] = newHint_InputWidget(0, "${hint.newident.optional}")));
+    addChildFlags_Widget(headings, iClob(makePadding_Widget(gap_UI)), collapse_WidgetFlag | hidden_WidgetFlag);
+    addChildFlags_Widget(values, iClob(makePadding_Widget(gap_UI)), collapse_WidgetFlag | hidden_WidgetFlag);
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.email}",   "ident.email",   iClob(inputs[1] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.userid}",  "ident.userid",  iClob(inputs[2] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.domain}",  "ident.domain",  iClob(inputs[3] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.org}",     "ident.org",     iClob(inputs[4] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
+    addDialogInputWithHeadingAndFlags_(headings, values, "${dlg.newident.country}", "ident.country", iClob(inputs[5] = newHint_InputWidget(0, "${hint.newident.optional}")), collapse_WidgetFlag | hidden_WidgetFlag);
     arrange_Widget(dlg);
     for (size_t i = 0; i < iElemCount(inputs); ++i) {
         as_Widget(inputs[i])->rect.size.x = 100 * gap_UI - headings->rect.size.x;
     }
     addChild_Widget(dlg,
                     iClob(makeDialogButtons_Widget(
-                        (iMenuItem[]){ { "${cancel}", 0, 0, NULL },
+                        (iMenuItem[]){ { "${dlg.newident.more}", 0, 0, "ident.showmore" },
+                                       { "---", 0, 0, NULL },
+                                       { "${cancel}", SDLK_ESCAPE, 0, "ident.cancel" },
                                        { uiTextAction_ColorEscape "${dlg.newident.create}",
                                          SDLK_RETURN,
                                          KMOD_PRIMARY,
                                          "ident.accept" } },
-                        2)));
+                        4)));
     addChild_Widget(get_Root()->widget, iClob(dlg));
     finalizeSheet_Mobile(dlg);
     return dlg;