Skip to content

Commit 64f3738

Browse files
Jack251970Jack251970
authored
Merge branch 'dev' into double-pin
2 parents 1bc80d5 + 1d2a7bf commit 64f3738

File tree

13 files changed

+110
-42
lines changed

13 files changed

+110
-42
lines changed

‎Flow.Launcher/ReleaseNotesWindow.xaml.cs

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -189,31 +189,46 @@ private static async Task<string> GetReleaseNotesMarkdownAsync()
189189
var releases = JsonSerializer.Deserialize<List<GitHubReleaseInfo>>(releaseNotesJSON);
190190

191191
// Get the latest releases
192-
var latestReleases = releases.OrderByDescending(release => release.PublishedDate).Take(3);
192+
var latestReleases = releases.OrderByDescending(release => release.PublishedDate).Take(3).ToList();
193193

194194
// Build the release notes in Markdown format
195195
var releaseNotesHtmlBuilder = new StringBuilder(string.Empty);
196-
foreach (var release in latestReleases)
196+
197+
for (int i = 0; i < latestReleases.Count; i++)
197198
{
199+
var release = latestReleases[i];
198200
releaseNotesHtmlBuilder.AppendLine("# " + release.Name);
199201

200202
// Because MdXaml.Html package cannot correctly render images without units,
201203
// We need to manually add unit for images
202204
// E.g. Replace <img src="..." width="500"> with <img src="..." width="500px">
203205
var notes = ImageUnitRegex().Replace(release.ReleaseNotes, m =>
204-
{
205-
var prefix = m.Groups[1].Value;
206-
var widthValue = m.Groups[2].Value;
207-
var quote = m.Groups[3].Value;
208-
var suffix = m.Groups[4].Value;
209-
// Only replace if width is number like 500 without units like 500px
210-
if (IsNumber(widthValue))
211-
return $"{prefix}{widthValue}px{quote}{suffix}";
212-
return m.Value;
213-
});
206+
{
207+
var prefix = m.Groups[1].Value;
208+
var widthValue = m.Groups[2].Value;
209+
var quote = m.Groups[3].Value;
210+
var suffix = m.Groups[4].Value;
211+
// Only replace if width is number like 500 without units like 500px
212+
if (IsNumber(widthValue))
213+
return $"{prefix}{widthValue}px{quote}{suffix}";
214+
return m.Value;
215+
});
214216

215217
releaseNotesHtmlBuilder.AppendLine(notes);
216218
releaseNotesHtmlBuilder.AppendLine();
219+
220+
// Add separator if it is not last release note
221+
if (i < latestReleases.Count - 1)
222+
{
223+
releaseNotesHtmlBuilder.Append("<br />");
224+
releaseNotesHtmlBuilder.Append("\n\n");
225+
226+
releaseNotesHtmlBuilder.AppendLine("---");
227+
228+
releaseNotesHtmlBuilder.Append("\n\n");
229+
releaseNotesHtmlBuilder.Append("<br />");
230+
releaseNotesHtmlBuilder.Append("\n\n");
231+
}
217232
}
218233

219234
return releaseNotesHtmlBuilder.ToString();

‎Flow.Launcher/Resources/Controls/Card.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
<Setter Property="Background" Value="Transparent" />
3939
</DataTrigger>
4040

41-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
41+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
4242
<Setter Property="Margin" Value="0" />
4343
<Setter Property="CornerRadius" Value="0" />
4444
<Setter Property="Background" Value="Transparent" />
4545
<Setter Property="BorderThickness" Value="0" />
4646
</DataTrigger>
4747

48-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
48+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
4949
<Setter Property="Margin" Value="0" />
5050
<Setter Property="CornerRadius" Value="0" />
5151
<Setter Property="Background" Value="Transparent" />
5252
<Setter Property="BorderThickness" Value="0 1 0 0" />
5353
</DataTrigger>
5454

55-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
55+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
5656
<Setter Property="Margin" Value="0" />
5757
<Setter Property="CornerRadius" Value="0" />
5858
<Setter Property="Background" Value="Transparent" />

‎Flow.Launcher/Resources/Controls/Card.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ public enum CardType
99
{
1010
Default,
1111
Inside,
12-
InsideFit
12+
InsideFit,
13+
First,
14+
Middle,
15+
Last
1316
}
1417

1518
public Card()

‎Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@
9191
</cc:Card>
9292

