Merge pull request WolvenKit#309 from WolvenKit/dev-UI

UI xaml designs by offline
TarekJor · Jan 28, 2021 · 3008cbc · 3008cbc
2 parents bfe91bc + 63c0d99
commit 3008cbc
Show file tree

Hide file tree

Showing 93 changed files with 2,308 additions and 344 deletions.
diff --git a/WolvenKit/App.xaml b/WolvenKit/App.xaml
@@ -10,8 +10,8 @@
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
                 <!-- Theme setting -->
                 <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Blue.xaml" />
-                <hc:Theme Name="HandyTheme"/>
-                <hc:Theme Skin="Dark"/>
+                <hc:ThemeResources/>
+                <hc:Theme/>
 
 
                 <ResourceDictionary Source="pack://application:,,,/Fluent;Component/Themes/Generic.xaml" />

diff --git a/WolvenKit/App.xaml.cs b/WolvenKit/App.xaml.cs
@@ -14,6 +14,10 @@
 using System.Threading;
 using WolvenKit.ViewModels;
 using WolvenKit.Views.Dialogs;
+using NodeNetwork;
+using System.Windows.Media;
+using MLib.Interfaces;
+using HandyControl.Controls.SplashWindow;
 
 namespace WolvenKit
 {
@@ -30,6 +34,10 @@ static App()
         {
 
 
+
+
+
+
         }
 
         /// <summary>
@@ -78,6 +86,11 @@ protected override async void OnStartup(StartupEventArgs e)
             //-- Category : CodeEditor
             viewModelLocator.Register(typeof(Views.CodeEditor.CodeEditorView), typeof(ViewModels.CodeEditor.CodeEditorViewModel));
 
+            //-- Category : PluginManager
+            viewModelLocator.Register(typeof(Views.PluginManager.PluginManagerView), typeof(ViewModels.PluginManager.PluginManagerViewModel));
+
+            //-- Category : VisualEditor
+            viewModelLocator.Register(typeof(Views.VisualEditor.VisualEditorView), typeof(ViewModels.VisualEditor.VisualEditorViewModel));
 
 
 
@@ -91,10 +104,40 @@ protected override async void OnStartup(StartupEventArgs e)
             viewModelLocator.Register(typeof(Views.HomePage.TopicView), typeof(ViewModels.HomePage.TopicViewModel));
             viewModelLocator.Register(typeof(Views.HomePage.Pages.AboutPageView), typeof(ViewModels.HomePage.Pages.AboutPageViewModel));
             viewModelLocator.Register(typeof(Views.HomePage.Pages.GithubPageView), typeof(ViewModels.HomePage.Pages.GithubPageViewModel));
-            viewModelLocator.Register(typeof(Views.HomePage.Pages.RecentProjectView), typeof(ViewModels.HomePage.Pages.RecentProjectViewModel));
-            viewModelLocator.Register(typeof(Views.HomePage.Pages.SettingsPageView), typeof(ViewModels.HomePage.Pages.SettingsPageViewModel));
+            viewModelLocator.Register(typeof(Views.HomePage.Pages.RecentProjectView), typeof(ViewModels.HomePage.Pages.RecentProjectViewModel));           
             viewModelLocator.Register(typeof(Views.HomePage.Pages.WikiPageView), typeof(ViewModels.HomePage.Pages.WikiPageViewModel));
             viewModelLocator.Register(typeof(Views.HomePage.Pages.WelcomePageView), typeof(ViewModels.HomePage.Pages.WelcomePageViewModel));
+            viewModelLocator.Register(typeof(Views.HomePage.Pages.WebsitePageView), typeof(ViewModels.HomePage.Pages.WebsitePageViewModel));
+            viewModelLocator.Register(typeof(Views.HomePage.Pages.SettingsPageView), typeof(ViewModels.HomePage.Pages.SettingsPageViewModel));
+
+            //-- Category : Settings Pages 
+            viewModelLocator.Register(typeof(Views.SettingsPages.GeneralSettingsView), typeof(ViewModels.SettingsPages.GeneralSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.General.GlobalSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.General.GlobalSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.General.AccountSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.General.AccountSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.General.UpdatesSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.General.UpdatesSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.General.ThemeSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.General.ThemeSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.General.LoggingSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.General.LoggingSubSettingsViewModel));
+
+
+            viewModelLocator.Register(typeof(Views.SettingsPages.ToolSettingsView), typeof(ViewModels.SettingsPages.ToolSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Tool.AssetBrowserSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Tool.AssetBrowserSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Tool.CodeEditorSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Tool.CodeEditorSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Tool.PluginManagerSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Tool.PluginManagerSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Tool.VisualEditorSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Tool.VisualEditorSubSettingsViewModel));
+
+
+            viewModelLocator.Register(typeof(Views.SettingsPages.EditorSettingsView), typeof(ViewModels.SettingsPages.EditorSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Editor.GeneralSubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Editor.GeneralSubSettingsViewModel));
+            viewModelLocator.Register(typeof(Views.SettingsPages.SubPages.Editor.CompatibilitySubSettingsView), typeof(ViewModels.SettingsPages.SubPages.Editor.CompatibilitySubSettingsViewModel));
+
+
+            viewModelLocator.Register(typeof(Views.SettingsPages.PackagingSettingsView), typeof(ViewModels.SettingsPages.PackagingSettingsViewModel));
+
+
+            viewModelLocator.Register(typeof(Views.SettingsPages.IntegrationsSettingsView), typeof(ViewModels.SettingsPages.IntegrationsSettingsViewModel));
+
+
+
 
 
             // ---- HeadCategory : Wizards
@@ -107,11 +150,11 @@ protected override async void OnStartup(StartupEventArgs e)
             viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ThemeWizard.ThemeWizardPageView), typeof(ViewModels.Wizards.WizardPages.ThemeWizard.ThemeWizardPageViewModel));
 
             //-- Category : ProjectWizard
