Restructured views
authorPanagiotis Kanavos <pkanavos@gmail.com>
Thu, 10 Nov 2011 16:55:27 +0000 (18:55 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Thu, 10 Nov 2011 16:55:27 +0000 (18:55 +0200)
22 files changed:
trunk/Pithos.Client.WPF/App.xaml.cs
trunk/Pithos.Client.WPF/Configuration/PithosSettings.cs
trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesViewModel.cs
trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
trunk/Pithos.Client.WPF/FileProperties/FilePropertiesViewModel.cs
trunk/Pithos.Client.WPF/IShell.cs [deleted file]
trunk/Pithos.Client.WPF/MessageView.xaml [deleted file]
trunk/Pithos.Client.WPF/MessageView.xaml.cs [deleted file]
trunk/Pithos.Client.WPF/Notification.cs [deleted file]
trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
trunk/Pithos.Client.WPF/PithosAccount.cs
trunk/Pithos.Client.WPF/PithosStyles.xaml
trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
trunk/Pithos.Client.WPF/Preferences/PreferencesViewModel.cs
trunk/Pithos.Client.WPF/Properties/Settings.Designer.cs
trunk/Pithos.Client.WPF/Properties/Settings.settings
trunk/Pithos.Client.WPF/ShellView.xaml [deleted file]
trunk/Pithos.Client.WPF/app.config
trunk/Pithos.Client.WPF/packages.config
trunk/packages/wpfthemes.0.0.1/lib/WPF.Themes.dll [deleted file]
trunk/packages/wpfthemes.0.0.1/wpfthemes.0.0.1.nupkg [deleted file]

index bdb6fdb..2acb681 100644 (file)
@@ -12,7 +12,7 @@ using System.Windows;
 using Caliburn.Micro;
 using Microsoft.Win32;
 using Pithos.Client.WPF.Caliburn.Micro.Logging;
-using WPF.Themes;
+
 
 namespace Pithos.Client.WPF
 {
index 85b44a8..32218d9 100644 (file)
@@ -50,6 +50,11 @@ namespace Pithos.Client.WPF.Configuration
             get { return Settings.Default.PithosSite; }
         }
 
+        public string PithosLoginUrl
+        {
+            get { return Settings.Default.PithosLoginUrl; }
+        }
+
         public string IconsPath
         {
             get { return Settings.Default.IconPath; }
@@ -105,6 +110,8 @@ namespace Pithos.Client.WPF.Configuration
             get { return Settings.Default.ProxyAuthentication; }
             set { Settings.Default.ProxyAuthentication = value; }
         }
+
+        
         
         public bool ExtensionsActivated
         {
index 4b3e5f9..83adc5f 100644 (file)
@@ -2,7 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:cal="http://www.caliburnproject.org"
         Title="ContainerPropertiesView" Height="500" Width="300"
-        Background="#FFD4D0C8" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png">
+        Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png"
+        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
index a90d2cd..761524f 100644 (file)
@@ -114,7 +114,7 @@ namespace Pithos.Client.WPF.FileProperties
 
 
 
-        public void Refresh()
+        public void Reload()
         {
             Container = Shell.RefreshContainerInfo(Container);
         }
index 5d5e7d5..22ed1ea 100644 (file)
@@ -5,7 +5,8 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
         mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="300" MaxWidth="500"
-        Background="#FFD4D0C8" Height="481" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png">
+         Height="481" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png"
+        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
index 64654c2..c277097 100644 (file)
@@ -126,7 +126,7 @@ namespace Pithos.Client.WPF
             get { return _permissions; }
         }
 
-        public void Refresh()
+        public void Reload()
         {
             PithosFile=Shell.RefreshObjectInfo(PithosFile);
         }
diff --git a/trunk/Pithos.Client.WPF/IShell.cs b/trunk/Pithos.Client.WPF/IShell.cs
deleted file mode 100644 (file)
index 8290828..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-namespace Pithos.Client.WPF {
-    public interface IShell {}
-}
diff --git a/trunk/Pithos.Client.WPF/MessageView.xaml b/trunk/Pithos.Client.WPF/MessageView.xaml
deleted file mode 100644 (file)
index a5bdfcf..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<Window x:Class="Pithos.Client.WPF.MessageView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="MessageView" Height="300" Width="300">
-    <Grid x:Name="LayoutRoot" Margin="2">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <TextBlock Text="{Binding Message}" Grid.Row="0" TextWrapping="WrapWithOverflow" Margin="0,5,0,10"/>
-        <ListBox  ItemsSource="{Binding Path=UserMessages}" Grid.Row="1">
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <Expander Header="{Binding Message}" FontWeight="Bold">
-                        <TextBlock Text="{Binding Details}" FontWeight="Normal" />
-                    </Expander>
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
-        <Button x:Name="Copy" Content="Copy" Width="39" Height="35" HorizontalAlignment="Left" Grid.Row="2" Click="OnCopy">
-            <ContentControl.ContentTemplate>
-                <DataTemplate>
-                    <Image  Source="/Pithos.Client.WPF;component/Images/copy.png"   />
-                </DataTemplate>
-            </ContentControl.ContentTemplate>
-        </Button>
-        <Button x:Name="OKButton" Content="Close"  Width="75" Height="23" HorizontalAlignment="Right" Margin="0,12,0,0" Grid.Row="2" IsDefault="True" Command="ApplicationCommands.Close" />
-    </Grid>
-</Window>
diff --git a/trunk/Pithos.Client.WPF/MessageView.xaml.cs b/trunk/Pithos.Client.WPF/MessageView.xaml.cs
deleted file mode 100644 (file)
index 4fe58f9..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.ComponentModel.Composition;
-using System.Linq;
-using System.Linq.Expressions;
-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.Shapes;
-using Caliburn.Micro;
-
-namespace Pithos.Client.WPF
-{
-    /// <summary>
-    /// Interaction logic for MessageView.xaml
-    /// </summary>
-    public partial class MessageView : Window, INotifyPropertyChanged
-    {
-        public ObservableCollection<UserMessage> UserMessages { get; set; }
-
-        private string _message;
-        public string Message
-        {
-            get
-            {
-                return _message;
-            }
-            set
-            {
-                _message = value;
-                NotifyOfPropertyChange(()=>Message);
-            }
-        }
-
-
-        public MessageView(IEnumerable<UserMessage> userMessages)
-        {
-            UserMessages = new ObservableCollection<UserMessage>(userMessages);
-            DataContext = this;
-            InitializeComponent();            
-        }
-
-        /// <summary>
-        /// Copies the messages to the clipboard
-        /// </summary>
-        public void OnCopy(object sender, RoutedEventArgs e)
-        {
-            StringBuilder clipText = new StringBuilder()
-                .Append('-', 30)
-                .AppendLine("\r\nProduct Map")
-                .Append('-', 30)
-                .AppendLine()
-                .AppendLine();
-            foreach (var message in UserMessages)
-            {
-                clipText
-                    .Append('-', 20)
-                    .AppendFormat("\r\n[{0,5}]\t{1}", message.Severity, message.Message)
-                    .AppendLine()
-                    .AppendLine(message.Details)
-                    .AppendLine();
-            }
-
-            Clipboard.SetText(clipText.ToString());
-        }
-
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        private void NotifyOfPropertyChange<TProperty>(Expression<Func<TProperty>> property)
-        {
-            if (PropertyChanged!=null)
-                PropertyChanged(this,new PropertyChangedEventArgs(property.GetMemberInfo().Name));
-        }
-    }
-
-    public class UserMessage
-    {
-        public string Message { get; set; }
-
-        public Severity Severity { get; set; }
-        public string Details { get; set; }
-    }
-
-    public enum Severity
-    {
-        Info,
-        Warn,
-        Error
-    }
-}
diff --git a/trunk/Pithos.Client.WPF/Notification.cs b/trunk/Pithos.Client.WPF/Notification.cs
deleted file mode 100644 (file)
index a6a7420..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Diagnostics;
-
-namespace Pithos.Client.WPF
-{
-    public class Notification
-    {
-        public string Title { get; set; }
-        public string Message { get; set; }
-        public TraceLevel Level { get; set; }
-    }
-    
-}
\ No newline at end of file
index eb47851..910c8c7 100644 (file)
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="WPF.Themes">
-      <HintPath>..\packages\wpfthemes.0.0.1\lib\WPF.Themes.dll</HintPath>
+    <Reference Include="WPFToolkit.Extended">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.1.5.0\lib\net40\WPFToolkit.Extended.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Shell\AboutView.xaml.cs">
+      <DependentUpon>AboutView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Caliburn\Micro\Logging\DebugLogger.cs" />
     <Compile Include="Caliburn\Micro\Logging\log4netLogger.cs" />
     <Compile Include="Configuration\PithosSettings.cs" />
     <Compile Include="FileProperties\Permission.cs" />
     <Compile Include="FileProperties\SizeExtensions.cs" />
     <Compile Include="FileProperties\Tag.cs" />
-    <Compile Include="MessageView.xaml.cs">
+    <Compile Include="Shell\AboutViewModel.cs" />
+    <Compile Include="Shell\FeedbackView.xaml.cs">
+      <DependentUpon>FeedbackView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Shell\FeedbackViewModel.cs" />
+    <Compile Include="Shell\MessageView.xaml.cs">
       <DependentUpon>MessageView.xaml</DependentUpon>
     </Compile>
     <Compile Include="NativeMethods.cs" />
-    <Compile Include="Notification.cs" />
+    <Compile Include="Shell\Notification.cs" />
     <Compile Include="PithosAccount.cs" />
     <Compile Include="PithosCommand.cs" />
     <Compile Include="Preferences\PreferencesView.xaml.cs">
     <Compile Include="SelectiveSynch\SelectiveSynchViewModel.cs" />
     <Compile Include="SelectiveSynch\VirtualToggleButton.cs" />
     <Compile Include="Services\Events.cs" />
-    <Compile Include="ShellViewModel.cs" />
+    <Compile Include="Shell\ShellViewModel.cs" />
     <Compile Include="Services\StatusService.cs" />
     <Compile Include="Wpf32Window.cs" />
+    <Page Include="Shell\AboutView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="FileProperties\ContainerPropertiesView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="AppBootstrapper.cs" />
-    <Compile Include="IShell.cs" />
+    <Compile Include="Shell\IShell.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="MessageView.xaml">
+    <Page Include="Shell\FeedbackView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Shell\MessageView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="ShellView.xaml">
+    <Page Include="Shell\ShellView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
index a92e233..d4f3e73 100644 (file)
@@ -32,14 +32,14 @@ namespace Pithos.Client.WPF
         /// <summary>
         /// Asynchronously retrieves PITHOS credentials
         /// </summary>
-        /// <param name="pithosSite">URL to retrieve the account info from PITHOS. Must end with =</param>
+        /// <param name="loginUrl">URL to retrieve the account info from PITHOS. Must end with =</param>
         /// <returns>The credentials wrapped in a Task</returns>
-        public static Task<NetworkCredential> RetrieveCredentialsAsync(string pithosSite)
+        public static Task<NetworkCredential> RetrieveCredentialsAsync(string loginUrl)
         {
-            Contract.Requires(Uri.IsWellFormedUriString(pithosSite, UriKind.Absolute));
+            Contract.Requires(Uri.IsWellFormedUriString(loginUrl, UriKind.Absolute));
 
-            if (!Uri.IsWellFormedUriString(pithosSite, UriKind.Absolute))
-                throw new ArgumentException("The pithosSite parameter must be a valid absolute URL", "pithosSite");
+            if (!Uri.IsWellFormedUriString(loginUrl, UriKind.Absolute))
+                throw new ArgumentException("The pithosSite parameter must be a valid absolute URL", "loginUrl");
             
             int port = GetFreePort();
 
@@ -98,8 +98,7 @@ namespace Pithos.Client.WPF
                     }
                 });
 
