Skip to content

Commit ccfcf51

Browse files
jjw24jjw24
authored
Merge branch 'dev' into explorer_prompt_deletion
2 parents c46bb35 + 2e8d6a1 commit ccfcf51

File tree

20 files changed

+469
-111
lines changed

20 files changed

+469
-111
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
name: "\U0001F41E Bug report"
3+
about: Create a bug report to help us improve Flow Launcher
4+
title: "[Describe Your Bug]"
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug/issue**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. ...
16+
2. ...
17+
3. ...
18+
19+
**Screenshots**
20+
If applicable, add screenshots to help explain your problem.
21+
22+
**Your System**
23+
```
24+
Windows build number: (run "ver" at a command prompt)
25+
Flow Launcher version: (Settings => About)
26+
```
27+
**Flow Launcher Error Log**
28+
<!--
29+
The latest log file can be found here: %AppData%\FlowLauncher\Logs\<version>\<date>.txt
30+
or for portable mode: %LocalAppData%\FlowLauncher\<App-Version>\UserData\Logs\<version>\<date>.txt
31+
Drag and drop the log file below this comment.
32+
-->

‎.github/ISSUE_TEMPLATE/code-review.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: "\U0001F50E Code Review"
3+
about: Describe (bad) code that needs to be improved
4+
title: "[Describe Problematic Code]"
5+
labels: 'code review'
6+
assignees: ''
7+
8+
---
9+
10+
**Point to the corresponding file and line number(s) which could be improved.**
11+
12+
Click on the line number in GitHub to create an anchored link to the corresponding code section. For example:
13+
14+
15+
https://github.com/Flow-Launcher/Flow.Launcher/blob/master/Flow.Launcher/Storage/TopMostRecord.cs#L8
16+
17+
Provide your alternative implementation idea:
18+
19+
```
20+
Code
21+
```

‎.github/ISSUE_TEMPLATE/discussion.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: "⁉️ Question/Discussion"
3+
about: Create a report to help us improve
4+
title: "[Ask a question or propose a change]"
5+
labels: 'question/discussion'
6+
assignees: ''
7+
8+
---
9+
10+
**Question**
11+
Describe your question.
12+
13+
**Discussion**
14+
Discuss a topic.

‎.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: "⭐ Feature request"
3+
about: Suggest a new idea or a feature enhacement
4+
title: "[Describe Your Feature]"
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
12+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
13+
14+
**Describe the solution you'd like**
15+
16+
A clear and concise description of what you want to happen.
17+
18+
**Describe alternatives you've considered**
19+
20+
A clear and concise description of any alternative solutions or features you've considered.
21+
22+
**Additional context**
23+
24+
Add any other context or screenshots about the feature request here.

‎Flow.Launcher.Plugin/Flow.Launcher.Plugin.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
</PropertyGroup>
1515

1616
<PropertyGroup>
17-
<Version>1.0.0</Version>
18-
<PackageVersion>1.0.0</PackageVersion>
19-
<AssemblyVersion>1.0.0</AssemblyVersion>
20-
<FileVersion>1.0.0</FileVersion>
17+
<Version>1.1.0</Version>
18+
<PackageVersion>1.1.0</PackageVersion>
19+
<AssemblyVersion>1.1.0</AssemblyVersion>
20+
<FileVersion>1.1.0</FileVersion>
2121
<PackageId>Flow.Launcher.Plugin</PackageId>
2222
<Authors>Flow-Launcher</Authors>
2323
<PackageLicenseExpression>MIT</PackageLicenseExpression>

