From 8c65b7a4c760c888ed9e12120b33ed6cf172874f Mon Sep 17 00:00:00 2001 From: hustlei Date: Mon, 21 Dec 2015 21:57:06 +0800 Subject: [PATCH] v1.1 lite tag1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正问题 --- src/EpubLib/Properties/AssemblyInfo.cs | 2 +- src/EpubViewer/ChangeLog.md | 2 ++ src/EpubViewer/MainWindow.xaml | 11 +++++++---- src/EpubViewer/MainWindow.xaml.cs | 5 +++++ src/EpubViewer/Properties/AssemblyInfo.cs | 2 +- src/MordenWin/Themes/MordenWindow.xaml | 4 ++-- src/MordenWin/Themes/Styles/MordenToolBar.xaml | 15 +++++++++++++-- 7 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/EpubLib/Properties/AssemblyInfo.cs b/src/EpubLib/Properties/AssemblyInfo.cs index 30025ac..fd3a9d0 100644 --- 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 index d3e056f..ad31ee3 100644 --- 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 index e2c8ba5..c5b41ba 100644 --- a/src/EpubViewer/MainWindow.xaml +++ b/src/EpubViewer/MainWindow.xaml @@ -16,7 +16,8 @@ Visible Collapsed - #3366ff + + #003399 @@ -29,7 +30,7 @@ - + 文 件 @@ -53,7 +54,8 @@ - + @@ -94,7 +96,8 @@ - + diff --git a/src/EpubViewer/MainWindow.xaml.cs b/src/EpubViewer/MainWindow.xaml.cs index dd2d920..ee7e237 100644 --- 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 index 69db6b3..41b8584 100644 --- 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 index b28c6ee..ce376ee 100644 --- a/src/MordenWin/Themes/MordenWindow.xaml +++ b/src/MordenWin/Themes/MordenWindow.xaml @@ -40,10 +40,10 @@ VerticalAlignment="Top" Visibility="{DynamicResource Color_ImageOrColor}"> - + - + diff --git a/src/MordenWin/Themes/Styles/MordenToolBar.xaml b/src/MordenWin/Themes/Styles/MordenToolBar.xaml index 554cb98..04c0c09 100644 --- a/src/MordenWin/Themes/Styles/MordenToolBar.xaml +++ b/src/MordenWin/Themes/Styles/MordenToolBar.xaml @@ -15,7 +15,18 @@ - --> \ No newline at end of file