개정판 fc4e50f2
macro 버튼 수정
Change-Id: Ibb11d25921cfe200e11b7eddc08265c84087e374
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 2440 | 2440 |
} |
| 2441 | 2441 |
else |
| 2442 | 2442 |
{
|
| 2443 |
if (Common.ViewerDataModel.Instance.IsMacroCommand) |
|
| 2444 |
{
|
|
| 2445 |
MacroHelper.Clear(); |
|
| 2446 |
} |
|
| 2443 | 2447 |
|
| 2444 | 2448 |
if (!instanceMain.dzMainMenu.IsFreeSelectionMode) |
| 2445 | 2449 |
{
|
| KCOM/Extensions/MacroHelper.cs | ||
|---|---|---|
| 55 | 55 |
return result; |
| 56 | 56 |
} |
| 57 | 57 |
|
| 58 |
/// <summary> |
|
| 59 |
/// macro 초기화 |
|
| 60 |
/// </summary> |
|
| 61 |
public static void Clear() |
|
| 62 |
{
|
|
| 63 |
var menu = ViewerDataModel.Instance.SystemMain.dzMainMenu; |
|
| 64 |
|
|
| 65 |
Common.ViewerDataModel.Instance.IsMacroCommand = false; |
|
| 66 |
Common.ViewerDataModel.Instance.MacroCommandIndex = 0; |
|
| 67 |
Common.ViewerDataModel.Instance.MacroItems.ForEach(x => |
|
| 68 |
{
|
|
| 69 |
x.IsCurrent = false; |
|
| 70 |
x.IsDraw = false; |
|
| 71 |
}); |
|
| 72 |
|
|
| 73 |
menu.controlType = MarkupToPDF.Controls.Common.ControlType.None; |
|
| 74 |
menu.txtBatch.Visibility = System.Windows.Visibility.Collapsed; |
|
| 75 |
menu.mouseHandlingMode = IKCOM.MouseHandlingMode.None; |
|
| 76 |
var TogList = menu.Parent.ChildrenOfType<Telerik.Windows.Controls.RadToggleButton>(); |
|
| 77 |
|
|
| 78 |
foreach (var tog in TogList) |
|
| 79 |
{
|
|
| 80 |
tog.IsChecked = false; |
|
| 81 |
} |
|
| 82 |
} |
|
| 83 |
|
|
| 58 | 84 |
public static void MacroAction() |
| 59 | 85 |
{
|
| 60 | 86 |
var menu = ViewerDataModel.Instance.SystemMain.dzMainMenu; |
| ... | ... | |
| 95 | 121 |
} |
| 96 | 122 |
else |
| 97 | 123 |
{
|
| 98 |
Common.ViewerDataModel.Instance.IsMacroCommand = false; |
|
| 99 |
Common.ViewerDataModel.Instance.MacroCommandIndex = 0; |
|
| 100 |
Common.ViewerDataModel.Instance.MacroItems.ForEach(x => |
|
| 101 |
{
|
|
| 102 |
x.IsCurrent = false; |
|
| 103 |
x.IsDraw = false; |
|
| 104 |
}); |
|
| 105 |
|
|
| 106 |
menu.controlType = MarkupToPDF.Controls.Common.ControlType.None; |
|
| 107 |
menu.txtBatch.Visibility = System.Windows.Visibility.Collapsed; |
|
| 108 |
menu.mouseHandlingMode = IKCOM.MouseHandlingMode.None; |
|
| 109 |
var TogList = menu.Parent.ChildrenOfType<Telerik.Windows.Controls.RadToggleButton>(); |
|
| 110 |
|
|
| 111 |
foreach (var tog in TogList) |
|
| 112 |
{
|
|
| 113 |
tog.IsChecked = false; |
|
| 114 |
} |
|
| 124 |
Clear(); |
|
| 115 | 125 |
} |
| 116 | 126 |
|
| 117 | 127 |
} |
| KCOM/Views/TopMenu.xaml | ||
|---|---|---|
| 438 | 438 |
</Grid> |
| 439 | 439 |
</telerik:RadRibbonGroup> |
| 440 | 440 |
<telerik:RadRibbonGroup DialogLauncherVisibility="Collapsed" Header="MACRO"> |
| 441 |
<telerik:RadToggleButton Width="30" Height="30" Click="ControlEvent" CommandParameter="MACRO;1" Tag="Normal"> |
|
| 442 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_new/cloudRectArrowText.png" /> |
|
| 443 |
</telerik:RadToggleButton> |
|
| 441 |
<Grid VerticalAlignment="Top"> |
|
| 442 |
<telerik:RadToggleButton Width="64" Height="30" Click="ControlEvent" CommandParameter="MACRO;1" Tag="Normal" BorderThickness="1"> |
|
| 443 |
<StackPanel Orientation="Horizontal" Background="Transparent"> |
|
| 444 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_new/cloudRect.png" /> |
|
| 445 |
<TextBlock Text="+"/> |
|
| 446 |
<Image Source="/KCOM;component/Resources/Images/MenuImage_new/ArrowTextBorder.png"/> |
|
| 447 |
</StackPanel> |
|
| 448 |
</telerik:RadToggleButton> |
|
| 449 |
</Grid> |
|
| 444 | 450 |
</telerik:RadRibbonGroup> |
| 445 | 451 |
<telerik:RadRibbonGroup x:Name="TextControlGroup" DialogLauncherVisibility="Collapsed" |
| 446 | 452 |
Header="TEXT" Icon="/KCOM;component/Resources/Images/MenuImage_New/small/text.png"> |
내보내기 Unified diff
