|
@@ -288,50 +288,62 @@ namespace PDF_Office.ViewModels.Dialog.BOTA
|
|
{
|
|
{
|
|
case "Highlight":
|
|
case "Highlight":
|
|
btnHighlight = iconToggleBtn;
|
|
btnHighlight = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "FreeHand":
|
|
case "FreeHand":
|
|
btnFreeHand = iconToggleBtn;
|
|
btnFreeHand = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotSticky":
|
|
case "AnnotSticky":
|
|
btnAnnotSticky = iconToggleBtn;
|
|
btnAnnotSticky = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotStamp":
|
|
case "AnnotStamp":
|
|
btnAnnotStamp = iconToggleBtn;
|
|
btnAnnotStamp = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "SharpLine":
|
|
case "SharpLine":
|
|
btnSharpLine = iconToggleBtn;
|
|
btnSharpLine = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "SharpArrow":
|
|
case "SharpArrow":
|
|
btnSharpArrow = iconToggleBtn;
|
|
btnSharpArrow = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotCircle":
|
|
case "AnnotCircle":
|
|
btnAnnotCircle = iconToggleBtn;
|
|
btnAnnotCircle = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotSquare":
|
|
case "AnnotSquare":
|
|
btnAnnotSquare = iconToggleBtn;
|
|
btnAnnotSquare = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotFreeText":
|
|
case "AnnotFreeText":
|
|
btnAnnotFreeText = iconToggleBtn;
|
|
btnAnnotFreeText = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotStrikeout":
|
|
case "AnnotStrikeout":
|
|
btnAnnotStrikeout = iconToggleBtn;
|
|
btnAnnotStrikeout = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "Underline":
|
|
case "Underline":
|
|
btnUnderLine = iconToggleBtn;
|
|
btnUnderLine = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
|
|
|
|
case "AnnotLink":
|
|
case "AnnotLink":
|
|
btnAnnotLink = iconToggleBtn;
|
|
btnAnnotLink = iconToggleBtn;
|
|
|
|
+ iconToggleBtns.Add(iconToggleBtn);
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -348,10 +360,10 @@ namespace PDF_Office.ViewModels.Dialog.BOTA
|
|
//btnAnnotStrikeout = arrys[9] as CustomIconToggleBtn;
|
|
//btnAnnotStrikeout = arrys[9] as CustomIconToggleBtn;
|
|
//btnUnderLine = arrys[10] as CustomIconToggleBtn;
|
|
//btnUnderLine = arrys[10] as CustomIconToggleBtn;
|
|
//btnAnnotLink = arrys[11] as CustomIconToggleBtn;
|
|
//btnAnnotLink = arrys[11] as CustomIconToggleBtn;
|
|
- for (int i = 0; i < arrys.Length - 2; i++)
|
|
|
|
- {
|
|
|
|
- iconToggleBtns.Add(arrys[i] as CustomIconToggleBtn);
|
|
|
|
- }
|
|
|
|
|
|
+ //for (int i = 0; i < arrys.Length - 2; i++)
|
|
|
|
+ //{
|
|
|
|
+ // iconToggleBtns.Add(arrys[i] as CustomIconToggleBtn);
|
|
|
|
+ //}
|
|
SetBtnSelectedState(arrys);
|
|
SetBtnSelectedState(arrys);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -519,22 +531,22 @@ namespace PDF_Office.ViewModels.Dialog.BOTA
|
|
/// <param name="obj"></param>
|
|
/// <param name="obj"></param>
|
|
private void CleanEvent(Object obj)
|
|
private void CleanEvent(Object obj)
|
|
{
|
|
{
|
|
- //for (int i = 0; i < iconToggleBtns.Count; i++)
|
|
|
|
- //{
|
|
|
|
- // SetBtnType(iconToggleBtns[i], true);
|
|
|
|
- //}
|
|
|
|
-
|
|
|
|
- //if (this._ListColor != null)
|
|
|
|
- //{
|
|
|
|
- // this._ListColor.SelectedItems.Clear();
|
|
|
|
- //}
|
|
|
|
- //if (this._ListAuthor != null)
|
|
|
|
- //{
|
|
|
|
- // this._ListAuthor.SelectedItems.Clear();
|
|
|
|
- //}
|
|
|
|
- DialogParameters valuePairs = new DialogParameters();
|
|
|
|
- valuePairs.Add(ParameterNames.AnnotationCleanState, true);
|
|
|
|
- RequestClose.Invoke(new DialogResult(ButtonResult.OK, valuePairs));
|
|
|
|
|
|
+ for (int i = 0; i < iconToggleBtns.Count; i++)
|
|
|
|
+ {
|
|
|
|
+ SetBtnType(iconToggleBtns[i], true);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (this._ListColor != null)
|
|
|
|
+ {
|
|
|
|
+ this._ListColor.SelectedItems.Clear();
|
|
|
|
+ }
|
|
|
|
+ if (this._ListAuthor != null)
|
|
|
|
+ {
|
|
|
|
+ this._ListAuthor.SelectedItems.Clear();
|
|
|
|
+ }
|
|
|
|
+ //DialogParameters valuePairs = new DialogParameters();
|
|
|
|
+ //valuePairs.Add(ParameterNames.AnnotationCleanState, true);
|
|
|
|
+ //RequestClose.Invoke(new DialogResult(ButtonResult.OK, valuePairs));
|
|
}
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// <summary>
|