Merge a81e8adde78e4d608b40d417fdafd2ca3005bdcc into 32c16021c420ce10f630d98b00f8735f0bf2fdd7

apps/client/src/layouts/desktop_layout.tsx

@@ -30,6 +30,7 @@ import ScrollingContainer from "../widgets/containers/scrolling_container.js";
 import ScrollPadding from "../widgets/scroll_padding.js";
 import SearchResult from "../widgets/search_result.jsx";
 import SharedInfo from "../widgets/shared_info.jsx";
+import OriginInfo from "../widgets/note_origin.jsx";
 import SpacerWidget from "../widgets/spacer.js";
 import SplitNoteContainer from "../widgets/containers/split_note_container.js";
 import SqlResults from "../widgets/sql_result.js";
@@ -139,6 +140,7 @@ export default class DesktopLayout {
                                                                 .filling()
                                                                 .child(new ContentHeader()
                                                                     .child(<ReadOnlyNoteInfoBar />)
+                                                                    .child(<OriginInfo />)
                                                                     .child(<SharedInfo />)
                                                                 )
                                                                 .child(<PromotedAttributes />)

apps/client/src/stylesheets/style.css

@@ -27,6 +27,9 @@
     --bs-body-bg: var(--main-background-color) !important;    
     --ck-mention-list-max-height: 500px;    
     --tn-modal-max-height: 90vh;
+
+    --tree-item-light-theme-max-color-lightness: 50;
+    --tree-item-dark-theme-min-color-lightness: 75;
 }
 
 body#trilium-app.motion-disabled *,
@@ -2579,4 +2582,12 @@ iframe.print-iframe {
     position: relative;
     flex-grow: 1;
     width: 100%;
+}
+
+/* Calendar collection */
+
+.calendar-view a.fc-timegrid-event,
+.calendar-view a.fc-daygrid-event {
+    /* Workaround: set font weight only if the theme-next is not active */
+    font-weight: var(--root-background, 800);
 }

apps/client/src/stylesheets/theme-dark.css

@@ -76,6 +76,9 @@
 
     --mermaid-theme: dark;
     --native-titlebar-background: #00000000;
