Fixed page timestamp; 24-hour time preference

IssueID #349

7 files changed, 31 insertions, 2 deletions

diff --git a/src/app.c b/src/app.c
index 75e37a0b..a2de03ca 100644
--- a/src/app.c
+++ b/src/app.c
@@ -240,6 +240,7 @@ static iString *serializePrefs_App_(const iApp *d) {
         const char * id;
         const iBool *value;
     } boolPrefs[] = {
+        { "prefs.time.24h", &d->prefs.time24h },
         { "prefs.animate", &d->prefs.uiAnimations },
         { "prefs.font.smooth", &d->prefs.fontSmoothing },
         { "prefs.mono.gemini", &d->prefs.monospaceGemini },
@@ -2573,6 +2574,10 @@ iBool handleCommand_App(const char *cmd) {
         d->prefs.uiAnimations = arg_Command(cmd) != 0;
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.time.24h.changed")) {
+        d->prefs.time24h = arg_Command(cmd) != 0;
+        return iTrue;
+    }
     else if (equal_Command(cmd, "saturation.set")) {
         d->prefs.saturation = (float) arg_Command(cmd) / 100.0f;
         if (!isFrozen) {
@@ -2892,6 +2897,7 @@ iBool handleCommand_App(const char *cmd) {
         updateScrollSpeedButtons_(dlg, mouse_ScrollType, d->prefs.smoothScrollSpeed[mouse_ScrollType]);
         updateScrollSpeedButtons_(dlg, keyboard_ScrollType, d->prefs.smoothScrollSpeed[keyboard_ScrollType]);
         updateDropdownSelection_LabelWidget(findChild_Widget(dlg, "prefs.uilang"), cstr_String(&d->prefs.strings[uiLanguage_PrefsString]));
+        setToggle_Widget(findChild_Widget(dlg, "prefs.time.24h"), d->prefs.time24h);
         updateDropdownSelection_LabelWidget(
             findChild_Widget(dlg, "prefs.returnkey"),
             format_CStr("returnkey.set arg:%d", d->prefs.returnKey));
diff --git a/src/lang.c b/src/lang.c
index 905601ca..831fa58f 100644
--- a/src/lang.c
+++ b/src/lang.c
@@ -22,6 +22,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "lang.h"
 #include "resources.h"
+#include "prefs.h"
+#include "app.h"
 
 #include <the_Foundation/sortedarray.h>
 #include <the_Foundation/string.h>
@@ -261,3 +263,17 @@ const char *format_Lang(const char *formatTextWithIds, ...) {
     va_end(args);
     return cstr_Block(collect_Block(msg));
 }
+
+iString *timeFormatHourPreference_Lang(const char *formatMsgId) {
+    iString *str = newCStr_String(cstr_Lang(formatMsgId));
+    translate_Lang(str);
+    if (prefs_App()->time24h) {
+        replace_String(str, "%I", "%H");
+        replace_String(str, " %p", "");
+        replace_String(str, "%p", "");
+    }
+    else {
+        replace_String(str, "%H:%M", "%I:%M %p");
+    }
+    return str;
+}
diff --git a/src/lang.h b/src/lang.h
index e3e6c433..8ed5eca9 100644
--- a/src/lang.h
+++ b/src/lang.h
@@ -40,3 +40,5 @@ const char *    cstrCount_Lang      (const char *msgId, int count);
 const char *    formatCStr_Lang     (const char *formatMsgId, int count);
 const char *    formatCStrs_Lang    (const char *formatMsgId, size_t count);
 const char *    format_Lang         (const char *formatTextWithIds, ...);
+
+iString *   timeFormatHourPreference_Lang   (const char *formatMsgId);
diff --git a/src/prefs.c b/src/prefs.c
index 956a75ae..10df9ade 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -43,6 +43,7 @@ void init_Prefs(iPrefs *d) {
     d->sideIcon          = iTrue;
     d->hideToolbarOnScroll = iTrue;
     d->pinSplit          = 1;
+    d->time24h           = iTrue;
     d->returnKey         = default_ReturnKeyBehavior;
     d->hoverLink         = iFalse;
     d->smoothScrolling   = iTrue;
diff --git a/src/prefs.h b/src/prefs.h
index d7712c9d..2fbff9de 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -73,6 +73,7 @@ struct Impl_Prefs {
     iBool            sideIcon;
     iBool            hideToolbarOnScroll;
     int              pinSplit; /* 0: no pinning, 1: left doc, 2: right doc */
+    iBool            time24h;
     /* Behavior */
     int              returnKey;
     iBool            hoverLink;
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index c41c77d6..aac77572 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1038,10 +1038,12 @@ static void updateTimestampBuf_DocumentWidget_(const iDocumentWidget *d) {
         d->drawBufs->timestampBuf = NULL;
     }
     if (isValid_Time(&d->sourceTime)) {
+        iString *fmt = timeFormatHourPreference_Lang("page.timestamp");
         d->drawBufs->timestampBuf = newRange_TextBuf(
             uiLabel_FontId,
             white_ColorId,
-            range_String(collect_String(format_Time(&d->sourceTime, cstr_Lang("page.timestamp")))));
+            range_String(collect_String(format_Time(&d->sourceTime, cstr_String(fmt)))));
+        delete_String(fmt);
     }
     d->drawBufs->flags &= ~updateTimestampBuf_DrawBufsFlag;
 }
@@ -4792,7 +4794,7 @@ static void drawSideElements_DocumentWidget_(const iDocumentWidget *d) {
                 bottomLeft_Rect(bounds),
                 init_I2(margin,
                         -margin + -dbuf->timestampBuf->size.y +
-                            iMax(0, d->scrollY.max + viewPos_DocumentWidget_(d)))),
+                            iMax(0, d->scrollY.max - pos_SmoothScroll(&d->scrollY)))),
             tmQuoteIcon_ColorId);
     }
     unsetClip_Paint(&p);
diff --git a/src/ui/util.c b/src/ui/util.c
index 57fa9f3d..baa05082 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2507,6 +2507,7 @@ iWidget *makePreferences_Widget(void) {
                                               alignLeft_WidgetFlag),
                          "prefs.uilang");
         }
+        addDialogToggle_(headings, values, "${prefs.time.24h}", "prefs.time.24h");
     }
     /* User Interface. */ {
         appendTwoColumnTabPage_Widget(tabs, "${heading.prefs.interface}", '2', &headings, &values);