Added an identity creation dialog

8 files changed, 101 insertions, 6 deletions

diff --git a/src/app.c b/src/app.c
index c91366c9..bae6a6ce 100644
--- a/src/app.c
+++ b/src/app.c
@@ -536,6 +536,17 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
     return doc;
 }
 
+static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
+    if (equal_Command(cmd, "ident.accept") || equal_Command(cmd, "cancel")) {
+        if (equal_Command(cmd, "ident.accept")) {
+
+        }
+        destroy_Widget(dlg);
+        return iTrue;
+    }
+    return iFalse;
+}
+
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
     if (equal_Command(cmd, "retainwindow")) {
@@ -673,6 +684,11 @@ iBool handleCommand_App(const char *cmd) {
                                     siteIcon_GmDocument(document_DocumentWidget(doc)));
         return iTrue;
     }
+    else if (equal_Command(cmd, "ident.new")) {
+        iWidget *dlg = makeIdentityCreation_Widget();
+        setCommandHandler_Widget(dlg, handleIdentityCreationCommands_);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "theme.set")) {
         const int isAuto = argLabel_Command(cmd, "auto");
         d->theme = arg_Command(cmd);
diff --git a/src/gmcerts.c b/src/gmcerts.c
index cc7e9702..2600b4cf 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -384,10 +384,11 @@ iGmIdentity *newIdentity_GmCerts(iGmCerts *d, int flags, iDate validUntil, const
                                  const iString *userId, const iString *org,
                                  const iString *country) {
     const iTlsCertificateName names[] = {
-        { subjectCommonName_TlsCertificateNameType,     commonName },
-        { subjectUserId_TlsCertificateNameType,         userId },
-        { subjectOrganization_TlsCertificateNameType,   org },
-        { subjectCountry_TlsCertificateNameType,        country },
+        { issuerCommonName_TlsCertificateNameType,    collectNewCStr_String("fi.skyjake.Lagrange") },
+        { subjectCommonName_TlsCertificateNameType,   commonName },
+        { subjectUserId_TlsCertificateNameType,       userId },
+        { subjectOrganization_TlsCertificateNameType, org },
+        { subjectCountry_TlsCertificateNameType,      country },
         { 0, NULL }
     };
     iGmIdentity *id = new_GmIdentity();
diff --git a/src/ui/color.c b/src/ui/color.c
index 1e9571a7..221a7c2a 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -108,6 +108,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiInputCursor_ColorId, orange_ColorId);
             copy_(uiInputCursorText_ColorId, black_ColorId);
             copy_(uiHeading_ColorId, cyan_ColorId);
+            copy_(uiAnnotation_ColorId, teal_ColorId);
             copy_(uiIcon_ColorId, cyan_ColorId);
             copy_(uiIconHover_ColorId, cyan_ColorId);
             copy_(uiSeparator_ColorId, gray25_ColorId);
@@ -150,6 +151,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiInputCursor_ColorId, orange_ColorId);
             copy_(uiInputCursorText_ColorId, black_ColorId);
             copy_(uiHeading_ColorId, cyan_ColorId);
+            copy_(uiAnnotation_ColorId, teal_ColorId);
             copy_(uiIcon_ColorId, cyan_ColorId);
             copy_(uiIconHover_ColorId, cyan_ColorId);
             copy_(uiSeparator_ColorId, black_ColorId);
@@ -191,6 +193,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiInputCursor_ColorId, teal_ColorId);
             copy_(uiInputCursorText_ColorId, white_ColorId);
             copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiAnnotation_ColorId, gray50_ColorId);
             copy_(uiIcon_ColorId, brown_ColorId);
             copy_(uiIconHover_ColorId, brown_ColorId);
             copy_(uiSeparator_ColorId, gray25_ColorId);
@@ -232,6 +235,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiInputCursor_ColorId, teal_ColorId);
             copy_(uiInputCursorText_ColorId, white_ColorId);
             copy_(uiHeading_ColorId, brown_ColorId);
+            copy_(uiAnnotation_ColorId, gray50_ColorId);
             copy_(uiIcon_ColorId, brown_ColorId);
             copy_(uiIconHover_ColorId, brown_ColorId);
             copy_(uiSeparator_ColorId, gray50_ColorId);
diff --git a/src/ui/color.h b/src/ui/color.h
index d9f4793f..3c986d59 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -95,6 +95,7 @@ enum iColorId {
     uiInputCursor_ColorId,
     uiInputCursorText_ColorId,
     uiHeading_ColorId,
+    uiAnnotation_ColorId,
     uiIcon_ColorId,
     uiIconHover_ColorId,
     uiSeparator_ColorId,
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index d9842a40..ffdacb99 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -341,6 +341,12 @@ const iString *command_LabelWidget(const iLabelWidget *d) {
     return &d->command;
 }
 
+iLabelWidget *newColor_LabelWidget(const char *text, int color) {
+    iLabelWidget *d = new_LabelWidget(format_CStr("%s%s", escape_Color(color), text), 0, 0, NULL);
+    setFlags_Widget(as_Widget(d), frameless_WidgetFlag, iTrue);
+    return d;
+}
+
 iBeginDefineSubclass(LabelWidget, Widget)
     .processEvent = (iAny *) processEvent_LabelWidget_,
     .draw         = (iAny *) draw_LabelWidget_,
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 64f96aed..c55ecd08 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -41,6 +41,8 @@ void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not r
 const iString *label_LabelWidget    (const iLabelWidget *);
 const iString *command_LabelWidget  (const iLabelWidget *);
 
+iLabelWidget *newColor_LabelWidget(const char *text, int color);
+
 iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
     return new_LabelWidget("", 0, 0, NULL);
 }
