개정판 95c73392
issue #00000 markup 바로가기 수정
| ColorList/ColorList.csproj | ||
|---|---|---|
| 169 | 169 |
<Resource Include="sample.png" /> |
| 170 | 170 |
</ItemGroup> |
| 171 | 171 |
<ItemGroup> |
| 172 |
<ProjectReference Include="..\ZoomAndPan\ZoomAndPan.csproj"> |
|
| 173 |
<Project>{6c950af4-04d2-4638-8b78-472e39f78b45}</Project>
|
|
| 174 |
<Name>ZoomAndPan</Name> |
|
| 175 |
</ProjectReference> |
|
| 176 |
</ItemGroup> |
|
| 177 |
<ItemGroup> |
|
| 178 | 172 |
<Content Include="ModelMarkus.Context.tt"> |
| 179 | 173 |
<Generator>TextTemplatingFileGenerator</Generator> |
| 180 | 174 |
<DependentUpon>ModelMarkus.edmx</DependentUpon> |
| ... | ... | |
| 202 | 196 |
<ItemGroup> |
| 203 | 197 |
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
|
| 204 | 198 |
</ItemGroup> |
| 199 |
<ItemGroup> |
|
| 200 |
<ProjectReference Include="..\ZoomAndPan\ZoomAndPan.csproj"> |
|
| 201 |
<Project>{6c950af4-04d2-4638-8b78-472e39f78b45}</Project>
|
|
| 202 |
<Name>ZoomAndPan</Name> |
|
| 203 |
</ProjectReference> |
|
| 204 |
</ItemGroup> |
|
| 205 | 205 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
| 206 | 206 |
</Project> |
| KCOM/App.xaml.cs | ||
|---|---|---|
| 1 | 1 |
|
| 2 | 2 |
using KCOM.Common; |
| 3 | 3 |
using KCOM.Views; |
| 4 |
using License.Validator; |
|
| 5 | 4 |
using log4net; |
| 6 | 5 |
using System; |
| 7 | 6 |
using System.ComponentModel; |
| ... | ... | |
| 354 | 353 |
} |
| 355 | 354 |
} |
| 356 | 355 |
|
| 357 |
private void License_ValidateError(object sender, ValidateErrorArgs e) |
|
| 358 |
{
|
|
| 359 |
e.Received = true; |
|
| 360 |
|
|
| 361 |
Telerik.Windows.Controls.RadWindow.Alert(new Telerik.Windows.Controls.DialogParameters |
|
| 362 |
{
|
|
| 363 |
Content = "License Error : " + e.Message, |
|
| 364 |
Owner = splashScreen |
|
| 365 |
}); |
|
| 366 |
///MessageBox.Show(e.Message); |
|
| 367 |
Application.Current.Shutdown(); |
|
| 368 |
} |
|
| 369 | 356 |
|
| 370 | 357 |
private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) |
| 371 | 358 |
{
|
| KCOM/Extensions/MarkupVisitHelper.cs | ||
|---|---|---|
| 53 | 53 |
/// 페이지 변경 후 다시 호출 |
| 54 | 54 |
handler = (snd, evt) => |
| 55 | 55 |
{
|
| 56 |
ViewerDataModel.Instance.PageLoaded -= handler;
|
|
| 56 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated -= handler;
|
|
| 57 | 57 |
|
| 58 |
Task.Delay(100).ConfigureAwait(true); |
|
| 58 |
//Task.Delay(100).ConfigureAwait(true);
|
|
| 59 | 59 |
|
| 60 |
GotoMarkup(CommentIdList); |
|
| 60 |
GotoSelectedMarkup(CommentIdList);
|
|
| 61 | 61 |
}; |
| 62 | 62 |
|
| 63 |
ViewerDataModel.Instance.PageLoaded += handler;
|
|
| 63 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.MarkupLoadComplated += handler;
|
|
| 64 | 64 |
|
| 65 | 65 |
ViewerDataModel.Instance.SystemMain.dzMainMenu.pageNavigator.GotoPage(commentList.First().PageNumber); |
| 66 | 66 |
} |
| KCOM/KCOM.csproj | ||
|---|---|---|
| 1035 | 1035 |
<SubType>Designer</SubType> |
| 1036 | 1036 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
| 1037 | 1037 |
</None> |
| 1038 |
<None Include="MARKUS - 복사본.ini"> |
|
| 1039 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
|
| 1040 |
</None> |
|
| 1041 | 1038 |
<None Include="MARKUS.ini"> |
| 1042 | 1039 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
| 1043 | 1040 |
</None> |
| ... | ... | |
| 1424 | 1421 |
<Project>{629dc8cd-d458-47ef-8f02-cd12c7001c3e}</Project>
|
| 1425 | 1422 |
<Name>KCOMDataModel</Name> |
| 1426 | 1423 |
</ProjectReference> |
| 1427 |
<ProjectReference Include="..\License.Validator\License.Validator.csproj"> |
|
| 1428 |
<Project>{ef2913c2-562e-43a3-9f9b-a31141783803}</Project>
|
|
| 1429 |
<Name>License.Validator</Name> |
|
| 1430 |
</ProjectReference> |
|
| 1431 | 1424 |
<ProjectReference Include="..\MarkupToPDF\MarkupToPDF.csproj"> |
| 1432 | 1425 |
<Project>{a714bd67-8aac-4ed8-8ecf-7853c3549a68}</Project>
|
| 1433 | 1426 |
<Name>MarkupToPDF</Name> |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 151 | 151 |
public AdornerFinal adorner_; |
| 152 | 152 |
public Multi_Undo_data multi_Undo_Data; |
| 153 | 153 |
public string Symbol_ID = ""; |
| 154 |
|
|
| 154 |
public event EventHandler<EventArgs> MarkupLoadComplated; |
|
| 155 | 155 |
/// <summary> |
| 156 | 156 |
/// Set to 'true' when the left mouse-button is down. |
| 157 | 157 |
/// </summary> |
| ... | ... | |
| 1194 | 1194 |
} |
| 1195 | 1195 |
|
| 1196 | 1196 |
SetCommentPages(cts); |
| 1197 |
|
|
| 1198 |
if (MarkupLoadComplated != null) |
|
| 1199 |
{
|
|
| 1200 |
MarkupLoadComplated(this, new EventArgs()); |
|
| 1201 |
} |
|
| 1197 | 1202 |
} |
| 1198 | 1203 |
|
| 1199 | 1204 |
public void SetCommentPages(CancellationToken? cts) |
내보내기 Unified diff
