개정판 23a96932
fixed issue #664 :
- check method 추가
- SaveEvent 에서 check 하도록 수정
| KCOM/Events/Implementation/TopMenuEvent.cs | ||
|---|---|---|
| 294 | 294 |
/// <param name="e"></param> |
| 295 | 295 |
public void SaveEvent(object sender, RoutedEventArgs e) |
| 296 | 296 |
{
|
| 297 |
this.ParentOfType<MainWindow>().dzMainMenu.EmptyControlCheck(); |
|
| 298 |
|
|
| 297 | 299 |
if (this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy == true) return; |
| 298 | 300 |
|
| 299 | 301 |
this.ParentOfType<MainWindow>().dzMainMenu.busyIndicator.IsBusy = true; |
| KCOM/Views/MainMenu.xaml.cs | ||
|---|---|---|
| 490 | 490 |
bool ComingNewBieEnd = false; |
| 491 | 491 |
|
| 492 | 492 |
private void pageNavigator_PageChanging(object sender, Controls.Sample.PageChangeEventArgs e) |
| 493 |
{
|
|
| 494 |
|
|
| 495 |
for (var j = 0; j < (Common.ViewerDataModel.Instance.MarkupControls_USER).Count; j++) |
|
| 496 |
{
|
|
| 497 |
if (((Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).GetType().Name == "TextControl") |
|
| 498 |
{
|
|
| 499 |
if (((MarkupToPDF.Controls.Text.TextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Text == null |
|
| 500 |
|| ((MarkupToPDF.Controls.Text.TextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Text == "") |
|
| 501 |
{
|
|
| 502 |
Common.ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(j); |
|
| 503 |
} |
|
| 504 |
} |
|
| 505 |
else if (((Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).GetType().Name == "ArrowTextControl") |
|
| 506 |
{
|
|
| 507 |
if (((MarkupToPDF.Controls.Text.ArrowTextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Base_TextBox.Text == null |
|
| 508 |
|| ((MarkupToPDF.Controls.Text.ArrowTextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Base_TextBox.Text == "") |
|
| 509 |
{
|
|
| 510 |
Common.ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(j); |
|
| 511 |
} |
|
| 512 |
} |
|
| 513 |
} |
|
| 514 |
|
|
| 493 |
{
|
|
| 515 | 494 |
if (ViewerDataModel.Instance.UndoDataList.Count > 0) |
| 516 | 495 |
{
|
| 517 | 496 |
this.ParentOfType<MainWindow>().dzTopMenu.SaveEvent(null, null); |
| ... | ... | |
| 5722 | 5701 |
} |
| 5723 | 5702 |
} |
| 5724 | 5703 |
} |
| 5725 |
|
|
| 5704 |
public void EmptyControlCheck() |
|
| 5705 |
{
|
|
| 5706 |
for (var j = 0; j < (Common.ViewerDataModel.Instance.MarkupControls_USER).Count; j++) |
|
| 5707 |
{
|
|
| 5708 |
if (((Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).GetType().Name == "TextControl") |
|
| 5709 |
{
|
|
| 5710 |
if (((MarkupToPDF.Controls.Text.TextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Text == null |
|
| 5711 |
|| ((MarkupToPDF.Controls.Text.TextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Text == "") |
|
| 5712 |
{
|
|
| 5713 |
Common.ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(j); |
|
| 5714 |
} |
|
| 5715 |
} |
|
| 5716 |
else if (((Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).GetType().Name == "ArrowTextControl") |
|
| 5717 |
{
|
|
| 5718 |
if (((MarkupToPDF.Controls.Text.ArrowTextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Base_TextBox.Text == null |
|
| 5719 |
|| ((MarkupToPDF.Controls.Text.ArrowTextControl)(Common.ViewerDataModel.Instance.MarkupControls_USER)[j]).Base_TextBox.Text == "") |
|
| 5720 |
{
|
|
| 5721 |
Common.ViewerDataModel.Instance.MarkupControls_USER.RemoveAt(j); |
|
| 5722 |
} |
|
| 5723 |
} |
|
| 5724 |
} |
|
| 5725 |
} |
|
| 5726 | 5726 |
public void InkControl_Convert() |
| 5727 | 5727 |
{
|
| 5728 | 5728 |
if (inkBoard.Strokes.Count > 0) |
내보내기 Unified diff
