10 files changed, 117 insertions, 50 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 947d5daa..d00733e1 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -36,6 +36,7 @@ struct Impl_LabelWidget {
     iWidget widget;
     iString srcLabel;
     iString label;
+    iInt2   labelOffset;
     int     font;
     int     key;
     int     kmods;
@@ -362,10 +363,6 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     }
     setClip_Paint(&p, rect);
     const int iconPad = iconPadding_LabelWidget_(d);
-//    const int iconColor = isCaution ? uiTextCaution_ColorId
-//                          : flags & (disabled_WidgetFlag | pressed_WidgetFlag) ? fg
-//                          : isHover                                            ? uiIconHover_ColorId
-//                                                                               : uiIcon_ColorId;
     if (d->icon && d->icon != 0x20) { /* no need to draw an empty icon */
         iString str;
         initUnicodeN_String(&str, &d->icon, 1);
@@ -427,8 +424,11 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     else {
         drawCenteredOutline_Text(
             d->font,
-            adjusted_Rect(bounds, init_I2(iconPad * (flags & tight_WidgetFlag ? 1.0f : 1.5f), 0),
-                          init_I2(-iconPad * (flags & tight_WidgetFlag ? 0.5f : 1.0f), 0)),
+            moved_Rect(
+                adjusted_Rect(bounds,
+                              init_I2(iconPad * (flags & tight_WidgetFlag ? 1.0f : 1.5f), 0),
+                              init_I2(-iconPad * (flags & tight_WidgetFlag ? 0.5f : 1.0f), 0)),
+                d->labelOffset),
             d->flags.alignVisual,
             d->flags.drawAsOutline ? fg : none_ColorId,
             d->flags.drawAsOutline ? d->widget.bgColor : fg,
@@ -523,6 +523,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     d->font = uiLabel_FontId;
     d->forceFg = none_ColorId;
     d->icon = 0;
+    d->labelOffset = zero_I2();
     initCStr_String(&d->srcLabel, label);
     initCopy_String(&d->label, &d->srcLabel);
     replaceVariables_LabelWidget_(d);
@@ -623,6 +624,10 @@ void setRemoveTrailingColon_LabelWidget(iLabelWidget *d, iBool removeTrailingCol
     }
 }
 
+void setTextOffset_LabelWidget(iLabelWidget *d, iInt2 offset) {
+    d->labelOffset = offset;
+}
+
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
     set_String(&d->label, text);
     set_String(&d->srcLabel, text);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 6f1b7902..4f605d6b 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -38,6 +38,7 @@ void    setWrap_LabelWidget         (iLabelWidget *, iBool wrap);
 void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setAllCaps_LabelWidget      (iLabelWidget *, iBool allCaps);
 void    setRemoveTrailingColon_LabelWidget  (iLabelWidget *, iBool removeTrailingColon);
+void    setTextOffset_LabelWidget   (iLabelWidget *, iInt2 offset);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setTextColor_LabelWidget    (iLabelWidget *, int color);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index 5382cbce..ab282a86 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -180,13 +180,16 @@ size_t currentPanelIndex_Mobile(const iWidget *panels) {
     return iInvalidPos;
 }
 
+iWidget *panel_Mobile(const iWidget *panels, size_t index) {
+    return child_Widget(findChild_Widget(panels, "detailstack"), index);
+}
+
 static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
     const iBool isPortrait = !isSideBySideLayout_();
     if (equal_Command(cmd, "panel.open")) {
-        iWidget *button = pointer_Command(cmd);
+        /* This command is sent by the button that opens the panel. */
+        iWidget *button = pointer_Command(cmd);        
         iWidget *panel = userData_Object(button);
-//        openMenu_Widget(panel, innerToWindow_Widget(panel, zero_I2()));
-//        setFlags_Widget(panel, hidden_WidgetFlag, iFalse);
         unselectAllPanelButtons_(topPanel);
         int panelIndex = -1;
         size_t childIndex = 0;
@@ -208,8 +211,6 @@ static iBool topPanelHandler_(iWidget *topPanel, const char *cmd) {
         setText_LabelWidget(detailTitle, text_LabelWidget((iLabelWidget *) findTitleLabel_(panel)));
         setFlags_Widget(button, selected_WidgetFlag, iTrue);
         postCommand_Widget(topPanel, "panel.changed arg:%d", panelIndex);
-        //printTree_Widget(findDetailStack_(topPanel));
-//        updateVisible_ListWidget(findChild_Widget(findDetailStack_(topPanel), "certlist"));
         updateCertListHeight_(findDetailStack_(topPanel));
         return iTrue;
     }
diff --git a/src/ui/mobile.h b/src/ui/mobile.h
index 9d7ac8e4..06955945 100644
--- a/src/ui/mobile.h
+++ b/src/ui/mobile.h
@@ -39,6 +39,7 @@ void        initPanels_Mobile           (iWidget *panels, iWidget *parentWidget,
                                          const iMenuItem *itemsNullTerminated,
                                          const iMenuItem *actions, size_t numActions);
 
+iWidget *   panel_Mobile                (const iWidget *panels, size_t index);
 size_t      currentPanelIndex_Mobile    (const iWidget *panels);
 
 enum iTransitionFlags {
diff --git a/src/ui/root.c b/src/ui/root.c
index b7a2e5c8..5df4b36f 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -333,19 +333,28 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     }
     else if (equal_Command(cmd, "identmenu.open")) {
         iWidget *toolBar = findWidget_Root("toolbar");
-        iWidget *button = findWidget_Root(toolBar ? "toolbar.ident" : "navbar.ident");
+        iWidget *button = findWidget_Root(toolBar && isPortraitPhone_App() ? "toolbar.ident" : "navbar.ident");
         iArray items;
         init_Array(&items, sizeof(iMenuItem));
         /* Current identity. */
         const iString     *docUrl = url_DocumentWidget(document_App());
         const iGmIdentity *ident  = identityForUrl_GmCerts(certs_App(), docUrl);
         const iString     *fp     = ident ? collect_String(hexEncode_Block(&ident->fingerprint)) : NULL;
-        pushBackN_Array(&items,
-                        (iMenuItem[]){ { format_CStr("///" uiHeading_ColorEscape "%s",
-                                                     ident ? cstr_String(name_GmIdentity(ident))
-                                                           : "${menu.identity.notactive}") },
-                                       { "---" } },
-                        2);
+        iString           *str    = NULL;
+        if (ident) {
+            str = copy_String(name_GmIdentity(ident));
+            if (!isEmpty_String(&ident->notes)) {
+                appendFormat_String(str, "\n%s%s", escape_Color(uiAnnotation_ColorId),
+                                    cstr_String(&ident->notes));
+            }
+        }
+        pushBackN_Array(
+            &items,
+            (iMenuItem[]){ { format_CStr("///" uiHeading_ColorEscape "%s",
+                                         str ? cstr_String(str) : "${menu.identity.notactive}") },
+                           { "---" } },
+            2);
+        delete_String(str);
         /* Alternate identities. */
         if (ident) {
             const iString *site = collectNewRange_String(urlRoot_String(docUrl));
@@ -385,8 +394,8 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
                       : leftHalf_Icon " ${menu.show.identities}",
                   0,
                   0,
-                  deviceType_App() == phone_AppDeviceType ? "toolbar.showident"
-                                                          : "sidebar.mode arg:3 toggle:1" });
+                  //deviceType_App() == phone_AppDeviceType ? "toolbar.showident"
+                                                          "sidebar.mode arg:3 toggle:1" });
         }
         else {
             pushBack_Array(&items, &(iMenuItem){ gear_Icon " ${menu.identities}", 0, 0,
@@ -517,9 +526,21 @@ static void updateNavBarIdentity_(iWidget *navBar) {
     iLabelWidget *toolName = findWidget_App("toolbar.name");
     if (toolName) {
         setOutline_LabelWidget(toolButton, ident == NULL);
-        updateTextCStr_LabelWidget(toolName, subjectName ? cstr_String(subjectName) : "");
+        /* Fit the name in the widget. */ 
+        if (subjectName) {
+            const char *endPos;
+            tryAdvanceNoWrap_Text(uiLabelTiny_FontId, range_String(subjectName), width_Widget(toolName),
+                &endPos);
+            updateText_LabelWidget(
+                toolName,
+                collectNewRange_String((iRangecc){ constBegin_String(subjectName), endPos }));
+        }
+        else {
+            updateTextCStr_LabelWidget(toolName, "");
+        }
         setFont_LabelWidget(toolButton, subjectName ? uiLabelMedium_FontId : uiLabelLarge_FontId);
-        arrange_Widget(parent_Widget(toolButton));
+        setTextOffset_LabelWidget(toolButton, init_I2(0, subjectName ? -1.5f * gap_UI : 0));
+        arrange_Widget(parent_Widget(toolButton));        
     }
 }
 
@@ -604,11 +625,13 @@ void updateToolbarColors_Root(iRoot *d) {
                                           tmBannerBackground_ColorId;
         setBackgroundColor_Widget(toolBar, bg);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
-            iLabelWidget *btn = i.object;
+//            iLabelWidget *btn = i.object;
             setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId :
                                      tmBannerIcon_ColorId);
             setBackgroundColor_Widget(i.object, bg); /* using noBackground, but ident has outline */
         }
+        setTextColor_LabelWidget(findChild_Widget(toolBar, "toolbar.name"),
+                                 isSidebarVisible ? uiTextDim_ColorId : tmBannerIcon_ColorId);
     }
 #else
     iUnused(d);
@@ -1014,8 +1037,13 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "toolbar.showident")) {
-        /* TODO: Clean this up. */
         iWidget *sidebar  = findWidget_App("sidebar");
+        if (isVisible_Widget(sidebar)) {
+            postCommandf_App("sidebar.toggle");
+        }
+        postCommand_App("preferences idents:1");
+#if 0
+        /* TODO: Clean this up. */
         iWidget *sidebar2 = findWidget_App("sidebar2");
         //dismissSidebar_(sidebar, "toolbar.view");
         if (isVisible_Widget(sidebar)) {
@@ -1036,6 +1064,7 @@ static iBool handleToolBarCommands_(iWidget *toolBar, const char *cmd) {
             setVisualOffset_Widget(sidebar2, offset, 0, 0);
             setVisualOffset_Widget(sidebar2, 0, 400, easeOut_AnimFlag | softer_AnimFlag);
         }
+#endif
         return iTrue;
     }
     else if (equal_Command(cmd, "sidebar.mode.changed")) {
@@ -1099,15 +1128,16 @@ void updateMetrics_Root(iRoot *d) {
             const iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
             const iWidget *viewButton = findChild_Widget(d->widget, "toolbar.view");
             const iWidget *idButton = findChild_Widget(toolBar, "toolbar.ident");
-            const int font = uiLabelTiny_FontId;
-            setFont_LabelWidget(idName, font);
-            setPos_Widget(as_Widget(idName),
+//            const int font = uiLabelTiny_FontId;
+            setFixedSize_Widget(as_Widget(idName), init_I2(-1, 2 * gap_UI + lineHeight_Text(uiLabelTiny_FontId)));
+//            setFont_LabelWidget(idName, font);
+            /*setPos_Widget(as_Widget(idName),
                           windowToLocal_Widget(as_Widget(idName),
                                                init_I2(left_Rect(bounds_Widget(idButton)),
                                                        bottom_Rect(bounds_Widget(viewButton)) -
                                                            lineHeight_Text(font) - gap_UI / 2)));
             setFixedSize_Widget(as_Widget(idName), init_I2(width_Widget(idButton),
-                                                           lineHeight_Text(font)));
+                                                           lineHeight_Text(font)));*/
         }
     }
     postRefresh_App();
@@ -1413,15 +1443,17 @@ void createUserInterface_Root(iRoot *d) {
         iWidget *content = findChild_Widget(root, "tabs.content");
         iSidebarWidget *sidebar1 = new_SidebarWidget(left_SidebarSide);
         addChildPos_Widget(content, iClob(sidebar1), front_WidgetAddPos);
-        iSidebarWidget *sidebar2 = new_SidebarWidget(right_SidebarSide);
         if (deviceType_App() != phone_AppDeviceType) {
+            iSidebarWidget *sidebar2 = new_SidebarWidget(right_SidebarSide);
             addChildPos_Widget(content, iClob(sidebar2), back_WidgetAddPos);
         }
+#if 0
         else {
             /* The identities sidebar is always in the main area. */
             addChild_Widget(findChild_Widget(root, "stack"), iClob(sidebar2));
             setFlags_Widget(as_Widget(sidebar2), hidden_WidgetFlag, iTrue);
         }
+#endif
     }
     /* Lookup results. */ {
         iLookupWidget *lookup = new_LookupWidget();
@@ -1481,23 +1513,29 @@ void createUserInterface_Root(iRoot *d) {
                                           iClob(newLargeIcon_LabelWidget(forwardArrow_Icon, "navigate.forward")),
                                           frameless_WidgetFlag),
                      "toolbar.forward");
-        setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(newLargeIcon_LabelWidget("\U0001f464", "identmenu.open")),
-                                          frameless_WidgetFlag),
+        iWidget *identButton;
+        setId_Widget(identButton = addChildFlags_Widget(
+                         toolBar,
+                         iClob(newLargeIcon_LabelWidget("\U0001f464", "identmenu.open")),
+                         frameless_WidgetFlag | fixedHeight_WidgetFlag),
                      "toolbar.ident");
         setId_Widget(addChildFlags_Widget(toolBar,
                                           iClob(newLargeIcon_LabelWidget(book_Icon, "toolbar.showview arg:-1")),
                                           frameless_WidgetFlag | commandOnClick_WidgetFlag),
                      "toolbar.view");
-        setId_Widget(addChildFlags_Widget(toolBar,
-                                          iClob(new_LabelWidget("", "toolbar.showident")),
+                     iLabelWidget *idName;
+        setId_Widget(addChildFlags_Widget(identButton,
+                                          iClob(idName = new_LabelWidget("", NULL)),
                                           frameless_WidgetFlag |
                                           noBackground_WidgetFlag |
-                                          fixedPosition_WidgetFlag |
+                                          moveToParentBottomEdge_WidgetFlag |
+                                          resizeToParentWidth_WidgetFlag
+                                          /*fixedPosition_WidgetFlag |
                                           fixedSize_WidgetFlag |
                                           ignoreForParentWidth_WidgetFlag |
-                                          ignoreForParentHeight_WidgetFlag),
+                                          ignoreForParentHeight_WidgetFlag*/),
                      "toolbar.name");
+        setFont_LabelWidget(idName, uiLabelTiny_FontId);
         iLabelWidget *menuButton = makeMenuButton_LabelWidget(menu_Icon, phoneNavMenuItems_,
                                                               iElemCount(phoneNavMenuItems_));
         setFont_LabelWidget(menuButton, uiLabelLarge_FontId);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 674e2b7c..9b94f4d9 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -608,8 +608,10 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
 }
 
 void setClosedFolders_SidebarWidget(iSidebarWidget *d, const iIntSet *closedFolders) {
-    delete_IntSet(d->closedFolders);
-    d->closedFolders = copy_IntSet(closedFolders);
+    if (d) {
+        delete_IntSet(d->closedFolders);
+        d->closedFolders = copy_IntSet(closedFolders);
+    }
 }
 
 enum iSidebarMode mode_SidebarWidget(const iSidebarWidget *d) {
@@ -625,7 +627,7 @@ float width_SidebarWidget(const iSidebarWidget *d) {
 }
 
 const iIntSet *closedFolders_SidebarWidget(const iSidebarWidget *d) {
-    return d->closedFolders;
+    return d ? d->closedFolders : collect_IntSet(new_IntSet());
 }
 
 static const char *normalModeLabels_[max_SidebarMode] = {
@@ -710,7 +712,8 @@ void init_SidebarWidget(iSidebarWidget *d, enum iSidebarSide side) {
         setId_Widget(buttons, "buttons");
         setDrawBufferEnabled_Widget(buttons, iTrue);
         for (int i = 0; i < max_SidebarMode; i++) {
-            if (deviceType_App() == phone_AppDeviceType && i == identities_SidebarMode) {
+            if (i == identities_SidebarMode && deviceType_App() != desktop_AppDeviceType) {
+                /* On mobile, identities are managed via Settings. */
                 continue;
             }
             d->modeButtons[i] = addChildFlags_Widget(
@@ -911,6 +914,7 @@ static void checkModeButtonLayout_SidebarWidget_(iSidebarWidget *d) {
 }
 
 void setWidth_SidebarWidget(iSidebarWidget *d, float widthAsGaps) {
+    if (!d) return;
     iWidget *w = as_Widget(d);
     const iBool isFixedWidth = deviceType_App() == phone_AppDeviceType;
     int width = widthAsGaps * gap_UI; /* in pixels */
@@ -1148,10 +1152,10 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 }
             }
         }
-        else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
-            postCommandf_App("sidebar.mode arg:%d toggle:1", identities_SidebarMode);
-            return iTrue;
-        }
+//        else if (deviceType_App() == tablet_AppDeviceType && equal_Command(cmd, "toolbar.showident")) {
+//            postCommandf_App("sidebar.mode arg:%d toggle:1", identities_SidebarMode);
+//            return iTrue;
+//        }
         else if (isPortraitPhone_App() && isVisible_Widget(w) && d->side == left_SidebarSide &&
                  equal_Command(cmd, "swipe.forward")) {
             postCommand_App("sidebar.toggle");
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index c22bfe86..89376633 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -123,9 +123,14 @@ static const iArray *makeIdentityItems_UploadWidget_(const iUploadWidget *d) {
     pushBack_Array(items, &(iMenuItem){ "---" });
     iConstForEach(PtrArray, i, listIdentities_GmCerts(certs_App(), NULL, NULL)) {
         const iGmIdentity *id = i.ptr;
+        iString *str = collect_String(copy_String(name_GmIdentity(id)));
+        if (!isEmpty_String(&id->notes)) {
+            appendFormat_String(
+                str, "\n%s%s", escape_Color(uiAnnotation_ColorId), cstr_String(&id->notes));
+        }
         pushBack_Array(
             items,
-            &(iMenuItem){ cstr_String(name_GmIdentity(id)), 0, 0,
+            &(iMenuItem){ cstr_String(str), 0, 0,
                           format_CStr("upload.setid fp:%s",
                                       cstrCollect_String(hexEncode_Block(&id->fingerprint))) });
     }
diff --git a/src/ui/util.c b/src/ui/util.c
index 61d3e9bb..de838769 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1215,6 +1215,15 @@ iLabelWidget *findMenuItem_Widget(iWidget *menu, const char *command) {
     return NULL;
 }
 
+iWidget *findUserData_Widget(iWidget *d, void *userData) {
+    iForEach(ObjectList, i, children_Widget(d)) {
+        if (userData_Object(i.object) == userData) {
+            return i.object;
+        }
+    }
+    return NULL;
+}
+
 void setMenuItemDisabled_Widget(iWidget *menu, const char *command, iBool disable) {
     if (flags_Widget(menu) & nativeMenu_WidgetFlag) {
         setDisabled_NativeMenuItem(findNativeMenuItem_Widget(menu, command), disable);
diff --git a/src/ui/util.h b/src/ui/util.h
index 81fb1cbd..7ee94f1d 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -249,7 +249,8 @@ void            setMenuItemDisabled_Widget      (iWidget *menu, const char *comm
 void            setMenuItemDisabledByIndex_Widget(iWidget *menu, size_t index, iBool disable);
 void            setMenuItemLabel_Widget         (iWidget *menu, const char *command, const char *newLabel);
 void            setMenuItemLabelByIndex_Widget  (iWidget *menu, size_t index, const char *newLabel);
-void            setNativeMenuItems_Widget       (iWidget *, const iMenuItem *items, size_t n);
+void            setNativeMenuItems_Widget       (iWidget *menu, const iMenuItem *items, size_t n);
+iWidget *       findUserData_Widget             (iWidget *, void *userData);
 
 int             checkContextMenu_Widget         (iWidget *, const SDL_Event *ev); /* see macro below */
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 254c2590..210fe899 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -271,10 +271,12 @@ void setMinSize_Widget(iWidget *d, iInt2 minSize) {
 }
 
 void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
-    d->padding[0] = left;
-    d->padding[1] = top;
-    d->padding[2] = right;
-    d->padding[3] = bottom;
+    if (d) {
+        d->padding[0] = left;
+        d->padding[1] = top;
+        d->padding[2] = right;
+        d->padding[3] = bottom;
+    }
 }
 
 iWidget *root_Widget(const iWidget *d) {