From 78b685c9ed6aba43a0f4ca9010baff41e67fe30b Mon Sep 17 00:00:00 2001 From: Demo-Liu <44599931+Demo-Liu@users.noreply.github.com> Date: Wed, 15 Dec 2021 17:02:04 +0800 Subject: [PATCH 01/14] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新版截图 --- README.md | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 9bfe89d..298ac69 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # GeekDesk 极客桌面 小巧、**美观**的桌面快速启动管理工具 - + + + 谈一谈做GeekDesk的原因: 目前的市场上也有一部分桌面图标管理工具, 但是**界面好点的收费**, **免费的界面差** @@ -11,36 +13,38 @@ 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水 WYdfmR.jpg -## 开发框架 -- wpf -- .net 4.7.2 -- [HandyControl](https://github.com/HandyOrg/HandyControl) -## 全局热键 鼠标跟随 快速启动 随时随地 -- 支持自定义热键 -- 支持鼠标跟随 -WJt4hQ.gif +## 全局热键 一键呼出 鼠标跟随 +- 自定义热键 设置并使用自己习惯的快捷键 +- 一键呼出 使用鼠标中键呼出 +- 鼠标跟随 自动追随鼠标位置 +WJt4hQ.gif ## 自定义壁纸 - 随意选择自己喜欢的壁纸 +WJt4hQ.gif -[![WJlcIs.md.jpg](https://z3.ax1x.com/2021/07/19/WJlcIs.md.jpg)](https://imgtu.com/i/WJlcIs) ## 毛玻璃等界面效果 - 背景图片毛玻璃效果 - 界面透明度 - 界面圆角 -WGOYSU.gif +WGOYSU.gif ## 自定义菜单图标 - 80多个系统图标可供选择 - 另支持在线导入阿里巴巴icon图标 - 篇幅原因,公众号内回复 **自定义图标** 可以查看教程 -WJ3fDU.png + ## 定时提醒 永不忘记 -WJU6df.gif +- 快捷键快速新建待办事项 +WJU6df.gif +## 开发框架 +- wpf +- .net 4.7.2 +- [HandyControl](https://github.com/HandyOrg/HandyControl) ## LICENSE - 这是个人开发的程序,任何人可任意修改和免费使用(未做较大功能性改动不允许修改赞赏码,重新修改发布需注明出处) - 商用需联系作者 From 33b9d3af424ce12f8ccf027145e9ec954d5216d1 Mon Sep 17 00:00:00 2001 From: Demo-Liu <44599931+Demo-Liu@users.noreply.github.com> Date: Fri, 7 Jan 2022 20:46:36 +0800 Subject: [PATCH 02/14] Update README.md --- README.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 298ac69..8a6b9e2 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,33 @@ # GeekDesk 极客桌面 小巧、**美观**的桌面快速启动管理工具 +———— 大风， 雨夜... +「你来了」 +「我来了」 + +「你究竟想干什么!」 +「我想做一款软件, 这个软件要Cool」 +「什么软件?」 +「从最常用的桌面开始吧」 + +「哼!现在的软件多入牛毛, 会差你一个吗」 +「我不知道, 但是我想做」 + +「你以为凭你一个人的力量能在这大海里掀起什么波浪吗」 +「但只要我想就够了, 这是我的梦想!」 + +「梦想? 可笑, 这世界哪有什么梦想. 不过是一日三餐, 车子和房!」 +「我想...就够了...」 + +「...」 + +———— 雨停, 狂风仍在呼啸... + -谈一谈做GeekDesk的原因: - -目前的市场上也有一部分桌面图标管理工具, 但是**界面好点的收费**, **免费的界面差** -**windows11**都来了, 难道还要用界面停留在**win7时代**的软件吗 - -所以就萌生了做这款软件的想法, **免费 / 美观 / 高度定制化** 是从GeekDesk诞生开始就有的需求和方向, 未来也会向着这些方向发展 -目前GeekDesk只有一个人在开发, 大家如果有好的建议也可以提Issue + +**免费 / 美观 / 高度定制化** 是从GeekDesk诞生开始就有的需求和方向, 未来也会向着这些方向发展 +目前GeekDesk只有一个人在开发所以想法有限, 大家如果有好的建议也可以提Issue 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水 WYdfmR.jpg From dedf20528f63016f28bf5a377a856278c4afa1aa Mon Sep 17 00:00:00 2001 From: Demo-Liu <44599931+Demo-Liu@users.noreply.github.com> Date: Fri, 7 Jan 2022 20:48:17 +0800 Subject: [PATCH 03/14] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8a6b9e2..fa5033c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # GeekDesk 极客桌面 小巧、**美观**的桌面快速启动管理工具 + ———— 大风， 雨夜... 「你来了」 「我来了」 @@ -20,8 +21,7 @@ 「我想...就够了...」 「...」 - -———— 雨停, 狂风仍在呼啸... + ———— 雨停, 狂风仍在呼啸... From dee1caa435e2c78806635c9607c71c97587c1525 Mon Sep 17 00:00:00 2001 From: Demo-Liu <44599931+Demo-Liu@users.noreply.github.com> Date: Fri, 7 Jan 2022 20:50:49 +0800 Subject: [PATCH 04/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa5033c..6cd67df 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # GeekDesk 极客桌面 小巧、**美观**的桌面快速启动管理工具 -———— 大风， 雨夜... +———— 大风, 雨夜... 「你来了」 「我来了」 From fbcd55b5864bbc7142e8138178ea0f32a9947c4f Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:43:24 +0800 Subject: [PATCH 05/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6cd67df..9cb94ac 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ ## 自定义菜单图标 - 80多个系统图标可供选择 - 另支持在线导入阿里巴巴icon图标 -- 篇幅原因,公众号内回复 **自定义图标** 可以查看教程 +- ~~篇幅原因,公众号内回复 **自定义图标** 可以查看教程~~ 现在软件内已经贴上教程链接啦 也欢迎大家关注我的公众号:blush: ## 定时提醒 永不忘记 From c1d6aec622db297665856615632d900b6385e4b1 Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:53:56 +0800 Subject: [PATCH 06/14] Update README.md --- README.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9cb94ac..b16f68d 100644 --- a/README.md +++ b/README.md @@ -27,9 +27,16 @@ **免费 / 美观 / 高度定制化** 是从GeekDesk诞生开始就有的需求和方向, 未来也会向着这些方向发展 + 目前GeekDesk只有一个人在开发所以想法有限, 大家如果有好的建议也可以提Issue - + 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水 + +### GitHub +[https://github.com/Demo-Liu/GeekDesk](https://github.com/Demo-Liu/GeekDesk) +### 码云 +[https://gitee.com/demo_liu/GeekDesk](https://gitee.com/demo_liu/GeekDesk) + WYdfmR.jpg ## 全局热键 一键呼出 鼠标跟随 @@ -62,7 +69,7 @@ ## 开发框架 - wpf - .net 4.7.2 -- [HandyControl](https://github.com/HandyOrg/HandyControl) -## LICENSE -- 这是个人开发的程序,任何人可任意修改和免费使用(未做较大功能性改动不允许修改赞赏码,重新修改发布需注明出处) -- 商用需联系作者 +- [HandyControl](https://github.com/HandyOrg/HandyControl) + +## Stargazers over time +[![Stargazers over time](https://starchart.cc/Demo-Liu/GeekDesk.svg)](https://starchart.cc/Demo-Liu/GeekDesk) From 89ebbbed78ffaa77fc117ec0f99b394bcede5879 Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:44:40 +0800 Subject: [PATCH 07/14] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index b16f68d..2e131fb 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,8 @@ 目前GeekDesk只有一个人在开发所以想法有限, 大家如果有好的建议也可以提Issue 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水 +当然, 点个**Star**也是对作者的激励哦~:smile::smile::smile: + ### GitHub [https://github.com/Demo-Liu/GeekDesk](https://github.com/Demo-Liu/GeekDesk) From e5f1368c8b1567f3c3cd75f0fcc5ca155d7c0884 Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:48:55 +0800 Subject: [PATCH 08/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2e131fb..27b3edf 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ 目前GeekDesk只有一个人在开发所以想法有限, 大家如果有好的建议也可以提Issue 另外如果你喜欢 GeekDesk的话, 或许可以为作者购买防脱洗发水 -当然, 点个**Star**也是对作者的激励哦~:smile::smile::smile: +当然, 点个**Star**也是对作者的激励哦~ 😊😊😊 ### GitHub From bf5a6da4480603893762aa73ee562fb4bf298105 Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Thu, 26 May 2022 16:23:17 +0800 Subject: [PATCH 09/14] Update Update.json --- Update.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Update.json b/Update.json index e2fd3af..b5cd757 100644 --- a/Update.json +++ b/Update.json @@ -4,6 +4,6 @@ "msgTitle": "本次更新内容如下", "msg": "['这次更新间隔比较久, 一个是工作比较忙, 另一个是因为老毛病颈椎病犯了, 但新版本总归是来了','增加图标排序功能','增加鼠标悬停切换菜单','增加搜索功能,显示界面后按下Ctrl+F','其它已知问题修复','老规矩兄弟萌, 我用爱发电, 你们点免费Star']", "githubUrl": "https://github.com/Demo-Liu/GeekDesk/releases", - "giteeUrl": "https://gitee.com/demo_liu/GeekDesk/releases", + "giteeUrl": "https://gitee.com/BookerLiu/GeekDesk/releases", "version": "2.4.14" -} \ No newline at end of file +} From 524b134d16c956f0880bc4850b52dc17fa009aee Mon Sep 17 00:00:00 2001 From: Booker <44599931+Demo-Liu@users.noreply.github.com> Date: Thu, 26 May 2022 17:54:52 +0800 Subject: [PATCH 10/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 27b3edf..501cf4d 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ### GitHub [https://github.com/Demo-Liu/GeekDesk](https://github.com/Demo-Liu/GeekDesk) ### 码云 -[https://gitee.com/demo_liu/GeekDesk](https://gitee.com/demo_liu/GeekDesk) +[https://gitee.com/BookerLiu/GeekDesk](https://gitee.com/BookerLiu/GeekDesk) WYdfmR.jpg From efb8c537d3d795cd00f8e63af415d35780540b98 Mon Sep 17 00:00:00 2001 From: Booker <44599931+BookerLiu@users.noreply.github.com> Date: Fri, 27 May 2022 11:25:58 +0800 Subject: [PATCH 11/14] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 501cf4d..b3aa787 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ### GitHub -[https://github.com/Demo-Liu/GeekDesk](https://github.com/Demo-Liu/GeekDesk) +[https://github.com/BookerLiu/GeekDesk](https://github.com/BookerLiu/GeekDesk) ### 码云 [https://gitee.com/BookerLiu/GeekDesk](https://gitee.com/BookerLiu/GeekDesk) From 01350dff43436ec4d787b0e17f56019bd62a38dc Mon Sep 17 00:00:00 2001 From: huangcan Date: Thu, 14 Jul 2022 11:36:07 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=E4=BB=A3=E5=8A=9E=E7=AA=97=E5=8F=A3=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=97=B6=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96type?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BANEW?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Control/Windows/ToDoWindow.xaml.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Control/Windows/ToDoWindow.xaml.cs b/Control/Windows/ToDoWindow.xaml.cs index 2c8ff26..01db6ad 100644 --- a/Control/Windows/ToDoWindow.xaml.cs +++ b/Control/Windows/ToDoWindow.xaml.cs @@ -19,6 +19,7 @@ namespace GeekDesk.Control.Windows InitializeComponent(); RightCard.Content = backlog; backlog.BacklogList.ItemsSource = appData.ToDoList; + backlog.type = ToDoType.NEW; this.Topmost = true; if (backlog.BacklogList.Items.Count > 0) { From 904e9a29997e844cdc7cf77d412cc9450f01a193 Mon Sep 17 00:00:00 2001 From: huangcan Date: Mon, 25 Jul 2022 12:56:12 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9B=B4=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=E5=B0=86=E6=AF=8F=E6=AC=A1=E7=82=B9=E5=87=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=86=E8=8F=9C=E5=8D=95=E7=9A=84dialog=20type=E5=80=BC?= =?UTF-8?q?=E6=94=B9=E6=88=90input?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Control/UserControls/PannelCard/LeftCardControl.xaml.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs index ece408c..ea72a54 100644 --- a/Control/UserControls/PannelCard/LeftCardControl.xaml.cs +++ b/Control/UserControls/PannelCard/LeftCardControl.xaml.cs @@ -329,6 +329,7 @@ namespace GeekDesk.Control.UserControls.PannelCard appData.AppConfig.SelectedMenuIcons = null; RunTimeStatus.SHOW_MENU_PASSWORDBOX = true; MainWindow.mainWindow.RightCard.PDDialog.Title.Text = "输入密码"; + MainWindow.mainWindow.RightCard.PDDialog.type = PasswordType.INPUT; MainWindow.mainWindow.RightCard.PDDialog.Visibility = Visibility.Visible; } else From 3fa3a42bb328523c8123f1a6be23ca5d81e3987d Mon Sep 17 00:00:00 2001 From: huangcan Date: Mon, 25 Jul 2022 17:01:16 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=9A=E5=9C=A8=E4=BD=BF=E7=94=A8DPI=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E6=97=B6=E5=8F=AF=E4=BB=A5=E6=AD=A3=E7=A1=AE=E7=9A=84=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=8F=96=E8=89=B2=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Control/Windows/PixelColorPickerWindow.xaml.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Control/Windows/PixelColorPickerWindow.xaml.cs b/Control/Windows/PixelColorPickerWindow.xaml.cs index 29fcbc0..06f151f 100644 --- a/Control/Windows/PixelColorPickerWindow.xaml.cs +++ b/Control/Windows/PixelColorPickerWindow.xaml.cs @@ -7,10 +7,14 @@ using System.Runtime.InteropServices; using System.Windows; using System.Windows.Controls; using System.Windows.Controls.Primitives; +using System.Windows.Forms; using System.Windows.Input; using System.Windows.Interop; using System.Windows.Media; using System.Windows.Media.Imaging; +using Cursors = System.Windows.Input.Cursors; +using KeyEventArgs = System.Windows.Input.KeyEventArgs; +using MouseEventArgs = System.Windows.Input.MouseEventArgs; namespace GeekDesk.Control.Windows { @@ -28,10 +32,14 @@ namespace GeekDesk.Control.Windows private readonly ColorPicker colorPicker; + [System.Runtime.InteropServices.DllImport("user32.dll")] + private static extern bool SetProcessDPIAware(); + public PixelColorPickerWindow(ColorPicker colorPicker) { InitializeComponent(); this.colorPicker = colorPicker; + SetProcessDPIAware(); ColorPickerWindow_Init(); } @@ -51,8 +59,8 @@ namespace GeekDesk.Control.Windows this.Topmost = true; bgBitmap = new System.Drawing.Bitmap( - (int)SystemParameters.VirtualScreenWidth, - (int)SystemParameters.VirtualScreenHeight, + Screen.AllScreens[0].Bounds.Width, + Screen.AllScreens[0].Bounds.Height, System.Drawing.Imaging.PixelFormat.Format32bppArgb );