mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 13:33:27 -07:00
Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9
This commit is contained in:
commit
0323705513
276 changed files with 5382 additions and 3666 deletions
|
@ -32,11 +32,11 @@ namespace Greenshot.Destinations {
|
|||
/// Description of EditorDestination.
|
||||
/// </summary>
|
||||
public class EditorDestination : AbstractDestination {
|
||||
private static ILog LOG = LogManager.GetLogger(typeof(EditorDestination));
|
||||
private static EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();
|
||||
private static readonly ILog LOG = LogManager.GetLogger(typeof(EditorDestination));
|
||||
private static readonly EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();
|
||||
public const string DESIGNATION = "Editor";
|
||||
private IImageEditor editor = null;
|
||||
private static Image greenshotIcon = GreenshotResources.getGreenshotIcon().ToBitmap();
|
||||
private readonly IImageEditor editor;
|
||||
private static readonly Image greenshotIcon = GreenshotResources.getGreenshotIcon().ToBitmap();
|
||||
|
||||
public EditorDestination() {
|
||||
}
|
||||
|
@ -79,8 +79,8 @@ namespace Greenshot.Destinations {
|
|||
}
|
||||
|
||||
public override IEnumerable<IDestination> DynamicDestinations() {
|
||||
foreach (IImageEditor editor in ImageEditorForm.Editors) {
|
||||
yield return new EditorDestination(editor);
|
||||
foreach (IImageEditor someEditor in ImageEditorForm.Editors) {
|
||||
yield return new EditorDestination(someEditor);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue