/ - Diff - Pithos MS Client - Greek Research and Technology Network's projects

     using System.ComponentModel;
     using System.Threading;
     using System.Net;
     using System.Windows;
     using System.Windows.Forms;
     using System.Drawing;
     using System.Runtime.InteropServices;
-...
     using System.Diagnostics;
     using System.Security.Cryptography.X509Certificates;
     using System.Net.Security;
     using Point = System.Drawing.Point;
     namespace AppLimit.NetSparkle
+    {
-...
             /// <param name="currentItem"></param>
             public void ShowUpdateNeededUI(NetSparkleAppCastItem currentItem)
+            {
                 // create the form
                 NetSparkleForm frm = new NetSparkleForm(currentItem, ApplicationIcon, ApplicationWindowIcon);
-...
                 if (HideReleaseNotes)
                     frm.RemoveReleaseNotesControls();
                 // show it
                 DialogResult dlgResult = frm.ShowDialog();

         <AssemblyOriginatorKeyFile>pithos.snk</AssemblyOriginatorKeyFile>
       </PropertyGroup>
       <ItemGroup>
         <Reference Include="log4net">
           <HintPath>..\Libraries\log4net.dll</HintPath>
         </Reference>
         <Reference Include="PresentationCore" />
         <Reference Include="PresentationFramework" />
         <Reference Include="System" />
         <Reference Include="System.Core">
           <RequiredTargetFramework>3.5</RequiredTargetFramework>
-...
         <Reference Include="System.Drawing" />
         <Reference Include="System.Management" />
         <Reference Include="System.Windows.Forms" />
         <Reference Include="System.Xaml" />
         <Reference Include="System.Xml.Linq">
           <RequiredTargetFramework>3.5</RequiredTargetFramework>
         </Reference>
-...
         </Reference>
         <Reference Include="System.Data" />
         <Reference Include="System.Xml" />
         <Reference Include="WindowsBase" />
       </ItemGroup>
       <ItemGroup>
         <Compile Include="AssemblyInfo.cs" />

     using System.Data;
     using System.Drawing;
     using System.Linq;
     using System.Reflection;
     using System.Text;
     using System.Windows.Forms;
     using System.IO;
     using log4net;
     namespace AppLimit.NetSparkle
+    {
         public partial class NetSparkleMainWindows : Form, IDisposable
+        {
             private StreamWriter sw = null;
             private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
             public NetSparkleMainWindows()
+            {
                 // init ui
                 InitializeComponent();
                 // init logfile
                 sw = File.CreateText(Path.Combine(Environment.ExpandEnvironmentVariables("%temp%"), "NetSparkle.log"));
+            }
             public void Report(String message)
-...
+            {
                 try
+                {
                     // write
                     sw.WriteLine(msg);
                     // flush
                     sw.Flush();
                     Log.Info(msg);
                 } catch(Exception)
+                {
-...
             void IDisposable.Dispose()
+            {
                 // flush again
                 sw.Flush();
                 // close the stream
                 sw.Dispose();
                 // close the base
                 base.Dispose();

                 AppDomain.CurrentDomain.UnhandledException += OnUnhandledException;
                 TaskScheduler.UnobservedTaskException += OnUnobservedException;
                 //_sparkle = new Sparkle(Settings.Default.UpdateUrl);
                 //_sparkle.updateDetected += OnUpdateDetected;
                 //_sparkle.ShowDiagnosticWindow = true;
                 //Must delay opening the upgrade window
                 //to avoid Windows Messages sent by the TaskbarIcon
                 //TaskEx.Delay(5000).ContinueWith(_=>_sparkle.StartLoop(true,true),TaskScheduler.FromCurrentSynchronizationContext());
                 //Fix incorrect proxy settings by switching to default proxy, if the proxy server settings is empty
                 if (Settings.Default.UseManualProxy && String.IsNullOrWhiteSpace(Settings.Default.ProxyServer))

             public AccountsCollection Accounts
+            {
                 get
+                {
                     if (_settings.Accounts==null)
                         _settings.Accounts=new AccountsCollection();
                     return _settings.Accounts;
+                }
                 get { return _settings.Accounts ?? (_settings.Accounts = new AccountsCollection()); }
                 set { _settings.Accounts = value; }
+            }
-...
                 set { _settings.HashingParallelism = value; }
+            }
             public string UpdateUrl
+            {
                 get { return _settings.UpdateUrl; }
+            }
             public bool UpdateDiagnostics
+            {
                 get { return _settings.UpdateDiagnostics; }
+            }
             public TimeSpan UpdateCheckInterval
+            {
                 get { return _settings.UpdateCheckInterval; }
+            }
             public void Save()
+            {
                 _settings.Save();

           <Project>{C45218F8-09E7-4F57-85BC-5D8D2AC736A3}</Project>
           <Name>ParallelExtensionsExtras</Name>
         </ProjectReference>
         <ProjectReference Include="..\NetSparkle\NetSparkle2010.csproj">
           <Project>{74635A21-2BAD-4522-AB95-E3E5703CD301}</Project>
           <Name>NetSparkle2010</Name>
         </ProjectReference>
         <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj">
           <Project>{7AC63864-7638-41C4-969C-D3197EF2BED9}</Project>
           <Name>NotifyIconWpf</Name>

b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
93	93	// You can specify all the values or you can default the Build and Revision Numbers
94	94	// by using the '*' as shown below:
95	95	// [assembly: AssemblyVersion("1.0.*")]
96		[assembly: AssemblyVersion("0.7.0.0")]
	96	[assembly: AssemblyVersion("0.7.20305.0")]
97	97	[assembly: AssemblyFileVersionAttribute("0.7.20305.0")]

             [global::System.Configuration.ApplicationScopedSettingAttribute()]
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
             [global::System.Configuration.DefaultSettingValueAttribute("file:///E:/Projects/PITHOS/Source/Pithos/trunk/Pithos.AppCast/versioninfo.xml")]
             [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/pkanavos/PithosUpdateTest/raw/master/versioninfo.xml")]
             public string UpdateUrl {
                 get {
                     return ((string)(this["UpdateUrl"]));
+                }
+            }
             [global::System.Configuration.UserScopedSettingAttribute()]
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.Configuration.DefaultSettingValueAttribute("False")]
             public bool UpdateDiagnostics {
                 get {
                     return ((bool)(this["UpdateDiagnostics"]));
+                }
                 set {
                     this["UpdateDiagnostics"] = value;
+                }
+            }
             [global::System.Configuration.UserScopedSettingAttribute()]
             [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
             [global::System.Configuration.DefaultSettingValueAttribute("24.00:00:00")]
             public global::System.TimeSpan UpdateCheckInterval {
                 get {
                     return ((global::System.TimeSpan)(this["UpdateCheckInterval"]));
+                }
                 set {
                     this["UpdateCheckInterval"] = value;
+                }
+            }
+        }
+    }

           <Value Profile="(Default)">00:01:00</Value>
         </Setting>
         <Setting Name="UpdateUrl" Type="(Web Service URL)" Scope="Application">
           <Value Profile="(Default)">file:///E:/Projects/PITHOS/Source/Pithos/trunk/Pithos.AppCast/versioninfo.xml</Value>
           <Value Profile="(Default)">https://github.com/pkanavos/PithosUpdateTest/raw/master/versioninfo.xml</Value>
         </Setting>
         <Setting Name="UpdateDiagnostics" Type="System.Boolean" Scope="User">
           <Value Profile="(Default)">False</Value>
         </Setting>
         <Setting Name="UpdateCheckInterval" Type="System.TimeSpan" Scope="User">
           <Value Profile="(Default)">24.00:00:00</Value>
         </Setting>
       </Settings>
     </SettingsFile>

b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
102	102	<Image Source="/Pithos.Client.WPF;component/Images/About.ico" />
103	103	</MenuItem.Icon>
104	104	</MenuItem>
	105	<MenuItem Header="Check For Upgrade" x:Name="CheckForUpgrade" cal:Message.Attach="CheckForUpgrade"/>
105	106	<MenuItem x:Name="GoToSiteRootMenu" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToSite()]"
106	107	cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=1}, Path=DataContext}" >
107	108	<MenuItem.HeaderTemplate>

     using System.Threading.Tasks;
     using System.Windows;
     using System.Windows.Controls.Primitives;
     using AppLimit.NetSparkle;
     using Caliburn.Micro;
     using Hardcodet.Wpf.TaskbarNotification;
     using Pithos.Client.WPF.Configuration;
-...
+    		{
     			base.OnActivate();
                 _sparkle = new Sparkle(Settings.UpdateUrl);
                 _sparkle.updateDetected += OnUpgradeDetected;
                 _sparkle.ShowDiagnosticWindow = Settings.UpdateDiagnostics;
                 //Must delay opening the upgrade window
                 //to avoid Windows Messages sent by the TaskbarIcon
                 TaskEx.Delay(5000).ContinueWith(_=>
                     Execute.OnUIThread(()=> _sparkle.StartLoop(true,true,Settings.UpdateCheckInterval)));
     			StartMonitoring();
+    		}
     	    private void OnUpgradeDetected(object sender, UpdateDetectedEventArgs e)
+    	    {
     	        Log.InfoFormat("Update detected {0}",e.LatestVersion);
+    	    }
             public void CheckForUpgrade()
+            {
                 _sparkle.StopLoop();
                 _sparkle.Dispose();
                 _sparkle=new Sparkle(Settings.UpdateUrl);
                 _sparkle.StartLoop(true,true,Settings.UpdateCheckInterval);
+            }
     		private async void StartMonitoring()
     	    private async void StartMonitoring()
+    		{
     			try
+    			{
-...
     		private bool _pollStarted;
     	    private Sparkle _sparkle;
     		//SMELL: Doing so much work for notifications in the shell is wrong
     	    //SMELL: Doing so much work for notifications in the shell is wrong
     		//The notifications should be moved to their own view/viewmodel pair
     		//and different templates should be used for different message types
     		//This will also allow the addition of extra functionality, eg. actions

        <setting name="StartupDelay" serializeAs="String">
         <value>00:01:00</value>
        </setting>
        <setting name="UpdateDiagnostics" serializeAs="String">
         <value>False</value>
        </setting>
        <setting name="UpdateCheckInterval" serializeAs="String">
         <value>24.00:00:00</value>
        </setting>
       </Pithos.Client.WPF.Properties.Settings>
     	</userSettings>
     	<connectionStrings>
-...
         <value>https://pithos.dev.grnet.gr</value>
        </setting>
        <setting name="UpdateUrl" serializeAs="String">
         <value>file:///E:/Projects/PITHOS/Source/Pithos/trunk/Pithos.AppCast/versioninfo.xml</value>
         <value>https://github.com/pkanavos/PithosUpdateTest/raw/master/versioninfo.xml</value>
        </setting>
       </Pithos.Client.WPF.Properties.Settings>
     	</applicationSettings>

Synnefo » Pithos MS Client

Revision 049333d2