Daniel Chalmers 7 年之前
父节点
当前提交
0a1d0ec6c4

+ 2 - 2
Clock Widget.sln → DesktopClock.sln

@@ -1,9 +1,9 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2020
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Clock Widget", "Clock Widget\Clock Widget.csproj", "{E3E9D465-6F11-4B31-A1AA-CE85BCC8175E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopClock", "DesktopClock\DesktopClock.csproj", "{E3E9D465-6F11-4B31-A1AA-CE85BCC8175E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 3 - 3
Clock Widget/App.config → DesktopClock/App.config

@@ -2,14 +2,14 @@
 <configuration>
   <configSections>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="Clock_Widget.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+      <section name="DesktopClock.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
   </configSections>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
   </startup>
   <userSettings>
-    <Clock_Widget.Properties.Settings>
+    <DesktopClock.Properties.Settings>
       <setting name="ShouldUpgrade" serializeAs="String">
         <value>True</value>
       </setting>
@@ -28,6 +28,6 @@
       <setting name="TimeZone" serializeAs="String">
         <value />
       </setting>
-    </Clock_Widget.Properties.Settings>
+    </DesktopClock.Properties.Settings>
   </userSettings>
 </configuration>

+ 1 - 1
Clock Widget/App.xaml → DesktopClock/App.xaml

@@ -1,4 +1,4 @@
-<Application x:Class="Clock_Widget.App"
+<Application x:Class="DesktopClock.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Exit="Application_Exit"

+ 2 - 2
Clock Widget/App.xaml.cs → DesktopClock/App.xaml.cs

@@ -1,8 +1,8 @@
 using System.Reflection;
 using System.Windows;
-using Clock_Widget.Properties;
+using DesktopClock.Properties;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     /// <summary>
     /// Interaction logic for App.xaml

+ 5 - 3
Clock Widget/Clock Widget.csproj → DesktopClock/DesktopClock.csproj

@@ -6,8 +6,8 @@
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{E3E9D465-6F11-4B31-A1AA-CE85BCC8175E}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>Clock_Widget</RootNamespace>
-    <AssemblyName>Clock Widget</AssemblyName>
+    <RootNamespace>DesktopClock</RootNamespace>
+    <AssemblyName>DesktopClock</AssemblyName>
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -95,7 +95,9 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="MvvmLightLibsStd10">

+ 2 - 2
Clock Widget/MainViewModel.cs → DesktopClock/MainViewModel.cs

@@ -1,11 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Windows.Input;
-using Clock_Widget.Properties;
+using DesktopClock.Properties;
 using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.CommandWpf;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     public class MainViewModel : ViewModelBase
     {

+ 3 - 3
Clock Widget/MainWindow.xaml → DesktopClock/MainWindow.xaml

@@ -1,10 +1,10 @@
-<Window x:Class="Clock_Widget.MainWindow"
+<Window x:Class="DesktopClock.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:Clock_Widget"
-        xmlns:p="clr-namespace:Clock_Widget.Properties"
+        xmlns:local="clr-namespace:DesktopClock"
+        xmlns:p="clr-namespace:DesktopClock.Properties"
         xmlns:wp="clr-namespace:WpfWindowPlacement;assembly=WpfWindowPlacement"
         mc:Ignorable="d"
         Title="{x:Static local:App.Title}"

+ 1 - 1
Clock Widget/MainWindow.xaml.cs → DesktopClock/MainWindow.xaml.cs

@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Input;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml

+ 3 - 3
Clock Widget/Properties/AssemblyInfo.cs → DesktopClock/Properties/AssemblyInfo.cs

@@ -1,11 +1,11 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
-[assembly: AssemblyTitle("Clock Widget")]
+[assembly: AssemblyTitle("DesktopClock")]
 [assembly: AssemblyCompany("Daniel Chalmers")]
 [assembly: AssemblyCopyright("© Daniel Chalmers 2018")]
-[assembly: AssemblyProduct("Clock Widget")]
+[assembly: AssemblyProduct("DesktopClock")]
 [assembly: Guid("9523E886-243C-4AFB-BFC8-A97CE9823206")]
 [assembly: ComVisible(false)]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

+ 2 - 2
Clock Widget/Properties/Resources.Designer.cs → DesktopClock/Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Clock_Widget.Properties {
+namespace DesktopClock.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace Clock_Widget.Properties {
         public static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Clock_Widget.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DesktopClock.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

+ 0 - 0
Clock Widget/Properties/Resources.resx → DesktopClock/Properties/Resources.resx


+ 1 - 1
Clock Widget/Properties/Settings.Designer.cs → DesktopClock/Properties/Settings.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Clock_Widget.Properties {
+namespace DesktopClock.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

+ 1 - 1
Clock Widget/Properties/Settings.settings → DesktopClock/Properties/Settings.settings

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Clock_Widget.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="DesktopClock.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="ShouldUpgrade" Type="System.Boolean" Scope="User">

+ 2 - 2
Clock Widget/SettingsHelper.cs → DesktopClock/SettingsHelper.cs

@@ -1,7 +1,7 @@
 using System;
-using Clock_Widget.Properties;
+using DesktopClock.Properties;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     public static class SettingsHelper
     {

+ 1 - 1
Clock Widget/SystemClockTimer.cs → DesktopClock/SystemClockTimer.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     /// <summary>
     /// A timer that ticks when the second changes on the system clock.

+ 1 - 1
Clock Widget/TimeZoneUtil.cs → DesktopClock/TimeZoneUtil.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Clock_Widget
+namespace DesktopClock
 {
     public static class TimeZoneUtil
     {