`,
+"2.2.11": `
+
+
+## New
+- Font picker with additional fonts (not yet fully configurable, but that will come in due time) [#8012](https://github.com/excalidraw/excalidraw/pull/8012)
+- Introducing Visual Thinking Badges. The more you use Excalidraw the higher your rank will be. Levels are: Bronze, Silver, Gold and Platinum.
+
+## Fixed
+- Embedded PDF was not visible on phones [#1904](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1904)
+- F2 does not rename files in Excalidraw View [#1900](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1900)
+- Wireframe to Code now honors the GPT model settings in plugin settings. [#1901](https://github.com/zsviczian/obsidian-excalidraw-plugin/issues/1901)
+- Updated ExcaliAI to support gpt-4o for vision. [#1859](https://github.com/zsviczian/obsidian-excalidraw-plugin/pull/1859) 🙏@Saik0s
+- Minor fixes from excalidraw.com [#8287](https://github.com/excalidraw/excalidraw/pull/8287), [#8285](https://github.com/excalidraw/excalidraw/pull/8285)
+`,
"2.2.10": `
diff --git a/src/dialogs/RankMessage.ts b/src/dialogs/RankMessage.ts
new file mode 100644
index 0000000..3a9d2b8
--- /dev/null
+++ b/src/dialogs/RankMessage.ts
@@ -0,0 +1,44 @@
+import { App, MarkdownRenderer, Modal } from "obsidian";
+import ExcalidrawPlugin from "../main";
+import { Rank, SwordColors } from "src/menu/ActionIcons";
+
+export class RankMessage extends Modal {
+
+ constructor(app: App, private plugin: ExcalidrawPlugin, private filecount: number, private rank: Rank, private color: string, private shield: string, private dark: string) {
+ super(app);
+ }
+
+ onOpen(): void {
+ //this.contentEl.classList.add("excalidraw-release");
+ this.containerEl.classList.add("excalidraw-release");
+ this.titleEl.setText("Congratulations, glorious knight!");
+ this.createForm();
+ }
+
+ async onClose() {
+ this.contentEl.empty();
+ this.plugin = null;
+ }
+
+ async createForm() {
+ const { title} = SwordColors[this.rank];
+ this.contentEl.createDiv({ cls: "excalidraw-rank" }, (el) => {
+ el.innerHTML = ``;
+ });
+
+ await MarkdownRenderer.render(
+ this.app,
+ `You have ${this.filecount} Excalidraw drawings in your Vault earning you a new rank: **${this.rank}**! You've ascended to **${title}**!\n\nI've spent the past 3+ years building this plugin. If you appreciate my work, consider supporting me on [Ko-Fi](https://ko-fi.com/zsolt) or join the next [Visual Thinking Workshop](https://visual-thinking-workshop.com) cohort.`,
+ this.contentEl,
+ "",
+ this.plugin,
+ );
+
+ this.contentEl.createEl("p", { text: "" }, (el) => {
+ //files manually follow one of two options:
+ el.style.textAlign = "right";
+ const bOk = el.createEl("button", { text: "Close" });
+ bOk.onclick = () => this.close();
+ });
+ }
+}
diff --git a/src/lang/locale/en.ts b/src/lang/locale/en.ts
index 1f385b5..b9c5301 100644
--- a/src/lang/locale/en.ts
+++ b/src/lang/locale/en.ts
@@ -230,7 +230,7 @@ export default {
"The default OpenAI API URL. This is a freetext field, so you can enter any valid OpenAI API compatible URL. " +
"Excalidraw will use this URL when posting API requests to OpenAI. I am not doing any error handling on this field, so make sure you enter a valid URL and only change this if you know what you are doing. ",
AI_OPENAI_DEFAULT_IMAGE_API_URL_NAME: "OpenAI Image Generation API URL",
- AI_OPENAI_DEFAULT_VISION_MODEL_PLACEHOLDER: "Enter your default AI vision model here. e.g.: gpt-4-vision-preview",
+ AI_OPENAI_DEFAULT_VISION_MODEL_PLACEHOLDER: "Enter your default AI vision model here. e.g.: gpt-4o",
SAVING_HEAD: "Saving",
SAVING_DESC: "In the 'Saving' section of Excalidraw Settings, you can configure how your drawings are saved. This includes options for compressing Excalidraw JSON in Markdown, setting autosave intervals for both desktop and mobile, defining filename formats, and choosing whether to use the .excalidraw.md or .md file extension. ",
COMPRESS_NAME: "Compress Excalidraw JSON in Markdown",
@@ -647,7 +647,7 @@ FILENAME_HEAD: "Filename",
LATEX_DEFAULT_DESC: "Leave empty if you don't want a default formula. You can add default formatting here such as \\color{white}.",
NONSTANDARD_HEAD: "Non-Excalidraw.com supported features",
NONSTANDARD_DESC: `These settings in the "Non-Excalidraw.com Supported Features" section provide customization options beyond the default Excalidraw.com features. These features are not available on excalidraw.com. When exporting the drawing to Excalidraw.com these features will appear different.
- You can configure the number of custom pens displayed next to the Obsidian Menu on the canvas, allowing you to choose from a range of options. Additionally, you can enable a fourth font option, which adds a fourth font button to the properties panel for text elements. `,
+ You can configure the number of custom pens displayed next to the Obsidian Menu on the canvas, allowing you to choose from a range of options. Additionally, you can enable a local font option, which adds a local font to the list of fonts on the element properties panel for text elements. `,
RENDER_TWEAK_HEAD: "Rendering tweaks",
MAX_IMAGE_ZOOM_IN_NAME: "Maximum image zoom in resolution",
MAX_IMAGE_ZOOM_IN_DESC: "To save on memory and because Apple Safari (Obsidian on iOS) has some hard-coded limitations, Excalidraw.com limits the max resolution of images and large objects when zooming in. You can override this limitation using a multiplicator. " +
@@ -697,16 +697,16 @@ FILENAME_HEAD: "Filename",
"Enabling this feature simplifies the use of Excalidraw front matter properties, allowing you to leverage many powerful settings. If you prefer not to load these properties automatically, " +
"you can disable this feature, but you will need to manually remove any unwanted properties from the suggester. " +
"Note that turning on this setting requires restarting the plugin as properties are loaded at startup.",
- CUSTOM_FONT_HEAD: "Fourth font",
- ENABLE_FOURTH_FONT_NAME: "Enable fourth font option",
+ CUSTOM_FONT_HEAD: "Local font",
+ ENABLE_FOURTH_FONT_NAME: "Enable local font option",
ENABLE_FOURTH_FONT_DESC:
- "By turning this on, you will see a fourth font button on the properties panel for text elements. " +
- "Files that use this fourth font will (partly) lose their platform independence. " +
+ "By turning this on, you will see a local font in the font list on the properties panel for text elements. " +
+ "Files that use this local font will (partly) lose their platform independence. " +
"Depending on the custom font set in settings, they will look differently when loaded in another vault, or at a later time. " +
"Also the 4th font will display as system default font on excalidraw.com, or other Excalidraw versions.",
- FOURTH_FONT_NAME: "Fourth font file",
+ FOURTH_FONT_NAME: "Local font file",
FOURTH_FONT_DESC:
- "Select a .ttf, .woff or .woff2 font file from your vault to use as the fourth font. " +
+ "Select a .ttf, .woff or .woff2 font file from your vault to use as the local font. " +
"If no file is selected, Excalidraw will use the Virgil font by default.",
SCRIPT_SETTINGS_HEAD: "Settings for installed Scripts",
SCRIPT_SETTINGS_DESC: "Some of the Excalidraw Automate Scripts include settings. Settings are organized by script. Settings will only become visible in this list after you have executed the newly downloaded script once.",
diff --git a/src/lang/locale/zh-cn.ts b/src/lang/locale/zh-cn.ts
index 12e2d31..6625421 100644
--- a/src/lang/locale/zh-cn.ts
+++ b/src/lang/locale/zh-cn.ts
@@ -230,7 +230,7 @@ export default {
"默认的 OpenAI API URL。请填写有效的 OpenAI API URL。" +
"Excalidraw 会通过该 URL 发送 API 请求给 OpenAI。我没有对此选项做任何错误处理，请谨慎修改。",
AI_OPENAI_DEFAULT_IMAGE_API_URL_NAME: "OpenAI 图像生成 API URL",
- AI_OPENAI_DEFAULT_VISION_MODEL_PLACEHOLDER: "gpt-4-vision-preview",
+ AI_OPENAI_DEFAULT_VISION_MODEL_PLACEHOLDER: "gpt-4o",
SAVING_HEAD: "保存",
SAVING_DESC: "包括：压缩，自动保存的时间间隔，文件的命名格式和扩展名等的设置。",
COMPRESS_NAME: "压缩 Excalidraw JSON",
diff --git a/src/main.ts b/src/main.ts
index e995c9e..509091d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -136,6 +136,8 @@ import { EditorHandler } from "./CodeMirrorExtension/EditorHandler";
import { clearMathJaxVariables } from "./LaTeX";
import { showFrameSettings } from "./dialogs/FrameSettings";
import { ExcalidrawLib } from "./ExcalidrawLib";
+import { Rank, SwordColors } from "./menu/ActionIcons";
+import { RankMessage } from "./dialogs/RankMessage";
declare let EXCALIDRAW_PACKAGES:string;
declare let react:any;
@@ -187,6 +189,7 @@ export default class ExcalidrawPlugin extends Plugin {
public forceToOpenInMarkdownFilepath: string = null;
private slob:string;
private ribbonIcon:HTMLElement;
+ public loadTimestamp:number;
constructor(app: App, manifest: PluginManifest) {
super(app, manifest);
@@ -308,14 +311,23 @@ export default class ExcalidrawPlugin extends Plugin {
}*/
async onload() {
+ this.loadTimestamp = Date.now();
addIcon(ICON_NAME, EXCALIDRAW_ICON);
addIcon(SCRIPTENGINE_ICON_NAME, SCRIPTENGINE_ICON);
addIcon(EXPORT_IMG_ICON_NAME, EXPORT_IMG_ICON);
await this.loadSettings({reEnableAutosave:true});
+ const updateSettings = !this.settings.onceOffCompressFlagReset || !this.settings.onceOffGPTVersionReset;
if(!this.settings.onceOffCompressFlagReset) {
this.settings.compress = true;
this.settings.onceOffCompressFlagReset = true;
+ }
+ if(!this.settings.onceOffGPTVersionReset) {
+ if(this.settings.openAIDefaultVisionModel === "gpt-4-vision-preview") {
+ this.settings.openAIDefaultVisionModel = "gpt-4o";
+ }
+ }
+ if(updateSettings) {
await this.saveSettings();
}
this.excalidrawConfig = new ExcalidrawConfig(this);
@@ -3529,6 +3541,21 @@ export default class ExcalidrawPlugin extends Plugin {
errorlog({file, error: "new drawing not recognized as an excalidraw file", fn: this.createDrawing});
}
+ if(Date.now() - this.loadTimestamp > 1){//2000) {
+ const filecount = this.app.vault.getFiles().filter(f=>this.isExcalidrawFile(f)).length;
+ const rank:Rank = filecount < 200 ? "Bronze" : filecount < 750 ? "Silver" : filecount < 2000 ? "Gold" : "Platinum";
+ const {grip, decoration, blade} = SwordColors[rank];
+ if(this.settings.rank !== rank) {
+ //in case the message was already displayed on another device and it was synced in the mean time
+ await this.loadSettings();
+ if(this.settings.rank !== rank) {
+ this.settings.rank = rank;
+ await this.saveSettings();
+ new RankMessage(this.app, this, filecount, rank, decoration, blade, grip).open();
+ }
+ }
+ }
+
return file;
}
diff --git a/src/menu/ActionIcons.tsx b/src/menu/ActionIcons.tsx
index 3621b0a..0e1e8b7 100644
--- a/src/menu/ActionIcons.tsx
+++ b/src/menu/ActionIcons.tsx
@@ -59,6 +59,21 @@ export const ICONS = {
#^
),
+ Learn: (
+
+ ),
Discord: (
),
- ExcalidrawSword: (
-
- )
};
+export const SwordColors = {
+ Bronze: { grip: "#cd7f32", decoration: "#96510d", blade: "#7A420B", bladeFillLight: "#E1B384", title: "Apprentice of Sketchnoting" },
+ Silver: { grip: "#CECDCC", decoration: "#b2b0b0", blade: "#979595", bladeFillLight: "#F5F5F5", title: "Champion of Spatial Thinking" },
+ Gold: { grip: "#F5D000", decoration: "#D6B600", blade: "#B89C00", bladeFillLight: "#FFEA70", title: "Hero of Visual Notetaking" },
+ Platinum: { grip: "#646261", decoration: "#323131", blade: "#000", bladeFillLight: "#8B8988", title: "Legend of Visual Thinking" },
+}
+
+export type Rank = keyof typeof SwordColors;
+
+export const excalidrawSword = (rank: Rank) => {
+ const { grip, decoration, blade, bladeFillLight } = SwordColors[rank];
+
+ return (
+
+ )
+}
export const saveIcon = (isDirty: boolean) => {
return (
`,
+ href: "https://github.com/zsviczian/obsidian-excalidraw-plugin/issues",
+ aria: "Report bugs and raise feature requsts on the plugin's GitHub page",
+ text: "Bugs and Feature Requests",
+ },
+ {
+ icon: ``,
+ href: "https://www.youtube.com/@VisualPKM",
+ aria: "Check out my YouTube channel to learn about Visual Thinking and Excalidraw",
+ text: "Visual PKM on YouTube",
+ },
+ {
+ icon: ``,
+ href: "https://discord.gg/DyfAXFwUHc",
+ aria: "Join the Visual Thinking Workshop Discord Server",
+ text: "Community on Discord",
+ },
+ {
+ icon: ``,
+ href: "https://twitter.com/zsviczian",
+ aria: "Follow me on Twitter",
+ text: "Follow me on Twitter",
+ },
+ {
+ icon: getIcon("graduation-cap").outerHTML,
+ href: "https://visual-thinking-workshop.com",
+ aria: "Learn about Visual PKM, Excalidraw, Obsidian, ExcaliBrain and more",
+ text: "Join the Visual Thinking Workshop",
+ }
+ ];
+
+ const linksEl = containerEl.createDiv("setting-item-description excalidraw-settings-links-container");
+ iconLinks.forEach(({ icon, href, aria, text }) => {
+ linksEl.createEl("a",{href, attr: { "aria-label": aria }}, (a)=> {
+ a.innerHTML = icon + text;
+ });
+ });
// ------------------------------------------------
// Saving
diff --git a/src/utils/FileUtils.ts b/src/utils/FileUtils.ts
index b763226..319b7f1 100644
--- a/src/utils/FileUtils.ts
+++ b/src/utils/FileUtils.ts
@@ -11,6 +11,7 @@ import { getAttachmentsFolderAndFilePath } from "./ObsidianUtils";
/**
* Splits a full path including a folderpath and a filename into separate folderpath and filename components
* @param filepath
+ * @returns folderpath will be normalized. This means "/" for root folder and no trailing "/" for other folders
*/
type ImageExtension = keyof typeof IMAGE_MIME_TYPES;
diff --git a/styles.css b/styles.css
index 643ab71..88ce582 100644
--- a/styles.css
+++ b/styles.css
@@ -594,4 +594,35 @@ root {
textarea.excalidraw-wysiwyg, .excalidraw input {
caret-color: var(--excalidraw-caret-color);
+}
+
+.excalidraw-settings-links-container {
+ display: flex; /* Align SVG and text horizontally */
+ align-items: center; /* Center SVG and text vertically */
+ text-decoration: none; /* Remove underline from links */
+ color: inherit; /* Inherit text color */
+ text-align: center;
+}
+
+.excalidraw-settings-links-container a {
+ display: flex; /* Align children horizontally */
+ align-items: center; /* Center items vertically */
+ text-align: left;
+}
+
+.excalidraw-settings-links-container svg {
+ margin-right: 8px;
+ height: 30px;
+ width: 30px;
+}
+
+.excalidraw-rank {
+ text-align: center;
+ margin-top: 0.5rem;
+ margin-bottom: 0.5rem;
+}
+
+.excalidraw-rank svg {
+ height: 8rem;
+ width: 8rem;
}
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index 54b4f2a..ccf4076 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,7 @@
"dom",
"scripthost",
"es2015",
- "esnext",
+ "ESNext",
"DOM.Iterable"
],
"jsx": "react",
