diff --git a/lib/startup-renderer.js b/lib/startup-renderer.js index 5d4bdca..c95b3f9 100644 --- a/lib/startup-renderer.js +++ b/lib/startup-renderer.js @@ -2,9 +2,9 @@ function resolveStartupLanguage(config) { return config && config.globalSettings && config.globalSettings.language === 'de' ? 'de' : 'en'; } -function createStartupQuery(config, version) { +function createStartupQuery(config, version, development = false) { const normalizedVersion = /^\d+\.\d+\.\d+$/.test(String(version || '').trim()) ? String(version).trim() : ''; - return { language: resolveStartupLanguage(config), version: normalizedVersion }; + return { language: resolveStartupLanguage(config), version: normalizedVersion, ...(development ? { development: '1' } : {}) }; } function createStartupWindow(BrowserWindow, options) { diff --git a/main.js b/main.js index e16ec62..ce42c42 100644 --- a/main.js +++ b/main.js @@ -1598,7 +1598,7 @@ async function settleWindowContentAfterShow(window) { function createWindow() { const startupWindow = createStartupWindow(BrowserWindow, { - title: `Multi-Hoster-Uploader | v.${app.getVersion()}`, + title: `Multi-Hoster-Uploader | v.${app.getVersion()}${app.isPackaged ? '' : ' | Entwicklerversion'}`, width: 1100, height: 750, minWidth: 800, @@ -1701,8 +1701,8 @@ function createWindow() { debugLog(`CHILD PROCESS GONE: type=${details.type} reason=${details.reason} exitCode=${details.exitCode}`); }); - let startupQuery = createStartupQuery(null, app.getVersion()); - try { startupQuery = createStartupQuery(configStore.load(), app.getVersion()); } catch {} + let startupQuery = createStartupQuery(null, app.getVersion(), !app.isPackaged); + try { startupQuery = createStartupQuery(configStore.load(), app.getVersion(), !app.isPackaged); } catch {} startupWindow.load(path.join(__dirname, 'renderer', 'index.html'), (err) => { _writeCrashLog('LOAD FILE FAILED', err); debugLog(`LOAD FILE FAILED: ${err && err.stack ? err.stack : err}`); diff --git a/renderer/app.js b/renderer/app.js index 17657b1..2750b5b 100644 --- a/renderer/app.js +++ b/renderer/app.js @@ -2162,10 +2162,12 @@ function renderHosterSummary() { const hosters = getSelectedHosters(); if (hosters.length === 0) { summary.textContent = 'Keine Upload-Ziele ausgewählt'; - } else if (hosters.length === 1) { - summary.textContent = `Aktives Ziel: ${getHosterLabel(hosters[0])}`; } else { - summary.textContent = `${hosters.length} Ziele aktiv: ${hosters.map((name) => getHosterLabel(name)).join(', ')}`; + const count = document.createElement('span'); + count.textContent = hosters.length === 1 ? '1 aktiver Hoster' : `${hosters.length.toLocaleString(getUiLocale())} aktive Hoster`; + const names = document.createElement('span'); + names.textContent = hosters.map((name) => getHosterLabel(name)).join(' · '); + summary.replaceChildren(count, names); } } @@ -6065,6 +6067,8 @@ function _setRollingUploadMetric(id, value) { if (!element) return; const numericValue = Number(value) || 0; const nextText = numericValue.toLocaleString(getUiLocale()); + element.dataset.compactValue = String(nextText.length > 6); + element.dataset.wideValue = String(nextText.length > 9); const previousValue = Number(element.dataset.numericValue) || 0; if (previousValue === numericValue) { const previousText = element.getAttribute('aria-label'); @@ -6190,7 +6194,8 @@ function setApplicationVersion(version) { if (typeof version !== 'string' || version !== version.trim() || !/^\d+\.\d+\.\d+$/.test(version)) return; const versionLabel = document.getElementById('versionLabel'); if (versionLabel) versionLabel.textContent = `v${version}`; - document.title = `Multi-Hoster-Uploader | v.${version}`; + const development = new URLSearchParams(window.location.search).get('development') === '1'; + document.title = `Multi-Hoster-Uploader | v.${version}${development ? ' | Entwicklerversion' : ''}`; } function initializeStaticHeader() { diff --git a/renderer/i18n.js b/renderer/i18n.js index 9bb73bc..170d0b0 100644 --- a/renderer/i18n.js +++ b/renderer/i18n.js @@ -181,6 +181,7 @@ ['Antwortauszug', 'Response excerpt'], ['Verfügbarkeit', 'Availability'], ['Bereite Accounts', 'Ready accounts'], + ['1 aktiver Hoster', '1 active host'], ['Primär', 'Primary'], ['Nicht geprüft', 'Not checked'], ['Nicht aktiv', 'Inactive'], @@ -926,6 +927,7 @@ [/^(\d+) Verlaufseintrag wird dauerhaft entfernt\.$/, '$1 history entry will be permanently removed.'], [/^(\d+) Verlaufseinträge werden dauerhaft entfernt\.$/, '$1 history entries will be permanently removed.'], [/^Aktives Ziel: (.+)$/, 'Active destination: $1'], + [/^([\d.]+) aktive Hoster$/, '$1 active hosts'], [/^Erfolgsrate aus den letzten (\d+) Uploads dieses Hosters$/, 'Success rate across this host\'s last $1 uploads'], [/^(\d+) Fehler$/, '$1 errors'], [/^Gesamt (\d+)$/, 'Total $1'], diff --git a/renderer/index.html b/renderer/index.html index a681fc0..557c87b 100644 --- a/renderer/index.html +++ b/renderer/index.html @@ -214,26 +214,32 @@ 0 -
-
- -
- Bereite Accounts - 0 -
-
Keine Upload-Ziele ausgewählt
-
-
-
Gesamt0
-
Verbindungen0
-
Verbleibend0
-
Verbleibende Größe0 B
-
Läuft0
-
Fertig0
-
Fehler0
+
+
+

Upload-Übersicht

+
Verbleibende Größe0 B
Geschwindigkeit0 B/s
ETA--:--
+
+
+
Läuft0
+
Verbleibend0
+
+
+
Gesamt0
+
Fertig0
+
Fehler0
+
Verbindungen0
+
+
+
+ Bereite Accounts + 0 +
+
Keine Upload-Ziele ausgewählt
+
+
diff --git a/renderer/styles.css b/renderer/styles.css index 3f43b04..26c13b2 100644 --- a/renderer/styles.css +++ b/renderer/styles.css @@ -3496,67 +3496,158 @@ select.hs-input { max-width: none; width: auto; min-width: 140px; } .upload-sidebar-lower { display: grid; - gap: 12px; + gap: 0; margin-top: auto; + flex: 0 0 auto; + min-width: 0; + border: 1px solid #42464f; + border-radius: 12px; + background: #202124; + color: #f1f4f9; + font: 400 14px/1.5 'Segoe UI', Arial, sans-serif; + overflow: hidden; } -.upload-sidebar-lower .view-sidebar-section { - margin-top: 0; +#upload-view.active { + grid-template-columns: 314px minmax(0, 1fr); } -.upload-sidebar-lower .view-sidebar-section-label { - font-size: 11px; +.upload-overview-top { + padding: 20px; + background: #2d384c; } -.upload-sidebar-lower .view-sidebar-summary { - font-size: 12px; +.upload-overview-bottom { + min-width: 0; + padding: 19px 20px; } -.upload-telemetry { - display: grid; - gap: 6px; - padding: 12px 10px 0; - border-top: 1px solid var(--border); +.upload-overview-heading { + display: flex; + align-items: center; + gap: 9px; + margin: 0 0 20px; + font-size: 18px; + line-height: 1.3; + font-weight: 500; +} + +.upload-overview-heading svg { + width: 19px; + height: 19px; + flex: none; + fill: none; + stroke: #b5ccff; + stroke-width: 1.8; + stroke-linecap: round; + stroke-linejoin: round; +} + +.upload-size-hero { + padding: 17px 0 0; +} + +.upload-size-hero .upload-telemetry-value { + display: block; + margin: 6px 0; + font-size: 36px; + line-height: 1.2; + font-weight: 500; + letter-spacing: -.02em; + text-align: left; +} + +.upload-telemetry-label { + min-width: 0; + color: #d9dee8; + overflow-wrap: anywhere; } .upload-telemetry-row { - min-height: 17px; - display: flex; - align-items: center; - justify-content: space-between; + min-height: 36px; + display: grid; + grid-template-columns: minmax(0, 1fr) auto; + align-items: baseline; gap: 12px; - color: var(--text-dim); - font-size: 12px; - line-height: 17px; + padding: 7px 0; + font-size: 14px; + line-height: 21px; } .upload-telemetry-value { - min-width: 58px; - color: var(--text); - font-size: 12px; + min-width: 7ch; + color: #f1f4f9; + font-size: 15px; + font-weight: 500; font-variant-numeric: tabular-nums; text-align: right; white-space: nowrap; } +#uploadTelemetryCompleted { color: #9adbb6; } +#uploadTelemetryFailed { color: #ffb0b8; } + +.upload-overview-tiles { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 10px; +} + +.upload-overview-tiles .upload-telemetry-row { + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 5px; + min-height: 80px; + padding: 12px; + border-radius: 8px; + background: #ffffff0d; +} + +.upload-overview-tiles .upload-telemetry-label { font-size: 13px; } +.upload-overview-tiles .upload-telemetry-value { min-width: 0; width: 100%; font-size: 22px; text-align: left; } +.upload-overview-tiles .upload-telemetry-value[data-compact-value="true"] { font-size: 14px; } +.upload-overview-tiles:has([data-wide-value="true"]) { grid-template-columns: minmax(0, 1fr); } + +.upload-overview-divider { + height: 1px; + margin: 19px 0; + background: #42464f; +} + +.upload-sidebar-lower .view-sidebar-summary { + font-size: 14px; + color: #d9dee8; +} + +.upload-ready-accounts { margin: 10px 0 6px; } +.upload-ready-accounts > span { display: flex; align-items: center; gap: 7px; min-width: 0; } +.upload-ready-accounts strong { color: #f1f4f9; font-size: 26px; line-height: 1.2; font-weight: 500; } +.upload-ready-dot { width: 7px; height: 7px; flex: none; border-radius: 50%; background: #9adbb6; } +.upload-sidebar-lower .hoster-summary { color: #b9c2d0; font-size: 13px; line-height: 1.65; overflow-wrap: anywhere; } +.upload-sidebar-lower .hoster-summary > span { display: block; } + .upload-rolling-value { - height: 17px; + height: 21px; overflow: hidden; position: relative; } .upload-rolling-value > span { width: 100%; - height: 17px; + height: 100%; display: block; } -.upload-rolling-value > .upload-rolling-outgoing, -.upload-rolling-value > .upload-rolling-incoming { +.upload-rolling-value > .upload-rolling-outgoing { position: absolute; inset: 0; } +.upload-rolling-value > .upload-rolling-incoming { position: relative; } + +.upload-overview-tiles .upload-rolling-value { height: 33px; } + .view-sidebar-summary { display: flex; align-items: center; @@ -4744,7 +4835,6 @@ input[type="checkbox"] { } @media (max-width: 1199px) { - #upload-view.active, #accounts-view.active, #history-view.active { grid-template-columns: 224px minmax(0, 1fr); @@ -4787,7 +4877,7 @@ input[type="checkbox"] { } #upload-view.active { - grid-template-columns: clamp(196px, 24vw, 224px) minmax(0, 1fr); + grid-template-columns: 276px minmax(0, 1fr); } #upload-view .view-sidebar { @@ -4810,20 +4900,11 @@ input[type="checkbox"] { #upload-view .upload-sidebar-lower { min-width: 0; - gap: 10px; + gap: 0; margin-top: 10px; flex: 0 0 auto; } - #upload-view .upload-sidebar-lower .view-sidebar-section { - padding-top: 10px; - } - - #upload-view .upload-telemetry { - gap: 4px; - padding-top: 8px; - } - #upload-view .view-sidebar-navigation { gap: 4px; } @@ -4848,14 +4929,12 @@ input[type="checkbox"] { } #upload-view .upload-telemetry-row { - gap: 8px; + gap: 12px; } #upload-view .upload-telemetry-label { min-width: 0; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + white-space: normal; } #upload-view .hoster-summary {