Alt + S 识别结果加入 jisho 查询
Browse files- src/WpfEditor/App.xaml.cs +0 -2
- src/WpfEditor/Chrome.cs +0 -85
- src/WpfEditor/EchoDictWindow.xaml.cs +51 -0
- src/WpfEditor/TextEditorControl.cs +23 -0
- src/WpfEditor/readme.txt +37 -0
src/WpfEditor/App.xaml.cs
CHANGED
|
@@ -10,8 +10,6 @@ namespace WpfEditor
|
|
| 10 |
{
|
| 11 |
base.OnStartup(e);
|
| 12 |
|
| 13 |
-
//new MainWindow().Show();
|
| 14 |
-
|
| 15 |
var win = Echodict.EchodictWindow.Instance; // 第一次实例化,后面启动就快了
|
| 16 |
|
| 17 |
var window = new TreeMenuPage();
|
|
|
|
| 10 |
{
|
| 11 |
base.OnStartup(e);
|
| 12 |
|
|
|
|
|
|
|
| 13 |
var win = Echodict.EchodictWindow.Instance; // 第一次实例化,后面启动就快了
|
| 14 |
|
| 15 |
var window = new TreeMenuPage();
|
src/WpfEditor/Chrome.cs
DELETED
|
@@ -1,85 +0,0 @@
|
|
| 1 |
-
using System;
|
| 2 |
-
using System.Collections.Generic;
|
| 3 |
-
using System.Linq;
|
| 4 |
-
using System.Text;
|
| 5 |
-
using System.Threading.Tasks;
|
| 6 |
-
|
| 7 |
-
using CefSharp;
|
| 8 |
-
using CefSharp.Wpf;
|
| 9 |
-
|
| 10 |
-
namespace WpfEditor
|
| 11 |
-
{
|
| 12 |
-
|
| 13 |
-
// see huggingface/BrowserTool
|
| 14 |
-
|
| 15 |
-
public class Chrome
|
| 16 |
-
{
|
| 17 |
-
/// <summary>
|
| 18 |
-
/// 安全地销毁浏览器实例
|
| 19 |
-
/// </summary>
|
| 20 |
-
/// <param name="browser">浏览器实例</param>
|
| 21 |
-
/// <param name="tabId">标签页ID</param>
|
| 22 |
-
private void DisposeBrowserInstance(ChromiumWebBrowser browser, string tabId)
|
| 23 |
-
{
|
| 24 |
-
try
|
| 25 |
-
{
|
| 26 |
-
if (browser != null && !browser.IsDisposed)
|
| 27 |
-
{
|
| 28 |
-
// 清理事件处理器
|
| 29 |
-
CleanupBrowserEventHandlers(browser);
|
| 30 |
-
|
| 31 |
-
// 销毁浏览器实例
|
| 32 |
-
browser.Dispose();
|
| 33 |
-
System.Diagnostics.Debug.WriteLine($"[BrowserInstanceManager] 浏览器实例已销毁 - TabId: {tabId}");
|
| 34 |
-
}
|
| 35 |
-
}
|
| 36 |
-
catch (Exception ex)
|
| 37 |
-
{
|
| 38 |
-
System.Diagnostics.Debug.WriteLine($"[BrowserInstanceManager] 销毁浏览器实例时发生异常 - TabId: {tabId}, Error: {ex.Message}");
|
| 39 |
-
}
|
| 40 |
-
}
|
| 41 |
-
|
| 42 |
-
/// <summary>
|
| 43 |
-
/// 清理浏览器事件处理器
|
| 44 |
-
/// </summary>
|
| 45 |
-
/// <param name="browser">浏览器实例</param>
|
| 46 |
-
private void CleanupBrowserEventHandlers(ChromiumWebBrowser browser)
|
| 47 |
-
{
|
| 48 |
-
try
|
| 49 |
-
{
|
| 50 |
-
if (browser?.Tag is Dictionary<string, object> browserTags)
|
| 51 |
-
{
|
| 52 |
-
// 清理存储在Tag中的事件处理器引用
|
| 53 |
-
if (browserTags.TryGetValue("titleUpdateHandler", out object titleHandler) &&
|
| 54 |
-
titleHandler is EventHandler<FrameLoadEndEventArgs> titleUpdateHandler)
|
| 55 |
-
{
|
| 56 |
-
browser.FrameLoadEnd -= titleUpdateHandler;
|
| 57 |
-
}
|
| 58 |
-
|
| 59 |
-
if (browserTags.TryGetValue("loadingStateChangedHandler", out object loadingHandler) &&
|
| 60 |
-
loadingHandler is EventHandler<LoadingStateChangedEventArgs> loadingStateChangedHandler)
|
| 61 |
-
{
|
| 62 |
-
browser.LoadingStateChanged -= loadingStateChangedHandler;
|
| 63 |
-
}
|
| 64 |
-
|
| 65 |
-
browserTags.Clear();
|
| 66 |
-
browser.Tag = null;
|
| 67 |
-
|
| 68 |
-
System.Diagnostics.Debug.WriteLine("[BrowserInstanceManager] 浏览器事件处理器已清理");
|
| 69 |
-
}
|
| 70 |
-
}
|
| 71 |
-
catch (Exception ex)
|
| 72 |
-
{
|
| 73 |
-
System.Diagnostics.Debug.WriteLine($"[BrowserInstanceManager] 清理事件处理器时发生异常: {ex.Message}");
|
| 74 |
-
}
|
| 75 |
-
}
|
| 76 |
-
|
| 77 |
-
|
| 78 |
-
|
| 79 |
-
|
| 80 |
-
|
| 81 |
-
|
| 82 |
-
|
| 83 |
-
|
| 84 |
-
}
|
| 85 |
-
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
src/WpfEditor/EchoDictWindow.xaml.cs
CHANGED
|
@@ -123,6 +123,57 @@ namespace Echodict
|
|
| 123 |
this.Topmost = true;
|
| 124 |
}
|
| 125 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 126 |
|
| 127 |
|
| 128 |
private void LoadConfig()
|
|
|
|
| 123 |
this.Topmost = true;
|
| 124 |
}
|
| 125 |
|
| 126 |
+
public void OpenUrl(string url)
|
| 127 |
+
{
|
| 128 |
+
if (this.WindowState == WindowState.Minimized)
|
| 129 |
+
{
|
| 130 |
+
this.WindowState = LastWindowState;
|
| 131 |
+
}
|
| 132 |
+
|
| 133 |
+
this.Show();
|
| 134 |
+
this.Activate();
|
| 135 |
+
this.Topmost = true;
|
| 136 |
+
|
| 137 |
+
// Check if we should use the existing browser or create a new tab
|
| 138 |
+
bool reuse = false;
|
| 139 |
+
//if (MainTabControl.Items.Count == 1)
|
| 140 |
+
//{
|
| 141 |
+
// var tab = MainTabControl.Items[0] as TabItem;
|
| 142 |
+
// if (tab != null && tab.Content is ChromiumWebBrowser browser)
|
| 143 |
+
// {
|
| 144 |
+
// // If address is empty or about:blank, reuse
|
| 145 |
+
// if (string.IsNullOrEmpty(browser.Address) || browser.Address == "about:blank")
|
| 146 |
+
// {
|
| 147 |
+
// browser.Address = url;
|
| 148 |
+
// reuse = true;
|
| 149 |
+
// }
|
| 150 |
+
// }
|
| 151 |
+
//}
|
| 152 |
+
|
| 153 |
+
if (!reuse)
|
| 154 |
+
{
|
| 155 |
+
AddNewTab(url);
|
| 156 |
+
}
|
| 157 |
+
}
|
| 158 |
+
|
| 159 |
+
private void AddNewTab(string url)
|
| 160 |
+
{
|
| 161 |
+
var browser = new ChromiumWebBrowser();
|
| 162 |
+
browser.Address = url;
|
| 163 |
+
|
| 164 |
+
var tabItem = new TabItem();
|
| 165 |
+
tabItem.Header = "Loading...";
|
| 166 |
+
tabItem.Content = browser;
|
| 167 |
+
|
| 168 |
+
browser.TitleChanged += (s, e) =>
|
| 169 |
+
{
|
| 170 |
+
Dispatcher.Invoke(() => tabItem.Header = e.NewValue?.ToString() ?? "New Tab");
|
| 171 |
+
};
|
| 172 |
+
|
| 173 |
+
MainTabControl.Items.Add(tabItem);
|
| 174 |
+
MainTabControl.SelectedItem = tabItem;
|
| 175 |
+
}
|
| 176 |
+
|
| 177 |
|
| 178 |
|
| 179 |
private void LoadConfig()
|
src/WpfEditor/TextEditorControl.cs
CHANGED
|
@@ -315,6 +315,15 @@ namespace WpfEditor
|
|
| 315 |
};
|
| 316 |
ContextMenu.Items.Add(selectAllMenuItem);
|
| 317 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 318 |
// 查询菜单项
|
| 319 |
MenuItem QeryMenuItem = new MenuItem
|
| 320 |
{
|
|
@@ -383,6 +392,20 @@ namespace WpfEditor
|
|
| 383 |
}
|
| 384 |
}
|
| 385 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 386 |
// "翻译"菜单项点击事件处理
|
| 387 |
private async void OnQueryMenuItemClick(object sender, RoutedEventArgs e)
|
| 388 |
{
|
|
|
|
| 315 |
};
|
| 316 |
ContextMenu.Items.Add(selectAllMenuItem);
|
| 317 |
|
| 318 |
+
|
| 319 |
+
// jisho查询菜单项
|
| 320 |
+
MenuItem jishoMenuItem = new MenuItem
|
| 321 |
+
{
|
| 322 |
+
Header = "jisho"
|
| 323 |
+
};
|
| 324 |
+
jishoMenuItem.Click += OnjishoMenuItemClick;
|
| 325 |
+
ContextMenu.Items.Add(jishoMenuItem);
|
| 326 |
+
|
| 327 |
// 查询菜单项
|
| 328 |
MenuItem QeryMenuItem = new MenuItem
|
| 329 |
{
|
|
|
|
| 392 |
}
|
| 393 |
}
|
| 394 |
|
| 395 |
+
private async void OnjishoMenuItemClick(object sender, RoutedEventArgs e)
|
| 396 |
+
{
|
| 397 |
+
if (HasSelection())
|
| 398 |
+
{
|
| 399 |
+
string text = GetSelectedText();
|
| 400 |
+
var content = System.Web.HttpUtility.UrlEncode(text);
|
| 401 |
+
String url = $"https://jisho.org/search/{content}";
|
| 402 |
+
|
| 403 |
+
var win = Echodict.EchodictWindow.Instance;
|
| 404 |
+
win.WindowStartupLocation = WindowStartupLocation.CenterScreen;
|
| 405 |
+
win.OpenUrl(url);
|
| 406 |
+
}
|
| 407 |
+
}
|
| 408 |
+
|
| 409 |
// "翻译"菜单项点击事件处理
|
| 410 |
private async void OnQueryMenuItemClick(object sender, RoutedEventArgs e)
|
| 411 |
{
|
src/WpfEditor/readme.txt
CHANGED
|
@@ -96,4 +96,41 @@ src\WpfEditor\MainWindow.xaml.cs
|
|
| 96 |
}
|
| 97 |
|
| 98 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 99 |
|
|
|
|
| 96 |
}
|
| 97 |
|
| 98 |
|
| 99 |
+
|
| 100 |
+
|
| 101 |
+
|
| 102 |
+
`/e:/huggingface/imradv3/src/WpfEditor/WpfEditor.csproj#L34-34` `/e:/huggingface/imradv3/src/WpfEditor/TextEditorControl.cs#L395-404` 这里用 CefSharp.Wpf.NETCore 来加载 url ,如果已有浏览器实例则在新的 tab 上加载
|
| 103 |
+
|
| 104 |
+
I have implemented the functionality to open the Jisho search URL using CefSharp.Wpf.NETCore in EchodictWindow , with support for opening in a new tab if the browser is already in use.
|
| 105 |
+
|
| 106 |
+
Here are the changes:
|
| 107 |
+
|
| 108 |
+
1. Modified EchodictWindow.xaml.cs :
|
| 109 |
+
|
| 110 |
+
- Added a public method OpenUrl(string url) which handles showing the window and deciding whether to reuse the existing tab or create a new one.
|
| 111 |
+
- Added AddNewTab(string url) helper method to dynamically create a new TabItem containing a ChromiumWebBrowser .
|
| 112 |
+
- The logic reuses the default tab if it is the only one open and currently empty (or "about:blank"). Otherwise, it opens a new tab.
|
| 113 |
+
2. Modified TextEditorControl.cs :
|
| 114 |
+
|
| 115 |
+
- Updated OnjishoMenuItemClick to call Echodict.EchodictWindow.Instance.OpenUrl(url) with the constructed Jisho URL.
|
| 116 |
+
|
| 117 |
+
|
| 118 |
+
|
| 119 |
+
|
| 120 |
+
|
| 121 |
+
|
| 122 |
+
|
| 123 |
+
|
| 124 |
+
|
| 125 |
+
|
| 126 |
+
|
| 127 |
+
|
| 128 |
+
|
| 129 |
+
|
| 130 |
+
|
| 131 |
+
|
| 132 |
+
|
| 133 |
+
|
| 134 |
+
|
| 135 |
+
|
| 136 |
|