개정판 91e84544
방향키에 의한 이미지 이동
Change-Id: I9d9e7798483d896119c283ed71bdb0b058e1a3c7
| KCOM/App.xaml | ||
|---|---|---|
| 27 | 27 |
<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/System.Windows.xaml"/> |
| 28 | 28 |
<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.xaml"/> |
| 29 | 29 |
<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Input.xaml"/> |
| 30 |
|
|
| 30 |
<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Navigation.xaml"/> |
|
| 31 |
<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/> |
|
| 31 | 32 |
<!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.RibbonView.xaml"/>--> |
| 32 | 33 |
<!--<ResourceDictionary Source="/Telerik.Windows.Themes.VisualStudio2013;component/Themes/Telerik.Windows.Controls.Docking.xaml"/>--> |
| 33 | 34 |
</ResourceDictionary.MergedDictionaries> |
| 35 |
<Style TargetType="telerik:AutoHideArea" BasedOn="{StaticResource AutoHideAreaStyle}">
|
|
| 36 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" /> |
|
| 37 |
</Style> |
|
| 38 |
<Style TargetType="telerik:RadDocking" BasedOn="{StaticResource RadDockingStyle}">
|
|
| 39 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 40 |
</Style> |
|
| 41 |
<Style TargetType="telerik:RadGridResizer" BasedOn="{StaticResource RadGridResizerStyle}">
|
|
| 42 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 43 |
</Style> |
|
| 44 |
<Style TargetType="telerik:RadSplitContainer" BasedOn="{StaticResource RadSplitContainerStyle}">
|
|
| 45 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 46 |
</Style> |
|
| 47 |
<Style TargetType="telerik:RadPaneGroup" BasedOn="{StaticResource RadPaneGroupStyle}">
|
|
| 48 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 49 |
</Style> |
|
| 50 |
<Style TargetType="telerik:PaneHeader" BasedOn="{StaticResource PaneHeaderStyle}">
|
|
| 51 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 52 |
</Style> |
|
| 53 |
<Style TargetType="telerik:RadTabControl" BasedOn="{StaticResource RadTabControlStyle}">
|
|
| 54 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False"/> |
|
| 55 |
</Style> |
|
| 34 | 56 |
</ResourceDictionary> |
| 35 | 57 |
|
| 36 | 58 |
</Application.Resources> |
| KCOM/App.xaml.cs | ||
|---|---|---|
| 231 | 231 |
|
| 232 | 232 |
await SplashScreenAsnyc(); |
| 233 | 233 |
base.OnStartup(e); |
| 234 |
|
|
| 234 |
|
|
| 235 | 235 |
System.Windows.Input.Keyboard.AddKeyDownHandler(this.MainWindow, KeyDownEvent); |
| 236 | 236 |
} |
| 237 | 237 |
catch (Exception ex) |
| KCOM/Events/Event_KeyEvent.cs | ||
|---|---|---|
| 23 | 23 |
public double CumulativeWheel = 0; |
| 24 | 24 |
MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn markupReturn = new MarkupToPDF.Controls.Parsing.MarkupParser.MarkupReturn(); |
| 25 | 25 |
|
| 26 |
public void KeyEventDownAction(object sender, KeyEventArgs e) |
|
| 26 |
public async void KeyEventDownAction(object sender, KeyEventArgs e)
|
|
| 27 | 27 |
{
|
| 28 |
if (e.IsRepeat && !ViewerDataModel.Instance.IsPressCtrl && !ViewerDataModel.Instance.IsPressShift) |
|
| 29 |
return; |
|
| 30 |
|
|
| 28 |
//if (e.IsRepeat && !ViewerDataModel.Instance.IsPressCtrl && !ViewerDataModel.Instance.IsPressShift)
|
|
| 29 |
// return;
|
|
| 30 |
await this.Dispatcher.InvokeAsync(() => {
|
|
| 31 | 31 |
switch (e.Key) |
| 32 | 32 |
{
|
| 33 | 33 |
//강인구 추가 |
| ... | ... | |
| 253 | 253 |
case Key.Up: |
| 254 | 254 |
case Key.Down: |
| 255 | 255 |
{
|
| 256 |
if(sender is UIElement) |
|
| 257 |
{
|
|
| 258 |
(sender as UIElement).SetValue(TabNavigationExtensions.IsTabStopProperty, false); |
|
| 259 |
} |
|
| 260 |
|
|
| 256 | 261 |
Point? MovePoint = null; |
| 257 | 262 |
if ((e.Key == Key.NumPad5) || (e.Key == Key.Down)) |
| 258 | 263 |
{
|
| ... | ... | |
| 280 | 285 |
} |
| 281 | 286 |
else |
| 282 | 287 |
{
|
| 283 |
if (ViewerDataModel.Instance.IsPressCtrl) |
|
| 284 |
{
|
|
| 288 |
//if (ViewerDataModel.Instance.IsPressCtrl)
|
|
| 289 |
//{
|
|
| 285 | 290 |
bool IsMovePossibility = false; |
| 286 | 291 |
|
| 287 | 292 |
var instance = ViewerDataModel.Instance; |
| ... | ... | |
| 325 | 330 |
|
| 326 | 331 |
System.Diagnostics.Debug.WriteLine(this.dzMainMenu.zoomAndPanControl.ContentOffsetX); |
| 327 | 332 |
} |
| 328 |
} |
|
| 333 |
//}
|
|
| 329 | 334 |
} |
| 330 | 335 |
} |
| 331 | 336 |
} |
| ... | ... | |
| 339 | 344 |
this.dzMainMenu.pageNavigator.GotoPage(Convert.ToInt32(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.CurrentPage.PageNumber) + 1); |
| 340 | 345 |
break; |
| 341 | 346 |
} |
| 347 |
}); |
|
| 342 | 348 |
} |
| 343 | 349 |
|
| 344 | 350 |
|
| KCOM/MainWindow.xaml | ||
|---|---|---|
| 9 | 9 |
mc:Ignorable="d" |
| 10 | 10 |
WindowStyle="None" WindowStartupLocation="CenterScreen" ResizeMode="CanResizeWithGrip" AllowsTransparency="True" |
| 11 | 11 |
Background="{DynamicResource KCOMColor_TopMenubackgroundBrush}"
|
| 12 |
telerik:TabNavigationExtensions.IsTabStop="False" |
|
| 12 | 13 |
Title="MARKUS" > |
| 13 | 14 |
<Window.Resources> |
| 14 | 15 |
<Style x:Key="NoMarginGrid" TargetType="{x:Type Grid}">
|
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 48 | 48 |
{
|
| 49 | 49 |
App.splashString(ISplashMessage.MAINWINDOW); |
| 50 | 50 |
this.Loaded += MainWindow_Loaded; |
| 51 |
this.KeyDown += new KeyEventHandler(KeyEventDownAction); |
|
| 51 |
this.PreviewKeyDown += new KeyEventHandler(KeyEventDownAction);
|
|
| 52 | 52 |
this.SourceInitialized += new EventHandler(win_SourceInitialized); |
| 53 | 53 |
} |
| 54 | 54 |
|
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 108 | 108 |
<TextBlock x:Name="txtBatch" Foreground="Red" FontSize="20" Text="Mark Control을 그립니다."/> |
| 109 | 109 |
</Popup> |
| 110 | 110 |
<telerik:RadBusyIndicator x:Name="busyIndicator" IsBusy="False" BusyContent="Saving..."> |
| 111 |
<ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl" |
|
| 111 |
<ZoomAndPan:ZoomAndPanControl x:Name="zoomAndPanControl"
|
|
| 112 | 112 |
MouseWheel="zoomAndPanControl_MouseWheel" |
| 113 | 113 |
MouseDown="zoomAndPanControl_MouseDown" |
| 114 | 114 |
MouseMove="zoomAndPanControl_MouseMove" |
| ... | ... | |
| 169 | 169 |
</controls:ScaleDecodeImage>--> |
| 170 | 170 |
<Image Panel.ZIndex="0" x:Name="mainPanel" RenderOptions.BitmapScalingMode="HighQuality" |
| 171 | 171 |
RenderOptions.EdgeMode="Unspecified" RenderOptions.ClearTypeHint="Enabled" |
| 172 |
Source="{Binding ImageViewPath,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 172 |
Source="{Binding ImageViewPath,Mode=OneWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
|
| 173 | 173 |
Width="{Binding ImageViewWidth,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 174 | 174 |
Height="{Binding ImageViewHeight,Mode=TwoWay, Source={x:Static common:ViewerDataModel.Instance}}"
|
| 175 | 175 |
> |
| MarkupToPDF/Common/CommentUserInfo.cs | ||
|---|---|---|
| 38 | 38 |
|
| 39 | 39 |
public CommentUserInfo() |
| 40 | 40 |
{
|
| 41 |
this.BorderThickness = new System.Windows.Thickness(20.0); |
|
| 41 |
this.SetValue(Telerik.Windows.Controls.TabNavigationExtensions.IsTabStopProperty, false); |
|
| 42 |
this.BorderThickness = new System.Windows.Thickness(20.0); |
|
| 42 | 43 |
this.MouseEnter += CommentUserInfo_MouseEnter; |
| 43 | 44 |
this.MouseLeave += CommentUserInfo_MouseLeave; |
| 44 | 45 |
} |
내보내기 Unified diff
