Merge branch 'develop'

BlythMeister · Jun 9, 2014 · b1d2c58 · b1d2c58
2 parents b0c4e60 + b4c39fd
commit b1d2c58
Show file tree

Hide file tree

Showing 17 changed files with 233 additions and 102 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,7 @@ Feel free to contribute, but please read the wiki (https://github.com/BlythMeist
 Gallifrey makes use of the following libraries:
 
 * Atlassian .Net SDK (https://bitbucket.org/farmas/atlassian.net-sdk/wiki/Home)
+* Exceptionless (http://exceptionless.com/)
 
 3rd Party Resources
 =========

diff --git a/src/Gallifrey.UI.Classic.Beta/App.config b/src/Gallifrey.UI.Classic.Beta/App.config
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
+  <configSections>
+    <section name="exceptionless" type="Exceptionless.Configuration.ExceptionlessSection, Exceptionless" />
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <exceptionless apiKey="e7ac6366507547639ce69fea261d6545" />
 </configuration>
diff --git a/src/Gallifrey.UI.Classic.Beta/Gallifrey.UI.Classic.Beta.csproj b/src/Gallifrey.UI.Classic.Beta/Gallifrey.UI.Classic.Beta.csproj
@@ -15,7 +15,7 @@
     <PublishUrl>..\..\deploy\beta\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateEnabled>false</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
@@ -27,9 +27,9 @@
     <ErrorReportUrl>https://github.com/BlythMeister/Gallifrey</ErrorReportUrl>
     <ProductName>Gallifrey %28Beta%29</ProductName>
     <PublisherName>Gallifrey</PublisherName>
-    <MinimumRequiredVersion>0.1.1.0</MinimumRequiredVersion>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.2.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>

diff --git a/src/Gallifrey.UI.Classic.Beta/Program.cs b/src/Gallifrey.UI.Classic.Beta/Program.cs
@@ -13,7 +13,7 @@ static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new MainWindow());
+            Application.Run(new MainWindow(true));
         }
     }
 }
diff --git a/src/Gallifrey.UI.Classic/AboutWindow.cs b/src/Gallifrey.UI.Classic/AboutWindow.cs
@@ -10,13 +10,14 @@ public partial class AboutWindow : Form
         private readonly List<string> contributors;
         private int position;
 
-        public AboutWindow()
+        public AboutWindow(bool isBeta)
         {
             InitializeComponent();
                 var networkDeploy = ApplicationDeployment.IsNetworkDeployed;
             var myVersion = networkDeploy ? ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : Application.ProductVersion;
             myVersion = string.Format("Current Version: {0}", myVersion);
             if (!networkDeploy) myVersion = string.Format("{0} (manual)", myVersion);
+            if (isBeta) myVersion = string.Format("{0} (beta)", myVersion);
             lblCurrentVersion.Text = myVersion;
 
             contributors = new List<string>()

diff --git a/src/Gallifrey.UI.Classic/App.config b/src/Gallifrey.UI.Classic/App.config
@@ -1,6 +1,10 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
+  <configSections>
+    <section name="exceptionless" type="Exceptionless.Configuration.ExceptionlessSection, Exceptionless" />
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+  </startup>
+  <exceptionless apiKey="e7ac6366507547639ce69fea261d6545" />
 </configuration>
diff --git a/src/Gallifrey.UI.Classic/ExportTimerWindow.cs b/src/Gallifrey.UI.Classic/ExportTimerWindow.cs
@@ -65,7 +65,7 @@ private bool ExportTime()
         {
             int hours, minutes;
 
-            if (!int.TryParse(txtExportHours.Text, out hours) || !int.TryParse(txtExportMins.Text, out minutes))
+            if (!int.TryParse(txtSetValueHours.Text, out hours) || !int.TryParse(txtSetValueMins.Text, out minutes))
             {
                 MessageBox.Show("Invalid Hours/Minutes Entered For Export!", "Invalid Export", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return false;

diff --git a/src/Gallifrey.UI.Classic/Gallifrey.UI.Classic.csproj b/src/Gallifrey.UI.Classic/Gallifrey.UI.Classic.csproj
@@ -15,7 +15,7 @@
     <PublishUrl>..\..\deploy\stable\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
-    <UpdateEnabled>true</UpdateEnabled>
+    <UpdateEnabled>false</UpdateEnabled>
     <UpdateMode>Foreground</UpdateMode>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
@@ -29,7 +29,7 @@
     <PublisherName>Gallifrey</PublisherName>
     <MinimumRequiredVersion>1.0.0.0</MinimumRequiredVersion>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.0</ApplicationVersion>
+    <ApplicationVersion>1.0.1.0</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -78,6 +78,15 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Atlassian.SDK.3.0.0-beta1\lib\Atlassian.Jira.dll</HintPath>
     </Reference>
+    <Reference Include="Exceptionless">
+      <HintPath>..\packages\Exceptionless.1.5.2064\lib\net45\Exceptionless.dll</HintPath>
+    </Reference>
+    <Reference Include="Exceptionless.Models">
+      <HintPath>..\packages\Exceptionless.1.5.2064\lib\net45\Exceptionless.Models.dll</HintPath>
+    </Reference>
+    <Reference Include="Exceptionless.Windows">
+      <HintPath>..\packages\Exceptionless.Windows.1.5.2064\lib\net45\Exceptionless.Windows.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Newtonsoft.Json.4.5.3\lib\net40\Newtonsoft.Json.dll</HintPath>
@@ -190,9 +199,7 @@
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="Font\digital7.ttf">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </EmbeddedResource>
+    <None Include="Font\digital7.ttf" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -242,14 +249,12 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="clock_blue.ico" />
+    <None Include="Icons\Download_16x16.png" />
     <None Include="Icons\pp_logo_100px.png" />
-    <None Include="Icons\pp_log_100px.png" />
     <None Include="Icons\GitHub_Mark_32px.png" />
     <None Include="Icons\Twitter_logo_blue.png" />
     <None Include="Icons\Mail_32x32.png" />
     <None Include="Icons\Information_48x48.png" />
-    <None Include="Icons\pp-logo-100px.png" />
-    <None Include="Icons\GitHub-Mark-32px.png" />
     <None Include="Icons\Save_48x48.png" />
     <None Include="Icons\Upload_48x48.png" />
     <None Include="Icons\Refresh_48x48.png" />

diff --git a/src/Gallifrey.UI.Classic/Icons/Download_16x16.png b/src/Gallifrey.UI.Classic/Icons/Download_16x16.png
diff --git a/src/Gallifrey.UI.Classic/MainWindow.Designer.cs b/src/Gallifrey.UI.Classic/MainWindow.Designer.cs