개정판 9380813b
Search Panel 방향키 수정
Text생성시 여러번 클릭 할 경우 입력값이 없으면 생성된 객체 삭제
Font Size에 한글입력 방지
Change-Id: I3b8e47c313869b6e03f0c634cb8ea340c189812d
| KCOM/Controls/Sample.xaml.cs | ||
|---|---|---|
| 297 | 297 |
/// <param name="e"></param> |
| 298 | 298 |
private void ImgListbox_SelectionChanged(object sender, System.Windows.Controls.SelectionChangedEventArgs e) |
| 299 | 299 |
{
|
| 300 |
if (!Keyboard.IsKeyDown(Key.Down) && !Keyboard.IsKeyDown(Key.Up)) |
|
| 300 |
|
|
| 301 |
//Search Panel의 Key Up/Down 추가로 인한 if 문 주석 |
|
| 302 |
//if (!Keyboard.IsKeyDown(Key.Down) && !Keyboard.IsKeyDown(Key.Up)) |
|
| 303 |
//{
|
|
| 304 |
// if (ImgListbox.SelectedItem != null) |
|
| 305 |
// {
|
|
| 306 |
// PageChange(ImgListbox.SelectedItem as KCOM.Common.ThumbnailItem); |
|
| 307 |
// } |
|
| 308 |
//} |
|
| 309 |
|
|
| 310 |
if (ImgListbox.SelectedItem != null) |
|
| 301 | 311 |
{
|
| 302 |
if (ImgListbox.SelectedItem != null) |
|
| 303 |
{
|
|
| 304 |
PageChange(ImgListbox.SelectedItem as KCOM.Common.ThumbnailItem); |
|
| 305 |
} |
|
| 312 |
PageChange(ImgListbox.SelectedItem as KCOM.Common.ThumbnailItem); |
|
| 306 | 313 |
} |
| 307 | 314 |
} |
| 308 | 315 |
|
| KCOM/Controls/SearchPanel.xaml | ||
|---|---|---|
| 61 | 61 |
telerik:StyleManager.Theme="Office2016" IsIndeterminate="False" /> |
| 62 | 62 |
</StackPanel> |
| 63 | 63 |
<ListView Style="{StaticResource SimpleListViewStyle}" Grid.Row="1" x:Name="lstSearchWord" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
|
| 64 |
BorderThickness="1" Margin="0,2" ItemsSource="{Binding SearchSet}" SelectionChanged="lstSearchWord_SelectionChanged">
|
|
| 64 |
BorderThickness="1" Margin="0,2" ItemsSource="{Binding SearchSet}" SelectionChanged="lstSearchWord_SelectionChanged" PreviewKeyDown="lstSearchWord_PreviewKeyDown">
|
|
| 65 | 65 |
<i:Interaction.Behaviors> |
| 66 | 66 |
<Behaviors:ListViewColumnSizeAutoBehavior/> |
| 67 | 67 |
</i:Interaction.Behaviors> |
| KCOM/Controls/SearchPanel.xaml.cs | ||
|---|---|---|
| 1 |
using KCOM.Common; |
|
| 1 |
using Bytescout.PDFExtractor; |
|
| 2 |
using KCOM.Common; |
|
| 2 | 3 |
using MarkupToPDF.Common; |
| 3 | 4 |
using System; |
| 4 | 5 |
using System.Collections.Generic; |
| ... | ... | |
| 18 | 19 |
using System.Windows.Navigation; |
| 19 | 20 |
using System.Windows.Shapes; |
| 20 | 21 |
using Telerik.Windows.Controls; |
| 22 |
using Telerik.Windows.Controls.Rating; |
|
| 21 | 23 |
|
| 22 | 24 |
namespace KCOM.Controls |
| 23 | 25 |
{
|
| ... | ... | |
| 83 | 85 |
IsCancelWork = false; |
| 84 | 86 |
|
| 85 | 87 |
this.searchIndicator.IsIndeterminate = false; |
| 88 |
|
|
| 89 |
//Debuging용 데이터 |
|
| 90 |
//SearchSet.Add(new SearchText() { PageNo = 1, searchResult = null });
|
|
| 91 |
//SearchSet.Add(new SearchText() { PageNo = 2, searchResult = null });
|
|
| 92 |
//SearchSet.Add(new SearchText() { PageNo = 3, searchResult = null });
|
|
| 93 |
//SearchSet.Add(new SearchText() { PageNo = 4, searchResult = null });
|
|
| 94 |
|
|
| 86 | 95 |
this.DataContext = this; |
| 87 | 96 |
//tbSearch.Text = ""; |
| 88 | 97 |
tbSearch.Focus(); |
| ... | ... | |
| 383 | 392 |
|
| 384 | 393 |
} |
| 385 | 394 |
|
| 395 |
private void lstSearchWord_PreviewKeyDown(object sender, KeyEventArgs e) |
|
| 396 |
{
|
|
| 397 |
int iIndex = this.lstSearchWord.SelectedIndex; |
|
| 398 |
|
|
| 399 |
if (iIndex > -1) |
|
| 400 |
{
|
|
| 401 |
if (e.Key == Key.Up) |
|
| 402 |
{
|
|
| 403 |
int iUpIndex = iIndex- 1; |
|
| 404 |
if(iUpIndex > -1) |
|
| 405 |
{
|
|
| 406 |
this.lstSearchWord.SelectedIndex = iUpIndex; |
|
| 407 |
} |
|
| 408 |
} |
|
| 409 |
else if (e.Key == Key.Down) |
|
| 410 |
{
|
|
| 411 |
int iDownIndex = iIndex + 1; |
|
| 412 |
if(iDownIndex < this.lstSearchWord.Items.Count-1) |
|
| 413 |
{
|
|
| 414 |
this.lstSearchWord.SelectedIndex = iDownIndex; |
|
| 415 |
} |
|
| 416 |
} |
|
| 417 |
} |
|
| 418 |
} |
|
| 419 |
|
|
| 386 | 420 |
private void lstSearchWord_SelectionChanged(object sender, SelectionChangedEventArgs e) |
| 387 | 421 |
{
|
| 388 | 422 |
try |
| ... | ... | |
| 438 | 472 |
var searchFocus = Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.SearchFocusBorder; |
| 439 | 473 |
searchFocus.Visibility = Visibility; |
| 440 | 474 |
|
| 441 |
Canvas.SetLeft(searchFocus, item.searchResult.Left * widthScale); |
|
| 442 |
Canvas.SetTop(searchFocus, item.searchResult.Top * heightScale); |
|
| 443 |
searchFocus.Width = item.searchResult.Width * widthScale; |
|
| 444 |
searchFocus.Height = item.searchResult.Height * widthScale; |
|
| 445 |
|
|
| 446 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ZoomTo(new Rect |
|
| 475 |
if (item.searchResult != null) |
|
| 447 | 476 |
{
|
| 448 |
X =item.searchResult.Left * widthScale, |
|
| 449 |
Y = item.searchResult.Top * heightScale, |
|
| 450 |
Width = ( item.searchResult.Width * widthScale *7), |
|
| 451 |
Height = (item.searchResult.Height * heightScale *7) |
|
| 452 |
}); |
|
| 477 |
Canvas.SetLeft(searchFocus, item.searchResult.Left * widthScale); |
|
| 478 |
Canvas.SetTop(searchFocus, item.searchResult.Top * heightScale); |
|
| 479 |
searchFocus.Width = item.searchResult.Width * widthScale; |
|
| 480 |
searchFocus.Height = item.searchResult.Height * widthScale; |
|
| 481 |
|
|
| 482 |
Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.zoomAndPanControl.ZoomTo(new Rect |
|
| 483 |
{
|
|
| 484 |
X = item.searchResult.Left * widthScale, |
|
| 485 |
Y = item.searchResult.Top * heightScale, |
|
| 486 |
Width = (item.searchResult.Width * widthScale * 7), |
|
| 487 |
Height = (item.searchResult.Height * heightScale * 7) |
|
| 488 |
}); |
|
| 489 |
} |
|
| 453 | 490 |
|
| 454 | 491 |
//extractor.SavePageTextToFile(item.PageNo - 1, @"C:\Users\kts\AppData\Local\Temp\MARKUS\savepageText\text.txt"); |
| 455 | 492 |
//extractor.SavePreprocessedPagePreview(item.PageNo - 1, $"C:\\Users\\kts\\AppData\\Local\\Temp\\MARKUS\\savepageText\\{(item.PageNo - 1).ToString()}.png");
|
| 456 | 493 |
}); |
| 457 | 494 |
} |
| 495 |
|
|
| 496 |
|
|
| 458 | 497 |
} |
| 459 | 498 |
} |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 26 | 26 |
using Markus.Fonts; |
| 27 | 27 |
using System.Threading.Tasks; |
| 28 | 28 |
using System.Windows.Threading; |
| 29 |
using System.Text.RegularExpressions; |
|
| 29 | 30 |
|
| 30 | 31 |
namespace KCOM.Views |
| 31 | 32 |
{
|
| ... | ... | |
| 1356 | 1357 |
} |
| 1357 | 1358 |
} |
| 1358 | 1359 |
|
| 1360 |
private void comboFontSize_PreviewKeyDown(object sender, System.Windows.Input.KeyEventArgs e) |
|
| 1361 |
{
|
|
| 1362 |
if (e.Key == Key.Space || e.Key == Key.ImeProcessed) |
|
| 1363 |
{
|
|
| 1364 |
e.Handled = true; |
|
| 1365 |
} |
|
| 1366 |
} |
|
| 1367 |
|
|
| 1368 |
private void comboFontSize_PreviewTextInput(object sender, System.Windows.Input.TextCompositionEventArgs e) |
|
| 1369 |
{
|
|
| 1370 |
var regex = new Regex(@"[^a-zA-Z0-9\s]"); |
|
| 1371 |
if (regex.IsMatch(e.Text)) |
|
| 1372 |
{
|
|
| 1373 |
e.Handled = true; |
|
| 1374 |
} |
|
| 1375 |
} |
|
| 1376 |
|
|
| 1359 | 1377 |
private void comboFontSize_ValueChanged(object sender, RadRangeBaseValueChangedEventArgs e) |
| 1360 | 1378 |
{
|
| 1361 | 1379 |
if (string.IsNullOrEmpty(comboFontSize.Value.ToString())) |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 17 | 17 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments> |
| 18 | 18 |
</PropertyGroup> |
| 19 | 19 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
|
|
| 20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDkiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
|
|
| 21 | 21 |
<StartAction>Project</StartAction> |
| 22 | 22 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
| 23 | 23 |
</PropertyGroup> |
| KCOM/MARKUS.ini | ||
|---|---|---|
| 3 | 3 |
[External] |
| 4 | 4 |
IP=125.129.196.207 |
| 5 | 5 |
[BaseClientAddress] |
| 6 |
URL=http://localhost:44301 |
|
| 6 |
URL=http://localhost:44301/
|
|
| 7 | 7 |
[HubAddress] |
| 8 | 8 |
URL=http://192.168.0.67:5100/ |
| 9 | 9 |
[UpdateVer64] |
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 253 | 253 |
{
|
| 254 | 254 |
var result = FinalConfirm(); |
| 255 | 255 |
|
| 256 |
if(result == null) |
|
| 257 |
e.Cancel = true; |
|
| 258 |
|
|
| 256 | 259 |
if (result == false) |
| 257 | 260 |
{
|
| 258 | 261 |
e.Cancel = true; |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 119 | 119 |
private BitmapFrame tempPageImage =null; |
| 120 | 120 |
|
| 121 | 121 |
public Undo_data UndoData { get; set; }
|
| 122 |
public CommentUserInfo previousControl { get; set; }
|
|
| 122 | 123 |
public CommentUserInfo currentControl { get; set; }
|
| 123 | 124 |
public ControlType controlType { get; set; }
|
| 124 | 125 |
private Move move = new Move(); |
| ... | ... | |
| 2209 | 2210 |
// enterMouse.IsSelected = false; |
| 2210 | 2211 |
//} |
| 2211 | 2212 |
|
| 2213 |
|
|
| 2212 | 2214 |
var control = ViewerDataModel.Instance.MarkupControls_USER.Where(data => data.IsMouseEnter).FirstOrDefault(); |
| 2213 | 2215 |
if (control != null) |
| 2214 | 2216 |
{
|
| ... | ... | |
| 2226 | 2228 |
} |
| 2227 | 2229 |
else |
| 2228 | 2230 |
{
|
| 2231 |
|
|
| 2229 | 2232 |
} |
| 2230 | 2233 |
} |
| 2231 | 2234 |
|
| ... | ... | |
| 3938 | 3941 |
(currentControl as TextControl).ApplyTemplate(); |
| 3939 | 3942 |
(currentControl as TextControl).Base_TextBox.Focus(); |
| 3940 | 3943 |
(currentControl as TextControl).SetFontFamily(this.ParentOfType<MainWindow>().dzTopMenu.GetFontFamily().FontFamily); |
| 3944 |
|
|
| 3945 |
if(previousControl == null) |
|
| 3946 |
{
|
|
| 3947 |
previousControl = currentControl as TextControl; |
|
| 3948 |
} |
|
| 3949 |
else |
|
| 3950 |
{
|
|
| 3951 |
var vPreviousControl = previousControl as TextControl; |
|
| 3952 |
if (string.IsNullOrEmpty(vPreviousControl.Text)) |
|
| 3953 |
{
|
|
| 3954 |
DeleteCommand.Instance.Execute(new[] { previousControl });
|
|
| 3955 |
previousControl = null; |
|
| 3956 |
} |
|
| 3957 |
else |
|
| 3958 |
{
|
|
| 3959 |
previousControl = currentControl as TextControl; |
|
| 3960 |
} |
|
| 3961 |
} |
|
| 3941 | 3962 |
CreateCommand.Instance.Execute(currentControl); |
| 3963 |
if (previousControl == null) |
|
| 3964 |
previousControl = currentControl; |
|
| 3942 | 3965 |
} |
| 3943 | 3966 |
} |
| 3944 | 3967 |
} |
| ... | ... | |
| 4659 | 4682 |
zoomAndPanControl.CaptureMouse(); |
| 4660 | 4683 |
e.Handled = true; |
| 4661 | 4684 |
} |
| 4685 |
|
|
| 4662 | 4686 |
} |
| 4663 | 4687 |
|
| 4664 | 4688 |
private void zoomAndPanControl2_MouseDown(object sender, MouseButtonEventArgs e) |
| KCOM/Views/TopMenu.xaml | ||
|---|---|---|
| 1 | 1 |
<UserControl |
| 2 |
x:Class="KCOM.Views.TopMenu" |
|
| 3 | 2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
| 4 | 3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
| 5 | 4 |
xmlns:common="clr-namespace:KCOM.Common" |
| ... | ... | |
| 8 | 7 |
xmlns:local="clr-namespace:KCOM.Views" |
| 9 | 8 |
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" |
| 10 | 9 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
| 10 |
xmlns:Globalization="clr-namespace:System.Globalization;assembly=mscorlib" |
|
| 11 |
x:Class="KCOM.Views.TopMenu" |
|
| 11 | 12 |
d:DesignHeight="250" |
| 12 | 13 |
d:DesignWidth="1600" |
| 13 | 14 |
mc:Ignorable="d"> |
| 14 | 15 |
<!-- d:DesignHeight="250" d:DesignWidth="1600"> --> |
| 15 | 16 |
<UserControl.Resources> |
| 16 |
<Style TargetType="telerik:RadToggleButton">
|
|
| 17 |
<Style TargetType="{x:Type telerik:RadToggleButton}">
|
|
| 17 | 18 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" /> |
| 18 | 19 |
<Setter Property="BorderThickness" Value="0" /> |
| 19 | 20 |
<Setter Property="Background" Value="Transparent" /> |
| 20 | 21 |
</Style> |
| 21 |
<Style TargetType="telerik:RadRibbonComboBox">
|
|
| 22 |
<Style TargetType="{x:Type telerik:RadRibbonComboBox}">
|
|
| 22 | 23 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" /> |
| 23 | 24 |
</Style> |
| 24 |
<Style TargetType="telerik:RadRibbonButton">
|
|
| 25 |
<Style TargetType="{x:Type telerik:RadRibbonButton}">
|
|
| 25 | 26 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" /> |
| 26 | 27 |
</Style> |
| 27 |
<Style TargetType="telerik:RadRibbonToggleButton">
|
|
| 28 |
<Style TargetType="{x:Type telerik:RadRibbonToggleButton}">
|
|
| 28 | 29 |
<Setter Property="telerik:StyleManager.Theme" Value="VisualStudio2013" /> |
| 29 | 30 |
</Style> |
| 30 | 31 |
</UserControl.Resources> |
| ... | ... | |
| 136 | 137 |
NumberDecimalDigits="0" |
| 137 | 138 |
ToolTipService.ToolTip="Save Interval Value" |
| 138 | 139 |
ValueChanged="cbSaveInterval_ValueChanged" |
| 139 |
Value="{Binding SaveInterval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
|
|
| 140 |
Value="{Binding SaveInterval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
|
|
| 140 | 141 |
</telerik:RadButtonGroup> |
| 141 | 142 |
|
| 142 | 143 |
</Grid> |
| ... | ... | |
| 449 | 450 |
NumberDecimalDigits="0" |
| 450 | 451 |
ToolTipService.ToolTip="Interval Value" |
| 451 | 452 |
ValueChanged="cbIntervalSize_ValueChanged" |
| 452 |
Value="{Binding Interval, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
|
|
| 453 |
Value="{Binding Interval, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
|
|
| 453 | 454 |
</telerik:RadButtonGroup> |
| 454 | 455 |
|
| 455 | 456 |
|
| ... | ... | |
| 499 | 500 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_new/cloudRect.png" /> |
| 500 | 501 |
</telerik:RadToggleButton> |
| 501 | 502 |
|
| 503 |
|
|
| 504 |
|
|
| 505 |
<!--<telerik:RadButtonGroup Height="20" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Width="120" Margin="-30,6,10,-1" |
|
| 506 |
BorderThickness="1" |
|
| 507 |
telerik:StyleManager.Theme="Windows8"> |
|
| 508 |
<TextBlock Width="50" |
|
| 509 |
Margin="2" |
|
| 510 |
HorizontalAlignment="Center" |
|
| 511 |
VerticalAlignment="Center" |
|
| 512 |
FontSize="10" |
|
| 513 |
Text="ArcSize" |
|
| 514 |
TextAlignment="Center" /> |
|
| 515 |
<telerik:RadNumericUpDown x:Name="cbArcSize" |
|
| 516 |
Width="66" |
|
| 517 |
Height="22" |
|
| 518 |
Margin="2" |
|
| 519 |
HorizontalAlignment="Stretch" |
|
| 520 |
VerticalAlignment="Center" |
|
| 521 |
HorizontalContentAlignment="Center" |
|
| 522 |
Maximum="10" |
|
| 523 |
Minimum="1" |
|
| 524 |
NumberDecimalDigits="0" |
|
| 525 |
telerik:StyleManager.Theme="Windows7" |
|
| 526 |
ToolTipService.ToolTip="Stroke Value" |
|
| 527 |
ValueChanged="cbLineSize_ValueChanged" |
|
| 528 |
|
|
| 529 |
Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 530 |
/> |
|
| 531 |
</telerik:RadButtonGroup>--> |
|
| 502 | 532 |
<!-- 강인구 추가 --> |
| 503 | 533 |
<CheckBox |
| 504 | 534 |
x:Name="cbFillShape" |
| ... | ... | |
| 611 | 641 |
NumberDecimalDigits="0" |
| 612 | 642 |
ToolTipService.ToolTip="Interval Value" |
| 613 | 643 |
ValueChanged="cbArcLength_ValueChanged" |
| 614 |
Value="{Binding ArcLength, Source={x:Static common:ViewerDataModel.Instance}, Mode=TwoWay}" />
|
|
| 644 |
Value="{Binding ArcLength, Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}" />
|
|
| 615 | 645 |
</telerik:RadDockPanel> |
| 616 | 646 |
|
| 617 | 647 |
|
| 618 | 648 |
|
| 619 |
<!--<telerik:RadButtonGroup Height="20" Grid.Column="2" Grid.Row="2" Grid.ColumnSpan="2" Width="120" Margin="-30,6,10,-1" |
|
| 620 |
BorderThickness="1" |
|
| 621 |
telerik:StyleManager.Theme="Windows8"> |
|
| 622 |
<TextBlock Width="50" |
|
| 623 |
Margin="2" |
|
| 624 |
HorizontalAlignment="Center" |
|
| 625 |
VerticalAlignment="Center" |
|
| 626 |
FontSize="10" |
|
| 627 |
Text="ArcSize" |
|
| 628 |
TextAlignment="Center" /> |
|
| 629 |
<telerik:RadNumericUpDown x:Name="cbArcSize" |
|
| 630 |
Width="66" |
|
| 631 |
Height="22" |
|
| 632 |
Margin="2" |
|
| 633 |
HorizontalAlignment="Stretch" |
|
| 634 |
VerticalAlignment="Center" |
|
| 635 |
HorizontalContentAlignment="Center" |
|
| 636 |
Maximum="10" |
|
| 637 |
Minimum="1" |
|
| 638 |
NumberDecimalDigits="0" |
|
| 639 |
telerik:StyleManager.Theme="Windows7" |
|
| 640 |
ToolTipService.ToolTip="Stroke Value" |
|
| 641 |
ValueChanged="cbLineSize_ValueChanged" |
|
| 642 |
|
|
| 643 |
Value="{Binding LineSize, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 644 |
/> |
|
| 645 |
</telerik:RadButtonGroup>--> |
|
| 646 | 649 |
</Grid> |
| 647 | 650 |
</telerik:RadRibbonGroup> |
| 648 | 651 |
<telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed" Header="MACRO"> |
| ... | ... | |
| 789 | 792 |
<telerik:RadOrderedWrapPanel> |
| 790 | 793 |
<StackPanel Orientation="Horizontal"> |
| 791 | 794 |
<telerik:RadRibbonComboBox |
| 792 |
Name="comboFontFamily" |
|
| 795 |
x:Name="comboFontFamily"
|
|
| 793 | 796 |
Width="60" |
| 794 | 797 |
telerik:ScreenTip.Description="Change the font face." |
| 795 | 798 |
telerik:ScreenTip.Title="Font" |
| ... | ... | |
| 817 | 820 |
NumberDecimalDigits="0" |
| 818 | 821 |
ToolTipService.ToolTip="Stroke Value" |
| 819 | 822 |
ValueChanged="comboFontSize_ValueChanged" |
| 820 |
Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" />
|
|
| 823 |
Value="{Binding TextSize, Source={x:Static common:ViewerDataModel.Instance}}" PreviewTextInput="comboFontSize_PreviewTextInput" PreviewKeyDown="comboFontSize_PreviewKeyDown" >
|
|
| 824 |
</telerik:RadNumericUpDown> |
|
| 821 | 825 |
</StackPanel> |
| 822 | 826 |
<StackPanel Orientation="Horizontal"> |
| 823 | 827 |
<telerik:RadToggleButton |
| ... | ... | |
| 1223 | 1227 |
<TextBlock |
| 1224 | 1228 |
Grid.Row="0" |
| 1225 | 1229 |
Grid.Column="1" |
| 1226 |
Margin="0,7,5,0"> |
|
| 1230 |
Margin="0,7,5,0"><InlineUIContainer>
|
|
| 1227 | 1231 |
<TextBlock |
| 1228 | 1232 |
Padding="3" |
| 1229 | 1233 |
HorizontalAlignment="Center" |
| 1230 | 1234 |
VerticalAlignment="Center" |
| 1231 | 1235 |
Text="/" /> |
| 1236 |
</InlineUIContainer><Run Text=" "/><InlineUIContainer> |
|
| 1232 | 1237 |
<TextBlock |
| 1233 | 1238 |
x:Name="tlPageCount" |
| 1234 | 1239 |
Padding="3" |
| 1235 | 1240 |
HorizontalAlignment="Center" |
| 1236 | 1241 |
VerticalAlignment="Center" |
| 1237 | 1242 |
Text="{Binding Document_Info.Count, Source={x:Static common:ViewerDataModel.Instance}}" />
|
| 1238 |
</TextBlock> |
|
| 1243 |
</InlineUIContainer></TextBlock>
|
|
| 1239 | 1244 |
|
| 1240 | 1245 |
<telerik:RadButton |
| 1241 | 1246 |
Grid.Row="1" |
| ... | ... | |
| 1244 | 1249 |
BorderThickness="0" |
| 1245 | 1250 |
Click="PageGoEvent" |
| 1246 | 1251 |
CommandParameter="Down"> |
| 1247 |
<telerik:RadButton.Content> |
|
| 1248 |
<Image |
|
| 1252 |
<Image |
|
| 1249 | 1253 |
Width="20" |
| 1250 | 1254 |
Height="20" |
| 1251 | 1255 |
Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png" |
| 1252 | 1256 |
Stretch="Uniform" /> |
| 1253 |
</telerik:RadButton.Content> |
|
| 1254 | 1257 |
</telerik:RadButton> |
| 1255 | 1258 |
<telerik:RadButton |
| 1256 | 1259 |
Grid.Row="1" |
| ... | ... | |
| 1259 | 1262 |
BorderThickness="0" |
| 1260 | 1263 |
Click="PageGoEvent" |
| 1261 | 1264 |
CommandParameter="Up"> |
| 1262 |
<telerik:RadButton.Content> |
|
| 1263 |
<Image |
|
| 1265 |
<Image |
|
| 1264 | 1266 |
Width="20" |
| 1265 | 1267 |
Height="20" |
| 1266 | 1268 |
RenderTransformOrigin="0.5,0.5" |
| 1267 | 1269 |
Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png" |
| 1268 | 1270 |
Stretch="Uniform"> |
| 1269 |
<Image.RenderTransform> |
|
| 1270 |
<RotateTransform Angle="180" /> |
|
| 1271 |
</Image.RenderTransform> |
|
| 1272 |
</Image> |
|
| 1273 |
</telerik:RadButton.Content> |
|
| 1271 |
<Image.RenderTransform> |
|
| 1272 |
<RotateTransform Angle="180" /> |
|
| 1273 |
</Image.RenderTransform> |
|
| 1274 |
</Image> |
|
| 1274 | 1275 |
</telerik:RadButton> |
| 1275 | 1276 |
</Grid> |
| 1276 | 1277 |
</telerik:RadRibbonGroup> |
| ... | ... | |
| 1783 | 1784 |
BorderThickness="0" |
| 1784 | 1785 |
Click="PageGoEvent" |
| 1785 | 1786 |
CommandParameter="Down"> |
| 1786 |
<telerik:RadButton.Content> |
|
| 1787 |
<Image |
|
| 1787 |
<Image |
|
| 1788 | 1788 |
Width="20" |
| 1789 | 1789 |
Height="20" |
| 1790 | 1790 |
Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png" |
| 1791 | 1791 |
Stretch="Uniform" /> |
| 1792 |
</telerik:RadButton.Content> |
|
| 1793 | 1792 |
</telerik:RadButton> |
| 1794 | 1793 |
|
| 1795 | 1794 |
<telerik:RadButton |
| ... | ... | |
| 1800 | 1799 |
BorderThickness="0" |
| 1801 | 1800 |
Click="PageGoEvent" |
| 1802 | 1801 |
CommandParameter="Up"> |
| 1803 |
<telerik:RadButton.Content> |
|
| 1804 |
<Image |
|
| 1802 |
<Image |
|
| 1805 | 1803 |
Width="20" |
| 1806 | 1804 |
Height="20" |
| 1807 | 1805 |
RenderTransformOrigin="0.5,0.5" |
| 1808 | 1806 |
Source="/KCOM;component/Resources/Images/MenuImage_new/pagearrow.png" |
| 1809 | 1807 |
Stretch="Uniform"> |
| 1810 |
<Image.RenderTransform> |
|
| 1811 |
<RotateTransform Angle="180" /> |
|
| 1812 |
</Image.RenderTransform> |
|
| 1813 |
</Image> |
|
| 1814 |
</telerik:RadButton.Content> |
|
| 1808 |
<Image.RenderTransform> |
|
| 1809 |
<RotateTransform Angle="180" /> |
|
| 1810 |
</Image.RenderTransform> |
|
| 1811 |
</Image> |
|
| 1815 | 1812 |
</telerik:RadButton> |
| 1816 | 1813 |
</StackPanel> |
| 1817 | 1814 |
<!--<Grid Margin="0,-1,0,0"> |
| ... | ... | |
| 2417 | 2414 |
BorderThickness="0" |
| 2418 | 2415 |
Click="CheckEvent" |
| 2419 | 2416 |
CommandParameter="Check"> |
| 2420 |
<telerik:RadButton.Content> |
|
| 2421 |
<Image |
|
| 2417 |
<Image |
|
| 2422 | 2418 |
Width="26" |
| 2423 | 2419 |
Height="26" |
| 2424 | 2420 |
Source="/KCOM;component/Resources/Images/MenuImage_new/checklist.png" |
| 2425 | 2421 |
Stretch="Uniform" /> |
| 2426 |
</telerik:RadButton.Content> |
|
| 2427 | 2422 |
</telerik:RadButton> |
| 2428 | 2423 |
</StackPanel> |
| 2429 | 2424 |
</telerik:RadOrderedWrapPanel> |
| ... | ... | |
| 2460 | 2455 |
Margin="0,0,5,0" |
| 2461 | 2456 |
BorderThickness="0" |
| 2462 | 2457 |
Click="SignManagerEvent"> |
| 2463 |
<telerik:RadButton.Content> |
|
| 2464 |
<Image |
|
| 2458 |
<Image |
|
| 2465 | 2459 |
Width="26" |
| 2466 | 2460 |
Height="26" |
| 2467 | 2461 |
Source="/KCOM;component/Resources/Images/MenuImage_new/signReal.png" |
| 2468 | 2462 |
Stretch="Uniform" /> |
| 2469 |
</telerik:RadButton.Content> |
|
| 2470 | 2463 |
</telerik:RadButton> |
| 2471 | 2464 |
</StackPanel> |
| 2472 | 2465 |
</telerik:RadOrderedWrapPanel> |
| KCOM/Views/TopMenu.xaml.cs | ||
|---|---|---|
| 114 | 114 |
} |
| 115 | 115 |
|
| 116 | 116 |
} |
| 117 |
|
|
| 118 |
|
|
| 119 | 117 |
} |
| 120 | 118 |
} |
내보내기 Unified diff
