프로젝트

일반

사용자정보

개정판 d4b0c723

IDd4b0c7238c5ff46b999b946abae8cd1aa1621f9e
상위 5ce56a3a
하위 e17af42b

KangIngu 이(가) 약 7년 전에 추가함

- 상단 네비게이션 변경
- 상단 기능에 대한 Undo Redo 기능 추가
- Text Style 저장 및 불러오기 오류 수정
- FinalPDF시 Text Style 적용 되도록 수정

차이점 보기:

KCOM/Views/TopMenu.xaml
115 115

  
116 116
                <telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed"
117 117
                                        Header="CONTROL"
118
                                        IsEnabled="True"
119
                                        telerik:ScreenTip.Description="펜 툴을 이용하여 그릴 수 있습니다"
120
                                        telerik:ScreenTip.Title="Pen">
118
                                        IsEnabled="True">
119
                    <!--<Grid Margin="0,-1,0,0">
120
                        <Grid.ColumnDefinitions>
121
                            <ColumnDefinition/>
122
                            <ColumnDefinition/>
123
                            <ColumnDefinition/>
124
                        </Grid.ColumnDefinitions>
125
                        <Grid.RowDefinitions>
126
                            <RowDefinition/>
127
                            <RowDefinition/>
128
                            <RowDefinition/>
129
                        </Grid.RowDefinitions>
130
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="0" Grid.Row="0" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
131
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/Undo3.png" />
132
                        </telerik:RadToggleButton>
133
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="1" Grid.Row="0" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
134
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/Redo3.png" />
135
                        </telerik:RadToggleButton>
136
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="2" Grid.Row="0" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
137
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/select.png" />
138
                        </telerik:RadToggleButton>
139
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="0" Grid.Row="1" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
140
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/copy2.png" />
141
                        </telerik:RadToggleButton>
142
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="1" Grid.Row="1" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
143
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/cut1.png" />
144
                        </telerik:RadToggleButton>
145
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="2" Grid.Row="1" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
146
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/Paste1.png" />
147
                        </telerik:RadToggleButton>
148
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="0" Grid.Row="2" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
149
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/eraser.png" />
150
                        </telerik:RadToggleButton>
151
                        <telerik:RadToggleButton CommandParameter="Line" Grid.Column="1" Grid.Row="2" Tag="Line3" Width="30" Height="30" Click="ControlEvent">
152
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_New/Delete4.png" />
153
                        </telerik:RadToggleButton>
154
                    </Grid>-->
121 155
                    <telerik:RadCollapsiblePanel>
122 156
                        <telerik:RadRibbonToggleButton 
123 157
                                                       CollapseToMedium="WhenGroupIsMedium"
124 158
                                                       CollapseToSmall="WhenGroupIsSmall"
125
                                                       CommandParameter="Select"
126
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/select.png"
159
                                                       CommandParameter="Undo"
160
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/undo3.png"
127 161
                                                       Size="Medium"
128 162
                                                       Click="ControlEvent"
129
                                                       Tag="Ink"
130
                                                       telerik:ScreenTip.Description="범위를 선택하여 그린 펜을 선택합니다"
131
                                                       telerik:ScreenTip.Title="Select Ink Strokes"
132
                                                       Text="Selection" />
163
                                                       Tag="Undo"
164
                                                       telerik:ScreenTip.Description="마크업을 그 전으로 돌립니다"
165
                                                       telerik:ScreenTip.Title="Undo"
166
                                                       Text="Undo" />
167
                        <telerik:RadRibbonToggleButton 
168
                                                       CollapseToMedium="WhenGroupIsMedium"
169
                                                       CollapseToSmall="WhenGroupIsSmall"
170
                                                       CommandParameter="Copy"
171
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/copy2.png"
172
                                                       Size="Medium"
173
                                                       Click="ControlEvent"
174
                                                       Tag="Copy"
175
                                                       telerik:ScreenTip.Description="마크업을 복사 합니다"
176
                                                       telerik:ScreenTip.Title="Copy"