-            viewModelLocator.Register(typeof(Views.Wizards.ProjectWizardView), typeof(ViewModels.Wizards.ProjectWizardViewModel));                                                             
-            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.SelectProjectTypeView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.SelectProjectTypeViewModel)); 
-            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.ProjectConfigurationView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.ProjectConfigurationViewModel));    
-            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.FinalizeSetupView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.FinalizeSetupViewModel));      
-            
+            viewModelLocator.Register(typeof(Views.Wizards.ProjectWizardView), typeof(ViewModels.Wizards.ProjectWizardViewModel));
+            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.SelectProjectTypeView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.SelectProjectTypeViewModel));
+            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.ProjectConfigurationView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.ProjectConfigurationViewModel));
+            viewModelLocator.Register(typeof(Views.Wizards.WizardPages.ProjectWizard.FinalizeSetupView), typeof(ViewModels.Wizards.WizardPages.ProjectWizard.FinalizeSetupViewModel));
+
             //-- Category : PublishWizard
             viewModelLocator.Register(typeof(Views.Wizards.PublishWizardView), typeof(ViewModels.Wizards.PublishWizardViewModel));
             viewModelLocator.Register(typeof(Views.Wizards.WizardPages.PublishWizard.RequiredSettingsView), typeof(ViewModels.Wizards.WizardPages.PublishWizard.RequiredSettingsViewModel));
@@ -139,10 +182,18 @@ protected override async void OnStartup(StartupEventArgs e)
 
 
             ControlzEx.Theming.ThemeManager.Current.ChangeTheme(Application.Current, "Dark.Red");
-
+            HandyControl.Tools.ThemeManager.Current.SetCurrentValue(HandyControl.Tools.ThemeManager.ApplicationThemeProperty, HandyControl.Tools.ApplicationTheme.Dark);
+
             Log.Info("Calling base.OnStartup");
 
-            base.OnStartup(e);
+
+
+
+            base.OnStartup(e); 
+            NNViewRegistrar.RegisterSplat();
+
+
+
         }
 
 

