Changed resource links to PithosPlus

diff --git a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
index f0297a7..ffcd300 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/ContainerPropertiesView.xaml
@@ -3,7 +3,7 @@
         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"
         Title="ContainerPropertiesView" Height="500" Width="300"
-        Icon="/Pithos;component/Images/PithosTaskbar.png"
+        Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
     <Window.Resources>
         <ResourceDictionary>
@@ -25,7 +25,7 @@
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="Auto"/>
             </Grid.ColumnDefinitions>
-            <Image x:Name="FileIcon" Margin="5" Grid.Column="0" Stretch="None" Source="/Pithos;component/Images/Container.png" />
+            <Image x:Name="FileIcon" Margin="5" Grid.Column="0" Stretch="None" Source="/PithosPlus;component/Images/Container.png" />
             <TextBlock x:Name="ContainerName" Margin="5" Grid.Column="1" Text="Container Name" FontSize="16" FontWeight="Bold"/>
             <TextBlock x:Name="ShortSize" Margin="5" Text="345 KB" FontWeight="Bold" FontSize="14" Grid.Column="2" />
         </Grid>

diff --git a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
index ad9998b..e287991 100644 (file)
--- a/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
+++ b/trunk/Pithos.Client.WPF/FileProperties/FilePropertiesView.xaml
@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:cal="http://www.caliburnproject.org"
         xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended" mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="400"  Width="400"
-         Height="400" Icon="/Pithos;component/Images/PithosTaskbar.png"
+         Height="400" Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}" WindowStartupLocation="CenterScreen" Topmost="False">
     <Window.Resources>
         <ResourceDictionary>

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index 8190fc5..b309da6 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -8,7 +8,7 @@
         Title="Pithos Preferences" Height="436" Width="600" 
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
-        Icon="/Pithos;component/Images/PithosTaskbar.png"
+        Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
         
     <Window.Resources>
@@ -40,7 +40,7 @@
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="GeneralTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos;component/Images/General.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/General.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="General"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -54,7 +54,7 @@
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AccountTab" IsSelected="{Binding AccountTabSelected,Mode=OneWay}">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Accounts.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Accounts"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -72,7 +72,7 @@
                             <ListBox.ItemTemplate>
                                 <DataTemplate>
                                     <StackPanel Orientation="Horizontal">
-                                    <Image Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=IsExpired,Mode=OneWay}" Source="/Pithos;component/Images/SmallWarning.png" Margin="2,0"/>
+                                    <Image Visibility="{Binding Converter={StaticResource BoolToVisible}, Path=IsExpired,Mode=OneWay}" Source="/PithosPlus;component/Images/SmallWarning.png" Margin="2,0"/>
                                     <TextBlock Text="{Binding AccountName}" />
                                     </StackPanel>
                                 </DataTemplate>
@@ -140,7 +140,7 @@
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Visibility="Collapsed" x:Name="RateTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Bandwidth.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Bandwidth"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -156,7 +156,7 @@
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="ProxyTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos;component/Images/Network.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Network.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Proxy"/>
                     </StackPanel>
                 </TabItem.Header>
@@ -196,7 +196,7 @@
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="AdvancedTab">
                 <TabItem.Header>
                     <StackPanel>
-                        <Image Source="/Pithos;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>
+                        <Image Source="/PithosPlus;component/Images/Advanced.png" Stretch="Uniform" Height="32"/>
                         <TextBlock Text="Advanced"/>                        
                     </StackPanel>
                 </TabItem.Header>

diff --git a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
index 9167e89..d2389ee 100644 (file)
--- a/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
+++ b/trunk/Pithos.Client.WPF/SelectiveSynch/SelectiveSynchView.xaml
@@ -7,7 +7,7 @@
         Title="Selective Synch" Height="300" Width="300" 
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
-        Icon="/Pithos;component/Images/PithosTaskbar.png"
+        Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
     <Window.Resources>
         <ResourceDictionary>

