Skip to content

Commit 8d8672e

Browse files
TheJoeFinTheJoeFin
committed
Add default search to ButtonInfo and FSG
1 parent f859c11 commit 8d8672e

File tree

4 files changed

+27
-62
lines changed

4 files changed

+27
-62
lines changed

‎Text-Grab/Models/ButtonInfo.cs

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -200,33 +200,9 @@ public ButtonInfo(string buttonText, string symbolText, string background, strin
200200
new()
201201
{
202202
OrderNumber = 1.7,
203-
ButtonText = "Google...",
203+
ButtonText = "Web Search",
204204
SymbolText = "",
205-
Command = "GoogleSearchCmd",
206-
SymbolIcon = SymbolRegular.GlobeSearch24
207-
},
208-
new()
209-
{
210-
OrderNumber = 1.8,
211-
ButtonText = "Bing...",
212-
SymbolText = "",
213-
Command = "BingSearchCmd",
214-
SymbolIcon = SymbolRegular.GlobeSearch24
215-
},
216-
new()
217-
{
218-
OrderNumber = 1.9,
219-
ButtonText = "Duck Duck Go...",
220-
SymbolText = "",
221-
Command = "DuckDuckGoSearchCmd",
222-
SymbolIcon = SymbolRegular.GlobeSearch24
223-
},
224-
new()
225-
{
226-
OrderNumber = 1.91,
227-
ButtonText = "Search GitHub...",
228-
SymbolText = "",
229-
Command = "GitHubSearchCmd",
205+
Command = "DefaultWebSearchCmd",
230206
SymbolIcon = SymbolRegular.GlobeSearch24
231207
},
232208
new()

‎Text-Grab/Views/EditTextWindow.xaml.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ public static Dictionary<string, RoutedCommand> GetRoutedCommands()
137137
{nameof(OcrPasteCommand), OcrPasteCommand},
138138
{nameof(MakeQrCodeCmd), MakeQrCodeCmd},
139139
{nameof(WebSearchCmd), WebSearchCmd},
140+
{nameof(DefaultWebSearchCmd), DefaultWebSearchCmd},
140141
};
141142
}
142143

‎Text-Grab/Views/FullscreenGrab.xaml

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@
161161
Height="34"
162162
Margin="4,0,2,0"
163163
Click="FreezeMenuItem_Click"
164-
IsChecked="{Binding IsChecked, ElementName=FreezeMenuItem, Mode=TwoWay}"
164+
IsChecked="{Binding IsChecked,
165+
ElementName=FreezeMenuItem,
166+
Mode=TwoWay}"
165167
Style="{StaticResource ToggleSymbolButton}"
166168
ToolTip="(F) Freeze what is on screens">
167169
<wpfui:SymbolIcon Symbol="Pause24" />
@@ -191,7 +193,9 @@
191193
Margin="0"
192194
d:IsChecked="True"
193195
Click="SingleLineMenuItem_Click"
194-
IsChecked="{Binding IsChecked, ElementName=SingleLineMenuItem, Mode=TwoWay}"
196+
IsChecked="{Binding IsChecked,
197+
ElementName=SingleLineMenuItem,
198+
Mode=TwoWay}"
195199
Style="{StaticResource ToggleSymbolButton}"
196200
ToolTip="(S) Make result a single line">
197201
<wpfui:SymbolIcon Symbol="SubtractSquare24" />
@@ -203,7 +207,9 @@
203207
Margin="0"
204208
d:IsChecked="True"
205209
Click="TableToggleButton_Click"
206-
IsChecked="{Binding IsChecked, ElementName=TableMenuItem, Mode=TwoWay}"
210+
IsChecked="{Binding IsChecked,
211+
ElementName=TableMenuItem,
212+
Mode=TwoWay}"
207213
Style="{StaticResource ToggleSymbolButton}"
208214
ToolTip="(T) OCR text as a table">
209215
<wpfui:SymbolIcon Symbol="Table24" />
@@ -215,7 +221,9 @@
215221
Margin="0"
216222
d:IsChecked="True"
217223
Click="NewGrabFrameMenuItem_Click"
218-
IsChecked="{Binding IsChecked, ElementName=NewGrabFrameMenuItem, Mode=TwoWay}"
224+
IsChecked="{Binding IsChecked,
225+
ElementName=NewGrabFrameMenuItem,
226+
Mode=TwoWay}"
219227
Style="{StaticResource ToggleSymbolButton}"
220228
ToolTip="(G) Place a Grab Frame">
221229
<wpfui:SymbolIcon Symbol="PanelBottom20" />
@@ -258,31 +266,17 @@
258266
IsCheckable="True"
259267
StaysOpenOnClick="False" />
260268
<MenuItem
261-
Name="BingSearchPostCapture"
269+
Name="WebSearchPostCapture"
262270
Click="PostActionMenuItem_Click"
263-
Header="Bing Search"
271+
Header="Web Search"
264272
InputGestureText="CTRL + 4"
265273
IsCheckable="True"
266274
StaysOpenOnClick="False" />
267-
<MenuItem
268-
Name="GoogleSearchPostCapture"
269-
Click="PostActionMenuItem_Click"
270-
Header="Google Search"
271-
InputGestureText="CTRL + 5"
272-
IsCheckable="True"
273-
StaysOpenOnClick="False" />
274-
<MenuItem
275-
Name="DuckSearchPostCapture"
276-
Click="PostActionMenuItem_Click"
277-
Header="Duck Duck Go Search"
278-
InputGestureText="CTRL + 6"
279-
IsCheckable="True"
280-
StaysOpenOnClick="False" />
281275
<MenuItem
282276
Name="InsertPostCapture"
283277
Click="PostActionMenuItem_Click"
284278
Header="Try to insert text"
285-
InputGestureText="CTRL + 7"
279+
InputGestureText="CTRL + 5"
286280
IsCheckable="True"
287281
StaysOpenOnClick="False" />
288282
</ContextMenu>
@@ -295,7 +289,9 @@
295289
Margin="2,0"
296290
d:IsChecked="True"
297291
Click="SendToEditTextToggleButton_Click"
298-
IsChecked="{Binding IsChecked, ElementName=SendToEtwMenuItem, Mode=TwoWay}"
292+
IsChecked="{Binding IsChecked,
293+
ElementName=SendToEtwMenuItem,
294+
Mode=TwoWay}"
299295
Style="{StaticResource ToggleSymbolButton}"
300296
ToolTip="(E) Send to an Edit Text Window">
301297
<wpfui:SymbolIcon Symbol="Window24" />

