xhkjedu
/
xhwkclient
İzle 8
Yıldızla 0
Çatalla 0
Kod Sorunlar 0 Değişiklik İstekleri 0 Sürümler 3 Wiki Aktivite
Kaynağa Gözat

修改打印

tags/3.0.0
张剑 3 yıl önce
ebeveyn
62181adfae
işleme
0e1ddb922c
6 değiştirilmiş dosya ile 443 ekleme ve 281 silme
Görünümü Böl Farklılık Durumunu Göster
  1. 2
    2
      XHWK.WKTool/App.config
  2. BIN
      XHWK.WKTool/Images/shuoming.png
  3. 280
    153
      XHWK.WKTool/Skin/SkinDictionary_White.xaml
  4. 151
    112
      XHWK.WKTool/XHMicroLessonSystemWindow.xaml
  5. 7
    13
      XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs
  6. 3
    1
      XHWK.WKTool/XHWK.WKTool.csproj

+ 2
- 2
XHWK.WKTool/App.config Dosyayı Görüntüle 

@@ -9,8 +9,8 @@
9 9 
     <!--参数是否加密 0不加密 1加密-->
10 10 
     <add key="IsParameterEncryption" value="0" />
11 11 
     <!--版本号-->
12 
-    <add key="VersionCode" value="82" />
13 
-    <add key="VersionName" value="2.6.2" />
12 
+    <add key="VersionCode" value="83" />
13 
+    <add key="VersionName" value="2.6.3" />
14 14 
     <!--皮肤样式 0白 1蓝 2黑色 -->
15 15 
     <add key="SkinStyle" value="0" />
16 16 
     <!--是否输出视频记录日志：0否-->

BIN
XHWK.WKTool/Images/shuoming.png Dosyayı Görüntüle


+ 280
- 153
XHWK.WKTool/Skin/SkinDictionary_White.xaml Dosyayı Görüntüle 

@@ -1,326 +1,453 @@
1 
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2 
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
1 
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
3 2
4 
-    <!--Title背景-->
5 
-    <ImageBrush x:Key="BackTitle"/>
6 
-    <!--工具栏背景-->
7 
-    <ImageBrush x:Key="BackTool"/>
8 
-    <!--笔状态图标-->
9 
-    <Style x:Key="TitlePenState"  TargetType="{x:Type Image}">
10 
-        <Setter Property="Source" Value="/SkinImages/White/HM_PenState.png"/>
3 
+    <!--  Title背景  -->
4 
+    <ImageBrush x:Key="BackTitle" />
5 
+    <!--  工具栏背景  -->
6 
+    <ImageBrush x:Key="BackTool" />
7 
+    <!--  笔状态图标  -->
8 
+    <Style x:Key="TitlePenState" TargetType="{x:Type Image}">
9 
+        <Setter Property="Source" Value="/SkinImages/White/HM_PenState.png" />
11 10 
     </Style>
12 
-    <!--笔状态颜色-->
13 
-    <Style x:Key="PenStateColor"  TargetType="TextBlock">
14 
-        <Setter Property="Foreground" Value="#FF298DF1"/>
11 
+    <!--  笔状态颜色  -->
12 
+    <Style x:Key="PenStateColor" TargetType="TextBlock">
13 
+        <Setter Property="Foreground" Value="#FF298DF1" />
15 14 
     </Style>
16 
-    <!--时间图标-->
17 
-    <Style x:Key="TitleLZTimeImg"  TargetType="{x:Type Image}">
18 
-        <Setter Property="Source" Value="/SkinImages/White/HM_LZIMG.png"/>
15 
+    <!--  时间图标  -->
16 
+    <Style x:Key="TitleLZTimeImg" TargetType="{x:Type Image}">
17 
+        <Setter Property="Source" Value="/SkinImages/White/HM_LZIMG.png" />
19 18 
     </Style>
20 
-    <!--LOGO颜色-->
21 
-    <Style x:Key="LogoColor"  TargetType="TextBlock">
22 
-        <Setter Property="Foreground" Value="#FF298DF1"/>
19 
+    <!--  LOGO颜色  -->
20 
+    <Style x:Key="LogoColor" TargetType="TextBlock">
21 
+        <Setter Property="Foreground" Value="#FF298DF1" />
23 22 
     </Style>
24 
-    <!--消息颜色-->
25 
-    <Style x:Key="TxbMesColor"  TargetType="TextBlock">
26 
-        <Setter Property="Foreground" Value="#FF000000"/>
23 
+    <!--  消息颜色  -->
24 
+    <Style x:Key="TxbMesColor" TargetType="TextBlock">
25 
+        <Setter Property="Foreground" Value="#FF000000" />
27 26 
     </Style>
28 
-    <!--登陆颜色-->
29 
-    <Style x:Key="LoginTypeColor"  TargetType="TextBlock">
30 
-        <Setter Property="Foreground" Value="#FF000000"/>
27 
+    <!--  登陆颜色  -->
28 
+    <Style x:Key="LoginTypeColor" TargetType="TextBlock">
29 
+        <Setter Property="Foreground" Value="#FF000000" />
31 30 
     </Style>
32 
-    <!--关闭按钮-->
31 
+    <!--  关闭按钮  -->
33 32 
     <ControlTemplate x:Key="SkinBtnClose" TargetType="{x:Type Button}">
34 33 
         <Grid>
35 34 
             <Grid.ColumnDefinitions>
36 
-                <ColumnDefinition Width="23*"/>
37 
-                <ColumnDefinition Width="72*"/>
35 
+                <ColumnDefinition Width="23*" />
36 
+                <ColumnDefinition Width="72*" />
38 37 
             </Grid.ColumnDefinitions>
39 
-            <Image Grid.ColumnSpan="2" x:Name="ImgSetUp" Source="/SkinImages/White/HM_Close.png"/>
40 
-            <Label Grid.Column="1" x:Name="Word" Content="关闭程序" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
38 
+            <Image
39 
+                x:Name="ImgSetUp"
40 
+                Grid.ColumnSpan="2"
41 
+                Source="/SkinImages/White/HM_Close.png" />
42 
+            <Label
43 
+                x:Name="Word"
44 
+                Grid.Column="1"
45 
+                HorizontalAlignment="Center"
46 
+                VerticalAlignment="Center"
47 
+                Content="关闭程序"
48 
+                FontSize="{TemplateBinding FontSize}"
49 
+                Foreground="#FF333333" />
41 50 
         </Grid>
