From d7845188637fbf4eb412dfcbd47179c2863bc4f2 Mon Sep 17 00:00:00 2001 From: Chris Kaczor Date: Thu, 8 Feb 2018 17:00:07 -0500 Subject: [PATCH] Switch to submodules, add options UI, add license and initial readme --- .gitmodules | 6 + Common | 1 + FloatingStatusWindow | 1 + JenkinsProject.cs | 1 + JenkinsProjects.cs | 8 - JenkinsStatusWindow.csproj | 77 ++++-- JenkinsStatusWindow.sln | 71 ++++-- LICENSE.md | 21 ++ Options/AboutOptionsPanel.xaml | 24 ++ Options/AboutOptionsPanel.xaml.cs | 36 +++ Options/GeneralOptionsPanel.xaml | 22 ++ Options/GeneralOptionsPanel.xaml.cs | 39 +++ Options/JenkinsProjectWindow.xaml | 87 +++++++ Options/JenkinsProjectWindow.xaml.cs | 66 +++++ Options/JenkinsProjectsOptionsPanel.xaml | 79 ++++++ Options/JenkinsProjectsOptionsPanel.xaml.cs | 114 +++++++++ Properties/Resources.Designer.cs | 255 +++++++++++++++++++- Properties/Resources.resx | 78 ++++++ README.md | 11 + WindowSource.cs | 67 ++++- packages.config | 5 - 21 files changed, 990 insertions(+), 79 deletions(-) create mode 100644 .gitmodules create mode 160000 Common create mode 160000 FloatingStatusWindow create mode 100644 LICENSE.md create mode 100644 Options/AboutOptionsPanel.xaml create mode 100644 Options/AboutOptionsPanel.xaml.cs create mode 100644 Options/GeneralOptionsPanel.xaml create mode 100644 Options/GeneralOptionsPanel.xaml.cs create mode 100644 Options/JenkinsProjectWindow.xaml create mode 100644 Options/JenkinsProjectWindow.xaml.cs create mode 100644 Options/JenkinsProjectsOptionsPanel.xaml create mode 100644 Options/JenkinsProjectsOptionsPanel.xaml.cs create mode 100644 README.md delete mode 100644 packages.config diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d2b6e42 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,6 @@ +[submodule "FloatingStatusWindow"] + path = FloatingStatusWindow + url = https://github.com/ckaczor/FloatingStatusWindow.git +[submodule "Common"] + path = Common + url = https://github.com/ckaczor/Common.git diff --git a/Common b/Common new file mode 160000 index 0000000..81ef8f4 --- /dev/null +++ b/Common @@ -0,0 +1 @@ +Subproject commit 81ef8f451c5ceada2ed704ecaaa789e623a7352d diff --git a/FloatingStatusWindow b/FloatingStatusWindow new file mode 160000 index 0000000..38d692c --- /dev/null +++ b/FloatingStatusWindow @@ -0,0 +1 @@ +Subproject commit 38d692c9fc888d0cf79ab6f55b487b64a4bf6cea diff --git a/JenkinsProject.cs b/JenkinsProject.cs index 1430e3f..3ebe85f 100644 --- a/JenkinsProject.cs +++ b/JenkinsProject.cs @@ -4,5 +4,6 @@ { public string Name { get; set; } public string Url { get; set; } + public bool Enabled { get; set; } } } diff --git a/JenkinsProjects.cs b/JenkinsProjects.cs index 65714ac..bd5735d 100644 --- a/JenkinsProjects.cs +++ b/JenkinsProjects.cs @@ -17,14 +17,6 @@ namespace JenkinsStatusWindow { var jenkinsProjects = JsonConvert.DeserializeObject(serializedData) ?? new JenkinsProjects(); - if (jenkinsProjects.Count == 0) - { - jenkinsProjects.Add(new JenkinsProject { Name = "VPW - Phase 2", Url = "http://jenkins-master.vertical.com:8080/job/vpw/" }); - jenkinsProjects.Add(new JenkinsProject { Name = "VPW - Phase 3", Url = "http://172.22.1.60:8080/view/Phase%203%20Apps/job/P3%20VPW/" }); - jenkinsProjects.Add(new JenkinsProject { Name = "Company Manager", Url = "http://172.22.1.60:8080/view/Phase%203%20Apps/job/P3%20Company%20Manager/" }); - jenkinsProjects.Add(new JenkinsProject { Name = "Profile", Url = "http://172.22.1.60:8080/view/Phase%203%20Apps/job/P3%20Profile/" }); - } - return jenkinsProjects; } diff --git a/JenkinsStatusWindow.csproj b/JenkinsStatusWindow.csproj index 15e8754..ce77add 100644 --- a/JenkinsStatusWindow.csproj +++ b/JenkinsStatusWindow.csproj @@ -36,17 +36,6 @@ 4 - - packages\CredentialManagement.1.0.2\lib\net35\CredentialManagement.dll - - - False - ..\FloatingStatusWindowLibrary\FloatingStatusWindowLibrary\bin\Debug\FloatingStatusWindowLibrary.dll - - - packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll - True - @@ -74,27 +63,40 @@ - - - - - Code + + AboutOptionsPanel.xaml + + + GeneralOptionsPanel.xaml + + + JenkinsProjectsOptionsPanel.xaml + + + JenkinsProjectWindow.xaml True True Resources.resx + + + + + Code + True Settings.settings True - ResXFileCodeGenerator + PublicResXFileCodeGenerator + Designer Resources.Designer.cs - + SettingsSingleFileGenerator Settings.Designer.cs @@ -105,17 +107,48 @@ + - - {ed1c07a1-54f5-4796-8b06-2a0bb1960d84} - Common.Native + + {17864d82-457d-4a0a-bc10-1d07f2b3a5d6} + Common - + {0074c983-550e-4094-9e8c-f566fb669297} Common.Wpf + + {f023a16c-2f13-4a87-a8b7-22c43c4a58a4} + FloatingStatusWindow + + + + + 1.0.2 + + + 10.0.3 + + + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer + + + MSBuild:Compile + Designer +