Revision 4b0a2fc0

b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
7 7
// General Information about an assembly is controlled through the following 
8 8
// set of attributes. Change these attribute values to modify the information
9 9
// associated with an assembly.
10
[assembly: AssemblyTitle("Pithos.Client.WPF")]
11
[assembly: AssemblyDescription("")]
10
[assembly: AssemblyTitle("Pithos Client for Windows")]
11
[assembly: AssemblyDescription("Pithos Client for Windows")]
12 12
[assembly: AssemblyConfiguration("")]
13
[assembly: AssemblyCompany("Microsoft")]
14
[assembly: AssemblyProduct("Pithos.Client.WPF")]
15
[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
13
[assembly: AssemblyCompany("GRNet")]
14
[assembly: AssemblyProduct("Pithos Client for Windows")]
15
[assembly: AssemblyCopyright("Copyright © GRNet 2011")]
16 16
[assembly: AssemblyTrademark("")]
17 17
[assembly: AssemblyCulture("")]
18
[assembly: AssemblyInformationalVersion("2011.11.10")]
18 19

  
19 20
// Setting ComVisible to false makes the types in this assembly not visible 
20 21
// to COM components.  If you need to access a type in this assembly from 
b/trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
230 230
            }
231 231
        }
232 232
        
233
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
234
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
235
        [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/im/login")]
236
        public string PithosLoginUrl {
237
            get {
238
                return ((string)(this["PithosLoginUrl"]));
239
            }
240
        }
241
        
233 242
        [global::System.Configuration.UserScopedSettingAttribute()]
234 243
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
235
        [global::System.Configuration.DefaultSettingValueAttribute("<?xml version=\"1.0\" encoding=\"utf-16\"?>\r\n<ArrayOfAccountSettings xmlns:xsi=\"http:" +
236
            "//www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchem" +
237
            "a\" />")]
244
        [global::System.Configuration.DefaultSettingValueAttribute("\r\n          <ArrayOfAccountSettings xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-i" +
245
            "nstance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" />\r\n        ")]
238 246
        public global::Pithos.Interfaces.AccountsCollection Accounts {
239 247
            get {
240 248
                return ((global::Pithos.Interfaces.AccountsCollection)(this["Accounts"]));
......
243 251
                this["Accounts"] = value;
244 252
            }
245 253
        }
246
        
247
        [global::System.Configuration.ApplicationScopedSettingAttribute()]
248
        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
249
        [global::System.Configuration.DefaultSettingValueAttribute("http://pithos.dev.grnet.gr/im/login")]
250
        public string PithosLoginUrl {
251
            get {
252
                return ((string)(this["PithosLoginUrl"]));
253
            }
254
        }
255 254
    }
256 255
}
b/trunk/Pithos.Client.WPF/Properties/Settings.settings
56 56
    <Setting Name="CloudfilesAuthenticationUrl" Type="System.String" Scope="Application">
57 57
      <Value Profile="(Default)">https://auth.api.rackspacecloud.com</Value>
58 58
    </Setting>
59
    <Setting Name="Accounts" Type="Pithos.Interfaces.AccountsCollection" Scope="User">
60
      <Value Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
61
&lt;ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /&gt;</Value>
62
    </Setting>
63 59
    <Setting Name="PithosLoginUrl" Type="System.String" Scope="Application">
64 60
      <Value Profile="(Default)">http://pithos.dev.grnet.gr/im/login</Value>
65 61
    </Setting>
62
    <Setting Name="Accounts" Type="Pithos.Interfaces.AccountsCollection" Scope="User">
63
      <Value Profile="(Default)">
64
          &lt;ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" /&gt;
65
        </Value>
66
    </Setting>
66 67
  </Settings>
67 68
</SettingsFile>
b/trunk/Pithos.Client.WPF/Shell/AboutView.xaml
1
<Window x:Class="Pithos.Client.WPF.AboutView"
1
<Window x:Class="Pithos.Client.WPF.Shell.AboutView"
2 2
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3 3
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4 4
        Title="AboutView" Height="300" Width="300">
5
    <StackPanel>
6
        <TextBlock Text="Pithos Windows Client" HorizontalAlignment="Center" FontSize="14" FontWeight="Bold"/>
7
        <StackPanel Orientation="Horizontal">
5
    <Grid>
6
        <Grid.RowDefinitions>
7
            <RowDefinition Height="Auto"/>
8
            <RowDefinition Height="Auto"/>
9
            <RowDefinition Height="Auto"/>
10
            <RowDefinition Height="*"/>
11
            <RowDefinition Height="Auto"/>
12
        </Grid.RowDefinitions>
13
        <Image Grid.Row="0" Source="/Pithos.Client.WPF;component/Images/SmallLogo.png" />
14
        <TextBlock Grid.Row="0" Text="Pithos " HorizontalAlignment="Center" FontSize="28" FontWeight="Bold" FontFamily="Segoe UI" Width="200" TextWrapping="WrapWithOverflow" TextAlignment="Center" VerticalAlignment="Center"/>
15
        <StackPanel Grid.Row="1" Orientation="Horizontal" Margin="10,0">
8 16
            <TextBlock Text="Version"/>
9 17
            <TextBlock x:Name="Version" FontWeight="Bold" Margin="5" />
10 18
        </StackPanel>
11
        <StackPanel Orientation="Horizontal">
19
        <StackPanel Grid.Row="2" Orientation="Horizontal" Margin="10,0">
12 20
            <TextBlock Text="Released"/>
13 21
            <TextBlock x:Name="ReleaseDate" FontWeight="Bold" Margin="5"/>
14 22
        </StackPanel>
15
        <TextBlock>
16
            <Hyperlink NavigateUri="" >Support Page</Hyperlink>
23
        <TextBlock Grid.Row="3" Margin="10,0">
24
            <Run>Visit the </Run>
25
            <Hyperlink NavigateUri="http://code.grnet.gr/projects/pithos-ms-client" >Development Web Site</Hyperlink>
17 26
        </TextBlock>
18
        
19
    </StackPanel>
27
        <Button x:Name="Close" Content="OK" Grid.Row="4" HorizontalAlignment="Center" Width="75" Margin="5" />
28
    </Grid>
20 29
</Window>
b/trunk/Pithos.Client.WPF/Shell/AboutView.xaml.cs
11 11
using System.Windows.Media.Imaging;
12 12
using System.Windows.Shapes;
13 13

  
14
namespace Pithos.Client.WPF
14
namespace Pithos.Client.WPF.Shell
15 15
{
16 16
    /// <summary>
17 17
    /// Interaction logic for AboutView.xaml
b/trunk/Pithos.Client.WPF/Shell/AboutViewModel.cs
5 5
// -----------------------------------------------------------------------
6 6

  
7 7
using System.ComponentModel.Composition;
8
using System.Reflection;
8 9
using Caliburn.Micro;
9 10

  
10 11
namespace Pithos.Client.WPF.Shell
......
13 14
    using System.Collections.Generic;
14 15
    using System.Linq;
15 16
    using System.Text;
16

  
17
    
17 18
    /// <summary>
18 19
    /// TODO: Update summary.
19 20
    /// </summary>
20 21
    [Export(typeof(AboutViewModel))]
21 22
    public class AboutViewModel:Screen
22 23
    {
23
        private string _version;
24 24
        public string Version { get; set; }
25
/*
25

  
26
        public string Released { get; set; }
27

  
28
        public Uri SupportPage { get; set; }
29

  
30
        public AboutViewModel()
26 31
        {
27
            get { return _version; }
28
            set
29
            {
30
                _version = value;
31
                NotifyOfPropertyChange(()=>Version);
32
            }
32
            var attributes=Assembly.GetExecutingAssembly().GetCustomAttributes(false);
33
            var versionAtt = attributes.OfType<AssemblyInformationalVersionAttribute>().First();
34
            var fileVersion = attributes.OfType<AssemblyFileVersionAttribute>().First();
35

  
36
            Released = versionAtt.InformationalVersion;
37
            Version = fileVersion.Version;
33 38
        }
34
*/
35 39

  
36
        private DateTime _released;
37
        public DateTime Released { get; set; }
38
/*
40
        public void Close()
39 41
        {
40
            get { return _released; }
41
            set
42
            {
43
                _released = value;
44
                NotifyOfPropertyChange(()=>Released);
45
            }
42
            this.TryClose();
46 43
        }
47
*/
48

  
49
        public Uri SupportPage { get; set; }
50 44
    }
51 45
}
b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
71 71
                    <MenuItem  Header="Preferences ..." x:Name="ShowPreferences" cal:Message.Attach="ShowPreferences"  />
72 72
                    <Separator  />
73 73
                    <MenuItem  Header="Send Feedback " x:Name="SendFeedback" cal:Message.Attach="SendFeedback"  />
74
                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="About Pithos"  />
74
                    <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="AboutPithos"  />
75 75
                    <Separator  />
76 76
                    <MenuItem  Header="Exit" Name="ExitPithos" cal:Message.Attach="ExitPithos" />
77 77
                </ContextMenu>
b/trunk/Pithos.Client.WPF/Shell/ShellViewModel.cs
276 276

  
277 277
        public void AboutPithos()
278 278
        {
279
            var about = new AboutView();
279
            var about = new AboutViewModel();
280 280
            _windowManager.ShowWindow(about);
281 281
        }
282 282

  
283 283
        public void SendFeedback()
284 284
        {
285
            var feedBack = new FeedbackView();
285
            var feedBack = new FeedbackViewModel();
286 286
            _windowManager.ShowWindow(feedBack);
287 287
        }
288 288

  

Also available in: Unified diff