‎Text-Grab/Views/FullscreenGrab.xaml.cs

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -698,27 +698,19 @@ private async void RegionClickCanvas_MouseUp(object sender, MouseButtonEventArgs
698698
if (RemoveDuplicatesMenuItem.IsChecked is true)
699699
TextFromOCR = TextFromOCR.RemoveDuplicateLines();
700700

701-
if (BingSearchPostCapture.IsChecked is true)
701+
if (WebSearchPostCapture.IsChecked is true)
702702
{
703-
string searchStringUrlSafe = WebUtility.UrlEncode(TextFromOCR.MakeStringSingleLine());
704-
_ = await Windows.System.Launcher.LaunchUriAsync(new Uri(string.Format($"https://www.bing.com/search?q={searchStringUrlSafe}")));
705-
}
703+
string searchStringUrlSafe = WebUtility.UrlEncode(TextFromOCR);
706704

707-
if (GoogleSearchPostCapture.IsChecked is true)
708-
{
709-
string searchStringUrlSafe = WebUtility.UrlEncode(TextFromOCR.MakeStringSingleLine());
710-
_ = await Windows.System.Launcher.LaunchUriAsync(new Uri(string.Format($"https://www.google.com/search?q={searchStringUrlSafe}")));
711-
}
705+
WebSearchUrlModel searcher = Singleton<WebSearchUrlModel>.Instance.DefaultSearcher;
712706

713-
if (DuckSearchPostCapture.IsChecked is true)
714-
{
715-
string searchStringUrlSafe = WebUtility.UrlEncode(TextFromOCR.MakeStringSingleLine());
716-
_ = await Windows.System.Launcher.LaunchUriAsync(new Uri(string.Format($"https://duckduckgo.com/?va=d&t=he&q={searchStringUrlSafe}&ia=web")));
707+
Uri searchUri = new($"{searcher.Url}{searchStringUrlSafe}");
708+
_ = await Windows.System.Launcher.LaunchUriAsync(searchUri);
717709
}
718710

719711
if (SendToEditTextToggleButton.IsChecked is true
720712
&& destinationTextBox is null
721-
&& BingSearchPostCapture.IsChecked is false)
713+
&& WebSearchPostCapture.IsChecked is false)
722714
{
723715
EditTextWindow etw = WindowUtilities.OpenOrActivateWindow<EditTextWindow>();
724716
destinationTextBox = etw.PassedTextControl;

0 commit comments

Comments
 (0)