From 22d9d595a6c8faea53e0732c1586ac0a40699a12 Mon Sep 17 00:00:00 2001 From: Denis P <70954129+live-dev999@users.noreply.github.com> Date: Thu, 7 Oct 2021 23:04:48 +0300 Subject: [PATCH 1/7] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 9feb48bc..34150f61 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: live-dev issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] +custom: ['https://paypal.me/livedev'] From 772f0f86b391c46bcf8d5053dbb1135e667062f4 Mon Sep 17 00:00:00 2001 From: Denis P <70954129+live-dev999@users.noreply.github.com> Date: Thu, 7 Oct 2021 23:04:48 +0300 Subject: [PATCH 2/7] Update FUNDING.yml --- .github/FUNDING.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3de1ad6e..34150f61 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl liberapay: live-dev issuehunt: # Replace with a single IssueHunt username otechie: # Replace with a single Otechie username -custom: ['paypal.me/livedev'] +custom: ['https://paypal.me/livedev'] From 3007cb4b9351434e0b8edd5a6e5c5e18169433e3 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Wed, 20 Oct 2021 17:28:24 +0300 Subject: [PATCH 3/7] O2NextGen-DesktopApps: create --- src/O2NextGen-DesktopApps.sln | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/O2NextGen-DesktopApps.sln diff --git a/src/O2NextGen-DesktopApps.sln b/src/O2NextGen-DesktopApps.sln new file mode 100644 index 00000000..8880b18a --- /dev/null +++ b/src/O2NextGen-DesktopApps.sln @@ -0,0 +1,13 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.31605.320 +MinimumVisualStudioVersion = 10.0.40219.1 +Global + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7D5FB0AE-B7F6-425B-9228-B02E67D1289F} + EndGlobalSection +EndGlobal From beba3d7cb91592ec76f513bcef88c6afef19f13b Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Wed, 20 Oct 2021 17:35:44 +0300 Subject: [PATCH 4/7] src: add a empty project O2NextGen.Shell.csproj(WPF .Net Core) --- src/DesktopApps/O2NextGen.Shell/App.xaml | 9 ++++++ src/DesktopApps/O2NextGen.Shell/App.xaml.cs | 17 +++++++++++ .../O2NextGen.Shell/AssemblyInfo.cs | 10 +++++++ .../O2NextGen.Shell/MainWindow.xaml | 12 ++++++++ .../O2NextGen.Shell/MainWindow.xaml.cs | 28 +++++++++++++++++++ .../O2NextGen.Shell/O2NextGen.Shell.csproj | 9 ++++++ src/O2NextGen-DesktopApps.sln | 12 ++++++++ 7 files changed, 97 insertions(+) create mode 100644 src/DesktopApps/O2NextGen.Shell/App.xaml create mode 100644 src/DesktopApps/O2NextGen.Shell/App.xaml.cs create mode 100644 src/DesktopApps/O2NextGen.Shell/AssemblyInfo.cs create mode 100644 src/DesktopApps/O2NextGen.Shell/MainWindow.xaml create mode 100644 src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs create mode 100644 src/DesktopApps/O2NextGen.Shell/O2NextGen.Shell.csproj diff --git a/src/DesktopApps/O2NextGen.Shell/App.xaml b/src/DesktopApps/O2NextGen.Shell/App.xaml new file mode 100644 index 00000000..6b830bfc --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/App.xaml @@ -0,0 +1,9 @@ + + + + + diff --git a/src/DesktopApps/O2NextGen.Shell/App.xaml.cs b/src/DesktopApps/O2NextGen.Shell/App.xaml.cs new file mode 100644 index 00000000..8c780a5f --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/App.xaml.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Configuration; +using System.Data; +using System.Linq; +using System.Threading.Tasks; +using System.Windows; + +namespace O2NextGen.Shell +{ + /// + /// Interaction logic for App.xaml + /// + public partial class App : Application + { + } +} diff --git a/src/DesktopApps/O2NextGen.Shell/AssemblyInfo.cs b/src/DesktopApps/O2NextGen.Shell/AssemblyInfo.cs new file mode 100644 index 00000000..74087a1f --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/AssemblyInfo.cs @@ -0,0 +1,10 @@ +using System.Windows; + +[assembly: ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml b/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml new file mode 100644 index 00000000..4188cde8 --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml @@ -0,0 +1,12 @@ + + + + + diff --git a/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs b/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs new file mode 100644 index 00000000..860e86cf --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace O2NextGen.Shell +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +} diff --git a/src/DesktopApps/O2NextGen.Shell/O2NextGen.Shell.csproj b/src/DesktopApps/O2NextGen.Shell/O2NextGen.Shell.csproj new file mode 100644 index 00000000..4724627f --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/O2NextGen.Shell.csproj @@ -0,0 +1,9 @@ + + + + WinExe + netcoreapp3.1 + true + + + diff --git a/src/O2NextGen-DesktopApps.sln b/src/O2NextGen-DesktopApps.sln index 8880b18a..01ca5715 100644 --- a/src/O2NextGen-DesktopApps.sln +++ b/src/O2NextGen-DesktopApps.sln @@ -3,7 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31605.320 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2NextGen.Shell", "DesktopApps\O2NextGen.Shell\O2NextGen.Shell.csproj", "{04BB64DD-8A64-4594-BF2C-D5B79D815F7E}" +EndProject Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {04BB64DD-8A64-4594-BF2C-D5B79D815F7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04BB64DD-8A64-4594-BF2C-D5B79D815F7E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04BB64DD-8A64-4594-BF2C-D5B79D815F7E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04BB64DD-8A64-4594-BF2C-D5B79D815F7E}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection From 4ca098fbed1d4d65a704d43a61158bd2f63ef723 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Wed, 20 Oct 2021 17:46:58 +0300 Subject: [PATCH 5/7] DesktopApps/O2NextGen: include a theme file --- src/DesktopApps/O2NextGen.Shell/App.xaml | 2 +- src/DesktopApps/O2NextGen.Shell/Themes/Dark.xaml | 4 ++++ src/DesktopApps/O2NextGen.Shell/Themes/Light.xaml | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/DesktopApps/O2NextGen.Shell/Themes/Dark.xaml create mode 100644 src/DesktopApps/O2NextGen.Shell/Themes/Light.xaml diff --git a/src/DesktopApps/O2NextGen.Shell/App.xaml b/src/DesktopApps/O2NextGen.Shell/App.xaml index 6b830bfc..3f3bcb39 100644 --- a/src/DesktopApps/O2NextGen.Shell/App.xaml +++ b/src/DesktopApps/O2NextGen.Shell/App.xaml @@ -4,6 +4,6 @@ xmlns:local="clr-namespace:O2NextGen.Shell" StartupUri="MainWindow.xaml"> - + diff --git a/src/DesktopApps/O2NextGen.Shell/Themes/Dark.xaml b/src/DesktopApps/O2NextGen.Shell/Themes/Dark.xaml new file mode 100644 index 00000000..66e823be --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/Themes/Dark.xaml @@ -0,0 +1,4 @@ + + + \ No newline at end of file diff --git a/src/DesktopApps/O2NextGen.Shell/Themes/Light.xaml b/src/DesktopApps/O2NextGen.Shell/Themes/Light.xaml new file mode 100644 index 00000000..66e823be --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/Themes/Light.xaml @@ -0,0 +1,4 @@ + + + \ No newline at end of file From a85e4f5c943b3c931f293f82699238bd6000ae0c Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Wed, 20 Oct 2021 17:49:29 +0300 Subject: [PATCH 6/7] chore: update DesktopApps/O2NextGen.Shell --- src/DesktopApps/O2NextGen.Shell/App.xaml | 1 - src/DesktopApps/O2NextGen.Shell/App.xaml.cs | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/DesktopApps/O2NextGen.Shell/App.xaml b/src/DesktopApps/O2NextGen.Shell/App.xaml index 3f3bcb39..7e25939e 100644 --- a/src/DesktopApps/O2NextGen.Shell/App.xaml +++ b/src/DesktopApps/O2NextGen.Shell/App.xaml @@ -1,7 +1,6 @@  diff --git a/src/DesktopApps/O2NextGen.Shell/App.xaml.cs b/src/DesktopApps/O2NextGen.Shell/App.xaml.cs index 8c780a5f..e43f0617 100644 --- a/src/DesktopApps/O2NextGen.Shell/App.xaml.cs +++ b/src/DesktopApps/O2NextGen.Shell/App.xaml.cs @@ -1,16 +1,11 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Data; -using System.Linq; -using System.Threading.Tasks; -using System.Windows; +using System.Windows; namespace O2NextGen.Shell { /// /// Interaction logic for App.xaml /// + // ReSharper disable once RedundantExtendsListEntry public partial class App : Application { } From e328f082921996f56af9905a6689140eb3b40763 Mon Sep 17 00:00:00 2001 From: Denis Prokhorchik Date: Wed, 20 Oct 2021 17:54:24 +0300 Subject: [PATCH 7/7] DesktopApps/O2NextGen: create folder Views & move MainView.xaml to Views folder --- .../O2NextGen.Shell/MainWindow.xaml.cs | 28 ------------------- .../{ => Views}/MainWindow.xaml | 0 .../O2NextGen.Shell/Views/MainWindow.xaml.cs | 15 ++++++++++ 3 files changed, 15 insertions(+), 28 deletions(-) delete mode 100644 src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs rename src/DesktopApps/O2NextGen.Shell/{ => Views}/MainWindow.xaml (100%) create mode 100644 src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml.cs diff --git a/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs b/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs deleted file mode 100644 index 860e86cf..00000000 --- a/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; -using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; - -namespace O2NextGen.Shell -{ - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - InitializeComponent(); - } - } -} diff --git a/src/DesktopApps/O2NextGen.Shell/MainWindow.xaml b/src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml similarity index 100% rename from src/DesktopApps/O2NextGen.Shell/MainWindow.xaml rename to src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml diff --git a/src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml.cs b/src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml.cs new file mode 100644 index 00000000..00066823 --- /dev/null +++ b/src/DesktopApps/O2NextGen.Shell/Views/MainWindow.xaml.cs @@ -0,0 +1,15 @@ +using System.Windows; + +namespace O2NextGen.Shell +{ + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + InitializeComponent(); + } + } +}