-            var uriBuilder=new UriBuilder(pithosSite);
-            uriBuilder.Path="login";            
+            var uriBuilder=new UriBuilder(loginUrl);                       
             uriBuilder.Query="next=" + listenerUrl;
 
             var retrieveUri = uriBuilder.Uri;
index 95f67ae..7751f73 100644 (file)
@@ -1,10 +1,19 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
-    <Style x:Key="ButtonStyle" TargetType="Button">
+
+    <Style x:Key="ButtonStyle" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Margin" Value="5"/>
         <Setter Property="Height" Value="25"/>
         <Setter Property="Width" Value="75" />
         <Setter Property="Padding" Value="3"/>
     </Style>
+    
+    <Style TargetType="Window" >
+        <Setter Property="Background" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>
+    </Style>
+    
+    <Style x:Key="MediumButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
+        <Setter Property="Width" Value="75"/>
+        <Setter Property="Height" Value="25"/>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
index 95c5070..ea5d683 100644 (file)
@@ -1,14 +1,14 @@
 <Window x:Class="Pithos.Client.WPF.PreferencesView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification"
-        xmlns:cal="http://www.caliburnproject.org" 
-        x:Name="TheView"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"        
+        xmlns:cal="http://www.caliburnproject.org"
+        xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended" x:Name="TheView"
         Title="Pithos Preferences" Height="381" Width="600" 
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/Pithos.Client.WPF;component/Images/Tray.ico"
-        Background="#FFD4D0C8">
+        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
+        
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary.MergedDictionaries>
                             </ListBox.ItemTemplate>
                         </ListBox>
                         <StackPanel Orientation="Horizontal" Grid.Row="1">
