Skip to content

Commit f07db3d

Browse files
committed
Merge branch 'dev' into websearchUri
2 parents 32107db + 150ce09 commit f07db3d

File tree

95 files changed

+219
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+219
-66
lines changed

Flow.Launcher.Plugin/Result.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ public class Result
2929
/// </summary>
3030
public string ActionKeywordAssigned { get; set; }
3131

32+
/// <summary>
33+
/// This holds the text which can be provided by plugin to be copied to the
34+
/// user's clipboard when Ctrl + C is pressed on a result. If the text is a file/directory path
35+
/// flow will copy the actual file/folder instead of just the path text.
36+
/// </summary>
37+
public string CopyText { get; set; } = string.Empty;
38+
3239
/// <summary>
3340
/// This holds the text which can be provided by plugin to help Flow autocomplete text
3441
/// for user on the plugin result. If autocomplete action for example is tab, pressing tab will have

Flow.Launcher/App.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ private void RegisterDispatcherUnhandledException()
153153
DispatcherUnhandledException += ErrorReporting.DispatcherUnhandledException;
154154
}
155155

156-
157156
/// <summary>
158157
/// let exception throw as normal is better for Debug
159158
/// </summary>
@@ -179,4 +178,4 @@ public void OnSecondAppStarted()
179178
Current.MainWindow.Show();
180179
}
181180
}
182-
}
181+
}

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8989
</PackageReference>
9090
<PackageReference Include="InputSimulator" Version="1.0.4" />
91+
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.2" />
9192
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
9293
<PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
9394
<PackageReference Include="NuGet.CommandLine" Version="5.4.0">

Flow.Launcher/Images/Browser.png

1.8 KB

Flow.Launcher/Images/EXE.png

1.37 KB

Flow.Launcher/Images/Link.png

2.39 KB

Flow.Launcher/Images/New Message.png

372 Bytes
-40.7 KB

Flow.Launcher/Images/calculator.png

2.6 KB

Flow.Launcher/Images/cancel.png

579 Bytes

0 commit comments

Comments
 (0)