Updated Readme, release 0.0.4.140 ready

BlackTasty · Dec 23, 2018 · ad40f36 · ad40f36
1 parent 8098d8e
commit ad40f36
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 16 deletions.
diff --git a/Installer/Resources/Runtime.zip b/Installer/Resources/Runtime.zip
diff --git a/Installer/UI/Components.xaml.cs b/Installer/UI/Components.xaml.cs
@@ -33,7 +33,7 @@ public void RegisterParent(MainWindow window)
         {
             this.window = window;
             vm = (ComponentsViewModel)DataContext;
-            vm.Components.Add(new Component(txt_application, true, 9236.48, ComponentType.APPLICATION, false));
+            vm.Components.Add(new Component(txt_application, true, 10092.24, ComponentType.APPLICATION, false));
             vm.Components.Add(new Component(txt_desktopIcon, false, 179, ComponentType.SHORTCUT));
             vm.Components.Add(new Component(txt_startmenu, false, 0, ComponentType.STARTMENU));
             CalculateSpace();

diff --git a/Installer_Online/UI/Components.xaml.cs b/Installer_Online/UI/Components.xaml.cs
@@ -33,7 +33,7 @@ public void RegisterParent(MainWindow window)
         {
             this.window = window;
             vm = (ComponentsViewModel)DataContext;
-            vm.Components.Add(new Component(txt_application, true, 11627.86719, ComponentType.APPLICATION, false));
+            vm.Components.Add(new Component(txt_application, true, 10092.24, ComponentType.APPLICATION, false));
             vm.Components.Add(new Component(txt_desktopIcon, false, 179, ComponentType.SHORTCUT));
             vm.Components.Add(new Component(txt_startmenu, false, 0, ComponentType.STARTMENU));
             CalculateSpace();

diff --git a/Osmo/MainWindow.xaml.cs b/Osmo/MainWindow.xaml.cs
@@ -45,6 +45,18 @@ public MainWindow()
             TemplateManager.Instance.SetMasterViewModel(DataContext as OsmoViewModel);
             LoadUISettings();
             Logger.Instance.WriteLog("Osmo has been successfully initialized!");
+            if (File.Exists(AppDomain.CurrentDomain.BaseDirectory + "\\cleanup.txt"))
+            {
+                Logger.Instance.WriteLog("Cleaning up after update...");
+                string[] lines = File.ReadAllLines(AppDomain.CurrentDomain.BaseDirectory + "\\cleanup.txt");
+                foreach (string path in lines)
+                {
+                    File.Delete(path);
+                }
+
+                File.Delete(AppDomain.CurrentDomain.BaseDirectory + "\\cleanup.txt");
+                Logger.Instance.WriteLog("Post cleanup successful!");
+            }
         }
 
         public void RequestShutdown()

diff --git a/Osmo/Properties/AssemblyInfo.cs b/Osmo/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.0.3.134")]
-[assembly: AssemblyFileVersion("0.0.3.134")]
+[assembly: AssemblyVersion("0.0.4.140")]
+[assembly: AssemblyFileVersion("0.0.4.140")]
diff --git a/Osmo/ViewModel/SBCreatorViewModel.cs b/Osmo/ViewModel/SBCreatorViewModel.cs
@@ -188,6 +188,8 @@ public void Reset()
             FrameRate = 30;
             mAnimation.Clear();
             CurrentFrameIndex = 0;
+            mDummyNames.Clear();
+            InvokePropertyChanged("DummyNames");
         }
 
         public void GenerateAnimation()

diff --git a/README.md b/README.md
@@ -68,7 +68,8 @@ Also please follow these guidelines:
 ![Skin Mixer](https://puu.sh/ASsBW/a04543558f.jpg "Skin Mixer")
 
 ### Animation preview 
-https://puu.sh/Az35a/171fdbfb7a.mp4
+[Demo Video](https://puu.sh/ClNxa/80d1a829d6.mp4)
+![Animation preview](https://puu.sh/ClO34/ea06a2ff03.jpg "Animation preview")
 
 ### Template Manager
 ![Template Manager](https://puu.sh/ASsCI/e2bebb7620.jpg "Template Manager")
@@ -78,3 +79,7 @@ https://puu.sh/Az35a/171fdbfb7a.mp4
 
 ### Resize Tool
 ![Resize Tool](https://puu.sh/ASsFP/fcce8783ef.jpg "Resize Tool")
+
+### Sliderball Creator
+[Demo Video](https://puu.sh/ClNLc/e49a0f0c7b.mp4)
+![Sliderball Creator](https://puu.sh/ClO52/9e066ccae8.jpg "Sliderball Creator")
diff --git a/Uninstaller/App.xaml.cs b/Uninstaller/App.xaml.cs
@@ -22,20 +22,20 @@ public static void Main()
             {
                 ShutdownMode = ShutdownMode.OnMainWindowClose
             };
-            EmbeddedAssembly.Load("Uninstaller.MaterialDesignColors.dll", "MaterialDesignColors.dll");
-            EmbeddedAssembly.Load("Uninstaller.MaterialDesignThemes.Wpf.dll", "MaterialDesignThemes.Wpf.dll");
+            //EmbeddedAssembly.Load("Uninstaller.MaterialDesignColors.dll", "MaterialDesignColors.dll");
+            //EmbeddedAssembly.Load("Uninstaller.MaterialDesignThemes.Wpf.dll", "MaterialDesignThemes.Wpf.dll");
 
-            AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
+            //AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
 
             appName = Helper.FindString("appName"); 
 
             app.InitializeComponent();
             app.Run();
         }
 
-        private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
-        {
-            return EmbeddedAssembly.Get(args.Name);
-        }
+        //private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args)
+        //{
+        //    return EmbeddedAssembly.Get(args.Name);
+        //}
     }
 }
diff --git a/Uninstaller/Uninstaller.csproj b/Uninstaller/Uninstaller.csproj
@@ -52,11 +52,11 @@
   <ItemGroup>
     <Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="MaterialDesignThemes.Wpf, Version=2.5.0.1205, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignThemes.2.5.0.1205\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -165,8 +165,8 @@
     <Resource Include="Resources\icon.jpg" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="MaterialDesignColors.dll" />
-    <EmbeddedResource Include="MaterialDesignThemes.Wpf.dll" />
+    <None Include="MaterialDesignColors.dll" />
+    <None Include="MaterialDesignThemes.Wpf.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.