-                            <Button Name="AddPithosAccount" Content="Add Pithos" Style="{StaticResource ButtonStyle}" Width="70"/>
-                            <Button Name="AddAccount" Content="Add Manual" Style="{StaticResource ButtonStyle}" Width="70"/>
-                            <Button Name="RemoveAccount" Content="Remove" Style="{StaticResource ButtonStyle}" Width="50"/>                            
+                            <extToolkit:DropDownButton Content="Add" Height="25" Width="75">
+                                <extToolkit:DropDownButton.DropDownContent>
+                                    <Menu>
+                                        <Menu.ItemsPanel>                                            
+                                                <ItemsPanelTemplate>
+                                                    <VirtualizingStackPanel Orientation="Vertical"/>
+                                                </ItemsPanelTemplate>                                            
+                                        </Menu.ItemsPanel>
+
+                                        <MenuItem Name="AddPithosAccount" Header="From Pithos" ToolTip="Go to Pithos site to login and retrieve the authentication token" cal:Message.Attach="AddPithosAccount"/>
+                                        <MenuItem Name="AddAccount" Header="Manually" ToolTip="Enter account details manually" cal:Message.Attach="AddAccount"/>
+                                    </Menu>
+                                </extToolkit:DropDownButton.DropDownContent>
+                            </extToolkit:DropDownButton>
+                            <Button Name="RemoveAccount" Content="Remove" Style="{StaticResource ButtonStyle}" Width="75"/>                            
                         </StackPanel>
                     </Grid>
                     <GroupBox Header="Account" Padding="5" Margin="5" Height="231" HorizontalAlignment="Stretch" VerticalAlignment="Top" Grid.Column="1">
