Taskbar menu message text limited to a single line
authorPanagiotis Kanavos <pkanavos@gmail.com>
Wed, 7 Mar 2012 17:33:22 +0000 (19:33 +0200)
committerPanagiotis Kanavos <pkanavos@gmail.com>
Wed, 7 Mar 2012 17:33:45 +0000 (19:33 +0200)
trunk/NetSparkle/NetSparkle2010.csproj
trunk/Pithos.Client.WPF/Converters/SingleLineConverter.cs [new file with mode: 0644]
trunk/Pithos.Client.WPF/Pithos.Client.WPF.csproj
trunk/Pithos.Client.WPF/Preferences/PreferencesView.xaml
trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
trunk/Pithos.Client.WPF/Shell/ShellView.xaml
trunk/Pithos.Setup.x64/Pithos.Setup.x64.vdproj
trunk/Pithos.Setup.x86/Pithos.Setup.x86.vdproj

index 3f858c7..3503aa8 100644 (file)
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/trunk/Pithos.Client.WPF/Converters/SingleLineConverter.cs b/trunk/Pithos.Client.WPF/Converters/SingleLineConverter.cs
new file mode 100644 (file)
index 0000000..a3c30e4
--- /dev/null
@@ -0,0 +1,72 @@
+#region
+/* -----------------------------------------------------------------------
+ * <copyright file="SingleLineConverter.cs" company="GRNet">
+ * 
+ * Copyright 2011-2012 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ * </copyright>
+ * -----------------------------------------------------------------------
+ */
+#endregion
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Pithos.Client.WPF.Converters
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Text;
+
+    /// <summary>
+    /// Returns only the first line of a string
+    /// </summary>
+    public class SingleLineConverter:IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is string)
+            {
+                var lines = ((string) value).Split(new []{"\r\n"},StringSplitOptions.RemoveEmptyEntries);
+                return lines.Length > 0 ? lines[0] : value;
+            }
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
index 79af7bb..f9d9689 100644 (file)
     <Compile Include="Converters\DummyConverter.cs" />
     <Compile Include="Converters\EmptyToVisibilityConverter.cs" />
     <Compile Include="Converters\NullToVisibilityConverter.cs" />
+    <Compile Include="Converters\SingleLineConverter.cs" />
     <Compile Include="FileProperties\ContainerPolicy.cs" />
     <Compile Include="FileProperties\NewContainerView.xaml.cs">
       <DependentUpon>NewContainerView.xaml</DependentUpon>
index ec04acb..15779f8 100644 (file)
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="Auto"/>
                                 </Grid.ColumnDefinitions>
-                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" Grid.Column="0" IsEnabled="False"/>
+                                <TextBox  Name="CurrentAccount_RootPath" Margin="5" HorizontalAlignment="Stretch" Grid.Column="0" IsReadOnly="True" ToolTip="{Binding CurrentAccount.RootPath}"/>                                    
+                                
                                 <Button Name="MoveAccountFolder" Content="Move ..." Width="60" Height="30" Grid.Column="1" />
                             </Grid>
                             <CheckBox Name="CurrentAccount_IsActive" Content="Account is Active" Grid.Column="1" Grid.Row="4" Margin="5"/>
index 21e142f..5ae6b34 100644 (file)
@@ -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.20305.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20305.0")]
+[assembly: AssemblyVersion("0.7.20306.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20306.0")]
index da421d5..02fa881 100644 (file)
@@ -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.Client.WPF;component/Images/PithosTaskbar.png">
+        Width="700" Height="200" SizeToContent="Width" WindowState="Minimized" Icon="/Pithos.Client.WPF;component/Images/PithosTaskbar.png" xmlns:my="clr-namespace:Pithos.Client.WPF.Converters">
 
 <!--
     <Window.Background>
@@ -21,6 +21,7 @@
                 <ResourceDictionary Source="../PithosStyles.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <BooleanToVisibilityConverter x:Key="BooleanToVisible" />
+            <my:SingleLineConverter x:Key="SingleConverter" />
         </ResourceDictionary>
     </Window.Resources>
     <Grid>
                         </MenuItem.ItemTemplate>
                     </MenuItem>
                     <Separator  />
