diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
new file mode 100755
index 0000000..88956db
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
new file mode 100755
index 0000000..68ad7e7
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml.cs
@@ -0,0 +1,33 @@
+/* ExceptionDetailView.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.ExceptionHandler
+{
+ ///
+ /// Interaction logic for ExceptionDetailView.xaml
+ ///
+ public partial class ExceptionDetailView : Window
+ {
+ public ExceptionDetailView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
new file mode 100755
index 0000000..b61e024
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
new file mode 100755
index 0000000..49cda96
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/ExceptionView.xaml.cs
@@ -0,0 +1,33 @@
+/* ExceptionView.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.ExceptionHandler
+{
+ ///
+ /// Interaction logic for ExceptionView.xaml
+ ///
+ public partial class ExceptionView : Window
+ {
+ public ExceptionView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs b/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
new file mode 100755
index 0000000..bb16451
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/ExceptionViewModel.cs
@@ -0,0 +1,92 @@
+/* ExceptionViewModel.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.Specialized;
+using System.Reflection;
+using Bovender.Unmanaged;
+using zaaReloaded2.Updater;
+
+namespace zaaReloaded2.ExceptionHandler
+{
+ public class ExceptionViewModel : Bovender.ExceptionHandler.ExceptionViewModel
+ {
+ #region Additional properties for the exception report
+
+ public string WordVersion
+ {
+ get
+ {
+ // TODO: Get Word version
+ return "n/a";
+ }
+ }
+
+ public string WordBitness
+ {
+ get
+ {
+ return Environment.Is64BitProcess ? "64-bit" : "32-bit";
+ }
+ }
+
+ public string AddinVersion
+ {
+ get
+ {
+ return zaaReloaded2.Updater.Version.CurrentVersion().ToString();
+ }
+ }
+
+ #endregion
+
+ #region constructor
+
+ public ExceptionViewModel(Exception e) : base(e) { }
+
+ #endregion
+
+ #region Overrides
+
+ public override object RevealModelObject()
+ {
+ return Exception;
+ }
+
+ protected override NameValueCollection GetPostValues()
+ {
+ NameValueCollection v = base.GetPostValues();
+ v["excel_version"] = WordVersion;
+ v["excel_bitness"] = ProcessBitness;
+ v["toolbox_version"] = AddinVersion;
+ return v;
+ }
+
+ protected override Uri GetPostUri()
+ {
+ return new Uri(Properties.Settings.Default.ExceptionPostUrl);
+ }
+
+ protected override string DevPath()
+ {
+ return @"x:\Code\zaaReloaded2\";
+ }
+
+ #endregion
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs b/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
new file mode 100755
index 0000000..9603f74
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionCompletedAction.cs
@@ -0,0 +1,50 @@
+/* SubmissionCompletedAction.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 System.Windows;
+using Bovender.Mvvm.Messaging;
+using Bovender.Mvvm.Actions;
+
+namespace zaaReloaded2.ExceptionHandler
+{
+ ///
+ /// WPF action that is invoked when the exception report submission
+ /// process is completed.
+ ///
+ class SubmissionCompletedAction : ProcessCompletedAction
+ {
+ protected override Window CreateSuccessWindow()
+ {
+ return Content.InjectInto();
+ }
+
+ protected override Window CreateFailureWindow()
+ {
+ return Content.InjectInto();
+ }
+
+ protected override Window CreateCancelledWindow()
+ {
+ return null;
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
new file mode 100755
index 0000000..0f707b4
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+ ×
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
new file mode 100755
index 0000000..ba3abdc
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionFailureView.xaml.cs
@@ -0,0 +1,33 @@
+/* SubmissionFailureView.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.ExceptionHandler
+{
+ ///
+ /// Interaction logic for SubmissionFailureView.xaml
+ ///
+ public partial class SubmissionFailureView : Window
+ {
+ public SubmissionFailureView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs b/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
new file mode 100755
index 0000000..cb429a3
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessAction.cs
@@ -0,0 +1,34 @@
+/* SubmissionProcessAction.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.Actions;
+
+namespace zaaReloaded2.ExceptionHandler
+{
+ class SubmissionProcessAction : MessageActionBase
+ {
+ protected override System.Windows.Window CreateView()
+ {
+ return Content.InjectInto();
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
new file mode 100755
index 0000000..41065db
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
new file mode 100755
index 0000000..d97ef19
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionProcessView.xaml.cs
@@ -0,0 +1,45 @@
+/* SubmissionProcessView.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;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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 zaaReloaded2.ExceptionHandler
+{
+ ///
+ /// Interaction logic for SubmissionProcessView.xaml
+ ///
+ public partial class SubmissionProcessView : Window
+ {
+ public SubmissionProcessView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
new file mode 100755
index 0000000..29702d6
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+ ✔
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
new file mode 100755
index 0000000..597ebcd
--- /dev/null
+++ b/zaaReloaded2/ExceptionHandler/SubmissionSuccessView.xaml.cs
@@ -0,0 +1,33 @@
+/* SubmissionSuccessView.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.ExceptionHandler
+{
+ ///
+ /// Interaction logic for SubmissionSuccessView.xaml
+ ///
+ public partial class SubmissionSuccessView : Window
+ {
+ public SubmissionSuccessView()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/zaaReloaded2/Properties/Settings.Designer.cs b/zaaReloaded2/Properties/Settings.Designer.cs
index 8da2566..261896e 100755
--- a/zaaReloaded2/Properties/Settings.Designer.cs
+++ b/zaaReloaded2/Properties/Settings.Designer.cs
@@ -70,27 +70,30 @@ namespace zaaReloaded2.Properties {
}
}
- [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Configuration.DefaultSettingValueAttribute("http://zaa.nephrowiki.de/updates")]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://zaa.nephrowiki.de/downloads")]
public string UpdatesUrl {
get {
return ((string)(this["UpdatesUrl"]));
}
- set {
- this["UpdatesUrl"] = value;
- }
}
- [global::System.Configuration.UserScopedSettingAttribute()]
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.DefaultSettingValueAttribute("versioninfo.txt")]
public string VersionInfoFile {
get {
return ((string)(this["VersionInfoFile"]));
}
- set {
- this["VersionInfoFile"] = value;
+ }
+
+ [global::System.Configuration.ApplicationScopedSettingAttribute()]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Configuration.DefaultSettingValueAttribute("http://zaa.nephrowiki.de/postreport.php")]
+ public string ExceptionPostUrl {
+ get {
+ return ((string)(this["ExceptionPostUrl"]));
}
}
}
diff --git a/zaaReloaded2/Properties/Settings.settings b/zaaReloaded2/Properties/Settings.settings
index 4791722..d4b4745 100755
--- a/zaaReloaded2/Properties/Settings.settings
+++ b/zaaReloaded2/Properties/Settings.settings
@@ -17,11 +17,14 @@
http://zaa.nephrowiki.de
-
- http://zaa.nephrowiki.de/updates
+
+ http://zaa.nephrowiki.de/downloads
-
+ versioninfo.txt
+
+ http://zaa.nephrowiki.de/postreport.php
+
\ No newline at end of file
diff --git a/zaaReloaded2/Ribbon.cs b/zaaReloaded2/Ribbon.cs
index b403a80..4192060 100755
--- a/zaaReloaded2/Ribbon.cs
+++ b/zaaReloaded2/Ribbon.cs
@@ -74,16 +74,29 @@ namespace zaaReloaded2
this.ribbon = ribbonUI;
}
+ ///
+ /// Handles ribbon button clicks. This method also contains the try...catch
+ /// structure that invokes the central exception handler in the event of an
+ /// exception.
+ ///
+ ///
public void Ribbon_Click(Office.IRibbonControl control)
{
- switch (control.Id)
+ try
{
- case "zrlAbout":
- ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
- vm.InjectInto().ShowDialog();
- break;
- default:
- throw new InvalidOperationException("No operation defined for " + control.Id);
+ 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);
+ }
+ }
+ catch (Exception e)
+ {
+ Bovender.ExceptionHandler.CentralHandler.Manage(this, e);
}
}
diff --git a/zaaReloaded2/app.config b/zaaReloaded2/app.config
index b720100..3876239 100755
--- a/zaaReloaded2/app.config
+++ b/zaaReloaded2/app.config
@@ -23,9 +23,6 @@
-
-
-
@@ -41,16 +38,15 @@
http://zaa.nephrowiki.de
-
-
-
-
- http://zaa.nephrowiki.de/updates
+ http://zaa.nephrowiki.de/downloadsversioninfo.txt
+
+ http://zaa.nephrowiki.de/postreport.php
+
-
+
\ No newline at end of file
diff --git a/zaaReloaded2/zaaReloaded2.csproj b/zaaReloaded2/zaaReloaded2.csproj
index 7f58c81..cba2434 100755
--- a/zaaReloaded2/zaaReloaded2.csproj
+++ b/zaaReloaded2/zaaReloaded2.csproj
@@ -114,6 +114,7 @@
..\packages\Bovender.0.2.0.0\lib\net40\Bovender.dll
+
@@ -175,6 +176,14 @@
+
+
+
+
+
+
+
+
@@ -250,6 +259,26 @@
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+ MSBuild:CompileDesigner