SidebarWidget: Improving blank Identities tab

If there are no identities, the Identities tab now shows a button for creating one, and a link to the Help documentation.

4 files changed, 51 insertions, 1 deletions

diff --git a/src/app.c b/src/app.c
index 64ea9ad1..e4c31eaf 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1018,6 +1018,12 @@ iBool handleCommand_App(const char *cmd) {
         setInitialScroll_DocumentWidget(doc, argfLabel_Command(cmd, "scroll"));
         setRedirectCount_DocumentWidget(doc, redirectCount);
         setUrlFromCache_DocumentWidget(doc, url, isHistory);
+        /* Optionally, jump to a text in the document. This will only work if the document
+           is already available, e.g., it's from "about:" or restored from cache. */
+        const iRangecc gotoHeading = range_Command(cmd, "gotoheading");
+        if (gotoHeading.start) {
+            postCommandf_App("document.goto heading:%s", cstr_Rangecc(gotoHeading));
+        }
     }
     else if (equal_Command(cmd, "document.request.cancelled")) {
         /* TODO: How should cancelled requests be treated in the history? */
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 07b0cc63..fa375969 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1548,6 +1548,19 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         return iTrue;
     }
     else if (equal_Command(cmd, "document.goto") && document_App() == d) {
+        const iRangecc heading = range_Command(cmd, "heading");
+        if (heading.start) {
+            const char *target = cstr_Rangecc(heading);
+            iConstForEach(Array, h, headings_GmDocument(d->doc)) {
+                const iGmHeading *head = h.value;
+                if (startsWithCase_Rangecc(head->text, target)) {
+                    /* TODO: A bit lazy here, the code is right down below. */
+                    postCommandf_App("document.goto loc:%p", head->text.start);
+                    break;
+                }
+            }
+            return iTrue;
+        }
         const char *loc = pointerLabel_Command(cmd, "loc");
         const iGmRun *run = findRunAtLoc_GmDocument(d->doc, loc);
         if (run) {
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index a6030f9d..3e1c6777 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -73,4 +73,6 @@ size_t              itemIndex_ListWidget        (const iListWidget *, iInt2 pos)
 const iAnyObject *  constItem_ListWidget        (const iListWidget *, size_t index);
 const iAnyObject *  constHoverItem_ListWidget   (const iListWidget *);
 
+iLocalDef isEmpty_ListWidget(const iListWidget *d) { return numItems_ListWidget(d) == 0; }
+
 iBool   isMouseDown_ListWidget      (const iListWidget *);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index d311ca92..e0ec9083 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -83,6 +83,7 @@ iDefineObjectConstruction(SidebarItem)
 struct Impl_SidebarWidget {
     iWidget widget;
     enum iSidebarMode mode;
+    iWidget *blank;
     iListWidget *list;
     int modeScroll[max_SidebarMode];
     int width;
@@ -106,6 +107,7 @@ static int cmpTitle_Bookmark_(const iBookmark **a, const iBookmark **b) {
 
 static void updateItems_SidebarWidget_(iSidebarWidget *d) {
     clear_ListWidget(d->list);
+    releaseChildren_Widget(d->blank);
     destroy_Widget(d->menu);
     d->menu = NULL;
     switch (d->mode) {
@@ -224,6 +226,28 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 addItem_ListWidget(d->list, item);
                 iRelease(item);
             }
+            if (isEmpty_ListWidget(d->list)) {
+                iWidget *div = makeVDiv_Widget();
+                setPadding_Widget(div, 3 * gap_UI, 0, 3 * gap_UI, 0);
+                addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
+                iLabelWidget *msg = new_LabelWidget("No Identities", 0, 0, NULL);
+                setFont_LabelWidget(msg, uiLabelLarge_FontId);
+                addChildFlags_Widget(div, iClob(msg), frameless_WidgetFlag);
+                addChild_Widget(div, iClob(makePadding_Widget(3 * gap_UI)));
+                addChild_Widget(div, iClob(new_LabelWidget("New Identity...", 0, 0, "ident.new")));
+                addChild_Widget(div, iClob(makePadding_Widget(3 * gap_UI)));
+                addChildFlags_Widget(
+                    div,
+                    iClob(new_LabelWidget("See " uiTextStrong_ColorEscape "Help" uiText_ColorEscape
+                                          " for more information about TLS client certificates.",
+                                          0,
+                                          0,
+                                          "!open newtab:1 gotoheading:Identities url:about:help")),
+                    frameless_WidgetFlag | fixedHeight_WidgetFlag | wrapText_WidgetFlag);
+                addChildFlags_Widget(div, iClob(new_Widget()), expand_WidgetFlag); /* pad */
+                addChild_Widget(d->blank, iClob(div));
+                arrange_Widget(d->blank);
+            }
             const iMenuItem menuItems[] = {
                 { "Use on This Page", 0, 0, "ident.use arg:1" },
                 { "Stop Using This Page", 0, 0, "ident.use arg:0" },
@@ -320,9 +344,14 @@ void init_SidebarWidget(iSidebarWidget *d) {
                          iClob(buttons),
                          arrangeHorizontal_WidgetFlag | resizeWidthOfChildren_WidgetFlag |
                              arrangeHeight_WidgetFlag | resizeToParentWidth_WidgetFlag);
+    iWidget *content = new_Widget();
+    setFlags_Widget(content, resizeChildren_WidgetFlag, iTrue);
     d->list = new_ListWidget();
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
-    addChildFlags_Widget(vdiv, iClob(d->list), expand_WidgetFlag);
+    addChild_Widget(content, iClob(d->list));
+    d->blank = new_Widget();
+    addChildFlags_Widget(content, iClob(d->blank), resizeChildren_WidgetFlag);
+    addChildFlags_Widget(vdiv, iClob(content), expand_WidgetFlag);
     setMode_SidebarWidget(d, bookmarks_SidebarMode);
     d->resizer = addChildFlags_Widget(
         w,