From 0c53bc6f32910c0b60b11e273a4c6c080d13d56a Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Fri, 6 Jul 2018 07:26:22 +0200
Subject: [PATCH] Move icons and images to a separate folder
---
Properties/Resources.resx | 14 ++++++------
Resources/{ => Images}/avatar.png | Bin
Resources/{ => Images}/icon-muted.ico | Bin
Resources/{ => Images}/icon-small.ico | Bin
Resources/{ => Images}/icon-tray-muted.ico | Bin
Resources/{ => Images}/icon-tray-new.ico | Bin
Resources/{ => Images}/icon-tray.ico | Bin
Resources/{ => Images}/icon.ico | Bin
Resources/{ => Images}/spinner.apng | Bin
TweetDuck.csproj | 24 +++++++++------------
10 files changed, 17 insertions(+), 21 deletions(-)
rename Resources/{ => Images}/avatar.png (100%)
rename Resources/{ => Images}/icon-muted.ico (100%)
rename Resources/{ => Images}/icon-small.ico (100%)
rename Resources/{ => Images}/icon-tray-muted.ico (100%)
rename Resources/{ => Images}/icon-tray-new.ico (100%)
rename Resources/{ => Images}/icon-tray.ico (100%)
rename Resources/{ => Images}/icon.ico (100%)
rename Resources/{ => Images}/spinner.apng (100%)
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
index 4964019c..dd2f8021 100644
--- a/Properties/Resources.resx
+++ b/Properties/Resources.resx
@@ -119,24 +119,24 @@
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="avatar" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\avatar.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>..\Resources\Images\avatar.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Images\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_muted" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Images\icon-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_tray" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon-tray.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Images\icon-tray.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_tray_muted" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon-tray-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Images\icon-tray-muted.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon_tray_new" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Images\icon-tray-new.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="spinner" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\Resources\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ <value>..\Resources\Images\spinner.apng;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
\ No newline at end of file
diff --git a/Resources/avatar.png b/Resources/Images/avatar.png
similarity index 100%
rename from Resources/avatar.png
rename to Resources/Images/avatar.png
diff --git a/Resources/icon-muted.ico b/Resources/Images/icon-muted.ico
similarity index 100%
rename from Resources/icon-muted.ico
rename to Resources/Images/icon-muted.ico
diff --git a/Resources/icon-small.ico b/Resources/Images/icon-small.ico
similarity index 100%
rename from Resources/icon-small.ico
rename to Resources/Images/icon-small.ico
diff --git a/Resources/icon-tray-muted.ico b/Resources/Images/icon-tray-muted.ico
similarity index 100%
rename from Resources/icon-tray-muted.ico
rename to Resources/Images/icon-tray-muted.ico
diff --git a/Resources/icon-tray-new.ico b/Resources/Images/icon-tray-new.ico
similarity index 100%
rename from Resources/icon-tray-new.ico
rename to Resources/Images/icon-tray-new.ico
diff --git a/Resources/icon-tray.ico b/Resources/Images/icon-tray.ico
similarity index 100%
rename from Resources/icon-tray.ico
rename to Resources/Images/icon-tray.ico
diff --git a/Resources/icon.ico b/Resources/Images/icon.ico
similarity index 100%
rename from Resources/icon.ico
rename to Resources/Images/icon.ico
diff --git a/Resources/spinner.apng b/Resources/Images/spinner.apng
similarity index 100%
rename from Resources/spinner.apng
rename to Resources/Images/spinner.apng
diff --git a/TweetDuck.csproj b/TweetDuck.csproj
index 2c8440f0..d294731e 100644
--- a/TweetDuck.csproj
+++ b/TweetDuck.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="packages\CefSharp.WinForms.67.0.0-CI2658\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.67.0.0-CI2658\build\CefSharp.WinForms.props')" />
<Import Project="packages\CefSharp.Common.67.0.0-CI2658\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.67.0.0-CI2658\build\CefSharp.Common.props')" />
@@ -16,7 +16,7 @@
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<UseVSHostingProcess>false</UseVSHostingProcess>
- <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
+ <ApplicationIcon>Resources\Images\icon.ico</ApplicationIcon>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
@@ -332,19 +332,15 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <ContentWithTargetPath Include="Resources\icon.ico">
- <TargetPath>icon.ico</TargetPath>
- </ContentWithTargetPath>
- </ItemGroup>
- <ItemGroup>
- <Content Include="Resources\avatar.png" />
<None Include="packages.config" />
- <None Include="Resources\icon-tray-muted.ico" />
- <None Include="Resources\icon-muted.ico" />
- <None Include="Resources\icon-small.ico" />
- <None Include="Resources\icon-tray-new.ico" />
- <None Include="Resources\icon-tray.ico" />
- <None Include="Resources\spinner.apng" />
+ <None Include="Resources\Images\avatar.png" />
+ <None Include="Resources\Images\icon.ico" />
+ <None Include="Resources\Images\icon-tray-muted.ico" />
+ <None Include="Resources\Images\icon-muted.ico" />
+ <None Include="Resources\Images\icon-small.ico" />
+ <None Include="Resources\Images\icon-tray-new.ico" />
+ <None Include="Resources\Images\icon-tray.ico" />
+ <None Include="Resources\Images\spinner.apng" />
<None Include="Resources\PostBuild.ps1" />
<None Include="Resources\Plugins\.debug\.meta" />
<None Include="Resources\Plugins\.debug\browser.js" />