개정판 75f6ff19
wix setup 수정
Change-Id: Ib2b85bb930675bc158e42d7884f8429c42e63a80
| DownloadManager/CheckAutoUpdate.cs | ||
|---|---|---|
| 103 | 103 |
|
| 104 | 104 |
if(File.Exists(filename)) |
| 105 | 105 |
{
|
| 106 |
|
|
| 107 | 106 |
using (var archive = ZipFile.Open(filename,ZipArchiveMode.Read)) |
| 108 | 107 |
{
|
| 109 | 108 |
foreach (var entry in archive.Entries) |
| DownloadManager/Program.cs | ||
|---|---|---|
| 69 | 69 |
if (args[0] == IIpc.ProcessTypeDefine.DEFINE_MONITOR) |
| 70 | 70 |
{
|
| 71 | 71 |
CheckAutoUpdate.Validation(); |
| 72 |
|
|
| 72 |
|
|
| 73 | 73 |
IsDebug = bool.Parse(args[1]); |
| 74 | 74 |
int processId = int.Parse(args[2]); /// kcom process id |
| 75 | 75 |
int thumbnamilPID = int.Parse(args[3]); |
| ... | ... | |
| 177 | 177 |
{
|
| 178 | 178 |
try |
| 179 | 179 |
{
|
| 180 |
logger.Info($"DeleteFiles Info {processType} {path}");
|
|
| 181 |
|
|
| 180 | 182 |
if (processType == IIpc.ProcessTypeDefine.DEFINE_THUMBNAIL) |
| 181 | 183 |
{
|
| 182 | 184 |
var dir = System.IO.Directory.GetDirectories(path, "*.*", System.IO.SearchOption.AllDirectories); |
| KCOM/MainWindow.xaml.cs | ||
|---|---|---|
| 229 | 229 |
{
|
| 230 | 230 |
base.OnClosing(e); |
| 231 | 231 |
|
| 232 |
SaveCheck(); |
|
| 232 |
if(!SaveCheck()) |
|
| 233 |
{
|
|
| 234 |
if(SaveConfirm()) |
|
| 235 |
{
|
|
| 236 |
dzTopMenu.SaveEventCallback(null, null); |
|
| 237 |
} |
|
| 238 |
else |
|
| 239 |
{
|
|
| 240 |
e.Cancel = true; |
|
| 241 |
} |
|
| 242 |
} |
|
| 233 | 243 |
|
| 234 | 244 |
//Update Check 를 통해 update url 을 Get 하고 결과값이 있을 경우에는 SmartUpdater 실행. |
| 235 | 245 |
//KeyValuePair<bool, string> updatecheck = UpdateCheck(); |
| ... | ... | |
| 239 | 249 |
//} |
| 240 | 250 |
} |
| 241 | 251 |
|
| 242 |
private void SaveCheck()
|
|
| 252 |
private bool SaveCheck()
|
|
| 243 | 253 |
{
|
| 254 |
bool result = false; |
|
| 255 |
|
|
| 244 | 256 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
| 245 | 257 |
{
|
| 246 | 258 |
DateTime undoTime = ViewerDataModel.Instance.UndoDataList.OrderByDescending(order => order.EventTime).FirstOrDefault().EventTime; |
| ... | ... | |
| 252 | 264 |
|
| 253 | 265 |
if (undoTime > updatetime) |
| 254 | 266 |
{
|
| 255 |
DialogParameters parameters = new DialogParameters() |
|
| 256 |
{
|
|
| 257 |
Owner = Application.Current.MainWindow, |
|
| 258 |
Content = new TextBlock() |
|
| 259 |
{
|
|
| 260 |
MinWidth = 400, |
|
| 261 |
FontSize = 11, |
|
| 262 |
Text = "Found unsaved comments. Save now?", |
|
| 263 |
TextWrapping = System.Windows.TextWrapping.Wrap |
|
| 264 |
}, |
|
| 265 |
Header = "Confirm", |
|
| 266 |
Theme = new VisualStudio2013Theme(), |
|
| 267 |
ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 },
|
|
| 268 |
Closed = OnClosingSave, |
|
| 269 |
}; |
|
| 270 |
RadWindow.Confirm(parameters); |
|
| 267 |
result = false; |
|
| 271 | 268 |
} |
| 272 | 269 |
else |
| 273 | 270 |
{
|
| 274 |
isSaveCheck = true;
|
|
| 271 |
result = true;
|
|
| 275 | 272 |
} |
| 276 | 273 |
} |
| 277 | 274 |
else |
| 278 | 275 |
{
|
| 279 |
isSaveCheck = true;
|
|
| 276 |
result = true;
|
|
| 280 | 277 |
} |
| 278 |
|
|
| 279 |
return result; |
|
| 281 | 280 |
} |
| 282 |
private void OnClosingSave(object sender, WindowClosedEventArgs e) |
|
| 281 |
|
|
| 282 |
private bool SaveConfirm() |
|
| 283 | 283 |
{
|
| 284 |
if (e.DialogResult == true) |
|
| 284 |
bool result = false; |
|
| 285 |
|
|
| 286 |
EventHandler<WindowClosedEventArgs> Closedhandler = null; |
|
| 287 |
|
|
| 288 |
Closedhandler = (snd, evt) => |
|
| 285 | 289 |
{
|
| 286 |
dzTopMenu.SaveEventCallback(null, null); |
|
| 287 |
} |
|
| 288 |
isSaveCheck = true; |
|
| 290 |
result = evt.DialogResult.GetValueOrDefault(); |
|
| 291 |
}; |
|
| 292 |
|
|
| 293 |
|
|
| 294 |
DialogParameters parameters = new DialogParameters() |
|
| 295 |
{
|
|
| 296 |
Owner = Application.Current.MainWindow, |
|
| 297 |
Content = new TextBlock() |
|
| 298 |
{
|
|
| 299 |
MinWidth = 400, |
|
| 300 |
FontSize = 11, |
|
| 301 |
Text = "Found unsaved comments. Save now?", |
|
| 302 |
TextWrapping = System.Windows.TextWrapping.Wrap |
|
| 303 |
}, |
|
| 304 |
Header = "Confirm", |
|
| 305 |
Theme = new VisualStudio2013Theme(), |
|
| 306 |
ModalBackground = new SolidColorBrush { Color = Colors.Black, Opacity = 0.6 },
|
|
| 307 |
Closed = Closedhandler |
|
| 308 |
}; |
|
| 309 |
|
|
| 310 |
RadWindow.Confirm(parameters); |
|
| 311 |
|
|
| 312 |
return result; |
|
| 289 | 313 |
} |
| 290 | 314 |
|
| 291 | 315 |
private void client_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e) |
| KCOM/Views/MainMenu.xaml | ||
|---|---|---|
| 914 | 914 |
</DataTemplate> |
| 915 | 915 |
</telerik:GridViewDataColumn.CellTemplate> |
| 916 | 916 |
</telerik:GridViewDataColumn> |
| 917 |
<telerik:GridViewDataColumn CellStyle="{StaticResource GridViewAlign}"
|
|
| 917 |
<telerik:GridViewDataColumn Header="Attachments" CellStyle="{StaticResource GridViewAlign}" IsVisible="{Binding IsDocumentHistory, Source={x:Static common:ViewerDataModel.Instance},Mode=TwoWay}"
|
|
| 918 | 918 |
DataMemberBinding="{Binding EnsembleLink}" IsReadOnly="True"
|
| 919 |
Header="Attachments" telerik:StyleManager.Theme="Office2013"
|
|
| 919 |
telerik:StyleManager.Theme="Office2013" |
|
| 920 | 920 |
HeaderTextAlignment="Center"> |
| 921 | 921 |
<telerik:GridViewDataColumn.CellTemplate> |
| 922 | 922 |
<DataTemplate> |
| KCOM_API/Web.Debug.config | ||
|---|---|---|
| 20 | 20 |
<value>True</value> |
| 21 | 21 |
</setting> |
| 22 | 22 |
<setting name="FinalService" serializeAs="String"> |
| 23 |
<value>tcp://localhost:9093/remFinalPDF</value>
|
|
| 23 |
<value>tcp://localhost:9092/remFinalPDF</value>
|
|
| 24 | 24 |
</setting> |
| 25 | 25 |
</KCOM_API.Properties.Settings> |
| 26 | 26 |
</applicationSettings> |
| KCOM_API/Web.config | ||
|---|---|---|
| 94 | 94 |
<value>True</value> |
| 95 | 95 |
</setting> |
| 96 | 96 |
<setting name="FinalService" serializeAs="String"> |
| 97 |
<value>tcp://localhost:9093/remFinalPDF</value>
|
|
| 97 |
<value>tcp://localhost:9092/remFinalPDF</value>
|
|
| 98 | 98 |
</setting> |
| 99 | 99 |
</KCOM_API.Properties.Settings> |
| 100 | 100 |
</applicationSettings> |
| MarkusAutoUpdate/SetupWix/Product.wxs | ||
|---|---|---|
| 32 | 32 |
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
| 33 | 33 |
<!--Embed Cabinet into single msi file--> |
| 34 | 34 |
<Media Id="1" Cabinet="$(var.CabName)" EmbedCab="yes" /> |
| 35 |
|
|
| 35 |
<WixVariable Id="WixUILicenseRtf" Value="Resources/license.rtf" /> |
|
| 36 |
<WixVariable Id="WixUIBannerBmp" Value="Resources/DOFTECH_LOGO.bmp" /> |
|
| 36 | 37 |
<!--<Condition Message="This application requires .NET Framework 4.5.2 Please install the .NET Framework then run this installer again."> |
| 37 | 38 |
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_452_OR_LATER_INSTALLED]]> |
| 38 | 39 |
</Condition>--> |
| ... | ... | |
| 47 | 48 |
<ComponentRef Id="REG_PROTOCOL_WRITE"/> |
| 48 | 49 |
<ComponentRef Id="REG_WARNONOPEN_WRITE"/> |
| 49 | 50 |
</Feature> |
| 51 |
<UI> |
|
| 52 |
<UIRef Id="WixUI_Minimal"/> |
|
| 53 |
</UI> |
|
| 50 | 54 |
</Product> |
| 51 | 55 |
<Fragment> |
| 52 | 56 |
<Directory Id="TARGETDIR" Name="SourceDir"> |
| ... | ... | |
| 94 | 98 |
</Fragment> |
| 95 | 99 |
<Fragment> |
| 96 | 100 |
<DirectoryRef Id="INSTALLFOLDER"> |
| 97 |
<Component Id="REG_WARNONOPEN_WRITE" Guid="171260E2-66FC-4088-9F1F-3FAEB29250CA" KeyPath="yes">
|
|
| 101 |
<Component Id="REG_WARNONOPEN_WRITE" Guid="171260E2-66FC-4088-9F1F-3FAEB29250CA"> |
|
| 98 | 102 |
<RegistryKey Key="Software\KCOM" Root="HKCU" Action="createAndRemoveOnUninstall" /> |
| 99 | 103 |
<RegistryKey Key="Software\Microsoft\Internet Explorer\KCOM" Root="HKCU" Action="createAndRemoveOnUninstall"> |
| 100 | 104 |
<RegistryValue Name="WarnOnOpen" Value="0" Type="integer" /> |
| MarkusAutoUpdate/SetupWix/SetupWix.wixproj | ||
|---|---|---|
| 43 | 43 |
</ItemGroup> |
| 44 | 44 |
<ItemGroup> |
| 45 | 45 |
<Content Include="packages.config" /> |
| 46 |
<Content Include="Resources\DoftechLogo.bmp" /> |
|
| 46 |
<Content Include="Resources\DOFTECH_LOGO.bmp" /> |
|
| 47 |
<Content Include="Resources\license.rtf" /> |
|
| 47 | 48 |
<Content Include="SetupWix.wax" /> |
| 48 | 49 |
</ItemGroup> |
| 49 | 50 |
<ItemGroup> |
| ... | ... | |
| 100 | 101 |
<Folder Include="Resources" /> |
| 101 | 102 |
</ItemGroup> |
| 102 | 103 |
<ItemGroup> |
| 104 |
<WixExtension Include="WixUIExtension"> |
|
| 105 |
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> |
|
| 106 |
<Name>WixUIExtension</Name> |
|
| 107 |
</WixExtension> |
|
| 103 | 108 |
<WixExtension Include="WixUtilExtension"> |
| 104 | 109 |
<HintPath>..\packages\WiX.3.11.2\tools\WixUtilExtension.dll</HintPath> |
| 105 | 110 |
<Name>WixUtilExtension</Name> |
내보내기 Unified diff
