Skip to content

Commit 870c2ba

Browse files
authored
Merge pull request #2745 from onesounds/240531-TrayIcon
Tray Icon for dev
2 parents 6920f4d + 874418a commit 870c2ba

File tree

6 files changed

+21
-5
lines changed

6 files changed

+21
-5
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
</Content>
112112
</ItemGroup>
113113

114+
<ItemGroup>
115+
<None Update="Resources\dev.ico">
116+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
117+
</None>
118+
</ItemGroup>
119+
114120
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
115121
<Exec Command="taskkill /f /fi &quot;IMAGENAME eq Flow.Launcher.exe&quot;" />
116122
</Target>

Flow.Launcher/Images/dev.ico

4.19 KB
Binary file not shown.

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,11 +332,10 @@ private void InitializeNotifyIcon()
332332
_notifyIcon = new NotifyIcon
333333
{
334334
Text = Infrastructure.Constant.FlowLauncherFullName,
335-
Icon = Properties.Resources.app,
335+
Icon = Constant.Version == "1.0.0" ? Properties.Resources.dev : Properties.Resources.app,
336336
Visible = !_settings.HideNotifyIcon
337337
};
338338

339-
340339
var openIcon = new FontIcon
341340
{
342341
Glyph = "\ue71e"

Flow.Launcher/Properties/Resources.Designer.cs

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Flow.Launcher/Properties/Resources.resx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,18 @@
112112
<value>2.0</value>
113113
</resheader>
114114
<resheader name="reader">
115-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116116
</resheader>
117117
<resheader name="writer">
118-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120-
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
120+
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
121121
<data name="app" type="System.Resources.ResXFileRef, System.Windows.Forms">
122122
<value>..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
123123
</data>
124+
<data name="dev" type="System.Resources.ResXFileRef, System.Windows.Forms">
125+
<value>..\Images\dev.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126+
</data>
124127
<data name="gamemode" type="System.Resources.ResXFileRef, System.Windows.Forms">
125128
<value>..\Images\gamemode.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
126129
</data>

Flow.Launcher/Resources/dev.ico

44.4 KB
Binary file not shown.

0 commit comments

Comments
 (0)