diff --git a/trunk/Pithos.Client.WPF/Shell/AboutView.xaml b/trunk/Pithos.Client.WPF/Shell/AboutView.xaml
index af745f2..0f8e080 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/AboutView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/AboutView.xaml
@@ -1,7 +1,7 @@
 <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" Icon="/Pithos;component/Images/PithosTaskbar.png">
+        Title="AboutView" Height="300" Width="300" Icon="/PithosPlus;component/Images/PithosTaskbar.png">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
@@ -10,7 +10,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <Image Grid.Row="0" Source="/Pithos;component/Images/SmallLogo.png" />
+        <Image Grid.Row="0" Source="/PithosPlus;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" VerticalAlignment="Center"/>

diff --git a/trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs b/trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
index 3af9f07..4e1b39a 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
+++ b/trunk/Pithos.Client.WPF/Shell/BalloonIconConverter.cs
@@ -63,7 +63,7 @@ namespace Pithos.Client.WPF.Shell
 \r
             if (!_iconCache.TryGetValue(icon, out image))\r
             {\r
-                var imagePath = String.Format("/Pithos;component/Images/{0}.png", Enum.GetName(typeof(BalloonIcon), value));\r
+                var imagePath = String.Format("/PithosPlus;component/Images/{0}.png", Enum.GetName(typeof(BalloonIcon), value));\r
                 var uri = new Uri(imagePath, UriKind.Relative);\r
                 image=new BitmapImage(uri);\r
                 _iconCache[icon] = image;\r

diff --git a/trunk/Pithos.Client.WPF/Shell/FeedbackView.xaml b/trunk/Pithos.Client.WPF/Shell/FeedbackView.xaml
index 3bcb112..ea9c0a0 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/FeedbackView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/FeedbackView.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="Pithos.Client.WPF.Shell.FeedbackView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="FeedbackView" Height="389" Width="455" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters" Icon="/Pithos;component/Images/PithosTaskbar.png">
+        Title="FeedbackView" Height="389" Width="455" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters" Icon="/PithosPlus;component/Images/PithosTaskbar.png">
     <Window.Resources>
         <my:EmptyToVisibilityConverter x:Key="EmptyToVisible" />
     </Window.Resources>

diff --git a/trunk/Pithos.Client.WPF/Shell/MessageView.xaml b/trunk/Pithos.Client.WPF/Shell/MessageView.xaml
index dcb8601..6d945d2 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/MessageView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/MessageView.xaml
@@ -4,7 +4,7 @@
         Title="MessageView" Height="Auto" Width="500" 
         Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}" 
         WindowStartupLocation="CenterScreen" 
-        Icon="/Pithos;component/Images/PithosTaskbar.png"
+        Icon="/PithosPlus;component/Images/PithosTaskbar.png"
         SizeToContent="Height" xmlns:my="clr-namespace:Microsoft.Windows.Controls.Core.Converters;assembly=WPFToolkit.Extended">
     <Window.CommandBindings>
         <CommandBinding Command="ApplicationCommands.Close"

diff --git a/trunk/Pithos.Client.WPF/Shell/MiniStatusView.xaml b/trunk/Pithos.Client.WPF/Shell/MiniStatusView.xaml
index efcf152..a67c513 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/MiniStatusView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/MiniStatusView.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         
-        Title="Pithos Status" Height="100" Width="250" WindowStyle="ToolWindow" Topmost="True" Icon="/Pithos;component/Images/PithosTaskbar.png" WindowStartupLocation="CenterOwner">
+        Title="Pithos Status" Height="100" Width="250" WindowStyle="ToolWindow" Topmost="True" Icon="/PithosPlus;component/Images/PithosTaskbar.png" WindowStartupLocation="CenterOwner">
     <Border HorizontalAlignment="Stretch" 
             VerticalAlignment="Stretch" CornerRadius="2">
         <Grid>
