Created RoundedWindow as a base window for prompts.

changbowen · Dec 29, 2016 · 75bfc0e · 75bfc0e
1 parent 7b3f111
commit 75bfc0e
Show file tree

Hide file tree

Showing 18 changed files with 928 additions and 466 deletions.
diff --git a/App.config b/App.config
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="DesktopNote.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="DesktopNote.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.5.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
     </startup>
     <userSettings>
         <DesktopNote.Properties.Settings>
@@ -45,4 +45,4 @@
             </setting>
         </DesktopNote.Properties.Settings>
     </userSettings>
-</configuration>
+</configuration>
diff --git a/App.xaml b/App.xaml
@@ -4,6 +4,11 @@
              Startup="RunCheck"
              ShutdownMode="OnExplicitShutdown">
     <Application.Resources>
-        <!--<ResourceDictionary Source="Resources/StringResources.en.xaml"/>-->
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!--<ResourceDictionary Source="Resources/StringResources.zh.xaml"/>-->
+                <!--<ResourceDictionary Source="Themes/Generic.xaml" />-->
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
     </Application.Resources>
 </Application>
diff --git a/App.xaml.cs b/App.xaml.cs
@@ -11,7 +11,7 @@ namespace DesktopNote
     public partial class App : Application
     {
         public static MainWindow mainwin;
-        public static FormatBox fb;
+        public static Win_Format fb;
         internal const int MaxWindowCount = 2;//need to set this to 4 while debugging if you use live debug toolbar in vs2015.
 
         [System.Runtime.InteropServices.DllImport("shlwapi.dll")]
@@ -85,5 +85,7 @@ private void RunCheck(object sender1, StartupEventArgs e1)
             Current.MainWindow = mainwin;
             mainwin.Show();
         }
+
+
     }
 }
diff --git a/DesktopNote.csproj b/DesktopNote.csproj
@@ -9,11 +9,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DesktopNote</RootNamespace>
     <AssemblyName>DesktopNote</AssemblyName>
-    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,6 +38,10 @@
   <PropertyGroup>
     <ApplicationIcon>Resources\stickynote.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>
+    </StartupObject>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
@@ -60,14 +65,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="FormatBox.xaml.cs">
-      <DependentUpon>FormatBox.xaml</DependentUpon>
+    <Compile Include="Win_Format.xaml.cs">
+      <DependentUpon>Win_Format.xaml</DependentUpon>
     </Compile>
     <Compile Include="GetCurrentMonitor.cs" />
+    <Compile Include="RoundedWindow.cs" />
+    <Compile Include="Win_Options.xaml.cs">
+      <DependentUpon>Win_Options.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Win_Search.xaml.cs">
       <DependentUpon>Win_Search.xaml</DependentUpon>
     </Compile>
-    <Page Include="FormatBox.xaml">
+    <Page Include="Win_Format.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -91,6 +100,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Win_Options.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Win_Search.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/FormatBox.xaml b/FormatBox.xaml