42 51 
         <ControlTemplate.Triggers>
43 52 
             <Trigger Property="IsMouseOver" Value="True">
44 
-                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/HM_Close_MI.png"/>
45 
-                <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF"/>
53 
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/HM_Close_MI.png" />
54 
+                <Setter TargetName="Word" Property="Foreground" Value="#FF3F6FFF" />
46 55 
             </Trigger>
47 56 
         </ControlTemplate.Triggers>
48 57 
     </ControlTemplate>
49 
-    <!--录制按钮-->
58 
+    <!--  录制按钮  -->
50 59 
     <ControlTemplate x:Key="SkinBtnRecord" TargetType="{x:Type Button}">
51 60 
         <Grid>
52 61 
             <Grid.ColumnDefinitions>
53 
-                <ColumnDefinition Width="23*"/>
54 
-                <ColumnDefinition Width="72*"/>
62 
+                <ColumnDefinition Width="23*" />
63 
+                <ColumnDefinition Width="72*" />
55 64 
             </Grid.ColumnDefinitions>
56 
-            <Image Grid.ColumnSpan="2" x:Name="ImgRecord" Source="/SkinImages/White/Toolbar_LZ.png"/>
57 
-            <Label Grid.Column="1" x:Name="Word" Content="开始录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
65 
+            <Image
66 
+                x:Name="ImgRecord"
67 
+                Grid.ColumnSpan="2"
68 
+                Source="/SkinImages/White/Toolbar_LZ.png" />
69 
+            <Label
70 
+                x:Name="Word"
71 
+                Grid.Column="1"
72 
+                HorizontalAlignment="Center"
73 
+                VerticalAlignment="Center"
74 
+                Content="开始录制"
75 
+                FontSize="{TemplateBinding FontSize}"
76 
+                Foreground="#FF3F6FFF" />
58 77 
         </Grid>
59 78 
         <ControlTemplate.Triggers>
60 79 
             <Trigger Property="IsMouseOver" Value="True">
61 
-                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png"/>
62 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
80 
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png" />
81 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
63 82 
             </Trigger>
64 83 
             <Trigger Property="IsPressed" Value="True">
65 
-                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png"/>
66 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
84 
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_MI.png" />
85 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
67 86 
             </Trigger>
68 87 
             <Trigger Property="IsEnabled" Value="False">
69 
-                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_N.png"/>
70 
-                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
88 
+                <Setter TargetName="ImgRecord" Property="Source" Value="/SkinImages/White/Toolbar_LZ_N.png" />
89 
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999" />
71 90 
             </Trigger>
72 91 
         </ControlTemplate.Triggers>
73 92 
     </ControlTemplate>
74 
-    <!--录制暂停按钮-->
93 
+    <!--  录制暂停按钮  -->
75 94 
     <ControlTemplate x:Key="SkinBtnRecordSuspend" TargetType="{x:Type Button}">
76 95 
         <Grid>
77 96 
             <Grid.ColumnDefinitions>
78 
-                <ColumnDefinition Width="23*"/>
79 
-                <ColumnDefinition Width="72*"/>
97 
+                <ColumnDefinition Width="23*" />
98 
+                <ColumnDefinition Width="72*" />
80 99 
             </Grid.ColumnDefinitions>
81 
-            <Image Grid.ColumnSpan="2" x:Name="ImgRecordSuspend" Source="/SkinImages/White/Toolbar_LZZT.png"/>
82 
-            <Label Grid.Column="1" x:Name="Word" Content="录制暂停" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
100 
+            <Image
101 
+                x:Name="ImgRecordSuspend"
102 
+                Grid.ColumnSpan="2"
103 
+                Source="/SkinImages/White/Toolbar_LZZT.png" />
104 
+            <Label
105 
+                x:Name="Word"
106 
+                Grid.Column="1"
107 
+                HorizontalAlignment="Center"
108 
+                VerticalAlignment="Center"
109 
+                Content="录制暂停"
110 
+                FontSize="{TemplateBinding FontSize}"
111 
+                Foreground="#FF3F6FFF" />
83 112 
         </Grid>
84 113 
         <ControlTemplate.Triggers>
85 114 
             <Trigger Property="IsMouseOver" Value="True">
86 
-                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png"/>
87 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
115 
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png" />
116 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
88 117 
             </Trigger>
89 118 
             <Trigger Property="IsPressed" Value="True">
90 
-                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png"/>
91 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
119 
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_MI.png" />
120 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
92 121 
             </Trigger>
93 122 
             <Trigger Property="IsEnabled" Value="False">
94 
-                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_N.png"/>
95 
-                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
123 
+                <Setter TargetName="ImgRecordSuspend" Property="Source" Value="/SkinImages/White/Toolbar_LZZT_N.png" />
124 
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999" />
96 125 
             </Trigger>
97 126 
         </ControlTemplate.Triggers>
98 127 
     </ControlTemplate>
99 
-    <!--录制保存按钮-->
128 
+    <!--  录制保存按钮  -->
100 129 
     <ControlTemplate x:Key="SkinBtnRecordStop" TargetType="{x:Type Button}">
101 130 
         <Grid>
102 131 
             <Grid.ColumnDefinitions>
103 
-                <ColumnDefinition Width="23*"/>
104 
-                <ColumnDefinition Width="72*"/>
132 
+                <ColumnDefinition Width="23*" />
133 
+                <ColumnDefinition Width="72*" />
105 134 
             </Grid.ColumnDefinitions>
