v1.1 lite tag1

修正问题
hustlei · Dec 21, 2015 · 8c65b7a · 8c65b7a
1 parent 0060518
commit 8c65b7a
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 10 deletions.
diff --git a/src/EpubLib/Properties/AssemblyInfo.cs b/src/EpubLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.1521")]
+[assembly: AssemblyVersion("1.1.0.1549")]
 [assembly: AssemblyFileVersion("1.1.0.1408")]
diff --git a/src/EpubViewer/ChangeLog.md b/src/EpubViewer/ChangeLog.md
@@ -11,6 +11,8 @@
 ### Bug Fixes
 + 解决打开格式不正确的epub文档或非epub文档时程序崩溃的问题。
 + 解决打开失败后tmp缓存文件不会自动删除的问题
++ 修正没有打开文档时点击同步按钮、新标签按钮出错的问题
++ 修正工具栏在xp操作系统里显示溢出工具的问题
 
 ## **Ver 1.1.0.1420** -- 2015.12.14
 ### New Features

diff --git a/src/EpubViewer/MainWindow.xaml b/src/EpubViewer/MainWindow.xaml
@@ -16,7 +16,8 @@
                 <ResourceDictionary>
                     <Visibility x:Key="Color_ImageOrColor" >Visible</Visibility>
                     <Visibility x:Key="Image_ImageOrColor" >Collapsed</Visibility>
-                    <Color x:Key="Win_BackGroudColor">#3366ff</Color>
+                    <!--<Color x:Key="Win_BackGroudColor">#3366ff</Color>-->
+                    <Color x:Key="Win_BackGroudColor">#003399</Color>
                 </ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
@@ -29,7 +30,7 @@
         <local:Waiting HorizontalAlignment="Center" VerticalAlignment="Center" Background="Transparent"
                       x:Name="waiting" Panel.ZIndex="9999" Visibility="Collapsed"></local:Waiting>
         <DockPanel LastChildFill="True">
-            <Menu Grid.ColumnSpan="3" Background="#1ED1D1D1" DockPanel.Dock="Top">
+            <Menu Background="Transparent" DockPanel.Dock="Top">
                 <MenuItem BorderBrush="#33C8C8C8" BorderThickness="1">
                     <MenuItem.Header>
                         <TextBlock Margin="8,1" TextAlignment="Center">文  件</TextBlock>
@@ -53,7 +54,8 @@
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="28"/>
                 </Grid.ColumnDefinitions>
-                <ToolBar MinHeight="25" MaxHeight="30" IsOverflowOpen="False" BorderBrush="#33C8C8C8" BorderThickness="0,0,0,1" Background="Transparent">
+                <ToolBar MinHeight="25" MaxHeight="30" IsOverflowOpen="False" BorderBrush="#33C8C8C8" BorderThickness="0,0,0,1"
+                         Background="Transparent" Style="{StaticResource MordenToolBar}">
                     <Button Height="25" Width="25" Margin="2,0" Click="Open_Click">
                         <Image Source="img/open.png"/>
                     </Button>
@@ -94,7 +96,8 @@
                         <Image Source="img/newTab.png"/>
                     </Button>
                 </ToolBar>
-                <ToolBar Grid.Column="1"  OverflowMode="Never" Background="Transparent" IsOverflowOpen="False">
+                <ToolBar Grid.Column="1"  OverflowMode="Never" Background="Transparent" IsOverflowOpen="False"
+                          Style="{StaticResource MordenToolBar}">
                     <Button Height="25" Width="25" Click="Info_Click">
                         <Image Source="img/Info.png"/>
                     </Button>

diff --git a/src/EpubViewer/MainWindow.xaml.cs b/src/EpubViewer/MainWindow.xaml.cs
@@ -224,6 +224,8 @@ private void Forward_Click(object sender, RoutedEventArgs e)
         }
         private void Sync_Click(object sender, RoutedEventArgs e)
         {
+            if (epubList.Count < 1)
+                return;
             string url = contentItem.browser.Url.OriginalString;
             foreach (System.Windows.Forms.TreeNode t in treeView.Nodes)
             {
@@ -281,6 +283,8 @@ private void ZoomOut_Click(object sender, RoutedEventArgs e)
         }
         private void NewTab_Click(object sender, RoutedEventArgs e)
         {
+            if (epubList.Count < 1)
+                return;
             contentItem = new ContentItem();
             if (epubList[0].IsSpine)
                 contentItem.UseDocumentTitle = true;
@@ -337,6 +341,7 @@ protected override void OnClosed(EventArgs e)
         private void searchResult_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             contentItem.browser.Url = new Uri(((System.Windows.Forms.TreeNode)searchResult.SelectedItem).Name);
+            contentItem.Header = ((System.Windows.Forms.TreeNode) searchResult.SelectedItem).Text;
         }
 
         private void searchButton_Click(object sender, RoutedEventArgs e)

diff --git a/src/EpubViewer/Properties/AssemblyInfo.cs b/src/EpubViewer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: 
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.1.0.1505")]
+[assembly: AssemblyVersion("1.1.0.1533")]
 [assembly: AssemblyFileVersion("1.1.0.1408")]
diff --git a/src/MordenWin/Themes/MordenWindow.xaml b/src/MordenWin/Themes/MordenWindow.xaml
@@ -40,10 +40,10 @@
                                                VerticalAlignment="Top"
                                                Visibility="{DynamicResource Color_ImageOrColor}">
                                         <Rectangle.Fill>
-                                            <LinearGradientBrush StartPoint="0, 0" EndPoint="0, 1" Opacity=".1">
+                                            <LinearGradientBrush StartPoint="0, 0" EndPoint="0, 1" Opacity=".20">
                                                 <GradientStop Offset="0" Color="{DynamicResource Win_BackGroudColor}" />
                                                 <GradientStop Offset=".3" Color="{DynamicResource Win_BackGroudColor}" />
-                                                <GradientStop Offset="1" Color="Transparent" />
+                                                <GradientStop Offset="1" Color="#33FFFFFF" />
                                             </LinearGradientBrush>
                                         </Rectangle.Fill>
                                     </Rectangle>

diff --git a/src/MordenWin/Themes/Styles/MordenToolBar.xaml b/src/MordenWin/Themes/Styles/MordenToolBar.xaml
@@ -15,7 +15,18 @@
         </Setter>
     </Style>
 
-    <Style x:Key="{x:Type ToolBar}" TargetType="{x:Type ToolBar}"
-           BasedOn="{StaticResource MordenToolBar}"/>
+    <Style x:Key="{x:Type ToolBar}" TargetType="{x:Type ToolBar}" BasedOn="{StaticResource MordenToolBar}"/>
 
 </ResourceDictionary>
+<!--<Style x:Key="{x:Type ToolBar}" TargetType="{x:Type ToolBar}">
+    <Setter Property="OverridesDefaultStyle" Value="true"/>
+    <Setter Property="Template">
+        <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToolBar}">
+                <Border CornerRadius="0" BorderThickness="0,1" Background="Transparent" BorderBrush="LightGray">
+                    <ToolBarPanel IsItemsHost="true" Margin="0,1,2,2"/>
+                </Border>
+            </ControlTemplate>
+        </Setter.Value>
+    </Setter>
+</Style>-->