개정판 fe5ec96f
설치 수정
Change-Id: Ie149c2e58a718f5237615a9307b816e7797f6b1d
| KCOM.sln | ||
|---|---|---|
| 39 | 39 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.Mvvm.ToolKit", "Markus.Mvvm.ToolKit\Markus.Mvvm.ToolKit.csproj", "{9EFE95D6-9985-422A-A76F-285C8CF73617}"
|
| 40 | 40 |
EndProject |
| 41 | 41 |
Global |
| 42 |
GlobalSection(Performance) = preSolution |
|
| 43 |
HasPerformanceSessions = true |
|
| 44 |
EndGlobalSection |
|
| 42 | 45 |
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
| 43 | 46 |
Debug|Any CPU = Debug|Any CPU |
| 44 | 47 |
Debug|x64 = Debug|x64 |
| ... | ... | |
| 226 | 229 |
GlobalSection(Performance) = preSolution |
| 227 | 230 |
HasPerformanceSessions = true |
| 228 | 231 |
EndGlobalSection |
| 232 |
GlobalSection(Performance) = preSolution |
|
| 233 |
HasPerformanceSessions = true |
|
| 234 |
EndGlobalSection |
|
| 229 | 235 |
EndGlobal |
| KCOM/App.xaml | ||
|---|---|---|
| 5 | 5 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" x:Class="KCOM.App" |
| 6 | 6 |
StartupUri="MainWindow.xaml"> |
| 7 | 7 |
<Application.Resources> |
| 8 |
<ResourceDictionary Source="Themes/RequirementControlStyle.xaml">
|
|
| 8 |
<ResourceDictionary> |
|
| 9 | 9 |
<ResourceDictionary.MergedDictionaries> |
| 10 | 10 |
<ResourceDictionary Source="Resources\Theme_Color.xaml"/> |
| 11 | 11 |
<ResourceDictionary/> |
| KCOM/KCOM.csproj | ||
|---|---|---|
| 383 | 383 |
<Generator>MSBuild:Compile</Generator> |
| 384 | 384 |
<SubType>Designer</SubType> |
| 385 | 385 |
</Page> |
| 386 |
<Page Include="Themes\RequirementControlStyle.xaml"> |
|
| 387 |
<SubType>Designer</SubType> |
|
| 388 |
<Generator>MSBuild:Compile</Generator> |
|
| 389 |
</Page> |
|
| 390 | 386 |
<Page Include="Views\AddRequirement.xaml"> |
| 391 | 387 |
<SubType>Designer</SubType> |
| 392 | 388 |
<Generator>MSBuild:Compile</Generator> |
| ... | ... | |
| 1173 | 1169 |
<Resource Include="Resources\Images\MenuImage_New\locked-padlock.png" /> |
| 1174 | 1170 |
<Resource Include="Resources\Images\MenuImage_New\locked-padlock_color.png" /> |
| 1175 | 1171 |
</ItemGroup> |
| 1176 |
<ItemGroup /> |
|
| 1172 |
<ItemGroup> |
|
| 1173 |
<Folder Include="Themes\" /> |
|
| 1174 |
</ItemGroup> |
|
| 1177 | 1175 |
<ItemGroup> |
| 1178 | 1176 |
<Resource Include="Messenger\clip.png" /> |
| 1179 | 1177 |
<Resource Include="Messenger\frame-landscape.png" /> |
| KCOM/KCOM.csproj.user | ||
|---|---|---|
| 21 | 21 |
<StartProgram>C:\Program Files\DOFTECH\MARKUS\KCOM.exe</StartProgram> |
| 22 | 22 |
</PropertyGroup> |
| 23 | 23 |
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> |
| 24 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjQwMDAwMTQxIiwiYlBhcnRuZXIiOmZhbHNlLCJDcmVhdGVGaW5hbFBERlBlcm1pc3Npb24iOnRydWUsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjp0cnVlLCJQcm9qZWN0Tk8iOiIwMDAwMDAiLCJVc2VySUQiOiJhZG1pbiIsIk1vZGUiOjB9</StartArguments>
|
|
| 24 |
<StartArguments>eyJEb2N1bWVudEl0ZW1JRCI6IjE0MyIsImJQYXJ0bmVyIjpmYWxzZSwiQ3JlYXRlRmluYWxQREZQZXJtaXNzaW9uIjoidHJ1ZSIsIk5ld0NvbW1lbnRQZXJtaXNzaW9uIjoidHJ1ZSIsIlByb2plY3ROTyI6IjExMTExMSIsIlVzZXJJRCI6ImFkbWluIiwiTW9kZSI6MH0=/</StartArguments>
|
|
| 25 | 25 |
</PropertyGroup> |
| 26 | 26 |
</Project> |
| KCOM/Themes/RequirementControlStyle.xaml | ||
|---|---|---|
| 1 |
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" |
|
| 2 |
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" |
|
| 3 |
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|
| 4 |
<Style x:Key="AddVpCommantWindowStyle" TargetType="telerik:RadPrompt"> |
|
| 5 |
<Setter Property="Template"> |
|
| 6 |
<Setter.Value> |
|
| 7 |
<ControlTemplate TargetType="telerik:RadPrompt"> |
|
| 8 |
<Grid x:Name="LayoutRoot"> |
|
| 9 |
<Grid.RowDefinitions> |
|
| 10 |
<RowDefinition Height="*"/> |
|
| 11 |
<RowDefinition Height="Auto"/> |
|
| 12 |
</Grid.RowDefinitions> |
|
| 13 |
<Grid.ColumnDefinitions> |
|
| 14 |
<ColumnDefinition Width="Auto"/> |
|
| 15 |
<ColumnDefinition Width="*"/> |
|
| 16 |
</Grid.ColumnDefinitions> |
|
| 17 |
<ContentPresenter x:Name="Icon" VerticalAlignment="Top" Margin="16 8 8 8" ContentTemplate="{TemplateBinding IconTemplate}"/>
|
|
| 18 |
<StackPanel x:Name="PromptContent" Grid.Row="0" Grid.Column="1" FocusManager.FocusedElement="{Binding ElementName=PromptTextBox}">
|
|
| 19 |
<ScrollViewer IsTabStop="False" Grid.Row="0" Grid.Column="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" Margin="0 0 0 8"> |
|
| 20 |
<ContentPresenter x:Name="PromptText" Margin="8 8 8 0"/> |
|
| 21 |
</ScrollViewer> |
|
| 22 |
<TextBox Margin="8" x:Name="PromptTextBox" IsTabStop="True" TabIndex="0" Focusable="True" Text="{TemplateBinding PromptResult}">
|
|
| 23 |
</TextBox> |
|
| 24 |
</StackPanel> |
|
| 25 |
<Border x:Name="HorizontalRule" |
|
| 26 |
Grid.Row="1" |
|
| 27 |
Grid.ColumnSpan="2" |
|
| 28 |
BorderThickness="0 0 0 1" |
|
| 29 |
Height="2" |
|
| 30 |
VerticalAlignment="Top"/> |
|
| 31 |
<StackPanel x:Name="DialogButtons" Grid.Row="1" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Right"> |
|
| 32 |
<telerik:RadButton x:Name="OK" |
|
| 33 |
Command="{x:Static telerik:WindowCommands.Confirm}"
|
|
| 34 |
telerik:RadWindow.ResponseButton="Accept" |
|
| 35 |
MinWidth="70" |
|
| 36 |
IsTabStop="True" |
|
| 37 |
TabIndex="1" |
|
| 38 |
HorizontalAlignment="Right" |
|
| 39 |
telerik:LocalizationManager.ResourceKey="Ok" |
|
| 40 |
Margin="0 10 8 8"> |
|
| 41 |
</telerik:RadButton> |
|
| 42 |
<telerik:RadButton x:Name="Cancel" |
|
| 43 |
Command="{x:Static telerik:WindowCommands.Cancel}"
|
|
| 44 |
telerik:RadWindow.ResponseButton="Cancel" |
|
| 45 |
MinWidth="70" |
|
| 46 |
IsTabStop="True" |
|
| 47 |
TabIndex="2" |
|
| 48 |
HorizontalAlignment="Right" |
|
| 49 |
telerik:LocalizationManager.ResourceKey="Cancel" |
|
| 50 |
Margin="0 10 8 8"/> |
|
| 51 |
</StackPanel> |
|
| 52 |
</Grid> |
|
| 53 |
</ControlTemplate> |
|
| 54 |
</Setter.Value> |
|
| 55 |
</Setter> |
|
| 56 |
</Style> |
|
| 57 |
</ResourceDictionary> |
|
| KCOM/ViewModel/RequirementViewModel.cs | ||
|---|---|---|
| 89 | 89 |
|
| 90 | 90 |
public RequirementViewModel() |
| 91 | 91 |
{
|
| 92 |
if (pemssServiceClient == null)
|
|
| 92 |
try
|
|
| 93 | 93 |
{
|
| 94 |
pemssServiceClient = new PemssServiceClient(App._binding,App._PemssEndPoint); |
|
| 94 |
if (pemssServiceClient == null) |
|
| 95 |
{
|
|
| 96 |
pemssServiceClient = new PemssServiceClient(App._binding, App._PemssEndPoint); |
|
| 97 |
} |
|
| 98 |
|
|
| 99 |
OnGetRequirementDataAsync().ConfigureAwait(false); |
|
| 95 | 100 |
} |
| 101 |
catch (Exception EX) |
|
| 102 |
{
|
|
| 96 | 103 |
|
| 97 |
OnGetRequirementDataAsync().ConfigureAwait(false); |
|
| 104 |
throw; |
|
| 105 |
} |
|
| 98 | 106 |
} |
| 99 | 107 |
|
| 100 | 108 |
public override void Loaded() |
| KCOM/Views/RequirementView.xaml | ||
|---|---|---|
| 7 | 7 |
xmlns:local="clr-namespace:KCOM.Controls" FontSize="12" |
| 8 | 8 |
xmlns:behavior="clr-namespace:KCOM.Behaviors" |
| 9 | 9 |
xmlns:viewmodel="clr-namespace:KCOM.ViewModel" |
| 10 |
xmlns:convert="clr-namespace:KCOM.Converters" LayoutUpdated="UserControl_LayoutUpdated"
|
|
| 10 |
xmlns:convert="clr-namespace:KCOM.Converters" |
|
| 11 | 11 |
xmlns:Behaviors="clr-namespace:KCOM.Behaviors" |
| 12 | 12 |
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity" |
| 13 |
mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="350"> |
|
| 14 |
<!--<UserControl.DataContext> |
|
| 15 |
<viewmodel:RequirementViewModel x:Name="ViewModel"/> |
|
| 16 |
</UserControl.DataContext>--> |
|
| 13 |
mc:Ignorable="d" d:DesignHeight="768" d:DesignWidth="350" DataContext="{DynamicResource ViewModel}">
|
|
| 14 |
<UserControl.Resources> |
|
| 15 |
<viewmodel:RequirementViewModel x:Key="ViewModel"/> |
|
| 16 |
<convert:StringMultiLineConvert x:Key="StringMultiLineConvert"/> |
|
| 17 |
</UserControl.Resources> |
|
| 17 | 18 |
<i:Interaction.Triggers> |
| 18 | 19 |
<i:EventTrigger EventName="Loaded"> |
| 19 | 20 |
<i:InvokeCommandAction Command="{Binding LoadedCommand}"/>
|
| ... | ... | |
| 22 | 23 |
<i:InvokeCommandAction Command="{Binding ClosingCommand}"/>
|
| 23 | 24 |
</i:EventTrigger> |
| 24 | 25 |
</i:Interaction.Triggers> |
| 25 |
<UserControl.Resources> |
|
| 26 |
<viewmodel:RequirementViewModel x:Key="ViewModel"/> |
|
| 27 |
<convert:StringMultiLineConvert x:Key="StringMultiLineConvert"/> |
|
| 28 |
</UserControl.Resources> |
|
| 29 |
<UserControl.DataContext> |
|
| 30 |
<Binding Mode="OneWay" Source="{StaticResource ViewModel}"/>
|
|
| 31 |
</UserControl.DataContext> |
|
| 32 |
<Grid x:Name="grid" Margin="2" LayoutUpdated="Grid_LayoutUpdated"> |
|
| 26 |
<Grid x:Name="grid" Margin="2"> |
|
| 33 | 27 |
<Grid.ColumnDefinitions> |
| 34 | 28 |
<ColumnDefinition Width="*"/> |
| 35 | 29 |
</Grid.ColumnDefinitions> |
| KCOM/Views/RequirementView.xaml.cs | ||
|---|---|---|
| 23 | 23 |
{
|
| 24 | 24 |
InitializeComponent(); |
| 25 | 25 |
} |
| 26 |
|
|
| 27 |
private void Grid_LayoutUpdated(object sender, EventArgs e) |
|
| 28 |
{
|
|
| 29 |
|
|
| 30 |
} |
|
| 31 |
|
|
| 32 |
private void UserControl_LayoutUpdated(object sender, EventArgs e) |
|
| 33 |
{
|
|
| 34 |
|
|
| 35 |
} |
|
| 36 | 26 |
} |
| 37 | 27 |
} |
| MARKUS_pemss.wxs | ||
|---|---|---|
| 350 | 350 |
<Component Id="cmp92F6718F031E4AD2810155492929EE55" Directory="INSTALLFOLDER" Guid="CC6B1FD1-0587-4C56-B2F0-437BFA51B673" Win64='yes'> |
| 351 | 351 |
<File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\NDP461-KB3102438-Web.exe" /> |
| 352 | 352 |
</Component> |
| 353 |
<Component Id="ACF00B822A774D6489A1DA5899659C9F" Directory="INSTALLFOLDER" Guid="93D28F84-DEE5-4C96-A8B9-009E11100513" Win64='yes'> |
|
| 354 |
<File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\Markus.Mvvm.ToolKit.dll" /> |
|
| 355 |
</Component> |
|
| 353 | 356 |
</ComponentGroup> |
| 354 | 357 |
</Fragment> |
| 355 | 358 |
</Wix> |
내보내기 Unified diff