106 
-            <Image Grid.ColumnSpan="2" x:Name="ImgRecordStop" Source="/SkinImages/White/Toolbar_Save.png"/>
107 
-            <Label Grid.Column="1" x:Name="Word" Content="保存录制" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF3F6FFF"/>
135 
+            <Image
136 
+                x:Name="ImgRecordStop"
137 
+                Grid.ColumnSpan="2"
138 
+                Source="/SkinImages/White/Toolbar_Save.png" />
139 
+            <Label
140 
+                x:Name="Word"
141 
+                Grid.Column="1"
142 
+                HorizontalAlignment="Center"
143 
+                VerticalAlignment="Center"
144 
+                Content="保存录制"
145 
+                FontSize="{TemplateBinding FontSize}"
146 
+                Foreground="#FF3F6FFF" />
108 147 
         </Grid>
109 148 
         <ControlTemplate.Triggers>
110 149 
             <Trigger Property="IsMouseOver" Value="True">
111 
-                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png"/>
112 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
150 
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png" />
151 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
113 152 
             </Trigger>
114 153 
             <Trigger Property="IsPressed" Value="True">
115 
-                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png"/>
116 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA"/>
154 
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_MI.png" />
155 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFA1C0FA" />
117 156 
             </Trigger>
118 157 
             <Trigger Property="IsEnabled" Value="False">
119 
-                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_N.png"/>
120 
-                <Setter TargetName="Word" Property="Foreground" Value="#FF999999"/>
158 
+                <Setter TargetName="ImgRecordStop" Property="Source" Value="/SkinImages/White/Toolbar_Save_N.png" />
159 
+                <Setter TargetName="Word" Property="Foreground" Value="#FF999999" />
121 160 
             </Trigger>
122 161 
         </ControlTemplate.Triggers>
123 162 
     </ControlTemplate>
124 163
125 
-    <!--录屏按钮-->
164 
+    <!--  录屏按钮  -->
126 165 
     <ControlTemplate x:Key="SkinBtnScreenRecording" TargetType="{x:Type Button}">
127 166 
         <Grid>
128 167 
             <Grid.ColumnDefinitions>
129 
-                <ColumnDefinition Width="100*"/>
130 
-                <ColumnDefinition Width="60*"/>
131 
-                <ColumnDefinition Width="40*"/>
168 
+                <ColumnDefinition Width="100*" />
169 
+                <ColumnDefinition Width="60*" />
170 
+                <ColumnDefinition Width="40*" />
132 171 
             </Grid.ColumnDefinitions>
133 
-            <Image Grid.ColumnSpan="3" x:Name="ImgScreenRecording" Source="/SkinImages/White/Toolbar_LP.png" Stretch="Fill" />
134 
-            <Label Grid.Column="1" x:Name="Word" Content="录屏" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
172 
+            <Image
173 
+                x:Name="ImgScreenRecording"
174 
+                Grid.ColumnSpan="3"
175 
+                Source="/SkinImages/White/Toolbar_LP.png"
176 
+                Stretch="Fill" />
177 
+            <Label
178 
+                x:Name="Word"
179 
+                Grid.Column="1"
180 
+                HorizontalAlignment="Center"
181 
+                VerticalAlignment="Center"
182 
+                Content="录屏"
183 
+                FontSize="{TemplateBinding FontSize}"
184 
+                Foreground="#FF333333" />
135 185 
         </Grid>
136 186 
         <ControlTemplate.Triggers>
137 187 
             <Trigger Property="IsMouseOver" Value="True">
138 
-                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png"/>
188 
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_MI.png" />
139 189 
             </Trigger>
140 190 
             <Trigger Property="IsPressed" Value="True">
141 
-                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png"/>
142 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
191 
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_CL.png" />
192 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
143 193 
             </Trigger>
144 194 
             <Trigger Property="IsEnabled" Value="False">
145 
-                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png"/>
146 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
195 
+                <Setter TargetName="ImgScreenRecording" Property="Source" Value="/SkinImages/White/Toolbar_LP_N.png" />
196 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
147 197 
             </Trigger>
148 198 
         </ControlTemplate.Triggers>
149 199 
     </ControlTemplate>
150 
-    <!--截图按钮-->
200 
+    <!--  截图按钮  -->
151 201 
     <ControlTemplate x:Key="SkinBtnScreenshot" TargetType="{x:Type Button}">
152 202 
         <Grid>
153 203 
             <Grid.ColumnDefinitions>
154 
-                <ColumnDefinition Width="100*"/>
155 
-                <ColumnDefinition Width="60*"/>
156 
-                <ColumnDefinition Width="40*"/>
204 
+                <ColumnDefinition Width="100*" />
205 
+                <ColumnDefinition Width="60*" />
206 
+                <ColumnDefinition Width="40*" />
157 207 
             </Grid.ColumnDefinitions>
158 
-            <Image Grid.ColumnSpan="3" x:Name="ImgScreenshot" Source="/SkinImages/White/Toolbar_JT.png" Stretch="Fill"/>
159 
-            <Label Grid.Column="1" x:Name="Word" Content="截图" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
208 
+            <Image
209 
+                x:Name="ImgScreenshot"
210 
+                Grid.ColumnSpan="3"
211 
+                Source="/SkinImages/White/Toolbar_JT.png"
212 
+                Stretch="Fill" />
213 
+            <Label
214 
+                x:Name="Word"
215 
+                Grid.Column="1"
216 
+                HorizontalAlignment="Center"
217 
+                VerticalAlignment="Center"
218 
+                Content="截图"
219 
+                FontSize="{TemplateBinding FontSize}"
220 
+                Foreground="#FF333333" />
160 221 
         </Grid>
161 222 
         <ControlTemplate.Triggers>
162 223 
             <Trigger Property="IsMouseOver" Value="True">
163 
-                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_MI.png"/>
224 
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_MI.png" />
164 225 
             </Trigger>
165 226 
             <Trigger Property="IsPressed" Value="True">
166 
-                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_CL.png"/>
167 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
227 
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_CL.png" />
228 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
168 229 
             </Trigger>
169 230 
             <Trigger Property="IsEnabled" Value="False">
170 
-                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_N.png"/>
171 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
231 
+                <Setter TargetName="ImgScreenshot" Property="Source" Value="/SkinImages/White/Toolbar_JT_N.png" />
232 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
172 233 
             </Trigger>
173 234 
         </ControlTemplate.Triggers>
