fixups

marffinn · Jan 9, 2025 · 6daa4bd · 6daa4bd
1 parent 7caa376
commit 6daa4bd
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/Desktop Audio Switcher.csproj b/Desktop Audio Switcher.csproj
@@ -7,7 +7,7 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>sound-card.ico</ApplicationIcon>
+    <ApplicationIcon>assets\sound-card.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="sound-card.ico">
+    <Content Include="assets\sound-card.ico" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="assets\sound-card.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
@@ -28,13 +32,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="close.png">
+    <Resource Include="assets\close.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="minimize.png">
+    <Resource Include="assets\minimize.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
-    <Resource Include="sound-card.png">
+    <Resource Include="assets\sound-card.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>

diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -6,7 +6,7 @@
         Height="200" 
         Loaded="Window_Loaded" 
         ResizeMode="CanMinimize" 
-        Icon="/sound-card.png" 
+        Icon="/assets/sound-card.png" 
         WindowStyle="None" 
         UseLayoutRounding="True" 
         Background="#FF462C2C" 
@@ -57,7 +57,7 @@
                 <Style TargetType="Button">
                     <Setter Property="Background">
                         <Setter.Value>
-                            <ImageBrush ImageSource="/minimize.png" />
+                            <ImageBrush ImageSource="/assets/minimize.png" />
                         </Setter.Value>
                     </Setter>
                     <Setter Property="BorderBrush" Value="{x:Null}" />
@@ -66,7 +66,7 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/minimize.png" />
+                                    <ImageBrush ImageSource="/assets/minimize.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
@@ -76,13 +76,13 @@
         </Button>
         <Button x:Name="Close_btn" HorizontalAlignment="Right" Margin="0,6,5,0" VerticalAlignment="Top" BorderThickness="0,0,0,0" Width="9" Height="9" Click="Close_btn_Click" Padding="0,0,0,0">
             <Button.Background>
-                <ImageBrush ImageSource="/close.png" Stretch="Fill"/>
+                <ImageBrush ImageSource="/assets/close.png" Stretch="Fill"/>
             </Button.Background>
             <Button.Style>
                 <Style TargetType="Button">
                     <Setter Property="Background">
                         <Setter.Value>
-                            <ImageBrush ImageSource="/close.png" />
+                            <ImageBrush ImageSource="/assets/close.png" />
                         </Setter.Value>
                     </Setter>
                     <Setter Property="BorderBrush" Value="{x:Null}" />
@@ -92,7 +92,7 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="Background">
                                 <Setter.Value>
-                                    <ImageBrush ImageSource="/close.png" />
+                                    <ImageBrush ImageSource="/assets/close.png" />
                                 </Setter.Value>
                             </Setter>
                         </Trigger>
@@ -102,7 +102,7 @@
         </Button>
         <Rectangle HorizontalAlignment="Center" Height="40" Margin="8,0,0,0" VerticalAlignment="Top" Width="40">
             <Rectangle.Fill>
-                <ImageBrush ImageSource="/sound-card.png"/>
+                <ImageBrush ImageSource="/assets/sound-card.png"/>
             </Rectangle.Fill>
         </Rectangle>
     </Grid>

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Audio Device Switcher
 
-![alt text](https://github.com/marffinn/Desktop-Audio-Switcher/blob/master/screenshot.png?raw=true)
+![alt text](https://github.com/marffinn/Desktop-Audio-Switcher/blob/master/assets/screenshot.png?raw=true)
 
 
 

diff --git a/close.png → assets/close.png b/close.png → assets/close.png
diff --git a/minimize.png → assets/minimize.png b/minimize.png → assets/minimize.png
diff --git a/screenshot.png → assets/screenshot.png b/screenshot.png → assets/screenshot.png
diff --git a/sound-card.ico → assets/sound-card.ico b/sound-card.ico → assets/sound-card.ico
diff --git a/sound-card.png → assets/sound-card.png b/sound-card.png → assets/sound-card.png