9393
<cc:CardGroup Margin="0 4 0 0">
94-
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
94+
<cc:Card
95+
Title="{DynamicResource SearchWindowPosition}"
96+
Icon="&#xe7f4;"
97+
Type="First">
9598
<StackPanel Orientation="Horizontal">
9699
<ComboBox
97100
MinWidth="220"
@@ -116,6 +119,7 @@
116119
<cc:Card
117120
Title="{DynamicResource SearchWindowAlign}"
118121
Icon="&#xe7f4;"
122+
Type="Last"
119123
Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
120124
IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
121125
<StackPanel Orientation="Horizontal">
@@ -196,7 +200,10 @@
196200
</cc:Card>
197201

198202
<cc:CardGroup Margin="0 14 0 0">
199-
<cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
203+
<cc:Card
204+
Title="{DynamicResource querySearchPrecision}"
205+
Sub="{DynamicResource querySearchPrecisionToolTip}"
206+
Type="First">
200207
<ComboBox
201208
MaxWidth="200"
202209
DisplayMemberPath="Display"
@@ -205,7 +212,10 @@
205212
SelectedValuePath="Value" />
206213
</cc:Card>
207214

208-
<cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
215+
<cc:Card
216+
Title="{DynamicResource lastQueryMode}"
217+
Sub="{DynamicResource lastQueryModeToolTip}"
218+
Type="Last">
209219
<ComboBox
210220
MinWidth="210"
211221
DisplayMemberPath="Display"
@@ -375,7 +385,8 @@
375385
<cc:Card
376386
Title="{DynamicResource KoreanImeRegistry}"
377387
Icon="&#xe88b;"
378-
Sub="{DynamicResource KoreanImeRegistryTooltip}">
388+
Sub="{DynamicResource KoreanImeRegistryTooltip}"
389+
Type="First">
379390
<ui:ToggleSwitch
380391
IsOn="{Binding LegacyKoreanIMEEnabled}"
381392
OffContent="{DynamicResource disable}"
@@ -384,7 +395,8 @@
384395
<cc:Card
385396
Title="{DynamicResource KoreanImeOpenLink}"
386397
Icon="&#xF210;"
387-
Sub="{DynamicResource KoreanImeOpenLinkToolTip}">
398+
Sub="{DynamicResource KoreanImeOpenLinkToolTip}"
399+
Type="Last">
388400
<Button Command="{Binding OpenImeSettingsCommand}" Content="{DynamicResource KoreanImeOpenLinkButton}" />
389401
</cc:Card>
390402
</cc:CardGroup>

‎Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,21 @@
5151
</cc:Card>
5252

5353
<cc:CardGroup Margin="0 12 0 0">
54-
<cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
54+
<cc:Card
55+
Title="{DynamicResource openResultModifiers}"
56+
Sub="{DynamicResource openResultModifiersToolTip}"
57+
Type="First">
5558
<ComboBox
5659
Width="120"
5760
FontSize="14"
5861
ItemsSource="{Binding OpenResultModifiersList}"
5962
SelectedValue="{Binding Settings.OpenResultModifiers}" />
6063
</cc:Card>
6164

62-
<cc:Card Title="{DynamicResource showOpenResultHotkey}" Sub="{DynamicResource showOpenResultHotkeyToolTip}">
65+
<cc:Card
66+
Title="{DynamicResource showOpenResultHotkey}"
67+
Sub="{DynamicResource showOpenResultHotkeyToolTip}"
68+
Type="Last">
6369
<ui:ToggleSwitch
6470
IsOn="{Binding Settings.ShowOpenResultHotkey}"
6571
OffContent="{DynamicResource disable}"

‎Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,35 @@
3232
TextAlignment="left" />
3333

3434
<cc:CardGroup>
35-
<cc:Card Title="{DynamicResource enableProxy}">
35+
<cc:Card Title="{DynamicResource enableProxy}" Type="First">
3636
<ui:ToggleSwitch
3737
IsOn="{Binding Settings.Proxy.Enabled}"
3838
OffContent="{DynamicResource disable}"
3939
OnContent="{DynamicResource enable}" />
4040
</cc:Card>
4141

42-
<cc:Card Title="{DynamicResource server}">
42+
<cc:Card Title="{DynamicResource server}" Type="Middle">
4343
<TextBox
4444
Width="300"
4545
IsEnabled="{Binding Settings.Proxy.Enabled}"
4646
Text="{Binding Settings.Proxy.Server}" />
4747
</cc:Card>
4848