+
+    --calendar-coll-event-background-saturation: 30%;
+    --calendar-coll-event-background-lightness: 30%;
 }
 
 body ::-webkit-calendar-picker-indicator {

apps/client/src/stylesheets/theme-light.css

@@ -80,6 +80,9 @@ html {
 
     --mermaid-theme: default;
     --native-titlebar-background: #ffffff00;
+
+    --calendar-coll-event-background-lightness: 95%;
+    --calendar-coll-event-background-saturation: 80%;
 }
 
 #left-pane .fancytree-node.tinted {

apps/client/src/stylesheets/theme-next-dark.css

@@ -271,11 +271,12 @@
     --ck-editor-toolbar-button-on-shadow: 1px 1px 2px rgba(0, 0, 0, .75);
     --ck-editor-toolbar-dropdown-button-open-background: #ffffff14;
 
-    --calendar-coll-event-background-saturation: 12%;
-    --calendar-coll-event-background-lightness: 21%;
+    --calendar-coll-event-background-saturation: 25%;
+    --calendar-coll-event-background-lightness: 20%;
     --calendar-coll-event-background-color: #3c3c3c;
     --calendar-coll-event-text-color: white;
     --calendar-cell-event-hover-filter: brightness(1.25);
+    --calendar-coll-today-background-color: #ffffff08;
 }
 
 /*

apps/client/src/stylesheets/theme-next-light.css

@@ -274,6 +274,7 @@
     --calendar-coll-event-background-color: #eaeaea;
     --calendar-coll-event-text-color: black;
     --calendar-cell-event-hover-filter: brightness(.95) saturate(1.25);
+    --calendar-coll-today-background-color: #00000006;
 }
 
 #left-pane .fancytree-node.tinted {

apps/client/src/translations/ar/translation.json

@@ -511,7 +511,7 @@
     "title": "الملاحظات المعدلة"
   },
   "note_properties": {
-    "info": "معلومات"
+    "this_note_was_originally_taken_from": ""
   },
   "backend_log": {
     "refresh": "تحديث"

apps/client/src/translations/cn/translation.json

@@ -840,8 +840,7 @@
     "search": "搜索"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "笔记来源:",
-    "info": "信息"
+    "this_note_was_originally_taken_from": "笔记来源:"
   },
   "owned_attribute_list": {
     "owned_attributes": "拥有的属性"

apps/client/src/translations/de/translation.json

@@ -837,8 +837,7 @@
     "search": "Suchen"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:",
-    "info": "Info"
+    "this_note_was_originally_taken_from": "Diese Notiz stammt ursprünglich aus:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Eigene Attribute"

apps/client/src/translations/en/translation.json

@@ -841,8 +841,7 @@
     "search": "Search"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "This note was originally taken from:",
-    "info": "Info"
+    "this_note_was_originally_taken_from": "This note was originally taken from:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Owned Attributes"

apps/client/src/translations/es/translation.json

@@ -840,8 +840,7 @@
     "search": "Buscar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:",
-    "info": "Información"
+    "this_note_was_originally_taken_from": "Esta nota fue tomada originalmente de:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos propios"

apps/client/src/translations/fr/translation.json

@@ -834,8 +834,7 @@
     "search": "Recherche"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :",
-    "info": "Infos"
+    "this_note_was_originally_taken_from": "Cette note est initialement extraite de :"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributs propres"

apps/client/src/translations/it/translation.json

@@ -1409,8 +1409,7 @@
     "search": "Ricerca"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:",
-    "info": "Informazioni"
+    "this_note_was_originally_taken_from": "Questa nota è stata originariamente tratta da:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Attributi posseduti"

apps/client/src/translations/ja/translation.json

@@ -693,7 +693,6 @@
     "outside_hoisted": "このパスはホイストされたノートの外側にあるため、ホイストを解除する必要があります。"
   },
   "note_properties": {
-    "info": "情報",
     "this_note_was_originally_taken_from": "このノートは元々以下から引用したものです:"
   },
   "similar_notes": {

apps/client/src/translations/pl/translation.json

@@ -447,8 +447,7 @@
     "search": "Szukaj"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:",
-    "info": "Info"
+    "this_note_was_originally_taken_from": "Ta notatka oryginalnie została wzięta z:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Posiadane atrybuty"

apps/client/src/translations/pt/translation.json

@@ -809,8 +809,7 @@
     "search": "Pesquisar"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
-    "info": "Informações"
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Atributos próprios"

apps/client/src/translations/pt_br/translation.json

@@ -1075,8 +1075,7 @@
     "outside_hoisted": "Este caminho está fora de uma nota fixada e você teria que desafixar."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:",
-    "info": "Informações"
+    "this_note_was_originally_taken_from": "Esta nota foi originalmente obtida de:"
   },
   "promoted_attributes": {
     "promoted_attributes": "Atributos Promovidos",

apps/client/src/translations/ro/translation.json

@@ -910,7 +910,6 @@
     "title": "Căile notiței"
   },
   "note_properties": {
-    "info": "Informații",
     "this_note_was_originally_taken_from": "Această notiță a fost preluată original de la:"
   },
   "note_type_chooser": {

apps/client/src/translations/ru/translation.json

@@ -1066,7 +1066,6 @@
     "archived": "Архивировано"
   },
   "note_properties": {
-    "info": "Информация",
     "this_note_was_originally_taken_from": "Эта заметка была первоначально взята из:"
   },
   "promoted_attributes": {

apps/client/src/translations/tw/translation.json

@@ -837,8 +837,7 @@
     "search": "搜尋"
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "筆記來源：",
-    "info": "資訊"
+    "this_note_was_originally_taken_from": "筆記來源："
   },
   "owned_attribute_list": {
     "owned_attributes": "自有屬性"

apps/client/src/translations/uk/translation.json

@@ -938,8 +938,7 @@
     "outside_hoisted": "Цей шлях знаходиться поза межами закріпленої нотатки і вам доведеться відкріпити."
   },
   "note_properties": {
-    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:",
-    "info": "Інформація"
+    "this_note_was_originally_taken_from": "Цю нотатку було спочатку взято з:"
   },
   "owned_attribute_list": {
     "owned_attributes": "Власні Атрибути"

apps/client/src/widgets/collections/calendar/event_builder.ts

@@ -81,7 +81,6 @@ export async function buildEventsForCalendar(note: FNote, e: EventSourceFuncArg)
 export async function buildEvent(note: FNote, { startDate, endDate, startTime, endTime, isArchived }: Event) {
     const customTitleAttributeName = note.getLabelValue("calendar:title");
     const titles = await parseCustomTitle(customTitleAttributeName, note);
-    const color = note.getLabelValue("calendar:color") ?? note.getLabelValue("color");
     const colorClass = note.getColorClass();
     const events: EventInput[] = [];
 
@@ -110,7 +109,6 @@ export async function buildEvent(note: FNote, { startDate, endDate, startTime, e
             start: startDate,
             url: `#${note.noteId}?popup`,
             noteId: note.noteId,
-            color: color ?? undefined,
             iconClass: note.getLabelValue("iconClass"),
             promotedAttributes: displayedAttributesData,
             className: clsx({archived: isArchived}, colorClass)

apps/client/src/widgets/collections/calendar/index.css

@@ -1,8 +1,19 @@
+:root {
+    /* Default values to be overridden by themes */
+    --calendar-coll-event-background-lightness: 95%;
+    --calendar-coll-event-background-saturation: 80%;
+    --calendar-coll-event-background-color: var(--accented-background-color);
+    --calendar-coll-event-text-color: var(--primary-button-text-color);
+    --calendar-cell-event-hover-filter: none;
+    --calendar-coll-today-background-color: var(--more-accented-background-color);
+}
+
 .calendar-view {
     --fc-event-border-color: var(--calendar-coll-event-text-color);
     --fc-event-bg-color: var(--calendar-coll-event-background-color);
     --fc-event-text-color: var(--calendar-coll-event-text-color);
     --fc-event-selected-overlay-color: transparent;
+    --fc-today-bg-color: var(--calendar-coll-today-background-color);
 
     overflow: hidden;
     position: relative;
@@ -12,8 +23,9 @@
     padding: 10px;
 }
 