177
                                                       Text="Copy" />
133 178
                        <telerik:RadRibbonToggleButton 
134 179
                                                       CollapseToMedium="WhenGroupIsMedium"
135 180
                                                       CollapseToSmall="WhenGroupIsSmall"
......
138 183
                                                       Size="Medium"
139 184
                                                       Click="ControlEvent"
140 185
                                                       Tag="Eraser"
141
                                                       telerik:ScreenTip.Description="펜으로 그린 부분을 선 단위로 적으로 제거합니다"
142
                                                       telerik:ScreenTip.Title="Path Unit Eraser"
186
                                                       telerik:ScreenTip.Description="마크업을 지웁니다"
187
                                                       telerik:ScreenTip.Title="Eraser"
143 188
                                                       Text="Eraser" />
144 189
                    </telerik:RadCollapsiblePanel>
190
                    <telerik:RadCollapsiblePanel>
191
                        <telerik:RadRibbonToggleButton 
192
                                                       CollapseToMedium="WhenGroupIsMedium"
193
                                                       CollapseToSmall="WhenGroupIsSmall"
194
                                                       CommandParameter="Redo"
195
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/Redo3.png"
196
                                                       Size="Medium"
197
                                                       Click="ControlEvent"
198
                                                       Tag="Redo"
199
                                                       telerik:ScreenTip.Description="마크업을 되돌립니다."
200
                                                       telerik:ScreenTip.Title="Eraser"
201
                                                       Text="Redo" />
202
                        <telerik:RadRibbonToggleButton 
203
                                                       CollapseToMedium="WhenGroupIsMedium"
204
                                                       CollapseToSmall="WhenGroupIsSmall"
205
                                                       CommandParameter="Cut"
206
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/cut1.png"
207
                                                       Size="Medium"
208
                                                       Click="ControlEvent"
209
                                                       Tag="Cut"
210
                                                       telerik:ScreenTip.Description="선택된 마크업을 잘라냅니다"
211
                                                       telerik:ScreenTip.Title="Cut"
212
                                                       Text="Cut" />
213
                        <telerik:RadRibbonToggleButton 
214
                                                       CollapseToMedium="WhenGroupIsMedium"
215
                                                       CollapseToSmall="WhenGroupIsSmall"
216
                                                       CommandParameter="Delete"
217
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/delete3.png"
218
                                                       Size="Medium"
219
                                                       Click="ControlEvent"
220
                                                       Tag="Delete"
221
                                                       telerik:ScreenTip.Description="선택된 마크업을 제거합니다"
222
                                                       telerik:ScreenTip.Title="Delete"
223
                                                       Text="Delete" />
224
                    </telerik:RadCollapsiblePanel>
225
                    <telerik:RadCollapsiblePanel>
226
                        <telerik:RadRibbonToggleButton 
227
                                                       CollapseToMedium="WhenGroupIsMedium"
228
                                                       CollapseToSmall="WhenGroupIsSmall"
229
                                                       CommandParameter="Select"
230
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/select.png"
231
                                                       Size="Medium"
232
                                                       Click="ControlEvent"
233
                                                       Tag="Select"
234
                                                       telerik:ScreenTip.Description="범위를 선택하여 마크업을 선택합니다"
235
                                                       telerik:ScreenTip.Title="Eraser"
236
                                                       Text="Selection" />
237
                        <telerik:RadRibbonToggleButton 
238
                                                       CollapseToMedium="WhenGroupIsMedium"
239
                                                       CollapseToSmall="WhenGroupIsSmall"
240
                                                       CommandParameter="Paste"
241
                                                       LargeImage="/KCOM;component/Resources/Images/MenuImage_new/paste1.png"
242
                                                       Size="Medium"
243
                                                       Click="ControlEvent"
244
                                                       Tag="Ink"
245
                                                       telerik:ScreenTip.Description="복사한 마크업을 붙여 넣습니다"
246
                                                       telerik:ScreenTip.Title="Paste"
247
                                                       Text="Paste" />
