From f8718816a4d4f58a2fe69a7352054b1d3c0db392 Mon Sep 17 00:00:00 2001 From: Paul Golmann Date: Sat, 15 Mar 2025 00:49:00 +0100 Subject: [PATCH 01/10] Handle FPS value in RTMP pipeline names --- src/lib/helpers/PipelineHelper.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/helpers/PipelineHelper.ts b/src/lib/helpers/PipelineHelper.ts index 4d4948b6..ea2ead83 100644 --- a/src/lib/helpers/PipelineHelper.ts +++ b/src/lib/helpers/PipelineHelper.ts @@ -39,9 +39,8 @@ export function parsePipelineName(name: string): PipelineInfo { // Extract resolution - typically NNNp format (like 720p, 1080p) const resolutionMatch = name.match(/(\d{3,4}p)/); - // Extract framerate - typically pNN format (like p30, p60) - // Handle both underscore separated and inline formats - const fpsMatch = name.match(/p(\d+(?:\.\d+)?)/); + // Extract framerate - typically pNN format (like p30, p60) or _NNfps (like _30fps, _60fps) + const fpsMatch = name.match(/p(\d+(?:\.\d+)?)|_(\d+(?:\.\d+)?)fps/); // Special case for libuvch264 const isLibUVC = name.includes('libuvch264'); From 7d95ea5097238452eafba0d33012084f6db1720f Mon Sep 17 00:00:00 2001 From: Paul Golmann Date: Sat, 15 Mar 2025 01:17:36 +0100 Subject: [PATCH 02/10] Change streaming tab layout - use two cols for medium viewports, three for large viewports - use auto height for rows for a more compact layout --- src/main/Tabs/Settings.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/Tabs/Settings.svelte b/src/main/Tabs/Settings.svelte index 84db87b1..26d6965e 100644 --- a/src/main/Tabs/Settings.svelte +++ b/src/main/Tabs/Settings.svelte @@ -369,8 +369,8 @@ const startStreamingWithCurrentConfig = () => { {/if} -
- +
+ {$_('settings.encoderSettings')} From 56a989ba514509620b6a77ad644415b5c77dc8e1 Mon Sep 17 00:00:00 2001 From: Paul Golmann Date: Sat, 15 Mar 2025 01:19:05 +0100 Subject: [PATCH 03/10] Increase vertical margin around sliders --- src/main/Tabs/Settings.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/Tabs/Settings.svelte b/src/main/Tabs/Settings.svelte index 26d6965e..816675e7 100644 --- a/src/main/Tabs/Settings.svelte +++ b/src/main/Tabs/Settings.svelte @@ -538,7 +538,7 @@ const startStreamingWithCurrentConfig = () => { { (selectedAudioDelay = value[0])} disabled={isStreaming} @@ -733,7 +733,7 @@ const startStreamingWithCurrentConfig = () => { Date: Sat, 15 Mar 2025 01:21:07 +0100 Subject: [PATCH 04/10] Add gap between icons and text in buttons --- src/lib/components/ui/button/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts index e7d87492..95f5647f 100644 --- a/src/lib/components/ui/button/index.ts +++ b/src/lib/components/ui/button/index.ts @@ -3,7 +3,7 @@ import { type VariantProps, tv } from 'tailwind-variants'; import type { Button as ButtonPrimitive } from 'bits-ui'; const buttonVariants = tv({ - base: 'focus-visible:ring-ring inline-flex items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:pointer-events-none disabled:opacity-50', + base: 'focus-visible:ring-ring inline-flex gap-2 items-center justify-center whitespace-nowrap rounded-md text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 disabled:pointer-events-none disabled:opacity-50', variants: { variant: { default: 'bg-primary text-primary-foreground hover:bg-primary/90 shadow', From fc5422caa9fcd5fd8d5e29fd7edb3770ad34ec33 Mon Sep 17 00:00:00 2001 From: Paul Golmann Date: Sat, 15 Mar 2025 01:53:35 +0100 Subject: [PATCH 05/10] Harmonize labels (all clickable, same margin) --- src/lib/components/ui/label/label.svelte | 2 +- src/main/Tabs/Advanced.svelte | 24 ++++++++++++++-------- src/main/Tabs/Settings.svelte | 12 +++++------ src/main/shared/HotspotConfigurator.svelte | 8 ++++---- src/main/shared/ModemConfigurator.svelte | 12 +++++------ 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/src/lib/components/ui/label/label.svelte b/src/lib/components/ui/label/label.svelte index 8b76f5d8..0912c65f 100644 --- a/src/lib/components/ui/label/label.svelte +++ b/src/lib/components/ui/label/label.svelte @@ -9,7 +9,7 @@ export { className as class }; diff --git a/src/main/Tabs/Advanced.svelte b/src/main/Tabs/Advanced.svelte index b54e9407..1c4b350a 100644 --- a/src/main/Tabs/Advanced.svelte +++ b/src/main/Tabs/Advanced.svelte @@ -75,12 +75,13 @@ StatusMessages.subscribe(statusMessage => {
- + {#if password.length < 8} -

{$_('advanced.minLength')}

+

{$_('advanced.minLength')}

{/if}
@@ -110,12 +111,18 @@ StatusMessages.subscribe(statusMessage => {
- {$_('advanced.cloudRemoteKey')} + +

+ + https://cloud.belabox.net + +

- +
- + handleClick(defaultNavElement)}> {siteName} diff --git a/src/main/shared/NavigationRenderer.svelte b/src/main/navigation/NavigationRenderer.svelte similarity index 100% rename from src/main/shared/NavigationRenderer.svelte rename to src/main/navigation/NavigationRenderer.svelte From eb316aad08241cb069b4d9b75aa7c1c7c1c701b1 Mon Sep 17 00:00:00 2001 From: Andres Cera Date: Fri, 14 Mar 2025 21:29:54 -0500 Subject: [PATCH 10/10] change Tabs -> tabs folder to match project structure --- src/lib/config/index.ts | 8 ++++---- src/main/{Tabs => tabs}/Advanced.svelte | 0 src/main/{Tabs => tabs}/General.svelte | 0 src/main/{Tabs => tabs}/Network.svelte | 0 src/main/{Tabs => tabs}/Settings.svelte | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename src/main/{Tabs => tabs}/Advanced.svelte (100%) rename src/main/{Tabs => tabs}/General.svelte (100%) rename src/main/{Tabs => tabs}/Network.svelte (100%) rename src/main/{Tabs => tabs}/Settings.svelte (100%) diff --git a/src/lib/config/index.ts b/src/lib/config/index.ts index 0cbd8a43..94b4f4ae 100644 --- a/src/lib/config/index.ts +++ b/src/lib/config/index.ts @@ -1,7 +1,7 @@ -import Advanced from '../../main/Tabs/Advanced.svelte'; -import General from '../../main/Tabs/General.svelte'; -import Network from '../../main/Tabs/Network.svelte'; -import Settings from '../../main/Tabs/Settings.svelte'; +import Advanced from '../../main/tabs/Advanced.svelte'; +import General from '../../main/tabs/General.svelte'; +import Network from '../../main/tabs/Network.svelte'; +import Settings from '../../main/tabs/Settings.svelte'; import type { ComponentProps } from 'svelte'; //eslint-disable-next-line @typescript-eslint/no-explicit-any diff --git a/src/main/Tabs/Advanced.svelte b/src/main/tabs/Advanced.svelte similarity index 100% rename from src/main/Tabs/Advanced.svelte rename to src/main/tabs/Advanced.svelte diff --git a/src/main/Tabs/General.svelte b/src/main/tabs/General.svelte similarity index 100% rename from src/main/Tabs/General.svelte rename to src/main/tabs/General.svelte diff --git a/src/main/Tabs/Network.svelte b/src/main/tabs/Network.svelte similarity index 100% rename from src/main/Tabs/Network.svelte rename to src/main/tabs/Network.svelte diff --git a/src/main/Tabs/Settings.svelte b/src/main/tabs/Settings.svelte similarity index 100% rename from src/main/Tabs/Settings.svelte rename to src/main/tabs/Settings.svelte