diff --git a/gimp/f.xcf b/gimp/f.xcf
new file mode 100644
index 0000000..a5cf985
Binary files /dev/null and b/gimp/f.xcf differ
diff --git a/gimp/i.xcf b/gimp/i.xcf
new file mode 100644
index 0000000..7b7aa88
Binary files /dev/null and b/gimp/i.xcf differ
diff --git a/zaaReloaded2/Icons/f.png b/zaaReloaded2/Icons/f.png
new file mode 100644
index 0000000..e13cd99
Binary files /dev/null and b/zaaReloaded2/Icons/f.png differ
diff --git a/zaaReloaded2/Icons/i.png b/zaaReloaded2/Icons/i.png
new file mode 100644
index 0000000..c3f1caf
Binary files /dev/null and b/zaaReloaded2/Icons/i.png differ
diff --git a/zaaReloaded2/Properties/Settings.Designer.cs b/zaaReloaded2/Properties/Settings.Designer.cs
index a97d002..8da2566 100755
--- a/zaaReloaded2/Properties/Settings.Designer.cs
+++ b/zaaReloaded2/Properties/Settings.Designer.cs
@@ -33,5 +33,65 @@ namespace zaaReloaded2.Properties {
this["SettingsRepository"] = value;
}
}
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("zaaReloaded2")]
+ public string AddinName {
+ get {
+ return ((string)(this["AddinName"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("2015")]
+ public string PubYear {
+ get {
+ return ((string)(this["PubYear"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("Daniel Kraus")]
+ public string Authors {
+ get {
+ return ((string)(this["Authors"]));
+ }
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://zaa.nephrowiki.de")]
+ public global::System.Uri Homepage {
+ get {
+ return ((global::System.Uri)(this["Homepage"]));
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://zaa.nephrowiki.de/updates")]
+ public string UpdatesUrl {
+ get {
+ return ((string)(this["UpdatesUrl"]));
+ }
+ set {
+ this["UpdatesUrl"] = value;
+ }
+ }
+
+ [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("versioninfo.txt")]
+ public string VersionInfoFile {
+ get {
+ return ((string)(this["VersionInfoFile"]));
+ }
+ set {
+ this["VersionInfoFile"] = value;
+ }
+ }
}
}
diff --git a/zaaReloaded2/Properties/Settings.settings b/zaaReloaded2/Properties/Settings.settings
index 130bf39..4791722 100755
--- a/zaaReloaded2/Properties/Settings.settings
+++ b/zaaReloaded2/Properties/Settings.settings
@@ -5,5 +5,23 @@
+
+ zaaReloaded2
+
+
+ 2015
+
+
+ Daniel Kraus
+
+
+ http://zaa.nephrowiki.de
+
+
+ http://zaa.nephrowiki.de/updates
+
+
+ versioninfo.txt
+
\ No newline at end of file
diff --git a/zaaReloaded2/Ribbon.cs b/zaaReloaded2/Ribbon.cs
new file mode 100755
index 0000000..b403a80
--- /dev/null
+++ b/zaaReloaded2/Ribbon.cs
@@ -0,0 +1,134 @@
+/* Ribbon.cs
+ * part of zaaReloaded2
+ *
+ * Copyright 2015 Daniel Kraus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Windows;
+using System.Drawing;
+using System.Windows.Resources;
+using Office = Microsoft.Office.Core;
+
+// TODO: Follow these steps to enable the Ribbon (XML) item:
+
+// 1: Copy the following code block into the ThisAddin, ThisWorkbook, or ThisDocument class.
+
+// protected override Microsoft.Office.Core.IRibbonExtensibility CreateRibbonExtensibilityObject()
+// {
+// return new Ribbon();
+// }
+
+// 2. Create callback methods in the "Ribbon Callbacks" region of this class to handle user
+// actions, such as clicking a button. Note: if you have exported this Ribbon from the Ribbon designer,
+// move your code from the event handlers to the callback methods and modify the code to work with the
+// Ribbon extensibility (RibbonX) programming model.
+
+// 3. Assign attributes to the control tags in the Ribbon XML file to identify the appropriate callback methods in your code.
+
+// For more information, see the Ribbon XML documentation in the Visual Studio Tools for Office Help.
+
+
+namespace zaaReloaded2
+{
+ [ComVisible(true)]
+ public class Ribbon : Office.IRibbonExtensibility
+ {
+ private Office.IRibbonUI ribbon;
+
+ public Ribbon()
+ {
+ }
+
+ #region IRibbonExtensibility Members
+
+ public string GetCustomUI(string ribbonID)
+ {
+ return GetResourceText("zaaReloaded2.Ribbon.xml");
+ }
+
+ #endregion
+
+ #region Ribbon Callbacks
+ //Create callback methods here. For more information about adding callback methods, visit http://go.microsoft.com/fwlink/?LinkID=271226
+
+ public void Ribbon_Load(Office.IRibbonUI ribbonUI)
+ {
+ this.ribbon = ribbonUI;
+ }
+
+ public void Ribbon_Click(Office.IRibbonControl control)
+ {
+ switch (control.Id)
+ {
+ case "zrlAbout":
+ ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
+ vm.InjectInto().ShowDialog();
+ break;
+ default:
+ throw new InvalidOperationException("No operation defined for " + control.Id);
+ }
+ }
+
+ ///
+ /// Returns an Image object for the ribbon.
+ ///
+ ///
+ /// The image file is expected to be a WPF resource file, not an embedded resource.
+ /// To be consistent accross the application which uses WPF resources for its WPF
+ /// windows, all images are to be built as resources rather than embedded resources.
+ ///
+ /// The file name (without path) of the image.
+ /// Image object
+ public object Ribbon_LoadImage(string imageId)
+ {
+ string initPackScheme = System.IO.Packaging.PackUriHelper.UriSchemePack;
+ StreamResourceInfo sri = Application.GetResourceStream(
+ new Uri(@"pack://application:,,,/zaaReloaded2;component/Icons/" + imageId));
+ return Image.FromStream(sri.Stream);
+ }
+
+ #endregion
+
+ #region Helpers
+
+ private static string GetResourceText(string resourceName)
+ {
+ Assembly asm = Assembly.GetExecutingAssembly();
+ string[] resourceNames = asm.GetManifestResourceNames();
+ for (int i = 0; i < resourceNames.Length; ++i)
+ {
+ if (string.Compare(resourceName, resourceNames[i], StringComparison.OrdinalIgnoreCase) == 0)
+ {
+ using (StreamReader resourceReader = new StreamReader(asm.GetManifestResourceStream(resourceNames[i])))
+ {
+ if (resourceReader != null)
+ {
+ return resourceReader.ReadToEnd();
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ #endregion
+ }
+}
diff --git a/zaaReloaded2/Ribbon.xml b/zaaReloaded2/Ribbon.xml
new file mode 100755
index 0000000..cd12b15
--- /dev/null
+++ b/zaaReloaded2/Ribbon.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/Style.xaml b/zaaReloaded2/Style.xaml
new file mode 100755
index 0000000..3b42593
--- /dev/null
+++ b/zaaReloaded2/Style.xaml
@@ -0,0 +1,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/ThisAddIn.cs b/zaaReloaded2/ThisAddIn.cs
index 4aba0de..54a27ac 100755
--- a/zaaReloaded2/ThisAddIn.cs
+++ b/zaaReloaded2/ThisAddIn.cs
@@ -50,6 +50,38 @@ namespace zaaReloaded2
{
}
+ #region Properties
+
+ public Ribbon Ribbon
+ {
+ get
+ {
+ if (_ribbon == null)
+ {
+ _ribbon = new Ribbon();
+ }
+ return _ribbon;
+ }
+ }
+
+ #endregion
+
+ #region Ribbon
+
+ protected override Microsoft.Office.Core.IRibbonExtensibility CreateRibbonExtensibilityObject()
+ {
+ return Ribbon;
+ }
+
+ #endregion
+
+
+ #region Private fields
+
+ private Ribbon _ribbon;
+
+ #endregion
+
#region VSTO generated code
///
diff --git a/zaaReloaded2/Updater/Version.cs b/zaaReloaded2/Updater/Version.cs
new file mode 100755
index 0000000..f4a526e
--- /dev/null
+++ b/zaaReloaded2/Updater/Version.cs
@@ -0,0 +1,44 @@
+/* Version.cs
+ * part of zaaReloaded2
+ *
+ * Copyright 2015 Daniel Kraus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using Bovender.Versioning;
+
+namespace zaaReloaded2.Updater
+{
+ class Version : SemanticVersion
+ {
+ #region Static 'overrides'
+
+ ///
+ /// Returns the current version of the XL Toolbox addin.
+ ///
+ ///
+ new public static SemanticVersion CurrentVersion()
+ {
+ return Bovender.Versioning.SemanticVersion.CurrentVersion(
+ Assembly.GetExecutingAssembly()
+ );
+ }
+
+ #endregion
+ }
+}
diff --git a/zaaReloaded2/VERSION b/zaaReloaded2/VERSION
new file mode 100755
index 0000000..4fd714e
--- /dev/null
+++ b/zaaReloaded2/VERSION
@@ -0,0 +1 @@
+2.0.0-alpha.1
\ No newline at end of file
diff --git a/zaaReloaded2/ViewModels/AboutViewModel.cs b/zaaReloaded2/ViewModels/AboutViewModel.cs
new file mode 100755
index 0000000..6e66e3e
--- /dev/null
+++ b/zaaReloaded2/ViewModels/AboutViewModel.cs
@@ -0,0 +1,116 @@
+/* AboutViewModel.cs
+ * part of zaaReloaded2
+ *
+ * Copyright 2015 Daniel Kraus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Bovender.Mvvm.ViewModels;
+using Bovender.Mvvm;
+using System.Diagnostics;
+
+namespace zaaReloaded2.ViewModels
+{
+ class AboutViewModel : ViewModelBase
+ {
+ #region Properties
+
+ public string AddinName
+ {
+ get
+ {
+ return Properties.Settings.Default.AddinName;
+ }
+ }
+
+ public string PubYear
+ {
+ get
+ {
+ string year = Properties.Settings.Default.PubYear;
+ if (year == "2015")
+ {
+ return year;
+ }
+ else
+ {
+ return "2015-" + year;
+ }
+ }
+ }
+
+ public string CopyrightString
+ {
+ get
+ {
+ return String.Format("(c) Copyright {0} {1}",
+ PubYear,
+ Properties.Settings.Default.Authors);
+ }
+ }
+
+ public string Version
+ {
+ get
+ {
+ return zaaReloaded2.Updater.Version.CurrentVersion().ToString();
+ }
+ }
+
+ public string Homepage
+ {
+ get
+ {
+ return Properties.Settings.Default.Homepage.ToString();
+ }
+ }
+
+ #endregion
+
+ #region Commands
+
+ public DelegatingCommand GotoHomepageCommand
+ {
+ get
+ {
+ if (_gotoHomepageCommand == null)
+ {
+ _gotoHomepageCommand = new DelegatingCommand(
+ param => { Process.Start(new ProcessStartInfo(Homepage)); });
+ }
+ return _gotoHomepageCommand;
+ }
+ }
+
+ #endregion
+
+ #region ViewModelBase implementation
+
+ public override object RevealModelObject()
+ {
+ throw new NotImplementedException();
+ }
+
+ #endregion
+
+ #region Fields
+
+ DelegatingCommand _gotoHomepageCommand;
+
+ #endregion
+ }
+}
diff --git a/zaaReloaded2/Views/AboutView.xaml b/zaaReloaded2/Views/AboutView.xaml
new file mode 100755
index 0000000..2bec5ea
--- /dev/null
+++ b/zaaReloaded2/Views/AboutView.xaml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/Views/AboutView.xaml.cs b/zaaReloaded2/Views/AboutView.xaml.cs
new file mode 100755
index 0000000..bb4c022
--- /dev/null
+++ b/zaaReloaded2/Views/AboutView.xaml.cs
@@ -0,0 +1,32 @@
+/* AboutView.xaml.cs
+ * part of zaaReloaded2
+ *
+ * Copyright 2015 Daniel Kraus
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+using System.Windows;
+
+namespace zaaReloaded2.Views
+{
+ ///
+ /// Interaction logic for AboutView.xaml
+ ///
+ public partial class AboutView : Window
+ {
+ public AboutView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config
index 40c8b50..b720100 100755
--- a/zaaReloaded2/app.config
+++ b/zaaReloaded2/app.config
@@ -20,5 +20,37 @@
-->
+
+
+
+
+
+
+
+
+
+ zaaReloaded2
+
+
+ 2015
+
+
+ Daniel Kraus
+
+
+ http://zaa.nephrowiki.de
+
+
+
+
+
+
+ http://zaa.nephrowiki.de/updates
+
+
+ versioninfo.txt
+
+
+
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 265d0a5..7f58c81 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -114,6 +114,8 @@
..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll
+
+
@@ -121,11 +123,13 @@
..\packages\Expression.Blend.Sdk.1.0.2\lib\net40-client\System.Windows.Interactivity.dll
+
+
@@ -172,6 +176,7 @@
+
@@ -202,6 +207,11 @@
Code
+
+
+ AboutView.xaml
+
+
ResXFileCodeGenerator
Resources.Designer.cs
@@ -239,7 +249,28 @@
-
+
+
+ MSBuild:Compile
+ Designer
+
+
+ Designer
+ MSBuild:Compile
+
+
+
+
+
+
+
+
+
+
+
+
+
+
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)