‎Flow.Launcher.sln

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launc
2626
{A3DCCBCA-ACC1-421D-B16E-210896234C26} = {A3DCCBCA-ACC1-421D-B16E-210896234C26}
2727
{049490F0-ECD2-4148-9B39-2135EC346EBE} = {049490F0-ECD2-4148-9B39-2135EC346EBE}
2828
{403B57F2-1856-4FC7-8A24-36AB346B763E} = {403B57F2-1856-4FC7-8A24-36AB346B763E}
29+
{588088F4-3262-4F9F-9663-A05DE12534C3} = {588088F4-3262-4F9F-9663-A05DE12534C3}
2930
EndProjectSection
3031
EndProject
3132
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Infrastructure", "Flow.Launcher.Infrastructure\Flow.Launcher.Infrastructure.csproj", "{4FD29318-A8AB-4D8F-AA47-60BC241B8DA3}"
@@ -70,6 +71,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Calcul
7071
EndProject
7172
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Explorer", "Plugins\Flow.Launcher.Plugin.Explorer\Flow.Launcher.Plugin.Explorer.csproj", "{F9C4C081-4CC3-4146-95F1-E102B4E10A5F}"
7273
EndProject
74+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.ProcessKiller", "Plugins\Flow.Launcher.Plugin.ProcessKiller\Flow.Launcher.Plugin.ProcessKiller.csproj", "{588088F4-3262-4F9F-9663-A05DE12534C3}"
75+
EndProject
7376
Global
7477
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7578
Debug|Any CPU = Debug|Any CPU
@@ -297,6 +300,18 @@ Global
297300
{F9C4C081-4CC3-4146-95F1-E102B4E10A5F}.Release|x64.Build.0 = Release|Any CPU
298301
{F9C4C081-4CC3-4146-95F1-E102B4E10A5F}.Release|x86.ActiveCfg = Release|Any CPU
299302
{F9C4C081-4CC3-4146-95F1-E102B4E10A5F}.Release|x86.Build.0 = Release|Any CPU
303+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
304+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
305+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|x64.ActiveCfg = Debug|Any CPU
306+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|x64.Build.0 = Debug|Any CPU
307+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|x86.ActiveCfg = Debug|Any CPU
308+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Debug|x86.Build.0 = Debug|Any CPU
309+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
310+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|Any CPU.Build.0 = Release|Any CPU
311+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|x64.ActiveCfg = Release|Any CPU
312+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|x64.Build.0 = Release|Any CPU
313+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|x86.ActiveCfg = Release|Any CPU
314+
{588088F4-3262-4F9F-9663-A05DE12534C3}.Release|x86.Build.0 = Release|Any CPU
300315
EndGlobalSection
301316
GlobalSection(SolutionProperties) = preSolution
302317
HideSolutionNode = FALSE
@@ -315,6 +330,7 @@ Global
315330
{9B130CC5-14FB-41FF-B310-0A95B6894C37} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
316331
{59BD9891-3837-438A-958D-ADC7F91F6F7E} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
317332
{F9C4C081-4CC3-4146-95F1-E102B4E10A5F} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
333+
{588088F4-3262-4F9F-9663-A05DE12534C3} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
318334
EndGlobalSection
319335
GlobalSection(ExtensibilityGlobals) = postSolution
320336
SolutionGuid = {F26ACB50-3F6C-4907-B0C9-1ADACC1D0DED}

‎Flow.Launcher/Themes/BlurBlack.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</Style>
2222

2323
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
24+
<Setter Property="Width" Value="750" /> <!-- This is used to set the blur width only -->
2425
<Setter Property="Background">
2526
<Setter.Value>
2627
<SolidColorBrush Color="Black" Opacity="0.3"/>

‎Flow.Launcher/Themes/BlurWhite.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
</Style>
2222

2323
<Style x:Key="WindowStyle" BasedOn="{StaticResource BaseWindowStyle}" TargetType="{x:Type Window}">
24+
<Setter Property="Width" Value="750" /> <!-- This is used to set the blur width only -->
2425
<Setter Property="Background">
2526
<Setter.Value>
2627
<SolidColorBrush Color="White" Opacity="0.1"/>

‎ISSUE_TEMPLATE.md

Lines changed: 0 additions & 102 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Explorer",
55
"Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
66
"Author": "Jeremy Wu",
7-
"Version": "1.0.0",
7+
"Version": "1.1.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",

0 commit comments

Comments
 (0)