49-
<cc:Card Title="{DynamicResource port}">
49+
<cc:Card Title="{DynamicResource port}" Type="Middle">
5050
<TextBox
5151
Width="100"
5252
IsEnabled="{Binding Settings.Proxy.Enabled}"
5353
Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
5454
</cc:Card>
5555

56-
<cc:Card Title="{DynamicResource userName}">
56+
<cc:Card Title="{DynamicResource userName}" Type="Middle">
5757
<TextBox
5858
Width="200"
5959
IsEnabled="{Binding Settings.Proxy.Enabled}"
6060
Text="{Binding Settings.Proxy.UserName}" />
6161
</cc:Card>
6262

63-
<cc:Card Title="{DynamicResource password}">
63+
<cc:Card Title="{DynamicResource password}" Type="Last">
6464
<TextBox
6565
Width="200"
6666
IsEnabled="{Binding Settings.Proxy.Enabled}"

‎Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@
489489
Title="{DynamicResource BackdropType}"
490490
Margin="0 0 0 0"
491491
Icon="&#xeb42;"
492-
Sub="{Binding BackdropSubText}">
492+
Sub="{Binding BackdropSubText}"
493+
Type="First">
493494
<ComboBox
494495
MinWidth="160"
495496
VerticalAlignment="Center"
@@ -505,7 +506,8 @@
505506
<cc:Card
506507
Title="{DynamicResource queryWindowShadowEffect}"
507508
Margin="0 0 0 0"
508-
Icon="&#xeb91;">
509+
Icon="&#xeb91;"
510+
Type="Last">
509511
<ui:ToggleSwitch
510512
IsEnabled="{Binding IsDropShadowEnabled}"
511513
IsOn="{Binding DropShadowEffect}"
@@ -546,7 +548,10 @@
546548

547549
<!-- Time and date -->
548550
<cc:CardGroup Margin="0 14 0 0">
549-
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
551+
<cc:Card
552+
Title="{DynamicResource Clock}"
553+
Icon="&#xec92;"
554+
Type="First">
550555
<StackPanel Orientation="Horizontal">
551556
<TextBlock
552557
VerticalAlignment="Center"
@@ -567,7 +572,10 @@
567572
</StackPanel>
568573
</cc:Card>
569574

570-
<cc:Card Title="{DynamicResource Date}" Icon="&#xe787;">
575+
<cc:Card
576+
Title="{DynamicResource Date}"
577+
Icon="&#xe787;"
578+
Type="Last">
571579
<StackPanel Orientation="Horizontal">
572580
<TextBlock
573581
VerticalAlignment="Center"

‎Plugins/Flow.Launcher.Plugin.Calculator/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public class Main : IPlugin, IPluginI18n, ISettingProvider
2020
@"bin2dec|hex2dec|oct2dec|" +
2121
@"factorial|sign|isprime|isinfty|" +
2222
@"==|~=|&&|\|\||(?:\<|\>)=?|" +
23-
@"[ei]|[0-9]|[\+\%\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
23+
@"[ei]|[0-9]|0x[\da-fA-F]+|[\+\%\-\*\/\^\., ""]|[\(\)\|\!\[\]]" +
2424
@")+$", RegexOptions.Compiled);
2525
private static readonly Regex RegBrackets = new Regex(@"[\(\)\[\]]", RegexOptions.Compiled);
2626
private static Engine MagesEngine;

‎Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"ID": "CEA0FDFC6D3B4085823D60DC76F28855",
33
"ActionKeyword": "*",
44
"Name": "Calculator",
5-
"Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
5+
"Description": "Perform mathematical calculations (including hexadecimal values)",
66
"Author": "cxfksword",
77
"Version": "1.0.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Calculator.dll",
1111
"IcoPath": "Images\\calculator.png"
12-
}
12+
}

‎Plugins/Flow.Launcher.Plugin.Explorer/Main.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class Main : ISettingProvider, IAsyncPlugin, IContextMenu, IPluginI18n
1717
{
1818
internal static PluginInitContext Context { get; set; }
1919

20-
internal Settings Settings;
20+
internal static Settings Settings { get; set; }
2121

2222
private SettingsViewModel viewModel;
2323

0 commit comments

Comments
 (0)