index f9d5df1..cecf214 100644 (file)
@@ -230,7 +230,7 @@ namespace Pithos.Client.WPF
 
         public async void AddPithosAccount()
        {
-            var credentials=await PithosAccount.RetrieveCredentialsAsync(Settings.PithosSite);
+            var credentials=await PithosAccount.RetrieveCredentialsAsync(Settings.PithosLoginUrl);
             var account = Settings.Accounts.FirstOrDefault(act => act.AccountName == credentials.UserName);
             if (account == null)
             {
index 2498526..972ab8a 100644 (file)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.239
+//     Runtime Version:4.0.30319.488
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -212,20 +212,6 @@ namespace Pithos.Client.WPF.Properties {
             }
         }
         
-        [global::System.Configuration.UserScopedSettingAttribute()]
-        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [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          </ArrayOfAccou" +
-            "ntSettings>\r\n        ")]
-        public global::Pithos.Interfaces.AccountsCollection Accounts {
-            get {
-                return ((global::Pithos.Interfaces.AccountsCollection)(this["Accounts"]));
-            }
-            set {
-                this["Accounts"] = value;
-            }
-        }
-        
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("https://pithos.dev.grnet.gr")]
@@ -243,5 +229,28 @@ namespace Pithos.Client.WPF.Properties {
                 return ((string)(this["CloudfilesAuthenticationUrl"]));
             }
         }
