diff --git a/src/DiscordRPC.Main/DiscordRPC.Main.csproj b/src/DiscordRPC.Main/DiscordRPC.Main.csproj index 3b99fc7..6c711fe 100644 --- a/src/DiscordRPC.Main/DiscordRPC.Main.csproj +++ b/src/DiscordRPC.Main/DiscordRPC.Main.csproj @@ -15,6 +15,7 @@ true true false + F:\ true Disk @@ -30,7 +31,6 @@ false true true - AnyCPU @@ -53,11 +53,9 @@ 4 - Resources\RikoRPC_logo_256px_Windows_256x256.ico - - - app.manifest + Resources\rikorpc_logo.ico + LocalIntranet @@ -73,6 +71,9 @@ false + + app.manifest + ..\packages\DiscordRichPresence.1.0.108\lib\net35\DiscordRPC.dll @@ -210,9 +211,6 @@ - - - @@ -222,5 +220,8 @@ + + + \ No newline at end of file diff --git a/src/DiscordRPC.Main/Properties/Resources.Designer.cs b/src/DiscordRPC.Main/Properties/Resources.Designer.cs index ea8e9d3..fe8e1cc 100644 --- a/src/DiscordRPC.Main/Properties/Resources.Designer.cs +++ b/src/DiscordRPC.Main/Properties/Resources.Designer.cs @@ -161,32 +161,32 @@ internal class Resources { } /// - /// Looks up a localized resource of type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Bitmap RikoRPC_logo_128px { + internal static System.Drawing.Icon rikorpc_logo { get { - object obj = ResourceManager.GetObject("RikoRPC_logo_128px", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + object obj = ResourceManager.GetObject("rikorpc_logo", resourceCulture); + return ((System.Drawing.Icon)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap RikoRPC_logo_256px { + internal static System.Drawing.Bitmap RikoRPC_logo_128px { get { - object obj = ResourceManager.GetObject("RikoRPC_logo_256px", resourceCulture); + object obj = ResourceManager.GetObject("RikoRPC_logo_128px", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Icon RikoRPC_logo_ico_256px { + internal static System.Drawing.Bitmap RikoRPC_logo_256px { get { - object obj = ResourceManager.GetObject("RikoRPC_logo_ico_256px", resourceCulture); - return ((System.Drawing.Icon)(obj)); + object obj = ResourceManager.GetObject("RikoRPC_logo_256px", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); } } } diff --git a/src/DiscordRPC.Main/Properties/Resources.resx b/src/DiscordRPC.Main/Properties/Resources.resx index f5c52c7..243e56f 100644 --- a/src/DiscordRPC.Main/Properties/Resources.resx +++ b/src/DiscordRPC.Main/Properties/Resources.resx @@ -154,7 +154,7 @@ ..\Resources\RikoRPC_logo_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\RikoRPC_logo_256px_Windows_256x256.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\rikorpc_logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/DiscordRPC.Main/Resources/RikoRPC_logo_128px.png b/src/DiscordRPC.Main/Resources/RikoRPC_logo_128px.png index 59864c5..2291aea 100644 Binary files a/src/DiscordRPC.Main/Resources/RikoRPC_logo_128px.png and b/src/DiscordRPC.Main/Resources/RikoRPC_logo_128px.png differ diff --git a/src/DiscordRPC.Main/Resources/RikoRPC_logo_256px.png b/src/DiscordRPC.Main/Resources/RikoRPC_logo_256px.png index 655f204..96c58d0 100644 Binary files a/src/DiscordRPC.Main/Resources/RikoRPC_logo_256px.png and b/src/DiscordRPC.Main/Resources/RikoRPC_logo_256px.png differ diff --git a/src/DiscordRPC.Main/Resources/RikoRPC_logo_48px.ico b/src/DiscordRPC.Main/Resources/RikoRPC_logo_48px.ico deleted file mode 100644 index 163af70..0000000 Binary files a/src/DiscordRPC.Main/Resources/RikoRPC_logo_48px.ico and /dev/null differ diff --git a/src/DiscordRPC.Main/Resources/rikorpc_logo.ico b/src/DiscordRPC.Main/Resources/rikorpc_logo.ico new file mode 100644 index 0000000..c74c5aa Binary files /dev/null and b/src/DiscordRPC.Main/Resources/rikorpc_logo.ico differ diff --git a/src/DiscordRPC.Main/UI/AboutWindow.xaml b/src/DiscordRPC.Main/UI/AboutWindow.xaml index 4d57277..5d0842a 100644 --- a/src/DiscordRPC.Main/UI/AboutWindow.xaml +++ b/src/DiscordRPC.Main/UI/AboutWindow.xaml @@ -22,7 +22,7 @@ + Foreground="#FF72767D" Margin="0,115,27.4,-0.6" TextWrapping="Wrap" Text="Stable/PTB" VerticalAlignment="Top" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Right" Width="117"/> diff --git a/src/DiscordRPC.Main/UI/FirstRunWindow.xaml b/src/DiscordRPC.Main/UI/FirstRunWindow.xaml index 63dc1e2..09802c8 100644 --- a/src/DiscordRPC.Main/UI/FirstRunWindow.xaml +++ b/src/DiscordRPC.Main/UI/FirstRunWindow.xaml @@ -5,18 +5,18 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:local="clr-namespace:DiscordRPC.Main" mc:Ignorable="d" - Title="Discord Rich Presence Customizer" Height="450" Width="800" Background="#FF36393E" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"> + Title="Discord Rich Presence Customizer" Height="401.4" Width="800" Background="#FF36393E" ResizeMode="NoResize" WindowStartupLocation="CenterScreen"> - -