diff --git a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json index 93c1b5dc..63c8002c 100644 --- a/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json +++ b/src/Shared/HandyControlDemo_Shared/Data/DemoInfo.json @@ -26,7 +26,7 @@ [ "GroupBox", "GroupBoxDemoCtl", "GroupBox_16x", "" ], [ "Menu", "MenuDemoCtl", "ContextMenu_16x", "" ], [ "RichTextBox", "RichTextBoxDemoCtl", "RichTextBox_16x", "" ], - [ "FlowDocumentScrollViewer", "FlowDocumentScrollViewerDemoCtl", "WPFFlowDocument_16x", "1" ], + [ "FlowDocument", "FlowDocumentDemoCtl", "WPFFlowDocument_16x", "1" ], [ "ToolBar", "ToolBarDemoCtl", "ToolBar_16x", "" ], [ "Border", "BorderDemoCtl", "BorderElement_16x", "" ], [ "Label", "LabelDemoCtl", "Label_16x", "" ] diff --git a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems index 45a6fcf3..924533c4 100644 --- a/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems +++ b/src/Shared/HandyControlDemo_Shared/HandyControlDemo_Shared.projitems @@ -293,8 +293,8 @@ ExpanderDemoCtl.xaml - - FlowDocumentScrollViewerDemoCtl.xaml + + FlowDocumentDemoCtl.xaml GroupBoxDemoCtl.xaml @@ -806,7 +806,7 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs index 21e62118..cc031730 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.Designer.cs @@ -627,6 +627,24 @@ namespace HandyControlDemo.Properties.Langs { } } + /// + /// 查找类似 流文档 的本地化字符串。 + /// + public static string FlowDocument { + get { + return ResourceManager.GetString("FlowDocument", resourceCulture); + } + } + + /// + /// 查找类似 流文档单页视图 的本地化字符串。 + /// + public static string FlowDocumentPageViewer { + get { + return ResourceManager.GetString("FlowDocumentPageViewer", resourceCulture); + } + } + /// /// 查找类似 流文档滚动视图 的本地化字符串。 /// diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx index dbc55e2a..35963e07 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.en.resx @@ -720,4 +720,10 @@ Open glowWindow + + FlowDocument + + + FlowDocumentPageViewer + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx index 6f5aec9c..618f3d54 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fa.resx @@ -720,4 +720,10 @@ Open glowWindow + + FlowDocument + + + FlowDocumentPageViewer + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx index 51edab20..120fcaa5 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.fr.resx @@ -720,4 +720,10 @@ Open glowWindow + + FlowDocument + + + FlowDocumentPageViewer + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx index 67447dbd..ab47f5b9 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.ko-KR.resx @@ -720,4 +720,10 @@ Open glowWindow + + FlowDocument + + + FlowDocumentPageViewer + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx index a6a4fc1d..96577701 100644 --- a/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControlDemo_Shared/Properties/Langs/Lang.resx @@ -720,4 +720,10 @@ 点击打开辉光窗口 + + 流文档 + + + 流文档单页视图 + \ No newline at end of file diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml new file mode 100644 index 00000000..3d41b56d --- /dev/null +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml @@ -0,0 +1,201 @@ + + + + + + +
+ + Neptune (planet), major planet in the solar system, eighth planet + from the Sun and fourth largest in diameter. Neptune maintains an almost constant + distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune + revolves outside the orbit of Uranus and for most of its orbit moves inside the + elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, + Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit + for about 20 years, temporarily making Neptune the farthest planet from the Sun. + The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In + 1999 Pluto’s orbit carried it back outside Neptune’s orbit. +
+ + Neptune has 72 times Earth's volume... + +
+ + + + + + + + + + Neptune Stats + + + + + Mean Distance from Sun + + + 4,504,000,000 km + + + + + Mean Diameter + + + 49,532 km + + + + + Approximate Mass + + + 1.0247e26 kg + + + + + + Information from the + Encarta + web site. + + + + +
+ + + + Astronomers believe Neptune has an inner rocky core that is surrounded by a vast + ocean of water mixed with rocky material. From the inner core, this ocean extends + upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts + of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume + is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of + its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as + one of the giant or Jovian planets (so-called because they resemble Jupiter). + + +
+ + Neptune has an orbital period of ~20 years... + +
+ Mathematical theories of astronomy led to the discovery of Neptune. To account for + wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and + French astronomer Urbain Jean Joseph Leverrier independently calculated the existence + and position of a new planet in 1845 and 1846, respectively. They theorized that the + gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s + orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first + observed the planet in 1846. + +
+ + + + + + +
+ + Neptune (planet), major planet in the solar system, eighth planet + from the Sun and fourth largest in diameter. Neptune maintains an almost constant + distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune + revolves outside the orbit of Uranus and for most of its orbit moves inside the + elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, + Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit + for about 20 years, temporarily making Neptune the farthest planet from the Sun. + The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In + 1999 Pluto’s orbit carried it back outside Neptune’s orbit. +
+ + Neptune has 72 times Earth's volume... + +
+ + + + + + + + + + Neptune Stats + + + + + Mean Distance from Sun + + + 4,504,000,000 km + + + + + Mean Diameter + + + 49,532 km + + + + + Approximate Mass + + + 1.0247e26 kg + + + + + + Information from the + Encarta + web site. + + + + +
+ + + + Astronomers believe Neptune has an inner rocky core that is surrounded by a vast + ocean of water mixed with rocky material. From the inner core, this ocean extends + upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts + of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume + is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of + its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as + one of the giant or Jovian planets (so-called because they resemble Jupiter). + + +
+ + Neptune has an orbital period of ~20 years... + +
+ Mathematical theories of astronomy led to the discovery of Neptune. To account for + wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and + French astronomer Urbain Jean Joseph Leverrier independently calculated the existence + and position of a new planet in 1845 and 1846, respectively. They theorized that the + gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s + orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first + observed the planet in 1846. + +
+ + + + + + diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs similarity index 51% rename from src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs rename to src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs index 0ebfaccf..3e69b3e6 100644 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml.cs +++ b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentDemoCtl.xaml.cs @@ -1,8 +1,8 @@ namespace HandyControlDemo.UserControl { - public partial class FlowDocumentScrollViewerDemoCtl + public partial class FlowDocumentDemoCtl { - public FlowDocumentScrollViewerDemoCtl() + public FlowDocumentDemoCtl() { InitializeComponent(); } diff --git a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml b/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml deleted file mode 100644 index f6c8c9c3..00000000 --- a/src/Shared/HandyControlDemo_Shared/UserControl/Styles/FlowDocumentScrollViewerDemoCtl.xaml +++ /dev/null @@ -1,101 +0,0 @@ - - - - -
- - Neptune (planet), major planet in the solar system, eighth planet - from the Sun and fourth largest in diameter. Neptune maintains an almost constant - distance, about 4,490 million km (about 2,790 million mi), from the Sun. Neptune - revolves outside the orbit of Uranus and for most of its orbit moves inside the - elliptical path of the outermost planet Pluto (see Solar System). Every 248 years, - Pluto’s elliptical orbit brings the planet inside Neptune’s nearly circular orbit - for about 20 years, temporarily making Neptune the farthest planet from the Sun. - The last time Pluto’s orbit brought it inside Neptune’s orbit was in 1979. In - 1999 Pluto’s orbit carried it back outside Neptune’s orbit. -
- - Neptune has 72 times Earth's volume... - -
- - - - - - - - - - Neptune Stats - - - - - Mean Distance from Sun - - - 4,504,000,000 km - - - - - Mean Diameter - - - 49,532 km - - - - - Approximate Mass - - - 1.0247e26 kg - - - - - - Information from the - Encarta - web site. - - - - -
- - - - Astronomers believe Neptune has an inner rocky core that is surrounded by a vast - ocean of water mixed with rocky material. From the inner core, this ocean extends - upward until it meets a gaseous atmosphere of hydrogen, helium, and trace amounts - of methane. Neptune has four rings and 11 known moons. Even though Neptune's volume - is 72 times Earth’s volume, its mass is only 17.15 times Earth’s mass. Because of - its size, scientists classify Neptune—along with Jupiter, Saturn, and Uranus—as - one of the giant or Jovian planets (so-called because they resemble Jupiter). - - -
- - Neptune has an orbital period of ~20 years... - -
- Mathematical theories of astronomy led to the discovery of Neptune. To account for - wobbles in the orbit of the planet Uranus, British astronomer John Couch Adams and - French astronomer Urbain Jean Joseph Leverrier independently calculated the existence - and position of a new planet in 1845 and 1846, respectively. They theorized that the - gravitational attraction of this planet for Uranus was causing the wobbles in Uranus’s - orbit. Using information from Leverrier, German astronomer Johann Gottfried Galle first - observed the planet in 1846. - -
- - - - diff --git a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems index d97060b7..f1feab7c 100644 --- a/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems +++ b/src/Shared/HandyControl_Shared/HandyControl_Shared.projitems @@ -398,11 +398,11 @@ Designer MSBuild:Compile - + Designer MSBuild:Compile - + Designer MSBuild:Compile diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs index cc31cac1..377beb26 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.Designer.cs @@ -240,6 +240,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 下一页 的本地化字符串。 + /// + public static string NextPage { + get { + return ResourceManager.GetString("NextPage", resourceCulture); + } + } + /// /// 查找类似 否 的本地化字符串。 /// @@ -276,6 +285,15 @@ namespace HandyControl.Properties.Langs { } } + /// + /// 查找类似 上一页 的本地化字符串。 + /// + public static string PreviousPage { + get { + return ResourceManager.GetString("PreviousPage", resourceCulture); + } + } + /// /// 查找类似 提示 的本地化字符串。 /// diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx index 4992c864..cdffda74 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.en.resx @@ -1,76 +1,96 @@  + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + - + + @@ -89,13 +109,13 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 Confirm @@ -190,4 +210,10 @@ Zoom out + + Previous page + + + Next page + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx index 166a0b08..c2cb1f04 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fa.resx @@ -1,76 +1,96 @@  + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + - + + @@ -89,13 +109,13 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 تایید @@ -190,4 +210,10 @@ Zoom out + + Previous page + + + Next page + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx index c400a1f2..9b1b8080 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.fr.resx @@ -210,4 +210,10 @@ Zoom out + + Previous page + + + Next page + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx index 2579b146..94a94d12 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.ko-KR.resx @@ -177,6 +177,9 @@ 이 칸은 비워둘 수 없습니다 + + Next page + 아니요 @@ -189,6 +192,9 @@ PNG 사진 + + Previous page + 출력 diff --git a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx index 679dd9bb..34f459cb 100644 --- a/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx +++ b/src/Shared/HandyControl_Shared/Properties/Langs/Lang.resx @@ -1,76 +1,96 @@  + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + - + + @@ -89,13 +109,13 @@ text/microsoft-resx - 1.3 + 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 确定 @@ -190,4 +210,10 @@ 缩小 + + 下一页 + + + 上一页 + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml new file mode 100644 index 00000000..7c69c960 --- /dev/null +++ b/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentBaseStyle.xaml @@ -0,0 +1,109 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentScrollViewerBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentScrollViewerBaseStyle.xaml deleted file mode 100644 index dc226e95..00000000 --- a/src/Shared/HandyControl_Shared/Themes/Styles/Base/FlowDocumentScrollViewerBaseStyle.xaml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocument.xaml similarity index 63% rename from src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml rename to src/Shared/HandyControl_Shared/Themes/Styles/FlowDocument.xaml index eab4eb00..05cd66b0 100644 --- a/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocumentScrollViewer.xaml +++ b/src/Shared/HandyControl_Shared/Themes/Styles/FlowDocument.xaml @@ -1,9 +1,11 @@  - +