diff --git a/WolvenKit/Resources/Styles/CustomHandyStyles.xaml b/WolvenKit/Resources/Styles/CustomHandyStyles.xaml
@@ -16,10 +16,13 @@
             <Geometry x:Key="AboutGeo">M535.5 935.5625A425.00000000000006 425.00000000000006 0 0 0 797.5 809.375A441.25000000000006 441.25000000000006 0 0 0 826.25 222.4999999999999A428.12500000000006 428.12500000000006 0 0 0 290.0000000000001 113.7499999999999A437.49999999999994 437.49999999999994 0 0 0 95 332.4999999999999A444.99999999999994 444.99999999999994 0 0 0 80.625 626.8749999999999A437.49999999999994 437.49999999999994 0 0 0 253.7500000000001 863.7499999999999A425.00000000000006 425.00000000000006 0 0 0 535.5000000000001 935.5624999999998zM565 132.5A368.125 368.125 0 0 1 778.125 261.875A379.375 379.375 0 0 1 753.1249999999999 765.625A363.75000000000006 363.75000000000006 0 0 1 288.75 811.875A378.75 378.75 0 0 1 320 168.7500000000001A363.125 363.125 0 0 1 565 132.5000000000001zM460.9375 625H539.0625V687.5H460.9375V625zM539.0625 562.5V312.5H460.9375V562.5H539.0625z</Geometry>
             <Geometry x:Key="SettingsGeo">M218.75 875H156.25V562.5H218.75V875zM600 562.5H400L375 596.875V659.375L400 687.5H600.0000000000001L625.0000000000001 656.25V593.75L600.0000000000001 562.5zM287.5 375H87.5L62.5 406.25V468.75L87.5 500H287.5L312.5 468.75V406.25L287.5 375zM531.25 875H468.75V750H531.25V875zM468.75 500H531.25V125H468.75V500zM218.75 312.5H156.25V125H218.75V312.5zM712.5 312.5H911.875L936.875 343.75V403.125L911.875 434.375H712.5L687.5 403.125V343.75L712.5 312.5zM843.75 875H781.25V500H843.75V875zM781.25 250H843.75V125H781.25V250z</Geometry>
             <Geometry x:Key="RecentGeo">M13.5,8H12V13L16.28,15.54L17,14.33L13.5,12.25V8M13,3A9,9 0 0,0 4,12H1L4.96,16.03L9,12H6A7,7 0 0,1 13,5A7,7 0 0,1 20,12A7,7 0 0,1 13,19C11.07,19 9.32,18.21 8.06,16.94L6.64,18.36C8.27,20 10.5,21 13,21A9,9 0 0,0 22,12A9,9 0 0,0 13,3</Geometry>
+
+
+
         </ResourceDictionary>
 
     </ResourceDictionary.MergedDictionaries>
- 
+
 
 
     <DrawingBrush x:Key="SortByCategoryDrawingBrush" o:Freeze="True">