@@ -10,7 +10,7 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
-            <Image Grid.Column="0" Width="48" Height="48" HorizontalAlignment="Right" Margin="0,5,5,0" VerticalAlignment="Top"  Source="/Pithos;component/Images/PithosTaskbar.png" Stretch="Fill" Opacity="0.7" ToolTip="Close Balloon" />
+            <Image Grid.Column="0" Width="48" Height="48" HorizontalAlignment="Right" Margin="0,5,5,0" VerticalAlignment="Top"  Source="/PithosPlus;component/Images/PithosTaskbar.png" Stretch="Fill" Opacity="0.7" ToolTip="Close Balloon" />
             <TextBlock TextWrapping="Wrap" x:Name="Status" 
                    HorizontalAlignment="Stretch"
                    VerticalAlignment="Stretch" Grid.Column="1" Margin="2,5,2,2"/>

diff --git a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
index 4fbb6af..46b1ec6 100644 (file)
--- a/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
+++ b/trunk/Pithos.Client.WPF/Shell/ShellView.xaml
@@ -5,7 +5,7 @@
         xmlns:cal="http://www.caliburnproject.org"
         x:Name="TheView" WindowStartupLocation="CenterScreen" WindowStyle="None"
         Visibility="Collapsed"
-        Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/Pithos;component/Images/PithosTaskbar.png" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters">
+        Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/PithosPlus;component/Images/PithosTaskbar.png" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters">
 
 <!--
     <Window.Background>
@@ -46,7 +46,7 @@
                             </DataTemplate>
                         </MenuItem.ItemTemplate>                        
                         <MenuItem.Icon>
-                            <Image Source="/Pithos;component/Images/Folder.ico" />
+                            <Image Source="/PithosPlus;component/Images/Folder.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem Header="Go to Account Site" x:Name="GoToSiteMenu" ItemsSource="{Binding Accounts}" Visibility="{Binding Path=HasAccounts, Converter={StaticResource BooleanToVisible}}" >
@@ -57,7 +57,7 @@
                             </DataTemplate>
                         </MenuItem.ItemTemplate>
                         <MenuItem.Icon>
-                            <Image Source="/Pithos;component/Images/Web.ico" />
+                            <Image Source="/PithosPlus;component/Images/Web.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
 
@@ -91,12 +91,12 @@
                     <Separator  />
                     <MenuItem  Header="Send Feedback" x:Name="SendFeedback" cal:Message.Attach="SendFeedback">
                         <MenuItem.Icon>
-                            <Image Source="/Pithos;component/Images/Feedback.ico" />
+                            <Image Source="/PithosPlus;component/Images/Feedback.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem  Header="About Pithos" x:Name="AboutPithos" cal:Message.Attach="AboutPithos">
                         <MenuItem.Icon>
-                            <Image Source="/Pithos;component/Images/About.ico" />
+                            <Image Source="/PithosPlus;component/Images/About.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <MenuItem  Header="Check For Upgrade" x:Name="CheckForUpgrade" cal:Message.Attach="CheckForUpgrade"/>
@@ -110,7 +110,7 @@
                             </DataTemplate>
                         </MenuItem.HeaderTemplate>
                         <MenuItem.Icon>
-                            <Image Source="/Pithos;component/Images/Web.ico" />
+                            <Image Source="/PithosPlus;component/Images/Web.ico" />
                         </MenuItem.Icon>
                     </MenuItem>
                     <Separator  />
@@ -127,7 +127,7 @@
             </tb:TaskbarIcon.TrayToolTip>
         </tb:TaskbarIcon>
 <!--
-        <Image Margin="0,0,10,5" Source="/Pithos;component/Images/logo.png" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="None"/>
+        <Image Margin="0,0,10,5" Source="/PithosPlus;component/Images/logo.png" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="None"/>
 -->
     </Grid>
 </Window>