From 6580f1d261f44f3b177e88228c1a7fa01f5a9b7a Mon Sep 17 00:00:00 2001 From: cast1e Date: Tue, 15 Oct 2024 18:51:53 +0800 Subject: [PATCH] edit --- wallitor-gui/src-tauri/src/setup.rs | 1 + wallitor-gui/src/assets/svgs/setting.svg | 1 + wallitor-gui/src/components/AddItem.vue | 23 +- wallitor-gui/src/components/CDialog.vue | 11 +- wallitor-gui/src/components/EditItem.vue | 242 ++++++++++++++++++ wallitor-gui/src/components/ItemCard.vue | 6 +- wallitor-gui/src/components/TitleBar.vue | 8 +- wallitor-gui/src/store/index.ts | 24 +- wallitor-gui/src/style/cui.css | 35 +++ wallitor-gui/src/ts/types.d.ts | 20 +- wallitor-gui/src/views/HomeView.vue | 60 ++++- ....timestamp-1728907575500-ace9aca6c3bef.mjs | 54 ---- 12 files changed, 386 insertions(+), 99 deletions(-) create mode 100644 wallitor-gui/src/assets/svgs/setting.svg create mode 100644 wallitor-gui/src/components/EditItem.vue create mode 100644 wallitor-gui/src/style/cui.css delete mode 100644 wallitor-gui/vite.config.ts.timestamp-1728907575500-ace9aca6c3bef.mjs diff --git a/wallitor-gui/src-tauri/src/setup.rs b/wallitor-gui/src-tauri/src/setup.rs index 90dd468..e61c764 100644 --- a/wallitor-gui/src-tauri/src/setup.rs +++ b/wallitor-gui/src-tauri/src/setup.rs @@ -40,6 +40,7 @@ pub fn init(app: &mut App) -> std::result::Result<(), Box if let Some(window) = app.get_webview_window("main") { let _ = window.show(); let _ = window.set_focus(); + let _ = window.unminimize(); } } TrayIconEvent::Click { diff --git a/wallitor-gui/src/assets/svgs/setting.svg b/wallitor-gui/src/assets/svgs/setting.svg new file mode 100644 index 0000000..7d9edf8 --- /dev/null +++ b/wallitor-gui/src/assets/svgs/setting.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/wallitor-gui/src/components/AddItem.vue b/wallitor-gui/src/components/AddItem.vue index 075db37..65f5789 100644 --- a/wallitor-gui/src/components/AddItem.vue +++ b/wallitor-gui/src/components/AddItem.vue @@ -64,16 +64,12 @@ import { open } from '@tauri-apps/plugin-dialog'; import { invoke } from '@tauri-apps/api/core'; import { useStore } from 'vuex'; import { ElMessage } from 'element-plus'; +import type { AddInfo } from '@/ts/types'; const store = useStore(); const visible = defineModel(); const bg = ref(null); -interface AddInfo { - name: string, - preview: string, - media: string, - description: string -} + const addInfo = ref({ name: "", preview: "", @@ -150,8 +146,8 @@ function handleAdd() { if (checkInfo(addInfo.value)) { if (applyButton.value) { ElMessage({ - type:"info", - message:"正在新建项目, 请勿重新点击或关闭程序" + type: "info", + message: "正在新建项目, 请勿重新点击或关闭程序" }) applyButton.value.disabled = true; invoke("new_wallpaper", { @@ -189,6 +185,16 @@ function handleAdd() { \ No newline at end of file diff --git a/wallitor-gui/src/components/ItemCard.vue b/wallitor-gui/src/components/ItemCard.vue index e9070ee..90a0d32 100644 --- a/wallitor-gui/src/components/ItemCard.vue +++ b/wallitor-gui/src/components/ItemCard.vue @@ -52,7 +52,6 @@ const props = defineProps({ } .item-card:hover { - box-shadow: var(--shadow-edge-glow), var(--shadow); cursor: pointer; transform: scale(1.03); box-shadow: 0 0 2px 5px rgba(177, 177, 177, 0.151); @@ -67,7 +66,7 @@ const props = defineProps({ } .item-card:hover .item-card-title { - bottom: 0; + bottom: 5px; } .item-card-main img { @@ -78,10 +77,11 @@ const props = defineProps({ .item-card-title { position: absolute; bottom: -40px; - right: 5px; + right: 10px; transition: .3s; font-size: 30px; font-weight: 400; color: var(--text-color); + text-shadow: 1px 1px 2px var(--bg-color); } \ No newline at end of file diff --git a/wallitor-gui/src/components/TitleBar.vue b/wallitor-gui/src/components/TitleBar.vue index 6aff9bd..1e82b15 100644 --- a/wallitor-gui/src/components/TitleBar.vue +++ b/wallitor-gui/src/components/TitleBar.vue @@ -26,6 +26,11 @@