-
authorPanagiotis Kanavos <pkanavos@gmail.com>
Thu, 10 Nov 2011 19:27:46 +0000 (21:27 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Thu, 10 Nov 2011 19:27:46 +0000 (21:27 +0200)
trunk/Pithos.Client.WPF/Images/SmallLogo.png [new file with mode: 0644]
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
trunk/Pithos.Client.WPF/Properties/Settings.settings
trunk/Pithos.Client.WPF/Shell/AboutView.xaml
trunk/Pithos.Client.WPF/Shell/AboutView.xaml.cs
trunk/Pithos.Client.WPF/Shell/AboutViewModel.cs
trunk/Pithos.Client.WPF/Shell/ShellView.xaml
trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs

diff --git a/trunk/Pithos.Client.WPF/Images/SmallLogo.png b/trunk/Pithos.Client.WPF/Images/SmallLogo.png
new file mode 100644 (file)
index 0000000..d3b40d2
Binary files /dev/null and b/trunk/Pithos.Client.WPF/Images/SmallLogo.png differ
index 016ff4d..3e5fe29 100644 (file)
@@ -7,14 +7,15 @@ using System.Windows;
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Pithos.Client.WPF")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle("Pithos Client for Windows")]
+[assembly: AssemblyDescription("Pithos Client for Windows")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Pithos.Client.WPF")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyCompany("GRNet")]
+[assembly: AssemblyProduct("Pithos Client for Windows")]
+[assembly: AssemblyCopyright("Copyright © GRNet 2011")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
+[assembly: AssemblyInformationalVersion("2011.11.10")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
index 972ab8a..78b80ca 100644 (file)
@@ -230,11 +230,19 @@ namespace Pithos.Client.WPF.Properties {
             }
         }
         
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/im/login")]
+        public string PithosLoginUrl {
+            get {
+                return ((string)(this["PithosLoginUrl"]));
+            }
+        }
+        
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfAccountSettings xmlns:xsi=\"http:" +
-            "//www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchem" +
-            "a\" />")]
+        [global::System.Configuration.DefaultSettingValueAttribute("\r\n          <ArrayOfAccountSettings xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-i" +
+            "nstance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" />\r\n        ")]
         public global::Pithos.Interfaces.AccountsCollection Accounts {
             get {
                 return ((global::Pithos.Interfaces.AccountsCollection)(this["Accounts"]));
@@ -243,14 +251,5 @@ namespace Pithos.Client.WPF.Properties {
                 this["Accounts"] = value;
             }
         }
-        
-        [global::System.Configuration.ApplicationScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/im/login")]
-        public string PithosLoginUrl {
-            get {
-                return ((string)(this["PithosLoginUrl"]));
-            }
-        }
     }
 }
index 9931ac6..7073177 100644 (file)
     <Setting Name="CloudfilesAuthenticationUrl" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://auth.api.rackspacecloud.com</Value>
     </Setting>
-    <Setting Name="Accounts" Type="Pithos.Interfaces.AccountsCollection" Scope="User">
-      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /&gt;</Value>
-    </Setting>
     <Setting Name="PithosLoginUrl" Type="System.String" Scope="Application">
       <Value Profile="(Default)">http://pithos.dev.grnet.gr/im/login</Value>
     </Setting>
+    <Setting Name="Accounts" Type="Pithos.Interfaces.AccountsCollection" Scope="User">
+      <Value Profile="(Default)">
+          &lt;ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /&gt;
+        </Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
index e30cdbe..cd602a9 100644 (file)
@@ -1,20 +1,29 @@
-<Window x:Class="Pithos.Client.WPF.AboutView"
+<Window x:Class="Pithos.Client.WPF.Shell.AboutView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="AboutView" Height="300" Width="300">
-    <StackPanel>
-        <TextBlock Text="Pithos Windows Client" HorizontalAlignment="Center" FontSize="14" FontWeight="Bold"/>
-        <StackPanel Orientation="Horizontal">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Image Grid.Row="0" Source="/Pithos.Client.WPF;component/Images/SmallLogo.png" />
+        <TextBlock Grid.Row="0" Text="Pithos " HorizontalAlignment="Center" FontSize="28" FontWeight="Bold" FontFamily="Segoe UI" Width="200" TextWrapping="WrapWithOverflow" TextAlignment="Center" VerticalAlignment="Center"/>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0">
             <TextBlock Text="Version"/>
             <TextBlock x:Name="Version" FontWeight="Bold" Margin="5" />
         </StackPanel>
-        <StackPanel Orientation="Horizontal">
+        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,0">
             <TextBlock Text="Released"/>
             <TextBlock x:Name="ReleaseDate" FontWeight="Bold" Margin="5"/>
         </StackPanel>
-        <TextBlock>
-            <Hyperlink NavigateUri="" >Support Page</Hyperlink>
+        <TextBlock Grid.Row="3" Margin="10,0">
+            <Run>Visit the </Run>
+            <Hyperlink NavigateUri="http://code.grnet.gr/projects/pithos-ms-client" >Development Web Site</Hyperlink>
         </TextBlock>
-        
-    </StackPanel>
+        <Button x:Name="Close" Content="OK" Grid.Row="4" HorizontalAlignment="Center" Width="75" Margin="5" />
+    </Grid>
 </Window>
index 07a8f43..2108dd8 100644 (file)
@@ -11,7 +11,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace Pithos.Client.WPF
+namespace Pithos.Client.WPF.Shell
 {
     /// <summary>
     /// Interaction logic for AboutView.xaml
index 997daf0..26f7d08 100644 (file)
@@ -5,6 +5,7 @@
 // -----------------------------------------------------------------------
 
 using System.ComponentModel.Composition;
+using System.Reflection;
 using Caliburn.Micro;
 
 namespace Pithos.Client.WPF.Shell
@@ -13,39 +14,32 @@ namespace Pithos.Client.WPF.Shell
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
-
+    
     /// <summary>
     /// TODO: Update summary.
     /// </summary>
     [Export(typeof(AboutViewModel))]
     public class AboutViewModel:Screen
     {
-        private string _version;
         public string Version { get; set; }
-/*
+
+        public string Released { get; set; }
+
+        public Uri SupportPage { get; set; }
+
+        public AboutViewModel()
         {
-            get { return _version; }
-            set
-            {
-                _version = value;
-                NotifyOfPropertyChange(()=>Version);
-            }
+            var attributes=Assembly.GetExecutingAssembly().GetCustomAttributes(false);
+            var versionAtt = attributes.OfType<AssemblyInformationalVersionAttribute>().First();
+            var fileVersion = attributes.OfType<AssemblyFileVersionAttribute>().First();
+
+            Released = versionAtt.InformationalVersion;
+            Version = fileVersion.Version;
         }
-*/
 
-        private DateTime _released;
-        public DateTime Released { get; set; }
-/*
+        public void Close()
         {
-            get { return _released; }
-            set
-            {
-                _released = value;
-                NotifyOfPropertyChange(()=>Released);
-            }
+            this.TryClose();
         }
-*/
-
-        public Uri SupportPage { get; set; }
     }
 }
index ad5a7a8..e19a57c 100644 (file)
@@ -71,7 +71,7 @@
                     <MenuItem  Header="Preferences ..." x:Name="ShowPreferences" cal:Message.Attach="ShowPreferences"  />
                     <Separator  />
                     <MenuItem  Header="Send Feedback " x:Name="SendFeedback" cal:Message.Attach="SendFeedback"  />
-                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="About Pithos"  />
+                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="AboutPithos"  />
                     <Separator  />
                     <MenuItem  Header="Exit" Name="ExitPithos" cal:Message.Attach="ExitPithos" />
                 </ContextMenu>
index e782f31..f642f12 100644 (file)
@@ -276,13 +276,13 @@ namespace Pithos.Client.WPF {
 
         public void AboutPithos()
         {
-            var about = new AboutView();
+            var about = new AboutViewModel();
             _windowManager.ShowWindow(about);
         }
 
         public void SendFeedback()
         {
-            var feedBack = new FeedbackView();
+            var feedBack = new FeedbackViewModel();
             _windowManager.ShowWindow(feedBack);
         }