[*] refactor

heng30 · heng30 · commit 3c1308e9e37c · 2026-04-02T12:02:38.000+08:00
diff --git a/wayshot/src/logic/video_editor.rs b/wayshot/src/logic/video_editor.rs
@@ -3,6 +3,7 @@ mod common_type;
 mod conversion;
 mod export;
 mod filters;
+mod font;
 mod library;
 mod playlist;
 mod preview;
@@ -24,4 +25,5 @@ pub fn init(ui: &crate::slint_generatedAppWindow::AppWindow) {
     subtitle::init(ui);
     preview::init(ui);
     record_audio::init(ui);
+    font::init(ui);
 }
diff --git a/wayshot/src/logic/video_editor/font.rs b/wayshot/src/logic/video_editor/font.rs
@@ -0,0 +1,19 @@
+use crate::{
+    global_store, global_ve_filter,
+    logic::{toast, tr::tr},
+    logic_cb,
+    slint_generatedAppWindow::{AppWindow, FontInfo as UIFontInfo},
+};
+
+#[macro_export]
+macro_rules! store_font_infos {
+    ($ui:expr) => {
+        crate::global_store!($ui)
+            .get_font_infos()
+            .as_any()
+            .downcast_ref::<VecModel<UIFontInfo>>()
+            .expect("We know we set a VecModel<UIFontInfo> earlier")
+    };
+}
+
+fn init(ui: &AppWindow) {}
diff --git a/wayshot/src/logic/video_editor/playlist.rs b/wayshot/src/logic/video_editor/playlist.rs
@@ -4,7 +4,7 @@ use super::{
     segment::refresh_affected_segments,
 };
 use crate::{
-    global_store,
+    global_store, global_ve_filter,
     logic::{toast, tr::tr},
     logic_cb,
     slint_generatedAppWindow::{
@@ -15,7 +15,7 @@ use crate::{
 };
 use anyhow::Result;
 use slint::{ComponentHandle, Model, VecModel, Weak};
-use std::{path::PathBuf, sync::Arc, time::Duration};
+use std::{cell::Cell, path::PathBuf, sync::Arc, time::Duration};
 use uuid::Uuid;
 use video_editor::{
     commands::{
@@ -154,6 +154,7 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
                 global_store!(ui).get_video_editor_current_edited_track_index();
             let timeline_offset_ms = global_store!(ui).get_video_editor_timeline_offset();
             let timeline_offset = Duration::from_millis(timeline_offset_ms as u64);
+            let created_new_tracks = Cell::new(false);
 
             let result: Result<ExecuteResult> = with_history_manager(|state| {
                 // Check if current track matches metadata type
@@ -243,6 +244,7 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
                     return Ok(execute_result);
                 }
 
+                created_new_tracks.set(true);
                 let tracks = Track::new(&metadata.path)
                     .map_err(|e| video_editor::Error::InvalidConfig(e.to_string()))?;
 
@@ -265,6 +267,11 @@ pub fn async_add_item_to_track(ui_weak: Weak<AppWindow>, name: String, file_path
                     sync_manager_to_ui(&ui);
                     refresh_affected_segments(&ui, execute_result.affected_segments);
 
+                    if created_new_tracks.get() {
+                        global_store!(ui).set_video_editor_current_edited_track_index(-1);
+                        global_ve_filter!(ui).set_selected_filter_index(-1);
+                    }
+
                     if matches!(metadata.get_type(), MetadataType::Video) || metadata.is_image() {
                         refresh_preview(&ui);
                     }
diff --git a/wayshot/ui/panel/def.slint b/wayshot/ui/panel/def.slint
@@ -64,6 +64,7 @@ import {
     VideoEditorSegmentMetadata,
     VideoEditorRecordAudioConfig,
     VideoEditorLayerImage,
+    FontInfo,
 } from "../store.slint";
 
-export { Theme, Logic, Store, Util, Icons, VEFilter, StartupTab, TabIndex, PopupIndex, SettingPreference, SettingBackup, SettingDetailIndex, MobileSettingDetailIndex, DeviceType, MobileTabIndex, SettingRecorder, SettingCursorTracker, TransitionType, SettingPlayer, FeatureType, SettingShareScreen, SettingShareScreenClient, ConnectionStatus, SettingPushStream, SettingCamera, MixPositionWithPadding, MixPositionWithPaddingTag, RealtimeImageEffect, BackgroundRemoverModel, Downloader, DownloaderState, Transcribe, TranscribeProgressType, FileType, Subtitle, SettingTranscribe, SettingAiModel, VideoEditorTrackType, VideoEditorTrackSegment, VideoEditorTrack, VideoEditorTracksManager, SelectedTrackIndex, SelectedSegmentIndex, VideoEditorPlaylistItem, MediaType, VideoEditorExportQueueItem, VideoEditorExportVideoConfig, VideoEditorExportAudioConfig, SubtitleType, VideoEditorSubtitle, VideoEditorNewProjectConfig, VideoEditorPreviewConfig, VideoPreviewSize, VideoEditorPreferenceTrackConfig, VideoEditorPreferenceCacheConfig, VideoEditorPreferenceConfig, VideoEditorSegmentMetadata, VideoEditorRecordAudioConfig, VideoEditorLayerImage, TransformDetail, CropDetail, ZoomDetail, FlyInDetail, FilterType }
+export { Theme, Logic, Store, Util, Icons, VEFilter, StartupTab, TabIndex, PopupIndex, SettingPreference, SettingBackup, SettingDetailIndex, MobileSettingDetailIndex, DeviceType, MobileTabIndex, SettingRecorder, SettingCursorTracker, TransitionType, SettingPlayer, FeatureType, SettingShareScreen, SettingShareScreenClient, ConnectionStatus, SettingPushStream, SettingCamera, MixPositionWithPadding, MixPositionWithPaddingTag, RealtimeImageEffect, BackgroundRemoverModel, Downloader, DownloaderState, Transcribe, TranscribeProgressType, FileType, Subtitle, SettingTranscribe, SettingAiModel, VideoEditorTrackType, VideoEditorTrackSegment, VideoEditorTrack, VideoEditorTracksManager, SelectedTrackIndex, SelectedSegmentIndex, VideoEditorPlaylistItem, MediaType, VideoEditorExportQueueItem, VideoEditorExportVideoConfig, VideoEditorExportAudioConfig, SubtitleType, VideoEditorSubtitle, VideoEditorNewProjectConfig, VideoEditorPreviewConfig, VideoPreviewSize, VideoEditorPreferenceTrackConfig, VideoEditorPreferenceCacheConfig, VideoEditorPreferenceConfig, VideoEditorSegmentMetadata, VideoEditorRecordAudioConfig, VideoEditorLayerImage, TransformDetail, CropDetail, ZoomDetail, FlyInDetail, FilterType, FontInfo }
diff --git a/wayshot/ui/panel/desktop/video-editor/font-dialog.slint b/wayshot/ui/panel/desktop/video-editor/font-dialog.slint
@@ -0,0 +1,31 @@
+import {
+    Theme,
+    Store,
+    Logic,
+    Util,
+    Icons,
+    VideoEditorSubtitle,
+    FontInfo,
+} from "../../def.slint";
+import { NoDataImg, MovingDialog } from "../../../base/widgets.slint";
+import { ListView } from "std-widgets.slint";
+import { CenterLayout } from "../../../base/center-layout.slint";
+
+export component FontDialog inherits MovingDialog {
+    title: Logic.tr("Font");
+    icon: Icons.font-light;
+    header-width: Theme.default-font-size * 36;
+    height: 600px;
+
+    private property <[FontInfo]> font-infos;
+
+    CenterLayout {
+        NoDataImg {
+            width: root.header-width * Theme.golden-ratio;
+            text: Logic.tr("No found system fonts");
+            font-size: Theme.default-font-size;
+        }
+    }
+
+    ListView { }
+}
diff --git a/wayshot/ui/panel/desktop/video-editor/right-panel/filter/filter.slint b/wayshot/ui/panel/desktop/video-editor/right-panel/filter/filter.slint
@@ -588,10 +588,10 @@ component FilterSelector inherits VerticalLayout {
 export component Filter inherits Rectangle {
     private property <bool> is-show-selector;
     private property <FilterType> filter-tab-type;
-    private property <bool> is-subtitle-track: Logic.video-editor-is-subtitle-track(Store.video-editor-current-edited-track-index);
+    // private property <bool> is-subtitle-track: Logic.video-editor-is-subtitle-track(Store.video-editor-current-edited-track-index);
     private property <bool> is-show-segment-filter: Store.video-editor-current-edited-track-index >= 0 && Store.video-editor-selected-segments-index.length > 0 && !is-subtitle-track;
 
-    // private property <bool> is-subtitle-track: true; // todo
+    private property <bool> is-subtitle-track: true; // todo
     // private property <bool> is-show-segment-filter: true; // todo
 
     if !is-show-segment-filter && !is-subtitle-track: NoDataImg {
diff --git a/wayshot/ui/panel/desktop/video-editor/right-panel/filter/subtitle/font-path.slint b/wayshot/ui/panel/desktop/video-editor/right-panel/filter/subtitle/font-path.slint
@@ -43,7 +43,7 @@ export component FontPath inherits Rectangle {
             text: Util.file-name(config.font-path);
 
             clicked => {
-                Store.video-editor-font-dialog-toggle-flag = !Store.video-editor-font-dialog-toggle-flag;
+                Store.video-editor-is-show-font-dialog = !Store.video-editor-is-show-font-dialog;
             }
         }
     }
diff --git a/wayshot/ui/panel/desktop/video-editor/right-panel/font.slint b/wayshot/ui/panel/desktop/video-editor/right-panel/font.slint
diff --git a/wayshot/ui/panel/desktop/video-editor/right-panel/right-panel.slint b/wayshot/ui/panel/desktop/video-editor/right-panel/right-panel.slint
@@ -8,7 +8,6 @@ import {
 import {
     TabBtns,
 } from "../../../../base/widgets.slint";
-import { Font } from "font.slint";
 import { Filter } from "filter/filter.slint";
 import { Subtitle } from "subtitle.slint";
 import { VEFilter } from "../filter.slint";
diff --git a/wayshot/ui/panel/desktop/video-editor/video-editor.slint b/wayshot/ui/panel/desktop/video-editor/video-editor.slint
@@ -14,6 +14,7 @@ import {
 } from "../../../base/widgets.slint";
 import { Header } from "header.slint";
 import { Tracks } from "tracks/tracks.slint";
+import { FontDialog } from "font-dialog.slint";
 import { LeftPanel } from "left-panel/left-panel.slint";
 import { RightPanel } from "right-panel/right-panel.slint";
 import { NewProject } from "new-project.slint";
@@ -245,6 +246,13 @@ export component VideoEditor inherits Rectangle {
         }
     }
 
+    if Store.video-editor-is-show-font-dialog: FontDialog {
+        close => {
+            Store.video-editor-is-show-font-dialog = false;
+            fs.focus();
+        }
+    }
+
     if Store.video-editor-is-show-new-project-dialog || Store.video-editor-is-show-unsave-change-dialog || Store.video-editor-is-show-recovery-dialog || Store.video-editor-is-show-preview-setting-dialog || Store.video-editor-is-show-preference-setting-dialog: Blanket {
         clicked => {
             Store.video-editor-is-show-new-project-dialog = false;
diff --git a/wayshot/ui/store.slint b/wayshot/ui/store.slint
@@ -610,6 +610,11 @@ export struct VideoEditorLayerImage {
     zoom: ZoomDetail,
 }
 
+export struct FontInfo {
+    family: string,
+    path: string,
+}
+
 //////////////////////////////// Logic Struct End  ////////////////////////////////
 
 export global Store {
@@ -772,8 +777,6 @@ export global Store {
     in-out property <bool> video-editor-color-picker-confirmed-flag;
     in-out property <color> video-editor-color-picker-color;
 
-    in-out property <bool> video-editor-font-dialog-toggle-flag;
-
     in-out property <image> video-editor-preview-image;
     in-out property <[VideoEditorLayerImage]> video-editor-preview-layer-images: [
         {
@@ -823,6 +826,9 @@ export global Store {
     in-out property <VideoEditorRecordAudioConfig> video-editor-record-audio-config;
     in-out property <VideoEditorVolume> video-editor-record-audio-volume: { left: -200, right: -200 };
 
+    in-out property <[FontInfo]> font-infos: [];
+    in-out property <bool> video-editor-is-show-font-dialog: true;
+
     in-out property <VideoEditorTracksManager> video-editor-tracks-manager:
     {
         duration: 740000,

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export component FontPath inherits Rectangle {`
`43`	`43`	`text: Util.file-name(config.font-path);`
`44`	`44`
`45`	`45`	`clicked => {`
`46`		`- Store.video-editor-font-dialog-toggle-flag = !Store.video-editor-font-dialog-toggle-flag;`
	`46`	`+ Store.video-editor-is-show-font-dialog = !Store.video-editor-is-show-font-dialog;`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`