174 235 
     </ControlTemplate>
175 
-    <!--导入按钮-->
236 
+    <!--  导入按钮  -->
176 237 
     <ControlTemplate x:Key="SkinBtnImport" TargetType="{x:Type Button}">
177 238 
         <Grid>
178 239 
             <Grid.ColumnDefinitions>
179 
-                <ColumnDefinition Width="100*"/>
180 
-                <ColumnDefinition Width="60*"/>
181 
-                <ColumnDefinition Width="40*"/>
240 
+                <ColumnDefinition Width="100*" />
241 
+                <ColumnDefinition Width="60*" />
242 
+                <ColumnDefinition Width="40*" />
182 243 
             </Grid.ColumnDefinitions>
183 
-            <Image Grid.ColumnSpan="3" x:Name="ImgImport" Source="/SkinImages/White/Toolbar_DR.png" Stretch="Fill"/>
184 
-            <Label Grid.Column="1" x:Name="Word" Content="导入" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
244 
+            <Image
245 
+                x:Name="ImgImport"
246 
+                Grid.ColumnSpan="3"
247 
+                Source="/SkinImages/White/Toolbar_DR.png"
248 
+                Stretch="Fill" />
249 
+            <Label
250 
+                x:Name="Word"
251 
+                Grid.Column="1"
252 
+                HorizontalAlignment="Center"
253 
+                VerticalAlignment="Center"
254 
+                Content="导入"
255 
+                FontSize="{TemplateBinding FontSize}"
256 
+                Foreground="#FF333333" />
185 257 
         </Grid>
186 258 
         <ControlTemplate.Triggers>
187 259 
             <Trigger Property="IsMouseOver" Value="True">
188 
-                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_MI.png"/>
260 
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_MI.png" />
189 261 
             </Trigger>
190 262 
             <Trigger Property="IsPressed" Value="True">
191 
-                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_CL.png"/>
192 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
263 
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_CL.png" />
264 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
193 265 
             </Trigger>
194 266 
             <Trigger Property="IsEnabled" Value="False">
195 
-                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_N.png"/>
196 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
267 
+                <Setter TargetName="ImgImport" Property="Source" Value="/SkinImages/White/Toolbar_DR_N.png" />
268 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
197 269 
             </Trigger>
198 270 
         </ControlTemplate.Triggers>
199 271 
     </ControlTemplate>
200 
-    <!--加页按钮-->
272 
+    <!--  加页按钮  -->
201 273 
     <ControlTemplate x:Key="SkinBtnAdd" TargetType="{x:Type Button}">
202 274 
         <Grid>
203 275 
             <Grid.ColumnDefinitions>
204 
-                <ColumnDefinition Width="100*"/>
205 
-                <ColumnDefinition Width="60*"/>
206 
-                <ColumnDefinition Width="40*"/>
276 
+                <ColumnDefinition Width="100*" />
277 
+                <ColumnDefinition Width="60*" />
278 
+                <ColumnDefinition Width="40*" />
207 279 
             </Grid.ColumnDefinitions>
208 
-            <Image Grid.ColumnSpan="3" x:Name="ImgAdd" Source="/SkinImages/White/Toolbar_JY.png" Stretch="Fill"/>
209 
-            <Label Grid.Column="1" x:Name="Word" Content="加页" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
280 
+            <Image
281 
+                x:Name="ImgAdd"
282 
+                Grid.ColumnSpan="3"
283 
+                Source="/SkinImages/White/Toolbar_JY.png"
284 
+                Stretch="Fill" />
285 
+            <Label
286 
+                x:Name="Word"
287 
+                Grid.Column="1"
288 
+                HorizontalAlignment="Center"
289 
+                VerticalAlignment="Center"
290 
+                Content="加页"
291 
+                FontSize="{TemplateBinding FontSize}"
292 
+                Foreground="#FF333333" />
210 293 
         </Grid>
211 294 
         <ControlTemplate.Triggers>
212 295 
             <Trigger Property="IsMouseOver" Value="True">
213 
-                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_MI.png"/>
296 
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_MI.png" />
214 297 
             </Trigger>
215 298 
             <Trigger Property="IsPressed" Value="True">
216 
-                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_CL.png"/>
217 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
299 
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_CL.png" />
300 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
218 301 
             </Trigger>
219 302 
             <Trigger Property="IsEnabled" Value="False">
220 
-                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_N.png"/>
221 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
303 
+                <Setter TargetName="ImgAdd" Property="Source" Value="/SkinImages/White/Toolbar_JY_N.png" />
304 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
222 305 
             </Trigger>
223 306 
         </ControlTemplate.Triggers>
224 307 
     </ControlTemplate>
225 
-    <!--打印按钮-->
308 
+    <!--  打印按钮  -->
226 309 
     <ControlTemplate x:Key="SkinBtnPrint" TargetType="{x:Type Button}">
227 310 
         <Grid>
228 311 
             <Grid.ColumnDefinitions>
229 
-                <ColumnDefinition Width="100*"/>
230 
-                <ColumnDefinition Width="60*"/>
231 
-                <ColumnDefinition Width="40*"/>
312 
+                <ColumnDefinition Width="100*" />
313 
+                <ColumnDefinition Width="60*" />
314 
+                <ColumnDefinition Width="40*" />
232 315 
             </Grid.ColumnDefinitions>
233 
-            <Image Grid.ColumnSpan="3" x:Name="ImgPrint" Source="/SkinImages/White/Toolbar_DY.png" Stretch="Fill"/>
234 
-            <Label Grid.Column="1" x:Name="Word" Content="打印" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
316 
+            <Image
317 
+                x:Name="ImgPrint"
318 
+                Grid.ColumnSpan="3"
319 
+                Source="/SkinImages/White/Toolbar_DY.png"
320 
+                Stretch="Fill" />
321 
+            <Label
322 
+                x:Name="Word"
323 
+                Grid.Column="1"
324 
+                HorizontalAlignment="Center"
325 
+                VerticalAlignment="Center"
326 
+                Content="打印"
327 
+                FontSize="{TemplateBinding FontSize}"
328 
+                Foreground="#FF333333" />
235 329 
         </Grid>
