Adjust Resources

2dust · Oct 17, 2024 · b74ddc0 · b74ddc0
1 parent d004c68
commit b74ddc0
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 122 deletions.
diff --git a/v2rayN/v2rayN.Desktop/v2rayN.ico → v2rayN/v2rayN.Desktop/Assets/v2rayN.ico b/v2rayN/v2rayN.Desktop/v2rayN.ico → v2rayN/v2rayN.Desktop/Assets/v2rayN.ico
diff --git a/v2rayN/v2rayN.Desktop/ViewModels/AppViewModel.cs b/v2rayN/v2rayN.Desktop/ViewModels/AppViewModel.cs
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml
@@ -170,10 +170,10 @@
                                         Content="{x:Static resx:ResUI.TipActiveServer}"
                                         IsVisible="{Binding isActive}"
                                         Theme="{StaticResource TagLabel}" />
-                                    <Label
+                                    <TextBlock
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
-                                        Content="{Binding remarks}" />
+                                        Text="{Binding remarks}" />
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>

diff --git a/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml b/v2rayN/v2rayN.Desktop/Views/ThemeSettingView.axaml
@@ -27,46 +27,32 @@
                 <StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Grid.Row="0"
-                            Grid.Column="0"
                             Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsColorMode}" />
-                        <ToggleSwitch
-                            x:Name="togDarkMode"
-                            Grid.Row="0"
-                            Grid.Column="1"
-                            Classes="Margin8" />
+                        <ToggleSwitch x:Name="togDarkMode" Classes="Margin8" />
                     </StackPanel>
 
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Grid.Row="1"
-                            Grid.Column="0"
                             Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsFontSize}" />
                         <ComboBox
                             x:Name="cmbCurrentFontSize"
-                            Grid.Row="1"
-                            Grid.Column="1"
                             Width="100"
                             Classes="Margin8" />
                     </StackPanel>
                     <StackPanel Orientation="Horizontal">
                         <TextBlock
-                            Grid.Row="2"
-                            Grid.Column="0"
                             Width="100"
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsLanguage}" />
                         <ComboBox
                             x:Name="cmbCurrentLanguage"
-                            Grid.Row="2"
-                            Grid.Column="1"
                             Width="100"
                             Classes="Margin8" />
                     </StackPanel>

diff --git a/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj b/v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj
@@ -4,7 +4,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
+		<ApplicationIcon>Assets\v2rayN.ico</ApplicationIcon>
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
@@ -37,7 +37,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <EmbeddedResource Include="v2rayN.ico">
+      <EmbeddedResource Include="Assets\v2rayN.ico">
         <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       </EmbeddedResource>
     </ItemGroup> 

diff --git a/v2rayN/v2rayN/v2rayN.ico → v2rayN/v2rayN/Resources/v2rayN.ico b/v2rayN/v2rayN/v2rayN.ico → v2rayN/v2rayN/Resources/v2rayN.ico
diff --git a/v2rayN/v2rayN/v2rayN.csproj b/v2rayN/v2rayN/v2rayN.csproj
@@ -8,7 +8,7 @@
 		<UseWPF>true</UseWPF>  
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<ImplicitUsings>enable</ImplicitUsings>
-		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
+		<ApplicationIcon>Resources\v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
@@ -24,15 +24,13 @@
 
 	<ItemGroup>       
         <AdditionalFiles Include="app.manifest" />       
-        <EmbeddedResource Include="v2rayN.ico">
+        <EmbeddedResource Include="Resources\v2rayN.ico">
           <CopyToOutputDirectory>Never</CopyToOutputDirectory>
         </EmbeddedResource>
         <Resource Include="Resources\NotifyIcon1.ico" />
         <Resource Include="Resources\NotifyIcon2.ico" />
         <Resource Include="Resources\NotifyIcon3.ico" />
-        <Resource Include="v2rayN.ico">
-          <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </Resource>
+        <Resource Include="Resources\v2rayN.ico" />
     </ItemGroup> 	 
 
 	<ItemGroup>