diff --git a/src/ui/util.c b/src/ui/util.c
index 753fd140..52d5031e 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -708,8 +708,9 @@ static iBool toggleHandler_(iWidget *d, const char *cmd) {
 }
 
 iWidget *makeToggle_Widget(const char *id) {
-    iWidget *toggle = as_Widget(new_LabelWidget("YES", 0, 0, "toggle"));
+    iWidget *toggle = as_Widget(new_LabelWidget("YES", 0, 0, "toggle")); /* "YES" for sizing */
     setId_Widget(toggle, id);
+    updateTextCStr_LabelWidget((iLabelWidget *) toggle, "NO"); /* actual initial value */
     setCommandHandler_Widget(toggle, toggleHandler_);
     return toggle;
 }
@@ -769,7 +770,7 @@ iWidget *makeBookmarkEditor_Widget(void) {
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
-    iInputWidget *inputs[4];
+    iInputWidget *inputs[3];
     addChild_Widget(headings, iClob(makeHeading_Widget("Title:")));
     setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "bmed.title");
     addChild_Widget(headings, iClob(makeHeading_Widget("URL:")));
@@ -832,3 +833,66 @@ iWidget *makeBookmarkCreation_Widget(const iString *url, const iString *title, i
     setCommandHandler_Widget(dlg, handleBookmarkCreationCommands_SidebarWidget_);
     return dlg;
 }
+
+iWidget *makeIdentityCreation_Widget(void) {
+    iWidget *dlg = makeSheet_Widget("ident");
+    setId_Widget(addChildFlags_Widget(
+                     dlg,
+                     iClob(new_LabelWidget(uiHeading_ColorEscape "NEW IDENTITY", 0, 0, NULL)),
+                     frameless_WidgetFlag),
+                 "ident.heading");
+    iWidget *page = new_Widget();
+    addChildFlags_Widget(
+        dlg,
+        iClob(
+            new_LabelWidget("Creating a 2048-bit self-signed RSA certificate.", 0, 0, NULL)),
+        frameless_WidgetFlag);
+    addChild_Widget(dlg, iClob(page));
+    setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+    iWidget *headings = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iWidget *values = addChildFlags_Widget(
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    iInputWidget *inputs[4];
+    addChild_Widget(headings, iClob(makeHeading_Widget("Common name:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[0] = new_InputWidget(0))), "ident.common");
+    addChild_Widget(headings, iClob(makeHeading_Widget("User ID:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[1] = new_InputWidget(0))), "ident.userid");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Organization:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[2] = new_InputWidget(0))), "ident.org");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Country:")));
+    setId_Widget(addChild_Widget(values, iClob(inputs[3] = new_InputWidget(0))), "ident.country");
+    addChild_Widget(headings, iClob(makeHeading_Widget("Valid until:")));
+    iInputWidget *until;
+    addChild_Widget(values, iClob(until = new_InputWidget(19)));
+    setTextCStr_InputWidget(until, "YYYY-MM-DD HH:MM:SS");
+//    addChild_Widget(headings, iClob(newEmpty_LabelWidget()));
+//    addChild_Widget(values,
+//                    iClob(newColor_LabelWidget("Time defaults to end of day.",
+//                                               uiAnnotation_ColorId)));
+    addChild_Widget(headings, iClob(makeHeading_Widget("Temporary:")));
+//    iWidget *temp = new_Widget();
+//    addChildFlags_Widget(
+//        values, iClob(temp), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+    addChild_Widget(values, iClob(makeToggle_Widget("ident.temp")));
+    //    addChild_Widget(
+    //        temp,
+    //        iClob(newColor_LabelWidget("Temporary identities are not saved.",
+    //        uiAnnotation_ColorId)));
+    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;
+    }
+    iWidget *div = new_Widget(); {
+        setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
+        addChild_Widget(div, iClob(new_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
+        addChild_Widget(
+            div,
+            iClob(new_LabelWidget(
+                uiTextAction_ColorEscape "Create", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
+    }
+    addChild_Widget(dlg, iClob(div));
+    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 129053e5..a008ee0c 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -147,3 +147,4 @@ iWidget *   makeQuestion_Widget     (const char *title, const char *msg,
 iWidget *   makePreferences_Widget      (void);
 iWidget *   makeBookmarkEditor_Widget   (void);
 iWidget *   makeBookmarkCreation_Widget (const iString *url, const iString *title, iChar icon);
+iWidget *   makeIdentityCreation_Widget (void);