236 330 
         <ControlTemplate.Triggers>
237 331 
             <Trigger Property="IsMouseOver" Value="True">
238 
-                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_MI.png"/>
332 
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_MI.png" />
239 333 
             </Trigger>
240 334 
             <Trigger Property="IsPressed" Value="True">
241 
-                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_CL.png"/>
242 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
335 
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_CL.png" />
336 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
243 337 
             </Trigger>
244 338 
             <Trigger Property="IsEnabled" Value="False">
245 
-                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_N.png"/>
246 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
339 
+                <Setter TargetName="ImgPrint" Property="Source" Value="/SkinImages/White/Toolbar_DY_N.png" />
340 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
247 341 
             </Trigger>
248 342 
         </ControlTemplate.Triggers>
249 343 
     </ControlTemplate>
250 
-    <!--我的按钮-->
344 
+    <!--  我的按钮  -->
251 345 
     <ControlTemplate x:Key="SkinBtnMy" TargetType="{x:Type Button}">
252 346 
         <Grid>
253 347 
             <Grid.ColumnDefinitions>
254 
-                <ColumnDefinition Width="100*"/>
255 
-                <ColumnDefinition Width="60*"/>
256 
-                <ColumnDefinition Width="40*"/>
348 
+                <ColumnDefinition Width="100*" />
349 
+                <ColumnDefinition Width="60*" />
350 
+                <ColumnDefinition Width="40*" />
257 351 
             </Grid.ColumnDefinitions>
258 
-            <Image Grid.ColumnSpan="3" x:Name="ImgMy" Source="/SkinImages/White/Toolbar_MY.png" Stretch="Fill"/>
259 
-            <Label Grid.Column="1" x:Name="Word" Content="我的" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
352 
+            <Image
353 
+                x:Name="ImgMy"
354 
+                Grid.ColumnSpan="3"
355 
+                Source="/SkinImages/White/Toolbar_MY.png"
356 
+                Stretch="Fill" />
357 
+            <Label
358 
+                x:Name="Word"
359 
+                Grid.Column="1"
360 
+                HorizontalAlignment="Center"
361 
+                VerticalAlignment="Center"
362 
+                Content="我的"
363 
+                FontSize="{TemplateBinding FontSize}"
364 
+                Foreground="#FF333333" />
260 365 
         </Grid>
261 366 
         <ControlTemplate.Triggers>
262 367 
             <Trigger Property="IsMouseOver" Value="True">
263 
-                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_MI.png"/>
368 
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_MI.png" />
264 369 
             </Trigger>
265 370 
             <Trigger Property="IsPressed" Value="True">
266 
-                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_CL.png"/>
267 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
371 
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_CL.png" />
372 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
268 373 
             </Trigger>
269 374 
             <Trigger Property="IsEnabled" Value="False">
270 
-                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_N.png"/>
271 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
375 
+                <Setter TargetName="ImgMy" Property="Source" Value="/SkinImages/White/Toolbar_MY_N.png" />
376 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
272 377 
             </Trigger>
273 378 
         </ControlTemplate.Triggers>
274 379 
     </ControlTemplate>
275 
-    <!--检测按钮-->
380 
+    <!--  检测按钮  -->
276 381 
     <ControlTemplate x:Key="SkinBtnDevice" TargetType="{x:Type Button}">
277 382 
         <Grid>
278 383 
             <Grid.ColumnDefinitions>
279 
-                <ColumnDefinition Width="100*"/>
280 
-                <ColumnDefinition Width="60*"/>
281 
-                <ColumnDefinition Width="40*"/>
384 
+                <ColumnDefinition Width="100*" />
385 
+                <ColumnDefinition Width="60*" />
386 
+                <ColumnDefinition Width="40*" />
282 387 
             </Grid.ColumnDefinitions>
283 
-            <Image Grid.ColumnSpan="3" x:Name="ImgDevice" Source="/SkinImages/White/Toolbar_JC.png" Stretch="Fill"/>
284 
-            <Label Grid.Column="1" x:Name="Word" Content="检测" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
388 
+            <Image
389 
+                x:Name="ImgDevice"
390 
+                Grid.ColumnSpan="3"
391 
+                Source="/SkinImages/White/Toolbar_JC.png"
392 
+                Stretch="Fill" />
393 
+            <Label
394 
+                x:Name="Word"
395 
+                Grid.Column="1"
396 
+                HorizontalAlignment="Center"
397 
+                VerticalAlignment="Center"
398 
+                Content="检测"
399 
+                FontSize="{TemplateBinding FontSize}"
400 
+                Foreground="#FF333333" />
285 401 
         </Grid>
286 402 
         <ControlTemplate.Triggers>
287 403 
             <Trigger Property="IsMouseOver" Value="True">
288 
-                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_MI.png"/>
404 
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_MI.png" />
289 405 
             </Trigger>
290 406 
             <Trigger Property="IsPressed" Value="True">
291 
-                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_CL.png"/>
292 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
407 
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_CL.png" />
408 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
293 409 
             </Trigger>
294 410 
             <Trigger Property="IsEnabled" Value="False">
295 
-                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_N.png"/>
296 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
411 
+                <Setter TargetName="ImgDevice" Property="Source" Value="/SkinImages/White/Toolbar_JC_N.png" />
412 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
297 413 
             </Trigger>
298 414 
         </ControlTemplate.Triggers>
299 415 
     </ControlTemplate>
300 
-    <!--设置按钮-->
416 
+    <!--  设置按钮  -->
301 417 
     <ControlTemplate x:Key="SkinBtnSetUp" TargetType="{x:Type Button}">
302 418 
         <Grid>
303 419 
             <Grid.ColumnDefinitions>
304 
-                <ColumnDefinition Width="100*"/>
305 
-                <ColumnDefinition Width="60*"/>
306 
-                <ColumnDefinition Width="40*"/>
420 
+                <ColumnDefinition Width="100*" />
421 
+                <ColumnDefinition Width="60*" />
422 
+                <ColumnDefinition Width="40*" />
307 423 
             </Grid.ColumnDefinitions>
