{#if item.lines?.length < 2 && !item.lines?.[0]?.text?.[0]?.value?.length}
{/if}
{#if isLocked}
@@ -611,6 +615,8 @@
width: 100%;
overflow: hidden;
padding-top: 0;
+
+ line-height: 1.5em;
}
.edit:global(.invisible) {
diff --git a/src/frontend/components/edit/editors/SlideEditor.svelte b/src/frontend/components/edit/editors/SlideEditor.svelte
index 235b559f..1c72f7ef 100644
--- a/src/frontend/components/edit/editors/SlideEditor.svelte
+++ b/src/frontend/components/edit/editors/SlideEditor.svelte
@@ -332,7 +332,7 @@
@@ -340,8 +340,8 @@
{/if}
@@ -440,7 +440,7 @@
}
.seperator {
- width: 2px;
+ width: 1px;
height: 100%;
background-color: var(--primary);
/* margin: 0 10px; */
diff --git a/src/frontend/components/edit/scripts/itemHelpers.ts b/src/frontend/components/edit/scripts/itemHelpers.ts
index ec998b5e..ca4417bb 100644
--- a/src/frontend/components/edit/scripts/itemHelpers.ts
+++ b/src/frontend/components/edit/scripts/itemHelpers.ts
@@ -10,7 +10,7 @@ import { clone, keysToID, sortByName } from "../../helpers/array"
export const DEFAULT_ITEM_STYLE = "top:120px;left:50px;height:840px;width:1820px;"
-export function addItem(type: ItemType, id: any = null, options: any = {}) {
+export function addItem(type: ItemType, id: any = null, options: any = {}, value: string = "") {
let activeTemplate: string | null = get(activeShow)?.id ? get(showsCache)[get(activeShow)!.id!]?.settings?.template : null
let template = activeTemplate ? get(templates)[activeTemplate]?.items : null
@@ -20,7 +20,7 @@ export function addItem(type: ItemType, id: any = null, options: any = {}) {
}
if (id) newData.id = id
- if (type === "text") newData.lines = [{ align: template?.[0]?.lines?.[0]?.align || "", text: [{ value: "", style: template?.[0]?.lines?.[0]?.text?.[0]?.style || "" }] }]
+ if (type === "text") newData.lines = [{ align: template?.[0]?.lines?.[0]?.align || "", text: [{ value, style: template?.[0]?.lines?.[0]?.text?.[0]?.style || "" }] }]
if (type === "list") newData.list = { items: [] }
// else if (type === "timer") newData.timer = { id: uid(), name: get(dictionary).timer?.counter || "Counter", type: "counter", start: 300, end: 0 }
else if (type === "timer") {
diff --git a/src/frontend/components/edit/tools/Items.svelte b/src/frontend/components/edit/tools/Items.svelte
index 83a16cd6..b41dfa68 100644
--- a/src/frontend/components/edit/tools/Items.svelte
+++ b/src/frontend/components/edit/tools/Items.svelte
@@ -1,6 +1,6 @@
@@ -32,9 +27,12 @@
}
.error {
+ margin-bottom: 2px;
+
font-size: 0.9em;
- /* font-style: italic;
- font-weight: bold; */
- opacity: 0.7;
+ opacity: 0.9;
+
+ text-decoration-line: underline;
+ text-decoration-color: rgb(255 0 0 / 0.7);
}
diff --git a/src/frontend/components/main/popups/CloudMethod.svelte b/src/frontend/components/main/popups/CloudMethod.svelte
index a8060bf1..5338d890 100644
--- a/src/frontend/components/main/popups/CloudMethod.svelte
+++ b/src/frontend/components/main/popups/CloudMethod.svelte
@@ -34,11 +34,11 @@
diff --git a/src/frontend/components/main/popups/History.svelte b/src/frontend/components/main/popups/History.svelte
index fc04c8c6..47b5dfe7 100644
--- a/src/frontend/components/main/popups/History.svelte
+++ b/src/frontend/components/main/popups/History.svelte
@@ -5,6 +5,7 @@
import T from "../../helpers/T.svelte"
import { getDateAndTimeString, timeAgo } from "../../helpers/time"
import Button from "../../inputs/Button.svelte"
+ import CombinedInput from "../../inputs/CombinedInput.svelte"
import Center from "../../system/Center.svelte"
const INITIAL: any = { id: "initial", time: 0 }
@@ -103,47 +104,60 @@
}
-{#if rHistory.length || uHistory.length}
- {#each rHistory as item, i}
- {@const itemId = getItemId(item)}
-
- {/each}
- {#each uHistory as item, i}
- {@const itemId = getItemId(item)}
-
- {/each}
-
-
-
-
-
-{:else}
-
-
-
-{/if}
+ {:else}
+
+
+
+ {/if}
+
diff --git a/src/frontend/components/main/popups/UserDataOverwrite.svelte b/src/frontend/components/main/popups/UserDataOverwrite.svelte
new file mode 100644
index 00000000..6d984c8a
--- /dev/null
+++ b/src/frontend/components/main/popups/UserDataOverwrite.svelte
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/frontend/components/main/popups/export/Export.svelte b/src/frontend/components/main/popups/export/Export.svelte
index 0eeeac5c..5c1a40a7 100644
--- a/src/frontend/components/main/popups/export/Export.svelte
+++ b/src/frontend/components/main/popups/export/Export.svelte
@@ -2,7 +2,7 @@
import { EXPORT } from "../../../../../types/Channels"
import type { Project } from "../../../../../types/Projects"
import { Show } from "../../../../../types/Show"
- import { activePopup, activeProject, dataPath, projects, showsCache, showsPath } from "../../../../stores"
+ import { activePopup, activeProject, dataPath, dictionary, projects, showsCache, showsPath, special } from "../../../../stores"
import { send } from "../../../../utils/request"
import { exportProject } from "../../../export/project"
import { clone } from "../../../helpers/array"
@@ -10,8 +10,8 @@
import { loadShows } from "../../../helpers/setShow"
import T from "../../../helpers/T.svelte"
import Button from "../../../inputs/Button.svelte"
+ import Checkbox from "../../../inputs/Checkbox.svelte"
import CombinedInput from "../../../inputs/CombinedInput.svelte"
- import Dropdown from "../../../inputs/Dropdown.svelte"
import Center from "../../../system/Center.svelte"
import Loader from "../../Loader.svelte"
import { exportFormats, exportTypes, getActiveShowId, getShowIdsFromType } from "./exportHelper"
@@ -21,18 +21,33 @@
let showIds: string[] = []
let loading: boolean = false
- let type: any = exportTypes[0]
- let format: any = exportFormats[0]
+ let exportType: string = ""
+ let exportFormat: string = ""
- $: if (type.id) updateActive()
- async function updateActive() {
- // type not supported by format
- if (exportFormats.find((a) => a.id === format.id)?.data?.hide.includes(type.id)) {
- format = exportFormats[0]
- }
+ const excludedFormats = {
+ project: ["show", "txt"],
+ all_shows: ["project", "pdf"],
+ }
+ function filterFormats(exportFormats) {
+ return clone(exportFormats).filter((a) => !(excludedFormats[exportType] || []).find((id) => id === a.id))
+ }
+
+ const formatIcons = {
+ show: "json",
+ txt: "txt",
+ pdf: "pdf",
+ project: "zip",
+ }
+
+ $: typeName = exportTypes.find((a) => a.id === exportType)?.name || ""
+ $: formatName = exportFormats.find((a) => a.id === exportFormat)?.name || ""
+
+ ///
+ $: if (exportType && exportFormat) updateActive()
+ async function updateActive() {
loading = true
- showIds = getShowIdsFromType[type.id]?.() || []
+ showIds = getShowIdsFromType[exportType]?.() || []
let showId = showIds[0]
if (!showId && !previewShow) showId = getActiveShowId()
@@ -43,22 +58,21 @@
}
loading = false
+
+ // TODO: get & display preview example of first txt!/show? export
}
async function exportClick() {
- // type not supported by format
- if (exportFormats.find((a) => a.id === format.id)?.data?.hide.includes(type.id)) return
-
- if (type.id === "all_shows") {
+ if (exportType === "all_shows") {
loading = true
- send(EXPORT, ["ALL_SHOWS"], { type: format.id, path: $dataPath, showsPath: $showsPath })
+ send(EXPORT, ["ALL_SHOWS"], { type: exportFormat, path: $dataPath, showsPath: $showsPath })
return
}
- if (format.id === "project") {
+ if (exportFormat === "project") {
if (!showIds.length) return
- let project: Project | null = type.id === "project" && $activeProject ? $projects[$activeProject] : null
+ let project: Project | null = exportType === "project" && $activeProject ? $projects[$activeProject] : null
if (!project) {
if (!previewShow) return
@@ -74,58 +88,140 @@
loading = true
await exportProject(project)
} else {
- send(EXPORT, ["GENERATE"], { type: format.id, path: $dataPath, showsPath: $showsPath, showIds, options: format.id === "pdf" ? pdfOptions : {} })
+ send(EXPORT, ["GENERATE"], { type: exportFormat, path: $dataPath, showsPath: $showsPath, showIds, options: exportFormat === "pdf" ? pdfOptions : {} })
}
activePopup.set(null)
}
let pdfOptions: any = {}
+
+ function setSpecial(e: any, key: string) {
+ let value = e?.target?.checked
+ special.update((a) => {
+ a[key] = value
+ return a
+ })
+ }
-
-
-
(type = e.detail)} />
-
- !a.data?.hide.includes(type.id))} value={format.name} on:click={(e) => (format = e.detail)} />
-
+{#if !exportType}
+
+
+
+ {#each exportTypes as type, i}
+
+ {/each}
+
+{:else if !exportFormat}
+
-
+
+
+
+ {#each filterFormats(exportFormats) as format, i}
+
+ {/each}
+
+{:else}
+
-{#if format.id === "pdf"}
-
+
+
+
+
+
+
+ {#if formatName.includes("$:")}{:else}{formatName}{/if}
+
+
-{/if}
-{#if loading}
-
-
-
-{/if}
+ {#if exportFormat === "pdf"}
+
+
+
+ {:else if exportFormat === "project"}
+
+
+
+ setSpecial(e, "projectIncludeMedia")} />
+
+
-
-
-
-
-
+
+ {#if loading}
+
+
+
+ {/if}
+
+
+
+
+{/if}
diff --git a/src/frontend/components/settings/tabs/Other.svelte b/src/frontend/components/settings/tabs/Other.svelte
index 48f6c9c4..b91b4b82 100644
--- a/src/frontend/components/settings/tabs/Other.svelte
+++ b/src/frontend/components/settings/tabs/Other.svelte
@@ -2,7 +2,7 @@
import { onDestroy, onMount } from "svelte"
import { EXPORT, MAIN } from "../../../../types/Channels"
import { activePage, activePopup, alertMessage, alertUpdates, dataPath, deletedShows, dictionary, popupData, shows, showsCache, showsPath, special, usageLog } from "../../../stores"
- import { destroy, receive, send } from "../../../utils/request"
+ import { awaitRequest, destroy, receive, send } from "../../../utils/request"
import { save } from "../../../utils/save"
import Icon from "../../helpers/Icon.svelte"
import T from "../../helpers/T.svelte"
@@ -41,12 +41,21 @@
const isChecked = (e: any) => e.target.checked
- function toggle(e: any, key: string) {
+ async function toggle(e: any, key: string) {
let checked = e.target.checked
- updateSpecial(checked, key)
if (key === "customUserDataLocation") {
- save(false, { backup: true, changeUserData: { reset: !checked, dataPath: $dataPath } })
+ let existingData = false
+ if (checked) {
+ existingData = (await awaitRequest(MAIN, "DOES_PATH_EXIST", { path: "data_config", dataPath: $dataPath }))?.exists
+ if (existingData) activePopup.set("user_data_overwrite")
+ }
+ if (!existingData) {
+ updateSpecial(checked, key)
+ save(false, { backup: true, changeUserData: { reset: !checked, dataPath: $dataPath } })
+ }
+ } else {
+ updateSpecial(checked, key)
}
}
@@ -377,7 +386,7 @@
{:else}
@@ -397,18 +406,18 @@
- a.id === ($special.autoBackup || "never"))?.name || ""} on:click={(e) => updateSpecial(e.detail.id, "autoBackup")} />
+ a.id === ($special.autoBackup || "never"))?.name || ""} on:click={(e) => updateSpecial(e.detail.id, "autoBackup")} up />
diff --git a/src/frontend/components/settings/tabs/Outputs.svelte b/src/frontend/components/settings/tabs/Outputs.svelte
index cc7edb74..190d9186 100644
--- a/src/frontend/components/settings/tabs/Outputs.svelte
+++ b/src/frontend/components/settings/tabs/Outputs.svelte
@@ -350,7 +350,7 @@
{#if currentOutput.bounds?.width}
- ({currentOutput.bounds.width}x{currentOutput.bounds.height})
+ ({currentOutput.bounds.width}x{currentOutput.bounds.height})
{/if}
diff --git a/src/frontend/components/settings/tabs/Styles.svelte b/src/frontend/components/settings/tabs/Styles.svelte
index 2fb3487b..24a50224 100644
--- a/src/frontend/components/settings/tabs/Styles.svelte
+++ b/src/frontend/components/settings/tabs/Styles.svelte
@@ -39,12 +39,6 @@
const isChecked = (e: any) => e.target.checked
- function updateCropping(newValue: number, key: string) {
- let cropping = currentStyle.cropping || { top: 0, right: 0, bottom: 0, left: 0 }
- cropping[key] = newValue
- updateStyle(cropping, "cropping")
- }
-
// pre v0.8.4: generate styles from old output "show" formatting
if (!Object.keys($styles).length) createStylesFromOutputs()
function createStylesFromOutputs() {
@@ -258,16 +252,6 @@
-
-
-
- updateCropping(Number(e.detail), "top")} />
- updateCropping(Number(e.detail), "right")} />
- updateCropping(Number(e.detail), "bottom")} />
- updateCropping(Number(e.detail), "left")} />
-
-
-
@@ -346,12 +330,12 @@
- a.id === (currentStyle.displayMetadata || "never"))?.name || "—"} on:click={(e) => updateStyle(e.detail.id, "displayMetadata")} />
+ a.id === (currentStyle.displayMetadata || "never"))?.name || "—"} on:click={(e) => updateStyle(e.detail.id, "displayMetadata")} up />
{#if (currentStyle.displayMetadata || "never") !== "never"}
- updateStyle(e.detail.id, "metadataTemplate")} />
+ updateStyle(e.detail.id, "metadataTemplate")} up />
@@ -364,7 +348,7 @@
{/if}
- updateStyle(e.detail.id, "messageTemplate")} />
+ updateStyle(e.detail.id, "messageTemplate")} up />
diff --git a/src/frontend/components/show/Section.svelte b/src/frontend/components/show/Section.svelte
index 79144d57..b9262e63 100644
--- a/src/frontend/components/show/Section.svelte
+++ b/src/frontend/components/show/Section.svelte
@@ -96,10 +96,9 @@
h4 :global(input) {
background-color: var(--primary-darkest);
}
- /* ::placeholder does not work here for some reason */
- h4.empty :global(input) {
- opacity: 0.4;
- /* font-size: 0.9em; */
+ /* ::placeholder opacity does not work for some reason */
+ h4.empty :global(input::placeholder) {
+ color: rgb(255 255 255 / 0.4);
}
.settings {
diff --git a/src/frontend/components/show/TextEditor.svelte b/src/frontend/components/show/TextEditor.svelte
index e010ea5e..4f58eeca 100644
--- a/src/frontend/components/show/TextEditor.svelte
+++ b/src/frontend/components/show/TextEditor.svelte
@@ -1,7 +1,7 @@