248
                        <telerik:RadRibbonToggleButton ></telerik:RadRibbonToggleButton>
249
                    </telerik:RadCollapsiblePanel>
145 250
                </telerik:RadRibbonGroup>
146 251

  
147 252
                <telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed"
......
288 393
                        <telerik:RadToggleButton Width="30" Height="30" Grid.Column="2" Click="ControlEvent" CommandParameter="TextCloud" Tag="Cloud">
289 394
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_new/textCloud.png" />
290 395
                        </telerik:RadToggleButton>
291
                        <CheckBox HorizontalAlignment="Left" Content="Highlight" Grid.Column="3" VerticalAlignment="Center" Margin="2,5,2,0" Checked="HighlightEvent" Unchecked="HighlightEvent"/>
396
                        <CheckBox HorizontalAlignment="Left" Content="Highlight" Grid.Column="3" VerticalAlignment="Center" Margin="2,5,2,0" Checked="HighlightEvent" Unchecked="HighlightEvent" IsChecked="{Binding checkHighlight, Source={x:Static common:ViewerDataModel.Instance}}" />
397
                        <!--<CheckBox Margin="10,5,2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Column="2" Grid.Row="0" Content="Fill" Checked="FillShapeEvent" Unchecked="FillShapeEvent" x:Name="cbFillShape" IsChecked="{Binding checkFillShape, Source={x:Static common:ViewerDataModel.Instance}}" />-->
292 398

  
293 399
                        <telerik:RadToggleButton Width="30" Height="30" Grid.Column="0" Grid.Row="1" Click="ControlEvent" CommandParameter="ArrowText" Tag="ArrowText_Normal">
294 400
                            <Image Source="/KCOM;component/Resources/Images/MenuImage_new/ArrowText.png" />
......
316 422
                    <telerik:RadOrderedWrapPanel>
317 423
                        <StackPanel Orientation="Horizontal">
318 424
						<!--강인구 추가-->
319
                            <telerik:RadRibbonComboBox Width="70" Name="comboFontFamily" SelectedIndex="0" telerik:ScreenTip.Title="Font" telerik:ScreenTip.Description="Change the font face." SelectionChanged="RadRibbonComboBox_SelectionChanged">
425
                            <telerik:RadRibbonComboBox Width="60" Name="comboFontFamily" SelectedIndex="0" telerik:ScreenTip.Title="Font" telerik:ScreenTip.Description="Change the font face." SelectionChanged="RadRibbonComboBox_SelectionChanged">
320 426
                                <telerik:RadRibbonComboBoxItem Content="Arial"/>
321 427
                                <telerik:RadRibbonComboBoxItem Content="Calibri (Body)" />
322 428
                                <telerik:RadRibbonComboBoxItem Content="Tahoma" />
......
325 431
                                <telerik:RadRibbonComboBoxItem Content="Cambria" />
326 432
                            </telerik:RadRibbonComboBox>
327 433
                                                        <!--강인구 추가(이벤트)-->
328
                            <telerik:RadRibbonComboBox Name="comboFontSize" Width="45" SelectedIndex="0" telerik:ScreenTip.Title="Font Size"  telerik:ScreenTip.Description="Change the font size." SelectionChanged="comboFontSize_SelectionChanged">
434
                            <!--<telerik:RadRibbonComboBox Name="comboFontSize" Width="45" SelectedIndex="0" telerik:ScreenTip.Title="Font Size"  telerik:ScreenTip.Description="Change the font size." SelectionChanged="comboFontSize_SelectionChanged">
329 435
                                <telerik:RadRibbonComboBoxItem Content="8" />
330 436
                                <telerik:RadRibbonComboBoxItem Content="9" />
331 437
                                <telerik:RadRibbonComboBoxItem Content="10" />
......
343 449
                                <telerik:RadRibbonComboBoxItem Content="80" />
344 450
                                <telerik:RadRibbonComboBoxItem Content="90" />
345 451
                                <telerik:RadRibbonComboBoxItem Content="100" />