308 
-            <Image Grid.ColumnSpan="3" x:Name="ImgSetUp" Source="/SkinImages/White/Toolbar_SZ.png" Stretch="Fill"/>
309 
-            <Label Grid.Column="1" x:Name="Word" Content="设置" FontSize="{TemplateBinding FontSize}" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="#FF333333"/>
424 
+            <Image
425 
+                x:Name="ImgSetUp"
426 
+                Grid.ColumnSpan="3"
427 
+                Source="/SkinImages/White/Toolbar_SZ.png"
428 
+                Stretch="Fill" />
429 
+            <Label
430 
+                x:Name="Word"
431 
+                Grid.Column="1"
432 
+                HorizontalAlignment="Center"
433 
+                VerticalAlignment="Center"
434 
+                Content="设置"
435 
+                FontSize="{TemplateBinding FontSize}"
436 
+                Foreground="#FF333333" />
310 437 
         </Grid>
311 438 
         <ControlTemplate.Triggers>
312 439 
             <Trigger Property="IsMouseOver" Value="True">
313 
-                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_MI.png"/>
440 
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_MI.png" />
314 441 
             </Trigger>
315 442 
             <Trigger Property="IsPressed" Value="True">
316 
-                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_CL.png"/>
317 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF"/>
443 
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_CL.png" />
444 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFFFFFFF" />
318 445 
             </Trigger>
319 446 
             <Trigger Property="IsEnabled" Value="False">
320 
-                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_N.png"/>
321 
-                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3"/>
447 
+                <Setter TargetName="ImgSetUp" Property="Source" Value="/SkinImages/White/Toolbar_SZ_N.png" />
448 
+                <Setter TargetName="Word" Property="Foreground" Value="#FFC3C3C3" />
322 449 
             </Trigger>
323 450 
         </ControlTemplate.Triggers>
324 451 
     </ControlTemplate>
325 
-
452 
+
326 453 
 </ResourceDictionary>

+ 151
- 112
XHWK.WKTool/XHMicroLessonSystemWindow.xaml Dosyayı Görüntüle 

@@ -509,114 +509,7 @@
509 509 
                                 Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
510 510 
                         </Grid>
511 511 
                     </Grid>
512 
-                    <!--  打印相关Title 926  -->
513 
-                    <Grid
514 
-                        x:Name="GridPrintingTitle"
515 
-                        Grid.Column="1"
516 
-                        Visibility="Collapsed">
517 
-                        <Grid.ColumnDefinitions>
518 
-                            <ColumnDefinition Width="120*" />
519 
-                            <ColumnDefinition Width="300*" />
520 
-                            <ColumnDefinition Width="120*" />
521 
-                            <ColumnDefinition Width="110*" />
522 
-                            <ColumnDefinition Width="75*" />
523 
-                            <ColumnDefinition Width="130*" />
524 
-                            <ColumnDefinition Width="130*" />
525 
-                            <ColumnDefinition Width="130*" />
526 
-                        </Grid.ColumnDefinitions>
527 
-                        <Grid Grid.Column="0" MouseLeftButtonDown="Window_MouseLeftButtonDown">
528 
-                            <TextBlock
529 
-                                HorizontalAlignment="Right"
530 
-                                VerticalAlignment="Center"
531 
-                                FontSize="{Binding WordSize18}"
532 
-                                Style="{DynamicResource TxbMesColor}"
533 
-                                Text="打印机：" />
534 
-
535 
-
536 
-                        </Grid>
537 
-                        <Grid Grid.Column="1" Grid.ColumnSpan="2">
538 
-                            <ComboBox
539 
-                                x:Name="cmbClass"
540 
-                                Height="Auto"
541 
-                                Margin="0,12"
542 
-                                Padding="10,0"
543 
-                                HorizontalAlignment="Stretch"
544 
-                                HorizontalContentAlignment="Center"
545 
-                                VerticalContentAlignment="Center"
546 
-                                Background="White"
547 
-                                BorderThickness="0"
548 
-                                Cursor="Hand"
549 
-                                DisplayMemberPath="Value"
550 
-                                FontSize="{Binding WordSize12}"
551 
-                                SelectedValuePath="Key"
552 
-                                Style="{StaticResource stlComboBox}"
553 
-                                Text="请选择" />
554 
-                        </Grid>
555 
-
556 512
557 
-
558 
-                        <Grid Grid.Column="6">
559 
-                            <StackPanel Orientation="Horizontal" />
560 
-                            <Button
561 
-                                x:Name="btnPrint_Print"
562 
-                                Margin="4,10"
563 
-                                HorizontalAlignment="Stretch"
564 
-                                VerticalAlignment="Stretch"
565 
-                                Click="BtnPrint_Print_Click"
566 
-                                Content="打印"
567 
-                                Cursor="Hand"
568 
-                                FontSize="{Binding WordSize14}"
569 
-                                Foreground="White"
570 
-                                IsDefault="True"
571 
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
572 
-                                <Button.Template>
573 
-                                    <ControlTemplate TargetType="{x:Type Button}">
574 
-                                        <Border
575 
-                                            BorderBrush="{TemplateBinding Control.BorderBrush}"
576 
-                                            BorderThickness="1"
577 
-                                            CornerRadius="4">
578 
-                                            <Border.Background>#2E8CF0</Border.Background>
579 
-                                            <ContentPresenter
580 
-                                                HorizontalAlignment="Center"
581 
-                                                VerticalAlignment="Center"
582 
-                                                Content="{TemplateBinding ContentControl.Content}" />
583 
-                                        </Border>
584 
-                                    </ControlTemplate>
585 
-                                </Button.Template>
586 
-                            </Button>
587 
-                        </Grid>
588 
-                        <Grid Grid.Column="7">
589 
-                            <Button
590 
-                                x:Name="btnPrintExplain"
591 
-                                Margin="4,10"
592 
-                                HorizontalAlignment="Stretch"
593 
-                                VerticalAlignment="Stretch"
594 
-                                Click="btnPrintExplain_Click"
595 
-                                Content="打印说明"
596 
-                                Cursor="Hand"
597 
-                                FontSize="{Binding WordSize14}"
598 
-                                Foreground="White"
599 
-                                IsDefault="True"
600 
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
601 
-                                <Button.Template>
602 
-                                    <ControlTemplate TargetType="{x:Type Button}">
603 
-                                        <Border
604 
-                                            BorderBrush="{TemplateBinding BorderBrush}"
605 
-                                            BorderThickness="1"
606 
-                                            CornerRadius="4">
607 
-                                            <Border.Background>
608 
-                                                <Brush>#2E8CF0</Brush>
609 
-                                            </Border.Background>
610 
-                                            <ContentPresenter
611 
-                                                HorizontalAlignment="Center"
612 
-                                                VerticalAlignment="Center"
613 
-                                                Content="{TemplateBinding Content}" />
614 
-                                        </Border>
615 
-                                    </ControlTemplate>
616 
-                                </Button.Template>
617 
-                            </Button>
618 
-                        </Grid>
619 
-                    </Grid>
620 513 
                     <!--  关闭  -->
