Imported web css properties to styles xml

New Tab
Updated Installer to wipe old databases.

Signed-off-by: George Pantazis <gpant@noc.grnet.gr>

diff --git a/trunk/Pithos.Client.WPF/Images/Plugins.png b/trunk/Pithos.Client.WPF/Images/Plugins.png
new file mode 100644 (file)
index 0000000..6368cca
Binary files /dev/null and b/trunk/Pithos.Client.WPF/Images/Plugins.png differ

diff --git a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
index 5323b86..dca77ef 100644 (file)
--- a/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
+++ b/trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
@@ -636,6 +636,9 @@
   <ItemGroup>
     <Resource Include="Images\Play.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Plugins.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/trunk/Pithos.Client.WPF/PithosStyles.xaml b/trunk/Pithos.Client.WPF/PithosStyles.xaml
index 7751f73..d8df740 100644 (file)
--- a/trunk/Pithos.Client.WPF/PithosStyles.xaml
+++ b/trunk/Pithos.Client.WPF/PithosStyles.xaml
@@ -6,12 +6,28 @@
         <Setter Property="Height" Value="25"/>
         <Setter Property="Width" Value="75" />
         <Setter Property="Padding" Value="3"/>
+        <Setter Property="Background" Value="White" />
+        <Setter Property="BorderBrush" Value="White" />
+    </Style>
+    
+    <Style TargetType="Grid" >
+        <Setter Property="Background" Value="White" />
     </Style>
     
     <Style TargetType="Window" >
-        <Setter Property="Background" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>
+        <!-- <Setter Property="Background" Value="{StaticResource {x:Static SystemColors.ControlBrushKey}}"/>-->
+        <Setter Property="Background" Value="White"/>
     </Style>
     
+    <Style TargetType="TabControl" >
+        <Setter Property="Background" Value="White" />
+        <Setter Property="BorderBrush" Value="White" />
+    </Style>
+
+    <Style TargetType="{x:Type TabItem}">
+        <Setter Property="Background" Value="White" />
+    </Style>
+
     <Style x:Key="MediumButton" TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
         <Setter Property="Width" Value="75"/>
         <Setter Property="Height" Value="25"/>

diff --git a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
index f36e707..0c2a608 100644 (file)
--- a/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
+++ b/trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
@@ -9,8 +9,10 @@
         ShowInTaskbar="true"
         WindowStartupLocation="CenterScreen"
         Icon="/PithosPlus;component/Images/PithosTaskbar.png"
-        Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}">
+        WindowStyle="None"
+        Background="White">
         
+        <!-- Background="{StaticResource {x:Static SystemColors.ControlBrushKey}}"> -->
     <Window.Resources>
         <ResourceDictionary>
         <ResourceDictionary.MergedDictionaries>
@@ -36,7 +38,7 @@
         </Grid.RowDefinitions>
 
        
-        <TabControl Grid.Row="0" x:Name="Tabs" >  
+        <TabControl Grid.Row="0" x:Name="Tabs">  
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="GeneralTab">
                 <TabItem.Header>
                     <StackPanel>
@@ -144,6 +146,14 @@
                     
                 </Grid>
             </TabItem>
+            <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" x:Name="PluginTab" IsSelected="{Binding AccountTabSelected,Mode=OneWay}">
+                <TabItem.Header>
+                    <StackPanel>
+                        <Image Source="/PithosPlus;component/Images/Plugins.png" Stretch="Uniform" Height="32"/>
+                        <TextBlock Text="Plugins"/>
+                    </StackPanel>
+                </TabItem.Header>
+                </TabItem>
             <TabItem VerticalContentAlignment="Stretch" HorizontalContentAlignment="Stretch" Visibility="Collapsed" x:Name="RateTab">
                 <TabItem.Header>
                     <StackPanel>

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 01f0e87..7ed836d 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.20621.2")]
-[assembly: AssemblyFileVersionAttribute("0.7.20621.2")]
+[assembly: AssemblyVersion("0.7.20622.3")]
+[assembly: AssemblyFileVersionAttribute("0.7.20622.3")]

diff --git a/trunk/Pithos.Installer/PithosPlus.iss b/trunk/Pithos.Installer/PithosPlus.iss
index 9220ae0..3e555a1 100644 (file)
--- a/trunk/Pithos.Installer/PithosPlus.iss
+++ b/trunk/Pithos.Installer/PithosPlus.iss
@@ -313,7 +313,7 @@ dotNET40Missing: Boolean;
       UsagePage: TOutputMsgWizardPage;\r
       Wz1, Wz2 : TOutputMsgWizardPage;\r
          ChkBox: TCheckBox;\r
-        LicenseID: Integer;      \r
+      LicenseID: Integer;      \r
 \r
 // IssFindModule called on in/uninstall\r
 ///function IssFindModule(hWnd: Integer; Modulename: String; Language: PAnsiChar; Silent: Boolean; CanIgnore: Boolean ): Integer;\r
@@ -417,6 +417,9 @@ begin
       dotNET40Missing := True;\r
     \r
   Result := True;\r
+\r
+  //Remove Old Database\r
+  DeleteFile(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\pithos.db');\r
 end;\r
 \r
 procedure DeinitializeSetup();\r
@@ -458,7 +461,6 @@ begin
           begin            \r
             DelTree(ExpandConstant('{localappdata}')+'\GRNET\PithosPlus.exe_StrongName_1vmy3hmn3mscykecwcnmpvno4d4mqi52',true,true,true);     \r
             DelTree(ExpandConstant('{localappdata}')+'\GRNET\PITHOS\',true,true,true);\r
-            \r
           End\r
         else\r
           MsgBox ('Settings will not be removed', mbInformation, MB_OK);        \r