-.calendar-view a {
-    color: unset;
+.calendar-view a,
+:root .calendar-view a.fc-daygrid-event:hover {
+    color: var(--fc-event-text-color);
 }
 
 .search-result-widget-content .calendar-view {
@@ -85,17 +97,25 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
 /* #region Events */
 
 .calendar-view a.fc-timegrid-event,
-.calendar-view a.fc-daygrid-event {
+.calendar-view a.fc-daygrid-event,
+.fc-daygrid-dot-event .fc-event-title {
     font-weight: 500;
 }
 
-.calendar-view a.fc-timegrid-event,
-.calendar-view a.fc-daygrid-event:not(.fc-daygrid-dot-event) {
-    --border-color: transparent;
+.calendar-view a.fc-timegrid-event:focus-visible,
+.calendar-view a.fc-daygrid-event:focus-visible {
+    outline: none;
+}
 
-    border-width: 2px 2px 2px 4px;
+.calendar-view a.fc-timegrid-event,
+.calendar-view a.fc-daygrid-event {
+    --border-color: transparent;
+    
+    border: 2px solid;
+    border-left-width: 4px;
     border-color: var(--border-color) var(--border-color) var(--border-color)
                   var(--fc-event-text-color) !important;
+    background: var(--fc-event-bg-color) !important;
 
     padding-left: 8px;
 }
@@ -115,8 +135,8 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
     color: currentColor;
 }
 
-.fc-timegrid-event.with-hue,
-.fc-daygrid-event:not(.fc-daygrid-dot-event).with-hue {
+.calendar-view .fc-timegrid-event.with-hue,
+.calendar-view .fc-daygrid-event.with-hue {
     --fc-event-text-color: var(--custom-color);
 
     background: hsl(var(--custom-color-hue),
@@ -124,8 +144,12 @@ body.desktop:not(.zen) .calendar-view .calendar-header {
                     var(--calendar-coll-event-background-lightness)) !important;
 }
 
-.fc-event-time {
+.calendar-view .fc-event-time {
     opacity: .75;
 }
 
+.fc-daygrid-event-dot {
+    display: none;
+}
+
 /* #endregion */

apps/client/src/widgets/note_origin.tsx

@@ -0,0 +1,43 @@
+import { t } from "../services/i18n";
+import { useNoteContext, useTriliumEvent, useTriliumOption } from "./react/hooks";
+import { useEffect, useState } from "preact/hooks";
+import attributes from "../services/attributes";
+import InfoBar from "./react/InfoBar";
+import RawHtml from "./react/RawHtml";
+import FNote from "../entities/fnote";
+
+export default function OriginInfo() {
+    const { note } = useNoteContext();
+    const [link, setLink] = useState<string>();
+
+    function refresh() {
+        if (!note) return;
+        const pageUrl = getPageUrl(note);
+        if (!pageUrl) {
+            setLink(undefined);
+            return;
+        }
+        setLink(`<a href="${pageUrl}" class="external tn-link">${pageUrl}</a>`);
+    }
+
+    useEffect(refresh, [note]);
+    useTriliumEvent("entitiesReloaded", ({ loadResults }) => {
+        if (loadResults.getAttributeRows().find((attr) => attr.type === "label" && attr.name?.toString() === "pageUrl" && attributes.isAffecting(attr, note))) {
+            refresh();
+        }
+    });
+
+    return (
+        <InfoBar className="origin-info-widget" type="subtle" style={{ display: (!link) ? "none" : undefined }}>
+            {link && (
+                <RawHtml
+                    html={`${t("note_properties.this_note_was_originally_taken_from")} ${link}`}
+                />
+            )}
+        </InfoBar>
+    )
+}
+
+function getPageUrl(note: FNote) {
+    return note.getOwnedLabelValue("pageUrl");
+}

apps/client/src/widgets/ribbon/NotePropertiesTab.tsx

@@ -1,20 +0,0 @@
-import { t } from "../../services/i18n";
-import { useNoteLabel } from "../react/hooks";
-import { TabContext } from "./ribbon-interface";
-
-/**
- * TODO: figure out better name or conceptualize better.
- */
-export default function NotePropertiesTab({ note }: TabContext) {
-    const [ pageUrl ] = useNoteLabel(note, "pageUrl");
-
-    return (
-        <div className="note-properties-widget" style={{ padding: "12px", color: "var(--muted-text-color)" }}>
-            { pageUrl && (
-                <div style={{ overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
-                    {t("note_properties.this_note_was_originally_taken_from")} <a href={pageUrl} class="page-url external">{pageUrl}</a>
-                </div>
-            )}
-        </div>
-    )
-}

apps/client/src/widgets/ribbon/RibbonDefinition.ts

@@ -1,6 +1,5 @@
 import ScriptTab from "./ScriptTab";
 import EditedNotesTab from "./EditedNotesTab";
-import NotePropertiesTab from "./NotePropertiesTab";
 import NoteInfoTab from "./NoteInfoTab";
 import SimilarNotesTab from "./SimilarNotesTab";
 import FilePropertiesTab from "./FilePropertiesTab";
@@ -59,13 +58,6 @@ export const RIBBON_TAB_DEFINITIONS: TabConfiguration[] = [
         show: ({ note }) => note?.type === "book" || note?.type === "search",
         toggleCommand: "toggleRibbonTabBookProperties"
     },
-    {
-        title: t("note_properties.info"),
-        icon: "bx bx-info-square",
-        content: NotePropertiesTab,
-        show: ({ note }) => !!note?.getLabelValue("pageUrl"),
-        activate: true
-    },
     {
         title: t("file_properties.title"),
         icon: "bx bx-file",

apps/desktop/electron-forge/forge.config.ts

@@ -1,8 +1,9 @@
-import path from "path";
+import path, { join } from "path";
 import fs from "fs-extra";
 import { LOCALES } from "@triliumnext/commons";
 import { PRODUCT_NAME } from "../src/app-info.js";
 import type { ForgeConfig } from "@electron-forge/shared-types";
+import { existsSync } from "fs";
 
 const ELECTRON_FORGE_DIR = __dirname;
 
@@ -228,8 +229,22 @@ const config: ForgeConfig = {
             // Ensure all locales that should be kept are actually present.
             for (const locale of localesToKeep) {
                 if (!keptLocales.has(locale)) {
-                    console.error(`Locale ${locale} was not found in the packaged app.`);
-                    process.exit(1);
+                    throw new Error(`Locale ${locale} was not found in the packaged app.`);
+                }
+            }
+
+            // Check that the bettersqlite3 binary has the right architecture.
+            if (packageResult.platform === "linux" && packageResult.arch === "arm64") {
+                for (const outputPath of packageResult.outputPaths) {
+                    const binaryPath = join(outputPath, "resources/app.asar.unpacked/node_modules/better-sqlite3/build/Release/better_sqlite3.node");
+                    if (!existsSync(binaryPath)) {
+                        throw new Error(`[better-sqlite3] Unable to find .node file at ${binaryPath}`);
+                    }
+
+                    const actualArch = getELFArch(binaryPath);
+                    if (actualArch !== "ARM64") {
+                        throw new Error(`[better-sqlite3] Expected ARM64 architecture but got ${actualArch} at: ${binaryPath}`);
+                    }
                 }
             }
         },
@@ -284,4 +299,20 @@ function getExtraResourcesForPlatform() {
     return resources;
 }
 
+function getELFArch(file: string) {
+  const buf = fs.readFileSync(file);
+
+  if (buf[0] !== 0x7f || buf[1] !== 0x45 || buf[2] !== 0x4c || buf[3] !== 0x46) {
+    throw new Error("Not an ELF file");
+  }
+
+  const eiClass = buf[4];      // 1=32-bit, 2=64-bit
+  const eiMachine = buf[18];   // architecture code
+
+  if (eiMachine === 0x3E) return 'x86-64';
+  if (eiMachine === 0xB7) return 'ARM64';
+  return 'other';
+}
+
+
 export default config;