621 514 
                     <Grid Grid.Column="2">
622 515 
                         <Label
 
@@ -634,9 +527,7 @@
634 527 
                             Cursor="Hand"
635 528 
                             FontSize="{Binding WordSize14}"
636 529 
                             Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
637 
-                        <!--<Button Cursor="Hand" x:Name="btnShrink_Black" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnShrink_Click" Margin="5,0" Width="20" Height="20" HorizontalAlignment="Left">
638 
-                            <Image Source="/BlackImages/HM_Min.png" />
639 
-                        </Button>-->
530 
+
640 531 
                     </Grid>
641 532 
                     <!--  测试  -->
642 533 
                     <Grid Grid.Column="2" Visibility="Collapsed">
 
@@ -764,8 +655,7 @@
764 655 
                                 Button.Template="{DynamicResource SkinBtnScreenRecording}"
765 656 
                                 Click="BtnScreenRecording_Click"
766 657 
                                 Cursor="Hand"
767 
-                                FontSize="{Binding WordSize16}"
768 
-                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
658 
+                                FontSize="{Binding WordSize16}" />
769 659 
                         </Grid>
770 660 
                         <!--  截图  -->
771 661 
                         <Grid Grid.Row="2">
 
@@ -2250,6 +2140,155 @@
2250 2140 
                 </Grid>
2251 2141 
             </Grid>
2252 2142 
         </Grid>
2143 
+
2144 
+        <!--  打印相关  -->
2145 
+        <Border
2146 
+            x:Name="GridPrintingTitle"
2147 
+            Grid.Column="1"
2148 
+            Width="588"
2149 
+            Height="210"
2150 
+            BorderBrush="#eeeeee"
2151 
+            BorderThickness="1"
2152 
+            Visibility="Collapsed">
2153 
+            <Grid Background="#ffffff">
2154 
+                <Grid.RowDefinitions>
2155 
+                    <RowDefinition Height="46" />
2156 
+                    <RowDefinition Height="*" />
2157 
+                    <RowDefinition Height="64" />
2158 
+                </Grid.RowDefinitions>
2159 
+                <Grid Grid.Row="0" Background="#F1F2F8">
2160 
+                    <TextBlock
2161 
+                        Margin="10,0,0,0"
2162 
+                        VerticalAlignment="Center"
2163 
+                        FontSize="16"
2164 
+                        Foreground="#333333"
2165 
+                        Text="打印机" />
2166 
+
2167 
+                    <Button
2168 
+                        Grid.Row="0"
2169 
+                        Width="46"
2170 
+                        HorizontalAlignment="Right"
2171 
+                        VerticalAlignment="Top"
2172 
+                        Click="BtnPrintCloseClick"
2173 
+                        Content="×"
2174 
+                        Cursor="Hand"
2175 
+                        FontSize="30"
2176 
+                        Foreground="#FF333333"
2177 
+                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" />
2178 
+                </Grid>
2179 
+                <Grid Grid.Row="1" Height="46">
2180 
+                    <Grid.ColumnDefinitions>
2181 
+                        <ColumnDefinition Width="Auto" />
2182 
+                        <ColumnDefinition Width="*" />
2183 
+                    </Grid.ColumnDefinitions>
2184 
+                    <TextBlock
2185 
+                        Grid.Column="0"
2186 
+                        Margin="10,0,0,0"
2187 
+                        HorizontalAlignment="Left"
2188 
+                        VerticalAlignment="Center"
2189 
+                        FontSize="16"
2190 
+                        Style="{DynamicResource TxbMesColor}"
2191 
+                        Text="打印机：" />
2192 
+
2193 
+                    <ComboBox
2194 
+                        x:Name="cmbClass"
2195 
+                        Grid.Column="1"
2196 
+                        Height="36"
2197 
+                        Margin="4,0,10,0"
2198 
+                        Padding="10,0,0,0"
2199 
+                        HorizontalAlignment="Stretch"
2200 
+                        HorizontalContentAlignment="Center"
2201 
+                        VerticalContentAlignment="Center"
2202 
+                        Background="White"
2203 
+                        BorderThickness="0"
2204 
+                        Cursor="Hand"
2205 
+                        DisplayMemberPath="Value"
2206 
+                        FontSize="16"
2207 
+                        SelectedValuePath="Key"
2208 
+                        Style="{StaticResource stlComboBox}"
2209 
+                        Text="请选择" />
2210 
+                </Grid>
2211 
+
2212 
+                <Grid Grid.Row="2">
2213 
+                    <Grid.ColumnDefinitions>
2214 
+                        <ColumnDefinition Width="30" />
2215 
+                        <ColumnDefinition Width="Auto" />
2216 
+                        <ColumnDefinition Width="*" />
2217 
+                        <ColumnDefinition Width="100" />
2218 
+                    </Grid.ColumnDefinitions>
2219 
+
2220 
+                    <Image
2221 
+                        Grid.Column="0"
2222 
+                        Width="20"
2223 
+                        Height="20"
2224 
+                        Margin="10,0,0,0"
2225 
+                        HorizontalAlignment="Center"
2226 
+                        VerticalAlignment="Center"
2227 
+                        Source="./Images/shuoming.png" />
2228 
+                    <Button
2229 
+                        x:Name="btnPrintExplain"
2230 
+                        Grid.Column="1"
2231 
+                        Height="36"
2232 
+                        Margin="6,0,0,0"
2233 
+                        HorizontalAlignment="Stretch"
2234 
+                        VerticalAlignment="Stretch"
2235 
+                        Click="btnPrintExplain_Click"
2236 
+                        Content="打印说明"
2237 
+                        Cursor="Hand"
2238 
+                        FontSize="{Binding WordSize14}"
2239 
+                        Foreground="#437AFA"
2240 
+                        IsDefault="True"
2241 
+                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
2242 
+                        <Button.Template>
2243 
+                            <ControlTemplate TargetType="{x:Type Button}">
2244 
+                                <Border
2245 
+                                    BorderBrush="{TemplateBinding BorderBrush}"
2246 
+                                    BorderThickness="1"
2247 
+                                    CornerRadius="8">
2248 
+
2249 
+                                    <ContentPresenter
2250 
+                                        HorizontalAlignment="Center"
2251 
+                                        VerticalAlignment="Center"
2252 
+                                        Content="{TemplateBinding Content}" />
2253 
+                                </Border>
2254 
+                            </ControlTemplate>
2255 
+                        </Button.Template>
2256 
+                    </Button>
2257 
+                    <Button
2258 
+                        x:Name="btnPrint_Print"
2259 
+                        Grid.Column="3"
2260 
+                        Height="36"
2261 
+                        Margin="0,0,10,0"
2262 
+                        HorizontalAlignment="Stretch"
2263 
+                        VerticalAlignment="Stretch"
2264 
+                        Click="BtnPrint_Print_Click"
2265 
+                        Content="打印"
2266 
+                        Cursor="Hand"
2267 
+                        FontSize="{Binding WordSize14}"
2268 
+                        Foreground="White"
2269 
+                        IsDefault="True"
2270 
+                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}">
2271 
+                        <Button.Template>
2272 
+                            <ControlTemplate TargetType="{x:Type Button}">
2273 
+                                <Border
2274 
+                                    BorderBrush="{TemplateBinding Control.BorderBrush}"
2275 
+                                    BorderThickness="1"
2276 
+                                    CornerRadius="8">
2277 
+                                    <Border.Background>#2E8CF0</Border.Background>
2278 
+                                    <ContentPresenter
2279 
+                                        HorizontalAlignment="Center"
2280 
+                                        VerticalAlignment="Center"
2281 
+                                        Content="{TemplateBinding ContentControl.Content}" />
2282 
+                                </Border>
2283 
+                            </ControlTemplate>
2284 
+                        </Button.Template>
2285 
+                    </Button>
2286 
+                </Grid>
2287 
+
2288 
+            </Grid>
2289 
+
2290 
+        </Border>
2291 
+
2253 2292 
         <Grid