+        
+        [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\" />")]
+        public global::Pithos.Interfaces.AccountsCollection Accounts {
+            get {
+                return ((global::Pithos.Interfaces.AccountsCollection)(this["Accounts"]));
+            }
+            set {
+                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 7fb8fe1..9931ac6 100644 (file)
     <Setting Name="PithosSite" Type="System.String" Scope="Application">
       <Value Profile="(Default)">http://pithos.dev.grnet.gr</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;
-          &lt;/ArrayOfAccountSettings&gt;
-        </Value>
-    </Setting>
     <Setting Name="PithosAuthenticationUrl" Type="System.String" Scope="Application">
       <Value Profile="(Default)">https://pithos.dev.grnet.gr</Value>
     </Setting>
     <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>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/trunk/Pithos.Client.WPF/ShellView.xaml b/trunk/Pithos.Client.WPF/ShellView.xaml
deleted file mode 100644 (file)
index 5550f69..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<Window x:Class="Pithos.Client.WPF.ShellView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:tb="clr-namespace:Hardcodet.Wpf.TaskbarNotification;assembly=Hardcodet.Wpf.TaskbarNotification" 
-        xmlns:cal="http://www.caliburnproject.org"
-        x:Name="TheView"
-         >
-
-    <Window.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="PithosStyles.xaml" />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </Window.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="Auto"/>
-        </Grid.RowDefinitions>
-
-        <tb:TaskbarIcon x:Name="TaskbarView"                           
-                        IconSource="{Binding StatusIcon}" 
-                        ToolTipText="{Binding StatusMessage}"                        
-                        MenuActivation="LeftOrRightClick" 
-                        DoubleClickCommand="{Binding OpenPithosFolderCommand}"                         
-                        >
-            <tb:TaskbarIcon.ContextMenu>
-                <ContextMenu x:Name="TaskbarMenu" >
-                    <MenuItem Header="Open PITHOS Folder" x:Name="OpenPithosFolder" ItemsSource="{Binding Accounts}" >
-                        <MenuItem.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock x:Name="AccountLink" Text="{Binding Path=UserName}" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action OpenPithosFolder($dataContext)]" 
-                                           cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" />
-                            </DataTemplate>
-                        </MenuItem.ItemTemplate>                        
-                        </MenuItem> 
-                    <MenuItem Header="Go to Account Site" x:Name="GoToSiteMenu" ItemsSource="{Binding Accounts}" >
-                        <MenuItem.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock x:Name="AccountLink" Text="{Binding Path=UserName}" cal:Message.Attach="[Event MouseLeftButtonUp]=[Action GoToSite($dataContext)]" 
-                                           cal:Action.TargetWithoutContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=MenuItem, AncestorLevel=2}, Path=DataContext}" />
-                            </DataTemplate>
-                        </MenuItem.ItemTemplate>
-                    </MenuItem>
-
-                    <MenuItem Header="Recently Changed Files" x:Name="RecentFiles" ItemsSource="{Binding RecentFiles}">
-                        <MenuItem.ItemTemplate>
-                            <DataTemplate>
-                                <TextBlock Text="{Binding FileName}"/>
-                            </DataTemplate>
-                        </MenuItem.ItemTemplate>
-                    </MenuItem>
-                    <Separator  />                    
-                    <MenuItem Header="Usage" x:Name="Usages" ItemsSource="{Binding Accounts}">
-                        <MenuItem.ItemTemplate>
-                            <DataTemplate>
-                                <StackPanel Orientation="Horizontal">
-                                    <TextBlock Text="{Binding UserName}" />
-                                    <TextBlock Text=":" Margin="5,0"/>
-                                    <TextBlock Text="{Binding Usage}" />
-                                </StackPanel>
-                            </DataTemplate>
-                        </MenuItem.ItemTemplate>
-                    </MenuItem>
-                    <Separator  />
-                    <MenuItem Header="{Binding StatusMessage}" x:Name="StatusMessage" />
-                    <Separator  />
-                    <MenuItem  Header="{Binding PauseSyncCaption}" x:Name="ToggleSynching" cal:Message.Attach="ToggleSynching"  />
-                    <Separator  />
-                    <MenuItem  Header="Preferences ..." x:Name="ShowPreferences" cal:Message.Attach="ShowPreferences"  />
-                    <Separator  />
-                    <MenuItem  Header="Exit" Name="ExitPithos" cal:Message.Attach="ExitPithos" />
-                </ContextMenu>
-            </tb:TaskbarIcon.ContextMenu>
-        </tb:TaskbarIcon>
-    </Grid>
-</Window>
index d9e98b6..f5e7033 100644 (file)
@@ -75,8 +75,7 @@
       <setting name="Accounts" serializeAs="Xml">
         <value>
           <ArrayOfAccountSettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-          </ArrayOfAccountSettings>
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema" />
         </value>
       </setting>
     </Pithos.Client.WPF.Properties.Settings>