346
                            </telerik:RadRibbonComboBox>
452
                            </telerik:RadRibbonComboBox>-->
453

  
454

  
455
                            <telerik:RadNumericUpDown x:Name="comboFontSize"
456
                                                      Width="35"
457
                                                      HorizontalContentAlignment="Center"
458
                                                      Maximum="60"
459
                                                      Minimum="1"
460
                                                      NumberDecimalDigits="0"
461
                                                      telerik:StyleManager.Theme="Windows7"
462
                                                      ToolTipService.ToolTip="Stroke Value"
463
													  ValueChanged="comboFontSize_ValueChanged"
464
                                                      Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}"
465
                                                      />
466

  
467

  
347 468
                        </StackPanel>
348 469
                        <!--<telerik:RadButtonGroup>
349 470
                            <telerik:RadRibbonButton SmallImage="/KCOM;component/Resources/Images/MenuImage/bold.png" telerik:ScreenTip.Title="Grow Font" />
......
354 475
                        </telerik:RadButtonGroup>-->
355 476
                        <!--<telerik:RadButtonGroup telerik:StyleManager.Theme="Office2016">-->
356 477
                        <!--강인구 추가(이벤트)-->
357
                        <telerik:RadToggleButton x:Name="btnBold" telerik:ScreenTip.Title="Bold" telerik:ScreenTip.Description="Make the selected text bold." Width="32" Height="32" Checked="btnBold_Checked">
478
                        <!--<CheckBox HorizontalAlignment="Left" Content="Highlight" Grid.Column="3" VerticalAlignment="Center" Margin="2,5,2,0" Checked="HighlightEvent" Unchecked="HighlightEvent" IsChecked="{Binding checkHighlight, Source={x:Static common:ViewerDataModel.Instance}}" />-->
479
                        <telerik:RadToggleButton x:Name="btnBold" telerik:ScreenTip.Title="Bold" telerik:ScreenTip.Description="Make the selected text bold." Width="32" Height="32" Checked="btnBold_Checked"  Unchecked="btnBold_Checked" IsChecked="{Binding checkTextWeight, Source={x:Static common:ViewerDataModel.Instance}}">
358 480
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/bold.png" />
359 481
                            </telerik:RadToggleButton>
360 482
                        <!--강인구 추가(이벤트)-->
361
                        <telerik:RadToggleButton  x:Name="btnItalic"  telerik:ScreenTip.Title="Italic" telerik:ScreenTip.Description="Italicize the selected text." Width="32" Height="32" Checked="btnItalic_Checked">
483
                        <telerik:RadToggleButton  x:Name="btnItalic"  telerik:ScreenTip.Title="Italic" telerik:ScreenTip.Description="Italicize the selected text." Width="32" Height="32" Checked="btnItalic_Checked"  Unchecked="btnItalic_Checked" IsChecked="{Binding checkTextStyle, Source={x:Static common:ViewerDataModel.Instance}}">
362 484
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/italic.png"/>
363 485
                            </telerik:RadToggleButton>
364 486
						<!--강인구 추가(이벤트)-->
365
                        <telerik:RadToggleButton  x:Name="btnUnderLine" Width="32" Height="32" telerik:ScreenTip.Title="Underline" telerik:ScreenTip.Description="Underline the selected text." Checked="btnUnderLine_Checked">
487
                        <telerik:RadToggleButton  x:Name="btnUnderLine" Width="32" Height="32" telerik:ScreenTip.Title="Underline" telerik:ScreenTip.Description="Underline the selected text." Checked="btnUnderLine_Checked"  Unchecked="btnUnderLine_Checked" IsChecked="{Binding checkUnderLine, Source={x:Static common:ViewerDataModel.Instance}}">
366 488
                                <Image Source="/KCOM;component/Resources/Images/MenuImage_new/underline.png" Margin="0,0.2,0,0"/>
367 489
                            </telerik:RadToggleButton>
368 490
                        <!--</telerik:RadButtonGroup>-->

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)