개정판 3abe8d4e
issue #00000 자신의 마크업이 없는 경우 GotoMarkup에서 오류발생
Change-Id: Ideebbe7797a790e55dfa96e24fe5a6a528eeb784
| FileUploadWevService/Properties/PublishProfiles/FolderProfile.pubxml | ||
|---|---|---|
| 7 | 7 |
<PropertyGroup> |
| 8 | 8 |
<WebPublishMethod>FileSystem</WebPublishMethod> |
| 9 | 9 |
<PublishProvider>FileSystem</PublishProvider> |
| 10 |
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
|
|
| 11 |
<LastUsedPlatform>Any CPU</LastUsedPlatform>
|
|
| 10 |
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
|
|
| 11 |
<LastUsedPlatform>x64</LastUsedPlatform>
|
|
| 12 | 12 |
<SiteUrlToLaunchAfterPublish /> |
| 13 | 13 |
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> |
| 14 | 14 |
<ExcludeApp_Data>False</ExcludeApp_Data> |
| KCOM.sln | ||
|---|---|---|
| 113 | 113 |
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D078FFFA-9F9E-43F5-8770-E4398FAB46A0}"
|
| 114 | 114 |
ProjectSection(SolutionItems) = preProject |
| 115 | 115 |
Nuget.config = Nuget.config |
| 116 |
testLink.txt = testLink.txt |
|
| 116 | 117 |
EndProjectSection |
| 117 | 118 |
EndProject |
| 118 | 119 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FileUploadWevService", "FileUploadWevService\FileUploadWevService.csproj", "{8A7E6629-886E-4F39-A8C5-EE24589891A8}"
|
| KCOM/App.xaml | ||
|---|---|---|
| 51 | 51 |
<Style BasedOn="{StaticResource RadPaneGroupStyle}" TargetType="telerik:RadPaneGroup">
|
| 52 | 52 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" /> |
| 53 | 53 |
</Style> |
| 54 |
<Style BasedOn="{StaticResource RadPaneStyle}" TargetType="telerik:RadPane">
|
|
| 55 |
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> |
|
| 56 |
</Style> |
|
| 54 | 57 |
<Style BasedOn="{StaticResource PaneHeaderStyle}" TargetType="telerik:PaneHeader">
|
| 55 | 58 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" /> |
| 59 |
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> |
|
| 56 | 60 |
</Style> |
| 57 | 61 |
<Style BasedOn="{StaticResource RadTabControlStyle}" TargetType="telerik:RadTabControl">
|
| 58 | 62 |
<Setter Property="telerik:TabNavigationExtensions.IsTabStop" Value="False" /> |
| KCOM/Assets/MarkupColorListBox.xaml | ||
|---|---|---|
| 1 |
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
|
| 2 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:System="clr-namespace:System;assembly=mscorlib" |
|
| 3 |
xmlns:ikcom="clr-namespace:IKCOM;assembly=IKCOM" |
|
| 4 |
xmlns:local="clr-namespace:KCOM.Assets" xmlns:converter="clr-namespace:KCOM.Common.Converter" xmlns:common="clr-namespace:KCOM.Common"> |
|
| 5 |
<ikcom:SetColorMarkupItem x:Key="ColorItemDataSource" /> |
|
| 1 |
<ResourceDictionary |
|
| 2 |
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
| 3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" |
|
| 4 |
xmlns:System="clr-namespace:System;assembly=mscorlib" |
|
| 5 |
xmlns:common="clr-namespace:KCOM.Common" |
|
| 6 |
xmlns:converter="clr-namespace:KCOM.Common.Converter" |
|
| 7 |
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" |
|
| 8 |
xmlns:ikcom="clr-namespace:IKCOM;assembly=IKCOM" |
|
| 9 |
xmlns:local="clr-namespace:KCOM.Assets" |
|
| 10 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"> |
|
| 11 |
<ikcom:SetColorMarkupItem x:Key="ColorItemDataSource" /> |
|
| 6 | 12 |
<!-- Resource dictionary entries should be defined here. --> |
| 7 |
<converter:StringToColorConverter x:Key="StringToColorConverter" />
|
|
| 13 |
<converter:StringToColorBrushConverter x:Key="StringToColorBrushConverter" />
|
|
| 8 | 14 |
<DataTemplate x:Key="MarkupPagesColorItem"> |
| 9 | 15 |
<StackPanel> |
| 10 |
<Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}">
|
|
| 11 |
<TextBlock FontSize="16"
|
|
| 12 |
Foreground="{Binding DisplayColor,
|
|
| 13 |
Converter={StaticResource StringToColorConverter}}"
|
|
| 14 |
Text="C"
|
|
| 15 |
TextWrapping="Wrap" />
|
|
| 16 |
<Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}">
|
|
| 17 |
<TextBlock |
|
| 18 |
FontSize="16"
|
|
| 19 |
Foreground="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}"
|
|
| 20 |
Text="C" |
|
| 21 |
TextWrapping="Wrap" /> |
|
| 16 | 22 |
</Border> |
| 17 | 23 |
</StackPanel> |
| 18 | 24 |
</DataTemplate> |
| ... | ... | |
| 44 | 50 |
<Setter.Value> |
| 45 | 51 |
<ControlTemplate TargetType="ListBox"> |
| 46 | 52 |
<Grid> |
| 53 |
<Border CornerRadius="2"> |
|
| 54 |
<!-- <ScrollViewer x:Name="ScrollViewer" BorderThickness="0" Padding="{TemplateBinding Padding}" TabNavigation="{TemplateBinding TabNavigation}" BorderBrush="{x:Null}"> -->
|
|
| 55 |
<ItemsPresenter /> |
|
| 56 |
<!-- </ScrollViewer> --> |
|
| 57 |
</Border> |
|
| 58 |
<Border |
|
| 59 |
x:Name="ValidationErrorElement" |
|
| 60 |
BorderBrush="#FFDB000C" |
|
| 61 |
BorderThickness="{TemplateBinding BorderThickness}"
|
|
| 62 |
CornerRadius="2" |
|
| 63 |
Visibility="Collapsed"> |
|
| 64 |
<ToolTipService.ToolTip> |
|
| 65 |
|
|
| 66 |
<!-- 오류로 주석처리함 Template="{StaticResource ValidationToolTipTemplate}" -->
|
|
| 67 |
<ToolTip |
|
| 68 |
x:Name="validationTooltip" |
|
| 69 |
DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}"
|
|
| 70 |
Placement="Right" |
|
| 71 |
PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}">
|
|
| 72 |
<ToolTip.Triggers> |
|
| 73 |
<EventTrigger RoutedEvent="Canvas.Loaded"> |
|
| 74 |
<BeginStoryboard> |
|
| 75 |
<Storyboard> |
|
| 76 |
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="validationTooltip" Storyboard.TargetProperty="IsHitTestVisible"> |
|
| 77 |
<DiscreteObjectKeyFrame KeyTime="0"> |
|
| 78 |
<DiscreteObjectKeyFrame.Value> |
|
| 79 |
<System:Boolean>true</System:Boolean> |
|
| 80 |
</DiscreteObjectKeyFrame.Value> |
|
| 81 |
</DiscreteObjectKeyFrame> |
|
| 82 |
</ObjectAnimationUsingKeyFrames> |
|
| 83 |
</Storyboard> |
|
| 84 |
</BeginStoryboard> |
|
| 85 |
</EventTrigger> |
|
| 86 |
</ToolTip.Triggers> |
|
| 87 |
</ToolTip> |
|
| 88 |
</ToolTipService.ToolTip> |
|
| 89 |
<Grid |
|
| 90 |
Width="10" |
|
| 91 |
Height="10" |
|
| 92 |
Margin="0,-4,-4,0" |
|
| 93 |
HorizontalAlignment="Right" |
|
| 94 |
VerticalAlignment="Top" |
|
| 95 |
Background="Transparent"> |
|
| 96 |
<Path |
|
| 97 |
Margin="-1,3,0,0" |
|
| 98 |
Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z" |
|
| 99 |
Fill="#FFDC000C" /> |
|
| 100 |
<Path |
|
| 101 |
Margin="-1,3,0,0" |
|
| 102 |
Data="M 0,0 L2,0 L 8,6 L8,8" |
|
| 103 |
Fill="#ffffff" /> |
|
| 104 |
</Grid> |
|
| 105 |
</Border> |
|
| 47 | 106 |
<VisualStateManager.VisualStateGroups> |
| 48 | 107 |
<VisualStateGroup x:Name="ValidationStates"> |
| 49 | 108 |
<VisualState x:Name="Valid" /> |
| ... | ... | |
| 78 | 137 |
</VisualState> |
| 79 | 138 |
</VisualStateGroup> |
| 80 | 139 |
</VisualStateManager.VisualStateGroups> |
| 81 |
<Border CornerRadius="2"> |
|
| 82 |
<!-- <ScrollViewer x:Name="ScrollViewer" BorderThickness="0" Padding="{TemplateBinding Padding}" TabNavigation="{TemplateBinding TabNavigation}" BorderBrush="{x:Null}"> -->
|
|
| 83 |
<ItemsPresenter /> |
|
| 84 |
<!-- </ScrollViewer> --> |
|
| 85 |
</Border> |
|
| 86 |
<Border x:Name="ValidationErrorElement" |
|
| 87 |
BorderBrush="#FFDB000C" |
|
| 88 |
BorderThickness="{TemplateBinding BorderThickness}"
|
|
| 89 |
CornerRadius="2" |
|
| 90 |
Visibility="Collapsed"> |
|
| 91 |
<ToolTipService.ToolTip> |
|
| 92 |
|
|
| 93 |
<!--오류로 주석처리함 Template="{StaticResource ValidationToolTipTemplate}"-->
|
|
| 94 |
<ToolTip x:Name="validationTooltip" |
|
| 95 |
DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}"
|
|
| 96 |
Placement="Right" |
|
| 97 |
PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}">
|
|
| 98 |
<ToolTip.Triggers> |
|
| 99 |
<EventTrigger RoutedEvent="Canvas.Loaded"> |
|
| 100 |
<BeginStoryboard> |
|
| 101 |
<Storyboard> |
|
| 102 |
<ObjectAnimationUsingKeyFrames Storyboard.TargetName="validationTooltip" Storyboard.TargetProperty="IsHitTestVisible"> |
|
| 103 |
<DiscreteObjectKeyFrame KeyTime="0"> |
|
| 104 |
<DiscreteObjectKeyFrame.Value> |
|
| 105 |
<System:Boolean>true</System:Boolean> |
|
| 106 |
</DiscreteObjectKeyFrame.Value> |
|
| 107 |
</DiscreteObjectKeyFrame> |
|
| 108 |
</ObjectAnimationUsingKeyFrames> |
|
| 109 |
</Storyboard> |
|
| 110 |
</BeginStoryboard> |
|
| 111 |
</EventTrigger> |
|
| 112 |
</ToolTip.Triggers> |
|
| 113 |
</ToolTip> |
|
| 114 |
</ToolTipService.ToolTip> |
|
| 115 |
<Grid Width="10" |
|
| 116 |
Height="10" |
|
| 117 |
Margin="0,-4,-4,0" |
|
| 118 |
HorizontalAlignment="Right" |
|
| 119 |
VerticalAlignment="Top" |
|
| 120 |
Background="Transparent"> |
|
| 121 |
<Path Margin="-1,3,0,0" |
|
| 122 |
Data="M 1,0 L6,0 A 2,2 90 0 1 8,2 L8,7 z" |
|
| 123 |
Fill="#FFDC000C" /> |
|
| 124 |
<Path Margin="-1,3,0,0" |
|
| 125 |
Data="M 0,0 L2,0 L 8,6 L8,8" |
|
| 126 |
Fill="#ffffff" /> |
|
| 127 |
</Grid> |
|
| 128 |
</Border> |
|
| 129 | 140 |
</Grid> |
| 130 | 141 |
</ControlTemplate> |
| 131 | 142 |
</Setter.Value> |
| ... | ... | |
| 142 | 153 |
<Setter.Value> |
| 143 | 154 |
<ControlTemplate TargetType="ListBoxItem"> |
| 144 | 155 |
<Grid Background="{TemplateBinding Background}">
|
| 156 |
<Rectangle |
|
| 157 |
x:Name="fillColor" |
|
| 158 |
Fill="#FFBADDE9" |
|
| 159 |
IsHitTestVisible="False" |
|
| 160 |
Opacity="0" |
|
| 161 |
RadiusX="1" |
|
| 162 |
RadiusY="1" /> |
|
| 163 |
<Rectangle |
|
| 164 |
x:Name="fillColor2" |
|
| 165 |
Fill="#FFBADDE9" |
|
| 166 |
IsHitTestVisible="False" |
|
| 167 |
Opacity="0" |
|
| 168 |
RadiusX="1" |
|
| 169 |
RadiusY="1" /> |
|
| 170 |
<ContentPresenter |
|
| 171 |
x:Name="contentPresenter" |
|
| 172 |
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
|
|
| 173 |
VerticalAlignment="{TemplateBinding VerticalAlignment}"
|
|
| 174 |
Content="{TemplateBinding Content}"
|
|
| 175 |
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
|
| 176 |
<Rectangle |
|
| 177 |
x:Name="FocusVisualElement" |
|
| 178 |
Stroke="#FF6DBDD1" |
|
| 179 |
StrokeThickness="0" |
|
| 180 |
Visibility="Collapsed" /> |
|
| 145 | 181 |
<VisualStateManager.VisualStateGroups> |
| 146 | 182 |
<VisualStateGroup x:Name="CommonStates"> |
| 147 | 183 |
<VisualState x:Name="Normal" /> |
| 148 | 184 |
<VisualState x:Name="MouseOver"> |
| 149 | 185 |
<Storyboard> |
| 150 |
<DoubleAnimation Duration="0" |
|
| 151 |
Storyboard.TargetName="fillColor" |
|
| 152 |
Storyboard.TargetProperty="Opacity" |
|
| 153 |
To=".35" /> |
|
| 186 |
<DoubleAnimation |
|
| 187 |
Storyboard.TargetName="fillColor" |
|
| 188 |
Storyboard.TargetProperty="Opacity" |
|
| 189 |
To=".35" |
|
| 190 |
Duration="0" /> |
|
| 154 | 191 |
</Storyboard> |
| 155 | 192 |
</VisualState> |
| 156 | 193 |
<VisualState x:Name="Disabled"> |
| 157 | 194 |
<Storyboard> |
| 158 |
<DoubleAnimation Duration="0" |
|
| 159 |
Storyboard.TargetName="contentPresenter" |
|
| 160 |
Storyboard.TargetProperty="Opacity" |
|
| 161 |
To=".55" /> |
|
| 195 |
<DoubleAnimation |
|
| 196 |
Storyboard.TargetName="contentPresenter" |
|
| 197 |
Storyboard.TargetProperty="Opacity" |
|
| 198 |
To=".55" |
|
| 199 |
Duration="0" /> |
|
| 162 | 200 |
</Storyboard> |
| 163 | 201 |
</VisualState> |
| 164 | 202 |
</VisualStateGroup> |
| ... | ... | |
| 166 | 204 |
<VisualState x:Name="Unselected" /> |
| 167 | 205 |
<VisualState x:Name="Selected"> |
| 168 | 206 |
<Storyboard> |
| 169 |
<DoubleAnimation Duration="0" |
|
| 170 |
Storyboard.TargetName="fillColor2" |
|
| 171 |
Storyboard.TargetProperty="Opacity" |
|
| 172 |
To=".75" /> |
|
| 207 |
<DoubleAnimation |
|
| 208 |
Storyboard.TargetName="fillColor2" |
|
| 209 |
Storyboard.TargetProperty="Opacity" |
|
| 210 |
To=".75" |
|
| 211 |
Duration="0" /> |
|
| 173 | 212 |
</Storyboard> |
| 174 | 213 |
</VisualState> |
| 175 | 214 |
</VisualStateGroup> |
| 176 | 215 |
<VisualStateGroup x:Name="FocusStates"> |
| 177 | 216 |
<VisualState x:Name="Focused"> |
| 178 | 217 |
<Storyboard> |
| 179 |
<ObjectAnimationUsingKeyFrames Duration="0" |
|
| 180 |
Storyboard.TargetName="FocusVisualElement" |
|
| 181 |
Storyboard.TargetProperty="Visibility"> |
|
| 218 |
<ObjectAnimationUsingKeyFrames |
|
| 219 |
Storyboard.TargetName="FocusVisualElement" |
|
| 220 |
Storyboard.TargetProperty="Visibility" |
|
| 221 |
Duration="0"> |
|
| 182 | 222 |
<DiscreteObjectKeyFrame KeyTime="0"> |
| 183 | 223 |
<DiscreteObjectKeyFrame.Value> |
| 184 | 224 |
<Visibility>Visible</Visibility> |
| ... | ... | |
| 190 | 230 |
<VisualState x:Name="Unfocused" /> |
| 191 | 231 |
</VisualStateGroup> |
| 192 | 232 |
</VisualStateManager.VisualStateGroups> |
| 193 |
<Rectangle x:Name="fillColor" |
|
| 194 |
Fill="#FFBADDE9" |
|
| 195 |
IsHitTestVisible="False" |
|
| 196 |
Opacity="0" |
|
| 197 |
RadiusX="1" |
|
| 198 |
RadiusY="1" /> |
|
| 199 |
<Rectangle x:Name="fillColor2" |
|
| 200 |
Fill="#FFBADDE9" |
|
| 201 |
IsHitTestVisible="False" |
|
| 202 |
Opacity="0" |
|
| 203 |
RadiusX="1" |
|
| 204 |
RadiusY="1" /> |
|
| 205 |
<ContentPresenter x:Name="contentPresenter" |
|
| 206 |
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
|
|
| 207 |
VerticalAlignment="{TemplateBinding VerticalAlignment}"
|
|
| 208 |
Content="{TemplateBinding Content}"
|
|
| 209 |
ContentTemplate="{TemplateBinding ContentTemplate}" />
|
|
| 210 |
<Rectangle x:Name="FocusVisualElement" |
|
| 211 |
Stroke="#FF6DBDD1" |
|
| 212 |
StrokeThickness="0" |
|
| 213 |
Visibility="Collapsed" /> |
|
| 214 | 233 |
</Grid> |
| 215 | 234 |
</ControlTemplate> |
| 216 | 235 |
</Setter.Value> |
| KCOM/Common/Converter/ColorListToBrushConverter.cs | ||
|---|---|---|
| 31 | 31 |
|
| 32 | 32 |
foreach (var item in newList) |
| 33 | 33 |
{
|
| 34 |
Color _color = Common.Converter.StringToColorConverter.Parse(item.DisplayColor); |
|
| 34 |
Color _color = Common.Converter.StringToColorBrushConverter.Parse(item.DisplayColor);
|
|
| 35 | 35 |
_color.A = 0x5A; |
| 36 | 36 |
GradientStop _stop = new GradientStop { Color = _color, Offset = _offset };
|
| 37 | 37 |
_offset = 1.0 / (double)(newList.Count()) * _count; /// 색을 분리하기 위해서 |
| KCOM/Common/Converter/ConsolidationBackgroudConverter.cs | ||
|---|---|---|
| 27 | 27 |
else if (value is bool) |
| 28 | 28 |
{
|
| 29 | 29 |
if ((bool)value) |
| 30 |
//return new SolidColorBrush(StringToColorConverter.Parse("#ff74bdfd"));
|
|
| 30 |
//return new SolidColorBrush(StringToColorBrushConverter.Parse("#ff74bdfd"));
|
|
| 31 | 31 |
return new SolidColorBrush { Color = Colors.Yellow, Opacity = 0.4 };
|
| 32 | 32 |
else |
| 33 | 33 |
return new SolidColorBrush(Colors.Transparent); |
| KCOM/Common/Converter/StringToColorConverter.cs | ||
|---|---|---|
| 17 | 17 |
public object Convert(object value, Type targetType, object parameter, CultureInfo culture) |
| 18 | 18 |
{
|
| 19 | 19 |
if (value == null) |
| 20 |
return new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
|
|
| 20 |
return Color.FromArgb(0, 0, 0, 0);
|
|
| 21 | 21 |
|
| 22 | 22 |
if (value is Color) |
| 23 |
return new SolidColorBrush((Color)value);
|
|
| 23 |
return value;
|
|
| 24 | 24 |
|
| 25 | 25 |
|
| 26 | 26 |
|
| 27 | 27 |
if (value is string) |
| 28 |
return new SolidColorBrush(Parse((string)value));
|
|
| 28 |
return Parse((string)value);
|
|
| 29 | 29 |
|
| 30 |
throw new NotSupportedException("ColorToBurshConverter only supports converting from Color and String");
|
|
| 30 |
throw new NotSupportedException("ColorToColorConverter only supports converting from Color and String");
|
|
| 31 | 31 |
} |
| 32 | 32 |
|
| 33 | 33 |
|
| 34 | 34 |
|
| 35 | 35 |
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) |
| 36 | 36 |
{
|
| 37 |
throw new NotSupportedException(); |
|
| 37 |
if (value != null) |
|
| 38 |
{
|
|
| 39 |
return value.ToString(); |
|
| 40 |
} |
|
| 41 |
else |
|
| 42 |
{
|
|
| 43 |
return null; |
|
| 44 |
} |
|
| 38 | 45 |
} |
| 39 | 46 |
|
| 40 | 47 |
|
| KCOM/Common/Converter/enumStringColorConverter.cs | ||
|---|---|---|
| 19 | 19 |
{
|
| 20 | 20 |
case (int)IKCOM.FAVORITE_FLAG.Personal: |
| 21 | 21 |
{
|
| 22 |
return new System.Windows.Media.SolidColorBrush(StringToColorConverter.Parse(EnumExtension.ToDescription(IKCOM.FAVORITE_FLAG.Personal))); |
|
| 22 |
return new System.Windows.Media.SolidColorBrush(StringToColorBrushConverter.Parse(EnumExtension.ToDescription(IKCOM.FAVORITE_FLAG.Personal)));
|
|
| 23 | 23 |
} |
| 24 | 24 |
break; |
| 25 | 25 |
case (int)IKCOM.FAVORITE_FLAG.TeamShare: |
| 26 | 26 |
{
|
| 27 |
return new System.Windows.Media.SolidColorBrush(StringToColorConverter.Parse(EnumExtension.ToDescription(IKCOM.FAVORITE_FLAG.TeamShare))); |
|
| 27 |
return new System.Windows.Media.SolidColorBrush(StringToColorBrushConverter.Parse(EnumExtension.ToDescription(IKCOM.FAVORITE_FLAG.TeamShare)));
|
|
| 28 | 28 |
} |
| 29 | 29 |
break; |
| 30 | 30 |
default: |
| KCOM/Controls/PrintControl.xaml | ||
|---|---|---|
| 537 | 537 |
<telerik:GridViewDataColumn.CellTemplate> |
| 538 | 538 |
<DataTemplate> |
| 539 | 539 |
<Grid Background="AliceBlue"> |
| 540 |
<!--<Rectangle Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />-->
|
|
| 540 |
<!--<Rectangle Fill="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />-->
|
|
| 541 | 541 |
<Rectangle Fill="{Binding DisplayColor}" />
|
| 542 | 542 |
<TextBlock Foreground="#00000000" Text="Color" /> |
| 543 | 543 |
</Grid> |
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 50 | 50 |
string color = ""; |
| 51 | 51 |
taskBar.Content = message; |
| 52 | 52 |
DicTaskMessage.TryGetValue(type, out color); |
| 53 |
taskBar.Foreground = new SolidColorBrush(StringToColorConverter.Parse(color)); |
|
| 53 |
taskBar.Foreground = new SolidColorBrush(StringToColorBrushConverter.Parse(color));
|
|
| 54 | 54 |
} |
| 55 | 55 |
*/ |
| 56 | 56 |
} |
| KCOM/Extensions/MarkupVisitHelper.cs | ||
|---|---|---|
| 28 | 28 |
|
| 29 | 29 |
foreach (var markupInfo in instance._markupInfoList) |
| 30 | 30 |
{
|
| 31 |
var comments = markupInfo.MarkupList.Where(f => f.ID == CommentIdList.First()); |
|
| 32 |
|
|
| 33 |
if (comments.Count() > 0) |
|
| 31 |
if (markupInfo.MarkupList != null) |
|
| 34 | 32 |
{
|
| 35 |
instance.SystemMain.dzMainMenu.gridViewMarkup.SelectedItem = markupInfo; |
|
| 36 |
commentList.AddRange(comments); |
|
| 33 |
var comments = markupInfo.MarkupList.Where(f => f.ID == CommentIdList.First()); |
|
| 34 |
|
|
| 35 |
if (comments.Count() > 0) |
|
| 36 |
{
|
|
| 37 |
instance.SystemMain.dzMainMenu.gridViewMarkup.SelectedItem = markupInfo; |
|
| 38 |
commentList.AddRange(comments); |
|
| 39 |
} |
|
| 37 | 40 |
} |
| 38 | 41 |
} |
| 39 | 42 |
|
| ... | ... | |
| 125 | 128 |
|
| 126 | 129 |
try |
| 127 | 130 |
{
|
| 128 |
if (Common.ViewerDataModel.Instance.MarkupAngle != 0)
|
|
| 131 |
if (Common.ViewerDataModel.Instance.MarkupAngle != Common.ViewerDataModel.Instance.PageAngle)
|
|
| 129 | 132 |
{
|
| 130 |
for (int i = 0; i < (Common.ViewerDataModel.Instance.MarkupAngle / 90); i++)
|
|
| 133 |
for (int i = 0; i < (Math.Abs(Common.ViewerDataModel.Instance.MarkupAngle - Common.ViewerDataModel.Instance.PageAngle) / 90); i++)
|
|
| 131 | 134 |
{
|
| 132 | 135 |
Common.ViewerDataModel.Instance.SystemMain.dzTopMenu.drawingPannelRotate(true); |
| 133 | 136 |
} |
| KCOM/KCOM.csproj | ||
|---|---|---|
| 540 | 540 |
<Compile Include="Behaviors\SpecialcharRemove.cs" /> |
| 541 | 541 |
<Compile Include="Behaviors\WindowBehavior.cs" /> |
| 542 | 542 |
<Compile Include="Common\Converter\ColorListToBrushConverter.cs" /> |
| 543 |
<Compile Include="Common\Converter\StringToColorConverter.cs" /> |
|
| 543 | 544 |
<Compile Include="Common\Converter\ZeroToCollapsedConverter.cs" /> |
| 544 | 545 |
<Compile Include="Common\DataSaveTask.cs" /> |
| 545 | 546 |
<Compile Include="Common\Check_Inferface.cs" /> |
| ... | ... | |
| 561 | 562 |
<Compile Include="Common\MathHelper.cs" /> |
| 562 | 563 |
<Compile Include="Common\MenuItem.cs" /> |
| 563 | 564 |
<Compile Include="Common\MouseInputBase.cs" /> |
| 565 |
<Compile Include="Controls\ColorList.xaml.cs"> |
|
| 566 |
<DependentUpon>ColorList.xaml</DependentUpon> |
|
| 567 |
</Compile> |
|
| 564 | 568 |
<Compile Include="Controls\CustomWindow.cs" /> |
| 565 | 569 |
<Compile Include="Controls\MacroEdit.xaml.cs"> |
| 566 | 570 |
<DependentUpon>MacroEdit.xaml</DependentUpon> |
| ... | ... | |
| 703 | 707 |
<Generator>MSBuild:Compile</Generator> |
| 704 | 708 |
<SubType>Designer</SubType> |
| 705 | 709 |
</Page> |
| 710 |
<Page Include="Controls\ColorList.xaml"> |
|
| 711 |
<SubType>Designer</SubType> |
|
| 712 |
<Generator>MSBuild:Compile</Generator> |
|
| 713 |
</Page> |
|
| 706 | 714 |
<Page Include="Controls\CommantImage.xaml"> |
| 707 | 715 |
<Generator>MSBuild:Compile</Generator> |
| 708 | 716 |
<SubType>Designer</SubType> |
| ... | ... | |
| 822 | 830 |
<Compile Include="Common\Converter\MarginCorrectionConverter.cs" /> |
| 823 | 831 |
<Compile Include="Common\Converter\MarkupDataToConverter.cs" /> |
| 824 | 832 |
<Compile Include="Common\Converter\PreviewerVisibleConverter.cs" /> |
| 825 |
<Compile Include="Common\Converter\StringToColorConverter.cs" /> |
|
| 833 |
<Compile Include="Common\Converter\StringToColorBrushConverter.cs" />
|
|
| 826 | 834 |
<Compile Include="Common\DocumentSet.cs" /> |
| 827 | 835 |
<Compile Include="Common\ExpandingMouseOver.cs" /> |
| 828 | 836 |
<Compile Include="Common\InitData.cs" /> |
| ... | ... | |
| 1466 | 1474 |
<ItemGroup> |
| 1467 | 1475 |
<Resource Include="Resources\Images\ExtImage\blank.png" /> |
| 1468 | 1476 |
</ItemGroup> |
| 1477 |
<ItemGroup> |
|
| 1478 |
<Resource Include="Resources\Images\MenuImage_New\rgb.png" /> |
|
| 1479 |
</ItemGroup> |
|
| 1469 | 1480 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 1470 | 1481 |
<Target Name="PostBuildMacros"> |
| 1471 | 1482 |
<GetAssemblyIdentity AssemblyFiles="$(TargetPath)"> |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 17 | 17 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments> |
| 18 | 18 |
</PropertyGroup> |
| 19 | 19 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> |
| 20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjA5MDJjMWUyODAxZjY4MDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6ImRvZnRlY2gifQ==</StartArguments>
|
|
| 20 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMDUiLCJiUGFydG5lciI6ZmFsc2UsIkNyZWF0ZUZpbmFsUERGUGVybWlzc2lvbiI6dHJ1ZSwiTmV3Q29tbWVudFBlcm1pc3Npb24iOnRydWUsIlByb2plY3ROTyI6IjAwMDAwMCIsIlVzZXJJRCI6InVzZXIxIn0=</StartArguments>
|
|
| 21 | 21 |
<StartAction>Project</StartAction> |
| 22 | 22 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
| 23 | 23 |
</PropertyGroup> |
| KCOM/MARKUS.ini | ||
|---|---|---|
| 1 | 1 |
[Internal] |
| 2 |
IP=http://markus.xicna.com:5977/API_V4
|
|
| 2 |
IP=localhost
|
|
| 3 | 3 |
[External] |
| 4 |
IP=http://markus.xicna.com:5977/API_V4
|
|
| 4 |
IP=125.129.196.207
|
|
| 5 | 5 |
[BaseClientAddress] |
| 6 |
URL=http://markus.xicna.com:5977/API_V4
|
|
| 6 |
URL=http://localhost:44301
|
|
| 7 | 7 |
[HubAddress] |
| 8 | 8 |
URL=http://192.168.0.67:5100/ |
| 9 | 9 |
[UpdateVer64] |
| 10 |
URL=http://localhost:8080/TileSource/Version/version_x64.xml
|
|
| 10 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x64.xml
|
|
| 11 | 11 |
[UpdateVer86] |
| 12 |
URL=http://localhost:8080/TileSource/Version/version_x86.xml
|
|
| 12 |
URL=http://192.168.0.67:5977/TileSource/Version/version_x86.xml
|
|
| 13 | 13 |
[excelFilePath] |
| 14 |
URL=http://localhost:8080/TileSource/Check_Test/CheckList_T.xlsx
|
|
| 14 |
URL=http://192.168.0.67:5977/TileSource/Check_Test/CheckList_T.xlsx
|
|
| 15 | 15 |
[KCOM_Get_FinalImage_Get_PdfImage] |
| 16 |
URL=http://localhost:8080/Get_FInalImage/Get_PdfImage.asmx
|
|
| 16 |
URL=http://192.168.0.67:5977/Get_FInalImage/Get_PdfImage.asmx
|
|
| 17 | 17 |
[KCOM_kr_co_devdoftech_cloud_FileUpload] |
| 18 |
URL=http://markus.xicna.com:5977/ImageUpload/FileUpload.asmx
|
|
| 18 |
URL=http://125.129.196.207:44301/ImageUpload/FileUpload.asmx
|
|
| 19 | 19 |
[mainServerImageWebPath] |
| 20 |
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 20 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 21 | 21 |
[subServerImageWebPath] |
| 22 |
URL=http://markus.xicna.com:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 22 |
URL=http://192.168.0.67:5977/TileSource/{0}_Tile/{1}/{2}/{3}.png
|
|
| 23 | 23 |
[Debug_BaseClientAddress] |
| 24 | 24 |
URL=http://192.168.0.67:5979 |
| 25 | 25 |
[HOST_DOMAIN] |
| ... | ... | |
| 31 | 31 |
[SetFinalPDFSuccess] |
| 32 | 32 |
MSG=7LWc7KKFIO2MjOydvCDsg53shLEg7KSR7J6F64uI64ukLiDrrLjshJzqtIDrpqzsi5zsiqTthZzsnYQg7ZmV7J247ZW07KO87IS47JqU |
| 33 | 33 |
[SetThumbnail] |
| 34 |
WIDTH=265
|
|
| 34 |
WIDTH=100
|
|
| 35 | 35 |
[Site] |
| 36 |
NAME=sdms
|
|
| 36 |
NAME=DAELIM
|
|
| 37 | 37 |
[PortForwarding] |
| 38 | 38 |
HUB=5100:5100 |
| 39 | 39 |
RESOURCE=5977:5977 |
| 40 |
BASE=8080:8080
|
|
| 40 |
BASE=5979:5979
|
|
| 41 | 41 |
[GetImageResourceFailed] |
| 42 | 42 |
MSG=7ZW064u5IOusuOyEnOydmCB7MH0gUGFnZSBDb252ZXJ06rCAIOygleyDgeyggeydtOyngCDslYrsirXri4jri6QuIOq0gOumrOyekOyXkOqyjCDrrLjsnZjtlbQg7KO87IS47JqULg== |
| 43 | 43 |
|
| 44 |
|
|
| 44 | 45 |
[COMMON] |
| 45 | 46 |
IsDocumentHistory = false |
| KCOM/Services/BaseServices.cs | ||
|---|---|---|
| 615 | 615 |
/// <param name="e"></param> |
| 616 | 616 |
private async void gridViewMarkup_SelectionChanged(object sender, Telerik.Windows.Controls.SelectionChangeEventArgs e) |
| 617 | 617 |
{
|
| 618 |
|
|
| 619 |
foreach (var item in e.AddedItems) |
|
| 620 |
{
|
|
| 621 |
var cellToSelect = new GridViewCellInfo(item, this.gridViewMarkup.Columns["color"], this.gridViewMarkup); |
|
| 622 |
|
|
| 623 |
if(cellToSelect != null) |
|
| 624 |
{
|
|
| 625 |
|
|
| 626 |
} |
|
| 627 |
} |
|
| 628 |
|
|
| 618 | 629 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
| 619 | 630 |
|
| 620 | 631 |
var dataSet = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().Where(data => data.UserID == _ViewInfo.UserID); |
| ... | ... | |
| 756 | 767 |
} |
| 757 | 768 |
} |
| 758 | 769 |
|
| 770 |
private async void gridViewMarkup_SelectedCellsChanged(object sender, Telerik.Windows.Controls.GridView.GridViewSelectedCellsChangedEventArgs e) |
|
| 771 |
{
|
|
| 772 |
if (e.AddedCells.Count() > 0) |
|
| 773 |
{
|
|
| 774 |
if(e.AddedCells[0].Column.Name == "color") |
|
| 775 |
{
|
|
| 776 |
|
|
| 777 |
} |
|
| 778 |
else |
|
| 779 |
{
|
|
| 780 |
List<MarkupInfoItem> removeItems = new List<MarkupInfoItem>(); |
|
| 781 |
|
|
| 782 |
if (!gridViewMarkup.SelectedItems.Contains(e.AddedCells[0].Item)) |
|
| 783 |
{
|
|
| 784 |
gridViewMarkup.SelectedItems.Add(e.AddedCells[0].Item); |
|
| 785 |
} |
|
| 786 |
else |
|
| 787 |
{
|
|
| 788 |
gridViewMarkup.Unselect(new[] { e.AddedCells[0].Item });
|
|
| 789 |
|
|
| 790 |
removeItems.Add(e.AddedCells[0].Item as MarkupInfoItem); |
|
| 791 |
} |
|
| 792 |
|
|
| 793 |
SelectionSet.Instance.UnSelect(Common.ViewerDataModel.Instance.SystemMain.dzMainMenu); |
|
| 794 |
|
|
| 795 |
var dataSet = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().Where(data => data.UserID == _ViewInfo.UserID); |
|
| 796 |
var dataSet_User = gridViewMarkup.Items.Cast<MarkupInfoItem>().Where(data => data.UserID == _ViewInfo.UserID); |
|
| 797 |
var resultA = (from item_Select in dataSet |
|
| 798 |
from item_Non in dataSet_User |
|
| 799 |
where item_Select == item_Non |
|
| 800 |
select item_Non).ToList(); |
|
| 801 |
|
|
| 802 |
if (resultA.Count() >= 2) |
|
| 803 |
{
|
|
| 804 |
// 동일한 사용자 데이터가 두개 이상 선택됩니다. Consolidation을 선택할까요? |
|
| 805 |
RadWindow.Confirm(new DialogParameters |
|
| 806 |
{
|
|
| 807 |
Owner = Application.Current.MainWindow, |
|
| 808 |
Header = "Info", |
|
| 809 |
Content = "Selected more than two identical user data. Do you want to select consolidation?", |
|
| 810 |
Closed = new EventHandler<WindowClosedEventArgs>((sen, ea) => |
|
| 811 |
{
|
|
| 812 |
if (gridViewMarkup.SelectedItems.Count() == 1) |
|
| 813 |
{
|
|
| 814 |
MarkupInfoItem instanceItem = gridViewMarkup.SelectedItems.FirstOrDefault() as MarkupInfoItem; |
|
| 815 |
gridViewMarkup.SelectedItem = null; |
|
| 816 |
|
|
| 817 |
|
|
| 818 |
if (ea.DialogResult.Value) |
|
| 819 |
{
|
|
| 820 |
if (instanceItem.Consolidate == 1 || instanceItem.PartConsolidate == 1) |
|
| 821 |
{
|
|
| 822 |
gridViewMarkup.SelectedItem = instanceItem; |
|
| 823 |
} |
|
| 824 |
else |
|
| 825 |
{
|
|
| 826 |
//1. Consolidations이 있다면 하나 선택 |
|
| 827 |
var Consolidations = resultA.Where(item => (item.Consolidate == 1 || item.PartConsolidate == 1)); |
|
| 828 |
|
|
| 829 |
if (Consolidations.Count() > 0) |
|
| 830 |
{
|
|
| 831 |
gridViewMarkup.SelectedItem = Consolidations.First(); |
|
| 832 |
} |
|
| 833 |
} |
|
| 834 |
|
|
| 835 |
} |
|
| 836 |
else |
|
| 837 |
{
|
|
| 838 |
//1. Consolidations 아닌게 있다면 Change |
|
| 839 |
var notConsolidations = resultA.Where(item => !(item.Consolidate == 1 || item.PartConsolidate == 1)); |
|
| 840 |
|
|
| 841 |
if (notConsolidations.Count() > 0) |
|
| 842 |
{
|
|
| 843 |
gridViewMarkup.SelectedItem = notConsolidations.First(); |
|
| 844 |
} |
|
| 845 |
else |
|
| 846 |
{//1. Consolidations 아닌게 없다면 그대로
|
|
| 847 |
gridViewMarkup.SelectedItem = instanceItem; |
|
| 848 |
} |
|
| 849 |
|
|
| 850 |
} |
|
| 851 |
} |
|
| 852 |
}), |
|
| 853 |
Theme = new Windows8Theme(), |
|
| 854 |
ModalBackground = new System.Windows.Media.SolidColorBrush { Color = System.Windows.Media.Colors.Black, Opacity = 0.6 },
|
|
| 855 |
}); |
|
| 856 |
} |
|
| 857 |
else //파라미터로 넘어온 사용자가 걸리지 않은 경우 |
|
| 858 |
{
|
|
| 859 |
List<MarkupInfoItem> gridItem = gridViewMarkup.Items.Cast<MarkupInfoItem>().ToList(); //전체 마크업 |
|
| 860 |
List<MarkupInfoItem> gridSelectionItem = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>().ToList(); //선택 된 마크업 |
|
| 861 |
List<MarkupInfoItem> gridNonSelectionItem = gridItem.Except(gridSelectionItem).ToList(); //선택 되지 않은 마크업 |
|
| 862 |
#region 코멘트 보기 |
|
| 863 |
if (gridViewMarkup.SelectedItems.Count() > 0 && this.pageNavigator.CurrentPage != null) |
|
| 864 |
{
|
|
| 865 |
foreach (var item in gridSelectionItem) |
|
| 866 |
{
|
|
| 867 |
if (item.UserID == App.ViewInfo.UserID) |
|
| 868 |
{
|
|
| 869 |
var controls = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 870 |
if (controls.Count == 0) |
|
| 871 |
{
|
|
| 872 |
var instance = ViewerDataModel.Instance.MyMarkupList.Where(d => d.PageNumber == this.pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 873 |
|
|
| 874 |
foreach (var markup in instance) |
|
| 875 |
{
|
|
| 876 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls_USER, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
|
| 877 |
item.MarkupInfoID, markup.ID, STAMP_Contents: App.SystemInfo.STAMP_CONTENTS); |
|
| 878 |
} |
|
| 879 |
} |
|
| 880 |
|
|
| 881 |
controls = Common.ViewerDataModel.Instance.MarkupControls_USER.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 882 |
foreach (var control in controls) |
|
| 883 |
{
|
|
| 884 |
Logger.sendCheckLog(String.Format("=={0}", control), 1);
|
|
| 885 |
control.Visibility = Visibility.Visible; |
|
| 886 |
} |
|
| 887 |
} |
|
| 888 |
else |
|
| 889 |
{
|
|
| 890 |
var controls = Common.ViewerDataModel.Instance.MarkupControls.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 891 |
if (controls.Count == 0) |
|
| 892 |
{
|
|
| 893 |
var instance = ViewerDataModel.Instance.MarkupList_Pre.Where(d => d.PageNumber == this.pageNavigator.CurrentPage.PageNumber && d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 894 |
foreach (var markup in instance) |
|
| 895 |
{
|
|
| 896 |
await MarkupParser.ParseExAsync(App.BaseAddress, ViewerDataModel.Instance.NewMarkupCancelToken(), App.ViewInfo.ProjectNO, markup.Data, Common.ViewerDataModel.Instance.MarkupControls, ViewerDataModel.Instance.PageAngle, item.DisplayColor, "", |
|
| 897 |
item.MarkupInfoID, markup.ID); |
|
| 898 |
} |
|
| 899 |
} |
|
| 900 |
|
|
| 901 |
controls = Common.ViewerDataModel.Instance.MarkupControls.Where(d => d.MarkupInfoID == item.MarkupInfoID).ToList(); |
|
| 902 |
foreach (var control in controls) |
|
| 903 |
{
|
|
| 904 |
control.Visibility = Visibility.Visible; |
|
| 905 |
} |
|
| 906 |
} |
|
| 907 |
} |
|
| 908 |
} |
|
| 909 |
#endregion |
|
| 910 |
#region 코멘트 숨기기 |
|
| 911 |
else if (removeItems.Count > 0) |
|
| 912 |
{
|
|
| 913 |
(from A in removeItems |
|
| 914 |
from B in Common.ViewerDataModel.Instance.MarkupControls |
|
| 915 |
where A.MarkupInfoID == B.MarkupInfoID |
|
| 916 |
select B).ToList().ForEach(data => |
|
| 917 |
{
|
|
| 918 |
data.Visibility = Visibility.Hidden; |
|
| 919 |
}); |
|
| 920 |
|
|
| 921 |
|
|
| 922 |
var myComment = removeItems.Where(d => d.UserID == App.ViewInfo.UserID).FirstOrDefault(); |
|
| 923 |
if (myComment != null) |
|
| 924 |
{
|
|
| 925 |
Common.ViewerDataModel.Instance.MarkupControls_USER.ToList().ForEach(delegate (MarkupToPDF.Common.CommentUserInfo markupitem) |
|
| 926 |
{
|
|
| 927 |
markupitem.Visibility = Visibility.Hidden; |
|
| 928 |
}); |
|
| 929 |
} |
|
| 930 |
} |
|
| 931 |
#endregion |
|
| 932 |
} |
|
| 933 |
} |
|
| 934 |
} |
|
| 935 |
} |
|
| 936 |
|
|
| 759 | 937 |
private void BaseClient_GetDocumentItemInfoCompleted(object sender, GetDocumentItemInfoCompletedEventArgs e) |
| 760 | 938 |
{
|
| 761 | 939 |
//Logger.sendResLog("GetDocumentItemInfoCompleted", "UserState : " + e.UserState + "\r Result :" + e.Result?.DOCUMENT_ID + "\r Cancelled :" + e.Cancelled + "\r Error :" + e.Error, 1);
|
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 14 | 14 |
xmlns:telerikGrid="clr-namespace:Telerik.Windows.Controls.GridView;assembly=Telerik.Windows.Controls.GridView" |
| 15 | 15 |
xmlns:toggle="clr-namespace:ToggleSwitch;assembly=ToggleSwitch" |
| 16 | 16 |
d:DesignHeight="768" |
| 17 |
d:DesignWidth="1080"
|
|
| 17 |
d:DesignWidth="1200"
|
|
| 18 | 18 |
IsTabStop="True" |
| 19 | 19 |
mc:Ignorable="d"> |
| 20 | 20 |
<UserControl.Resources> |
| ... | ... | |
| 59 | 59 |
</Style> |
| 60 | 60 |
<converter:PDFVisibleConverter x:Key="PDFVisibleConverter" /> |
| 61 | 61 |
<converter:ConsolidationBackgroudConverter x:Key="ConsolidationBackgroudConverter" /> |
| 62 |
<converter:StringToColorBrushConverter x:Key="StringToColorBrushConverter" /> |
|
| 62 | 63 |
<converter:StringToColorConverter x:Key="StringToColorConverter" /> |
| 63 | 64 |
<converter:AvoidStringConverter x:Key="AvoidStringConverter" /> |
| 64 | 65 |
<converter:TeamConsolidateStringConverter x:Key="TeamConsoliStringConverter" /> |
| ... | ... | |
| 291 | 292 |
</VisualStateManager.VisualStateGroups> |
| 292 | 293 |
</Grid> |
| 293 | 294 |
</ControlTemplate> |
| 295 |
<!-- App.xaml에 선언됨 --> |
|
| 296 |
<!--<Style BasedOn="{StaticResource PaneHeaderStyle}" TargetType="telerik:PaneHeader">-->
|
|
| 297 |
<!--<Style TargetType="telerik:PaneHeader"> |
|
| 298 |
<Setter Property="HorizontalContentAlignment" Value="Stretch" /> |
|
| 299 |
<Setter Property="HorizontalAlignment" Value="Stretch" /> |
|
| 300 |
</Style>--> |
|
| 294 | 301 |
</UserControl.Resources> |
| 295 | 302 |
<Grid Background="{DynamicResource KCOMColor_MainBrush}">
|
| 296 | 303 |
<!--<Grid.ColumnDefinitions> |
| ... | ... | |
| 906 | 913 |
<DataTemplate> |
| 907 | 914 |
<Grid> |
| 908 | 915 |
<Grid> |
| 909 |
<Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
|
|
| 916 |
<Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />
|
|
| 910 | 917 |
<TextBlock Foreground="#00000000" Text="Color" /> |
| 911 | 918 |
</Grid> |
| 912 | 919 |
<Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
|
| ... | ... | |
| 1173 | 1180 |
Header="User information List"> |
| 1174 | 1181 |
<telerik:RadPane.TitleTemplate> |
| 1175 | 1182 |
<DataTemplate> |
| 1176 |
<Grid> |
|
| 1183 |
<Grid HorizontalAlignment="Stretch">
|
|
| 1177 | 1184 |
<Grid.ColumnDefinitions> |
| 1178 | 1185 |
<ColumnDefinition Width="*" /> |
| 1179 | 1186 |
<ColumnDefinition Width="Auto" /> |
| 1187 |
<ColumnDefinition Width="*" /> |
|
| 1180 | 1188 |
</Grid.ColumnDefinitions> |
| 1181 |
|
|
| 1182 |
<StackPanel Orientation="Horizontal"> |
|
| 1189 |
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal"> |
|
| 1183 | 1190 |
<TextBlock |
| 1184 | 1191 |
Margin="1" |
| 1185 | 1192 |
VerticalAlignment="Center" |
| ... | ... | |
| 1270 | 1277 |
</Border> |
| 1271 | 1278 |
</telerik:RadRibbonButton> |
| 1272 | 1279 |
</StackPanel> |
| 1280 |
<Line |
|
| 1281 |
Grid.Column="1" |
|
| 1282 |
Width="2" |
|
| 1283 |
Margin="5,0" |
|
| 1284 |
VerticalAlignment="Center" |
|
| 1285 |
Stroke="Black" |
|
| 1286 |
X1="2" |
|
| 1287 |
X2="2" |
|
| 1288 |
Y1="2" |
|
| 1289 |
Y2="24" /> |
|
| 1290 |
<telerik:RadRibbonButton |
|
| 1291 |
x:Name="btnColorList" |
|
| 1292 |
Grid.Column="2" |
|
| 1293 |
HorizontalAlignment="Right" |
|
| 1294 |
VerticalAlignment="Center" |
|
| 1295 |
telerik:StyleManager.Theme="Office2016" |
|
| 1296 |
Click="btnColorList_Click" |
|
| 1297 |
ToolTipService.ToolTip="Color Change"> |
|
| 1298 |
<Border |
|
| 1299 |
Background="#E9F0F8" |
|
| 1300 |
BorderBrush="#839AB3" |
|
| 1301 |
BorderThickness="1"> |
|
| 1302 |
<Image Width="22" Source="/Resources/Images/MenuImage_New/rgb.png" /> |
|
| 1303 |
</Border> |
|
| 1304 |
</telerik:RadRibbonButton> |
|
| 1273 | 1305 |
<!--<StackPanel Grid.Column="1" |
| 1274 | 1306 |
HorizontalAlignment="Right" |
| 1275 | 1307 |
Orientation="Horizontal"> |
| ... | ... | |
| 1306 | 1338 |
CanUserInsertRows="False" |
| 1307 | 1339 |
CanUserSortColumns="True" |
| 1308 | 1340 |
IsFilteringAllowed="False" |
| 1309 |
IsReadOnly="True" |
|
| 1341 |
IsReadOnly="False" |
|
| 1342 |
MouseRightButtonDown="gridViewMarkup_MouseRightButtonDown" |
|
| 1310 | 1343 |
RowIndicatorVisibility="Collapsed" |
| 1311 | 1344 |
SelectionChanged="gridViewMarkup_SelectionChanged" |
| 1312 | 1345 |
SelectionMode="Multiple" |
| 1346 |
SelectionUnit="FullRow" |
|
| 1313 | 1347 |
ShowGroupFooters="False" |
| 1314 | 1348 |
ShowGroupPanel="True" |
| 1315 | 1349 |
Sorted="GridViewMarkup_Sorted" |
| 1316 | 1350 |
Sorting="GridViewMarkup_Sorting"> |
| 1351 |
<!-- SelectedCellsChanged="gridViewMarkup_SelectedCellsChanged" --> |
|
| 1317 | 1352 |
<!--<telerik:RadGridView.GroupDescriptors> |
| 1318 | 1353 |
<telerik:GroupDescriptor Member="Depatment" SortDirection="Ascending" DisplayContent = "DEPT" x:Name="gDept"> |
| 1319 | 1354 |
<telerik:GroupDescriptor.AggregateFunctions> |
| ... | ... | |
| 1335 | 1370 |
<CheckBox telerik:StyleManager.Theme="Office_Black" Click="gridViewMarkupAllSelect_Click" /> |
| 1336 | 1371 |
</telerik:GridViewSelectColumn.Header> |
| 1337 | 1372 |
</telerik:GridViewSelectColumn> |
| 1338 |
<telerik:GridViewDataColumn |
|
| 1339 |
Width="Auto" |
|
| 1340 |
Header="Color" |
|
| 1341 |
IsReadOnly="True"> |
|
| 1373 |
<telerik:GridViewDataColumn Width="Auto" Header="Color"> |
|
| 1342 | 1374 |
<telerik:GridViewDataColumn.CellTemplate> |
| 1343 | 1375 |
<DataTemplate> |
| 1344 | 1376 |
<Grid> |
| 1345 | 1377 |
<Grid> |
| 1346 |
<Rectangle Margin="0,2,2,2" Fill="{Binding DisplayColor, Converter={StaticResource StringToColorConverter}}" />
|
|
| 1378 |
<Border Background="{Binding DisplayColor, Converter={StaticResource StringToColorBrushConverter}}" />
|
|
| 1347 | 1379 |
<TextBlock Foreground="#00000000" Text="Color" /> |
| 1348 | 1380 |
</Grid> |
| 1349 | 1381 |
<Grid VerticalAlignment="Center" Visibility="{Binding AvoidConsolidate, Converter={StaticResource BoolToVisibleConverter}}">
|
| ... | ... | |
| 1356 | 1388 |
|
| 1357 | 1389 |
</DataTemplate> |
| 1358 | 1390 |
</telerik:GridViewDataColumn.CellTemplate> |
| 1391 |
<telerik:GridViewDataColumn.CellEditTemplate> |
|
| 1392 |
<DataTemplate> |
|
| 1393 |
<telerik:RadColorPicker SelectedColor="{Binding DisplayColor, Mode=TwoWay, Converter={StaticResource StringToColorConverter}}" />
|
|
| 1394 |
</DataTemplate> |
|
| 1395 |
</telerik:GridViewDataColumn.CellEditTemplate> |
|
| 1359 | 1396 |
</telerik:GridViewDataColumn> |
| 1360 | 1397 |
<telerik:GridViewDataColumn |
| 1361 | 1398 |
Width="Auto" |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 4938 | 4938 |
#endif |
| 4939 | 4939 |
} |
| 4940 | 4940 |
|
| 4941 |
private void btnColorList_Click(object sender, RoutedEventArgs e) |
|
| 4942 |
{
|
|
| 4943 |
|
|
| 4944 |
} |
|
| 4945 |
|
|
| 4941 | 4946 |
private void SyncCompare_Click(object sender, RoutedEventArgs e) |
| 4942 | 4947 |
{
|
| 4943 | 4948 |
SetCompareRect(); |
| ... | ... | |
| 6139 | 6144 |
} |
| 6140 | 6145 |
} |
| 6141 | 6146 |
} |
| 6142 |
|
|
| 6147 |
|
|
| 6148 |
private void gridViewMarkup_MouseRightButtonDown(object sender, MouseButtonEventArgs e) |
|
| 6149 |
{
|
|
| 6150 |
var dataSet = gridViewMarkup.SelectedItems.Cast<MarkupInfoItem>(); |
|
| 6151 |
|
|
| 6152 |
if (dataSet?.Count() == 1) |
|
| 6153 |
{
|
|
| 6154 |
PopupWindow popup = new PopupWindow(); |
|
| 6155 |
|
|
| 6156 |
} |
|
| 6157 |
} |
|
| 6158 |
|
|
| 6159 |
|
|
| 6143 | 6160 |
/* |
| 6144 | 6161 |
private void zoomAndPanControl_Drop(object sender, DragEventArgs e) |
| 6145 | 6162 |
{
|
내보내기 Unified diff