@@ -90,6 +89,7 @@
       <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".Net Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" />
     </DbProviderFactories>
   </system.data>
+
   <startup useLegacyV2RuntimeActivationPolicy="true">
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client" />
   </startup>
       <setting name="CloudfilesAuthenticationUrl" serializeAs="String">
         <value>https://auth.api.rackspacecloud.com</value>
       </setting>
+      <setting name="PithosLoginUrl" serializeAs="String">
+        <value>http://pithos.dev.grnet.gr/im/login</value>
+      </setting>
     </Pithos.Client.WPF.Properties.Settings>
   </applicationSettings>
   <log4net>
index a30183f..ae97656 100644 (file)
@@ -2,6 +2,6 @@
 <packages>
   <package id="Caliburn.Micro" version="1.2.0" />
   <package id="Caliburn.Micro.Logging" version="1.2" />
+  <package id="Extended.Wpf.Toolkit" version="1.5.0" />
   <package id="System.Data.SQLite" version="1.0.66.1" />
-  <package id="wpfthemes" version="0.0.1" />
 </packages>
\ No newline at end of file
diff --git a/trunk/packages/wpfthemes.0.0.1/lib/WPF.Themes.dll b/trunk/packages/wpfthemes.0.0.1/lib/WPF.Themes.dll
deleted file mode 100644 (file)
index afa7d02..0000000
Binary files a/trunk/packages/wpfthemes.0.0.1/lib/WPF.Themes.dll and /dev/null differ
diff --git a/trunk/packages/wpfthemes.0.0.1/wpfthemes.0.0.1.nupkg b/trunk/packages/wpfthemes.0.0.1/wpfthemes.0.0.1.nupkg
deleted file mode 100644 (file)
index 502c3a8..0000000
Binary files a/trunk/packages/wpfthemes.0.0.1/wpfthemes.0.0.1.nupkg and /dev/null differ