diff --git a/WolvenKit/ViewModels/AD/RibbonViewModel.cs b/WolvenKit/ViewModels/AD/RibbonViewModel.cs
@@ -35,8 +35,8 @@ public class RibbonViewModel : ViewModel
         public RibbonViewModel(
             ISettingsManager settingsManager,
             IProjectManager projectManager,
-            ILoggerService loggerService, 
-            INavigationService navigationService, 
+            ILoggerService loggerService,
+            INavigationService navigationService,
             IUIVisualizerService uiVisualizerService
             )
         {
@@ -77,8 +77,18 @@ public enum ERibbonContextualTabGroupVisibility
         /// <summary>
         /// Dependency Property on RibbonView
         /// </summary>
-        public List<string> ListOfThemes => new List<string>(){
-            "Dark.Red", "Dark.Green", "Dark.Blue", "Dark.Purple", "Dark.Orange", "Dark.Lime", "Dark.Emerald", "Dark.Teal", "Dark.Cyan", "Dark.Cobalt", "Dark.Indigo", "Dark.Violet", "Dark.Pink", "Dark.Magenta", "Dark.Crimson", "Dark.Amber", "Dark.Yellow", "Dark.Brown", "Dark.Olive", "Dark.Steel", "Dark.Mauve", "Dark.Taupe", "Dark.Sienna" , "Light.Red", "Light.Green", "Light.Blue", "Light.Purple", "Light.Orange", "Light.Lime", "Light.Emerald", "Light.Teal", "Light.Cyan", "Light.Cobalt", "Light.Indigo", "Light.Violet", "Light.Pink", "Light.Magenta", "Light.Crimson", "Light.Amber", "Light.Yellow", "Light.Brown", "Light.Olive", "Light.Steel", "Light.Mauve", "Light.Taupe", "Light.Sienna"};
+        public List<string> ListOfThemes => new List<string>()
+        {
+            "Dark.Red", "Dark.Green", "Dark.Blue",
+            "Dark.Purple", "Dark.Orange", "Dark.Lime",
+            "Dark.Emerald", "Dark.Teal", "Dark.Cyan",
+            "Dark.Cobalt", "Dark.Indigo", "Dark.Violet",
+            "Dark.Pink", "Dark.Magenta", "Dark.Crimson",
+            "Dark.Amber", "Dark.Yellow", "Dark.Brown",
+            "Dark.Olive", "Dark.Steel", "Dark.Mauve",
+            "Dark.Taupe", "Dark.Sienna"
+        };
+
         private string _selectedTheme;
         /// <summary>
         /// Dependency Property on RibbonView
@@ -123,7 +133,7 @@ private void ExecuteViewSelected(object viewmodel)
         private bool CanRunCommand1() => true;
         private void RunCommand1()
         {
-            
+
         }
         #endregion
 

diff --git a/WolvenKit/ViewModels/AssetBrowser/AssetBrowserViewModel.cs b/WolvenKit/ViewModels/AssetBrowser/AssetBrowserViewModel.cs
@@ -1,12 +1,13 @@
-using System;
+using Catel.MVVM;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace WolvenKit.ViewModels.AssetBrowser
 {
-    class AssetBrowserViewModel : ViewModel
+    class AssetBrowserViewModel : ViewModelBase
     {
     }
 }
diff --git a/WolvenKit/ViewModels/CodeEditor/CodeEditorViewModel.cs b/WolvenKit/ViewModels/CodeEditor/CodeEditorViewModel.cs
@@ -1,12 +1,13 @@
-using System;
+using Catel.MVVM;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace WolvenKit.ViewModels.CodeEditor
 {
-    class CodeEditorViewModel : ViewModel
+    class CodeEditorViewModel : ViewModelBase
     {
 
     }

diff --git a/WolvenKit/ViewModels/HomePage/Pages/WebsitePageViewModel.cs b/WolvenKit/ViewModels/HomePage/Pages/WebsitePageViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.HomePage.Pages
+{
+    class WebsitePageViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/PluginManager/PluginManagerViewModel.cs b/WolvenKit/ViewModels/PluginManager/PluginManagerViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.PluginManager
+{
+    class PluginManagerViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/EditorSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/EditorSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages
+{
+    class EditorSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/GeneralSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/GeneralSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages
+{
+    class GeneralSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/IntegrationsSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/IntegrationsSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages
+{
+    class IntegrationsSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/PackagingSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/PackagingSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages
+{
+    class PackagingSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/Editor/CompatibilitySubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/Editor/CompatibilitySubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.Editor
+{
+    class CompatibilitySubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/Editor/GeneralSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/Editor/GeneralSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.Editor
+{
+    class GeneralSubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/General/AccountSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/General/AccountSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.General
+{
+    class AccountSubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/General/GlobalSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/General/GlobalSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.General
+{
+    class GlobalSubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/General/LoggingSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/General/LoggingSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.General
+{
+    class LoggingSubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/General/ThemeSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/General/ThemeSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.General
+{
+    class ThemeSubSettingsViewModel : ViewModelBase
+    {
+    }
+}
diff --git a/WolvenKit/ViewModels/SettingsPages/SubPages/General/UpdatesSubSettingsViewModel.cs b/WolvenKit/ViewModels/SettingsPages/SubPages/General/UpdatesSubSettingsViewModel.cs
@@ -0,0 +1,13 @@
+using Catel.MVVM;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WolvenKit.ViewModels.SettingsPages.SubPages.General
+{
+    class UpdatesSubSettingsViewModel : ViewModelBase
+    {
+    }
+}