2254 2293 
             x:Name="GridPrintMask"
2255 2294 
             Background="#4C000000"

+ 7
- 13
XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs Dosyayı Görüntüle 

@@ -631,23 +631,10 @@ namespace XHWK.WKTool
631 631 
             }
632 632 
             if (GridPrintingTitle.Visibility == Visibility.Visible)
633 633 
             {
634 
-                //GridPrintContent.Visibility = Visibility.Collapsed;
635 
-                GridMain.Visibility = Visibility.Visible;
636 
-                GridM.IsEnabled = true;
637 
-                GridRecordingTitle.Visibility = Visibility.Visible;
638 634 
                 GridPrintingTitle.Visibility = Visibility.Collapsed;
639 
-                //if (APP.pageData.pagenum > 0)
640 
-                //{
641 
-                //    GridPage.Visibility = Visibility.Visible;
642 
-                //}
643 
-                //DataContext = APP.pageData;
644 635 
             }
645 636 
             else
646 637 
             {
647 
-                PageHide();
648 
-                GridMain.Visibility = Visibility.Visible;
649 
-                GridM.IsEnabled = false;
650 
-                //GridPrintContent.Visibility = Visibility.Visible;
651 638 
                 GridPrintingTitle.Visibility = Visibility.Visible;
652 639 
                 if (APP.PageDrawList.Count > 0 && !string.IsNullOrWhiteSpace(APP.PageDrawList[0].PageImagePath))
653 640 
                 {
 
@@ -5869,6 +5856,11 @@ namespace XHWK.WKTool
5869 5856
5870 5857 
         #region 事件
5871 5858
5859 
+        private void BtnPrintCloseClick(object sender, RoutedEventArgs e)
5860 
+        {
5861 
+            GridPrintingTitle.Visibility = Visibility.Collapsed;
5862 
+        }
5863 
+
5872 5864 
         /// <summary>
5873 5865 
         /// 打印
5874 5866 
         /// </summary>
 
@@ -5913,6 +5905,8 @@ namespace XHWK.WKTool
5913 5905 
             timesPrintMsg = new System.Timers.Timer(500);
5914 5906 
             timesPrintMsg.Elapsed += TimesPrintMsg_Elapsed;
5915 5907 
             timesPrintMsg.Start();
5908 
+
5909 
+            GridPrintingTitle.Visibility = Visibility.Collapsed;
5916 5910 
         }
5917 5911
5918 5912 
         /// <summary>

+ 3
- 1
XHWK.WKTool/XHWK.WKTool.csproj Dosyayı Görüntüle 

@@ -841,7 +841,9 @@
841 841 
     <Resource Include="SkinImages\White\Toolbar_SZ_MI.png" />
842 842 
     <Resource Include="SkinImages\White\Toolbar_SZ_N.png" />
843 843 
   </ItemGroup>
844 
-  <ItemGroup />
844 
+  <ItemGroup>
845 
+    <Resource Include="Images\shuoming.png" />
846 
+  </ItemGroup>
845 847 
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
846 848 
   <PropertyGroup>
847 849 
     <PreBuildEvent>xcopy /Y /i /e $(ProjectDir)\Extension $(TargetDir)\

Write Preview
Loading…
İptal
Kaydet