-                    <MenuItem  x:Name="StatusMessage">
-                        <MenuItem.Header>
-                            <TextBlock Text="{Binding StatusMessage}" TextWrapping="WrapWithOverflow" Width="160" />
-                        </MenuItem.Header>
-                    </MenuItem>
+                    <MenuItem  x:Name="StatusMessage" Header="{Binding Path=StatusMessage, Converter={StaticResource SingleConverter}}" MaxWidth="200" />
                     <Separator  />
                     <MenuItem  Header="{Binding PauseSyncCaption}" x:Name="ToggleSynching" cal:Message.Attach="ToggleSynching"  />
                     <Separator  />
index d4716f3..89b741a 100644 (file)
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
         "MsmSig" = "8:_UNDEFINED"
         }
         }
         "Entry"
         {
+        "MsmKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "OwnerKey" = "8:_8A9B95E5C0E945ECA7F21580A0D088D9"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
         "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "MsmSig" = "8:_UNDEFINED"
         }
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E79B572E4B64318A4A691D5E4B4BF3F5"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppLimit.NetSparkle.Net40, Version=1.0.22.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E79B572E4B64318A4A691D5E4B4BF3F5"
+                    {
+                    "Name" = "8:AppLimit.NetSparkle.Net40.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppLimit.NetSparkle.Net40.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F472AA6700476700D62AABE8262628BF"
             {
             "AssemblyRegister" = "3:1"
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
-        "ProductCode" = "8:{F0D4CF43-1BE4-4B68-A247-781E31CF37B4}"
-        "PackageCode" = "8:{D8D45676-4CC0-40A9-B6E5-0F58306DF8E7}"
+        "ProductCode" = "8:{B83227E8-A064-475F-9BC8-38BBFBC55AB8}"
+        "PackageCode" = "8:{DD9A6ECF-274E-41F9-9B5E-00B77D45DF24}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.7.20305"
+        "ProductVersion" = "8:0.7.20306"
         "Manufacturer" = "8:GRNET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client"
index 284c487..e8a4ab3 100644 (file)
         "Entry"
         {
         "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
+        "OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_586310F986FB0DB4F49D3EAFBD87760C"
         "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
         "MsmSig" = "8:_UNDEFINED"
         }
         }
         "Entry"
         {
+        "MsmKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "OwnerKey" = "8:_AA1756E83B8A428E9A235CF626FD83B2"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_F472AA6700476700D62AABE8262628BF"
         "OwnerKey" = "8:_4C5B93BC82FE5E63E01458A8DA46B4D6"
         "MsmSig" = "8:_UNDEFINED"
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
+        "OwnerKey" = "8:_E79B572E4B64318A4A691D5E4B4BF3F5"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
+        "MsmKey" = "8:_UNDEFINED"
         "OwnerKey" = "8:_626ECD9012C5D7BD4388B6BE07F5107D"
         "MsmSig" = "8:_UNDEFINED"
         }
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E79B572E4B64318A4A691D5E4B4BF3F5"
+            {
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:AppLimit.NetSparkle.Net40, Version=1.0.22.0, Culture=neutral, PublicKeyToken=2cc55badaa91f4de, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_E79B572E4B64318A4A691D5E4B4BF3F5"
+                    {
+                    "Name" = "8:AppLimit.NetSparkle.Net40.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:AppLimit.NetSparkle.Net40.dll"
+            "TargetName" = "8:"
+            "Tag" = "8:"
+            "Folder" = "8:_FA3E4362540D4C76A5914763C178A3BD"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
+            "IsolateTo" = "8:"
+            }
             "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_F472AA6700476700D62AABE8262628BF"
             {
             "AssemblyRegister" = "3:1"
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Pithos"
-        "ProductCode" = "8:{ABBA3B74-FF31-462C-800D-D59AED5562FB}"
-        "PackageCode" = "8:{4BCE4514-9393-4BCB-B76C-5BC126DBD9D7}"
+        "ProductCode" = "8:{EB522759-1C60-4F3E-8B4A-4CE50A7FD0D7}"
+        "PackageCode" = "8:{FF62B781-2B1F-42DC-AF9D-DF8F98A74D95}"
         "UpgradeCode" = "8:{205365D1-28AA-4322-A46C-FCB37502C6EF}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:0.7.20305"
+        "ProductVersion" = "8:0.7.20306"
         "Manufacturer" = "8:GRNET"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:http://code.grnet.gr/projects/pithos-ms-client"