Skip to content

Commit 2b72285

Browse files
onesoundsonesounds
committed
Add Strings in about panel
Add github / docs link
1 parent 70a2a5c commit 2b72285

File tree

4 files changed

+43
-14
lines changed

4 files changed

+43
-14
lines changed

‎Flow.Launcher.Infrastructure/Constant.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,7 @@ public static class Constant
4040
public const string Logs = "Logs";
4141

4242
public const string Website = "https://flow-launcher.github.io";
43+
public const string GitHub = "https://github.com/Flow-Launcher/Flow.Launcher";
44+
public const string Docs = "https://flow-launcher.github.io/docs";
4345
}
4446
}

‎Flow.Launcher/Languages/en.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@
130130
<!-- Setting About -->
131131
<system:String x:Key="about">About</system:String>
132132
<system:String x:Key="website">Website</system:String>
133+
<system:String x:Key="github">Github</system:String>
134+
<system:String x:Key="docs">Docs</system:String>
133135
<system:String x:Key="version">Version</system:String>
134136
<system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
135137
<system:String x:Key="checkUpdates">Check for Updates</system:String>
@@ -141,6 +143,9 @@
141143
</system:String>
142144
<system:String x:Key="releaseNotes">Release Notes</system:String>
143145
<system:String x:Key="documentation">Usage Tips</system:String>
146+
<system:String x:Key="devtool">DevTools</system:String>
147+
<system:String x:Key="settingfolder">Setting Folder</system:String>
148+
<system:String x:Key="logfolder">Log Folder</system:String>
144149

145150
<!-- FileManager Setting Dialog -->
146151
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,11 +2348,21 @@
23482348
<StackPanel Style="{StaticResource TextPanel}">
23492349
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
23502350
</StackPanel>
2351-
<TextBlock Style="{StaticResource SideTextAbout}">
2352-
<Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2353-
<Run Text="{Binding Website, Mode=OneWay}" />
2354-
</Hyperlink>
2355-
</TextBlock>
2351+
<StackPanel
2352+
Grid.Column="2"
2353+
Margin="0,0,18,0"
2354+
Orientation="Horizontal">
2355+
<TextBlock Margin="0,0,12,0">
2356+
<Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2357+
<Run Text="{DynamicResource website}" />
2358+
</Hyperlink>
2359+
</TextBlock>
2360+
<TextBlock>
2361+
<Hyperlink NavigateUri="{Binding Github, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2362+
<Run Text="{DynamicResource github}" />
2363+
</Hyperlink>
2364+
</TextBlock>
2365+
</StackPanel>
23562366
<TextBlock Style="{StaticResource Glyph}">
23572367
&#xeb41;
23582368
</TextBlock>
@@ -2366,7 +2376,7 @@
23662376
</StackPanel>
23672377
<TextBlock Style="{StaticResource SideTextAbout}">
23682378
<Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2369-
<Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
2379+
<Run Text="{DynamicResource releaseNotes}" />
23702380
</Hyperlink>
23712381
</TextBlock>
23722382
<TextBlock Style="{StaticResource Glyph}">
@@ -2380,11 +2390,21 @@
23802390
<StackPanel Style="{StaticResource TextPanel}">
23812391
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
23822392
</StackPanel>
2383-
<TextBlock Style="{StaticResource SideTextAbout}">
2384-
<Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2385-
<Run Text="{Binding Documentation, Mode=OneWay}" />
2386-
</Hyperlink>
2387-
</TextBlock>
2393+
<StackPanel
2394+
Grid.Column="2"
2395+
Margin="0,0,18,0"
2396+
Orientation="Horizontal">
2397+
<TextBlock Margin="0,0,12,0">
2398+
<Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2399+
<Run Text="{DynamicResource documentation}" />
2400+
</Hyperlink>
2401+
</TextBlock>
2402+
<TextBlock>
2403+
<Hyperlink NavigateUri="{Binding Docs, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
2404+
<Run Text="{DynamicResource docs}" />
2405+
</Hyperlink>
2406+
</TextBlock>
2407+
</StackPanel>
23882408
<TextBlock Style="{StaticResource Glyph}">
23892409
&#xe82f;
23902410
</TextBlock>
@@ -2394,7 +2414,7 @@
23942414
<Border Style="{DynamicResource SettingGroupBox}">
23952415
<ItemsControl Style="{StaticResource SettingGrid}">
23962416
<StackPanel Style="{StaticResource TextPanel}">
2397-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Developer's Tool" />
2417+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource devtool}" />
23982418
</StackPanel>
23992419
<StackPanel
24002420
Grid.Column="1"
@@ -2404,8 +2424,8 @@
24042424
<Button
24052425
Margin="0,0,12,0"
24062426
Click="OpenSettingFolder"
2407-
Content="Setting Folder" />
2408-
<Button Click="OpenLogFolder" Content="Log Folder" />
2427+
Content="{DynamicResource settingfolder}" />
2428+
<Button Click="OpenLogFolder" Content="{DynamicResource logfolder}" />
24092429
</StackPanel>
24102430
<TextBlock Style="{StaticResource Glyph}">
24112431
&#xec7a;

‎Flow.Launcher/ViewModel/SettingWindowViewModel.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@ public FamilyTypeface SelectedResultFontFaces
518518
public string Website => Constant.Website;
519519
public string ReleaseNotes => _updater.GitHubRepository + @"/releases/latest";
520520
public string Documentation => Constant.Documentation;
521+
public string Docs => Constant.Docs;
522+
public string Github => Constant.GitHub;
521523
public static string Version => Constant.Version;
522524
public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes);
523525
#endregion

0 commit comments

Comments
 (0)