github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-14 18:57:28 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG-1908: Made Greenshot recheck & add the external commands like Ms-Paint and Paint.NET if they are not deleted manually and not yet available. Also cleaned up some code.

Browse source
This commit is contained in:
Robin 2016-09-16 21:48:57 +02:00
commit 6efc7796b8
49 changed files with 322 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Greenshot/Controls/BindableToolStripButton.cs
View file

@ -41,7 +41,7 @@ namespace Greenshot.Controls {
CheckedChanged += BindableToolStripButton_CheckedChanged;
}
void BindableToolStripButton_CheckedChanged(object sender, EventArgs e) {
private void BindableToolStripButton_CheckedChanged(object sender, EventArgs e) {
if(PropertyChanged != null) PropertyChanged(this, new PropertyChangedEventArgs("Checked"));
}
}

2
Greenshot/Controls/BindableToolStripComboBox.cs
View file

@ -41,7 +41,7 @@ namespace Greenshot.Controls {
SelectedIndexChanged += BindableToolStripComboBox_SelectedIndexChanged;
}
void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) {
private void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) {
if(PropertyChanged != null) {
PropertyChanged(this, new PropertyChangedEventArgs("SelectedItem"));

2
Greenshot/Controls/ColorButton.cs
View file

@ -67,7 +67,7 @@ namespace Greenshot.Controls {
}
}
void ColorButtonClick(object sender, EventArgs e) {
private void ColorButtonClick(object sender, EventArgs e) {
ColorDialog colorDialog = ColorDialog.GetInstance();
colorDialog.Color = SelectedColor;
// Using the parent to make sure the dialog doesn't show on another window

4
Greenshot/Controls/FontFamilyComboBox.cs
View file

@ -53,7 +53,7 @@ namespace Greenshot.Controls {
}
}
void ComboBox_DrawItem(object sender, DrawItemEventArgs e) {
private void ComboBox_DrawItem(object sender, DrawItemEventArgs e) {
// DrawBackground handles drawing the background (i.e,. hot-tracked v. not)
// It uses the system colors (Bluish, and and white, by default)
// same as calling e.Graphics.FillRectangle ( SystemBrushes.Highlight, e.Bounds );
@ -108,7 +108,7 @@ namespace Greenshot.Controls {
}
}
void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) {
private void BindableToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) {
if (PropertyChanged != null) {
PropertyChanged(this, new PropertyChangedEventArgs("Text"));
PropertyChanged(this, new PropertyChangedEventArgs("FontFamily"));

2
Greenshot/Controls/MenuStripEx.cs
View file

@ -29,7 +29,7 @@ namespace Greenshot.Controls {
public class MenuStripEx : MenuStrip {
private const int WM_MOUSEACTIVATE = 0x21;
enum NativeConstants : uint {
private enum NativeConstants : uint {
MA_ACTIVATE = 1,
MA_ACTIVATEANDEAT = 2,
}

2
Greenshot/Controls/ToolStripColorButton.cs
View file

@ -65,7 +65,7 @@ namespace Greenshot.Controls {
}
}
void ColorButtonClick(object sender, EventArgs e) {
private void ColorButtonClick(object sender, EventArgs e) {
ColorDialog colorDialog = ColorDialog.GetInstance();
colorDialog.Color = SelectedColor;
// Using the parent to make sure the dialog doesn't show on another window

4
Greenshot/Controls/ToolStripEx.cs
View file

@ -26,10 +26,10 @@ namespace Greenshot.Controls {
/// This is an extension of the default ToolStrip and allows us to click it even when the form doesn't have focus.
/// See: http://blogs.msdn.com/b/rickbrew/archive/2006/01/09/511003.aspx
/// </summary>
class ToolStripEx : ToolStrip {
internal class ToolStripEx : ToolStrip {
private const int WM_MOUSEACTIVATE = 0x21;
enum NativeConstants : uint {
private enum NativeConstants : uint {
MA_ACTIVATE = 1,
MA_ACTIVATEANDEAT = 2,
}

3
Greenshot/Drawing/Fields/AbstractFieldHolderWithChildren.cs
View file

@ -34,8 +34,7 @@ namespace Greenshot.Drawing.Fields
[Serializable()]
public abstract class AbstractFieldHolderWithChildren : AbstractFieldHolder
{
FieldChangedEventHandler fieldChangedEventHandler;
private FieldChangedEventHandler fieldChangedEventHandler;
[NonSerialized]
private EventHandler childrenChanged;

2
Greenshot/Drawing/Fields/FieldAggregator.cs
View file

@ -47,7 +47,7 @@ namespace Greenshot.Drawing.Fields
private IDrawableContainerList boundContainers;
private bool internalUpdateRunning = false;
enum Status { IDLE, BINDING, UPDATING };
private enum Status { IDLE, BINDING, UPDATING };
private static readonly ILog LOG = LogManager.GetLogger(typeof(FieldAggregator));
private static EditorConfiguration editorConfiguration = IniConfig.GetIniSection<EditorConfiguration>();

10
Greenshot/Drawing/Surface.cs
View file

@ -1169,7 +1169,7 @@ namespace Greenshot.Drawing
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void SurfaceMouseDown(object sender, MouseEventArgs e)
private void SurfaceMouseDown(object sender, MouseEventArgs e)
{
// Handle Adorners
@ -1261,7 +1261,7 @@ namespace Greenshot.Drawing
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void SurfaceMouseUp(object sender, MouseEventArgs e)
private void SurfaceMouseUp(object sender, MouseEventArgs e)
{
// Handle Adorners
@ -1350,7 +1350,7 @@ namespace Greenshot.Drawing
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void SurfaceMouseMove(object sender, MouseEventArgs e)
private void SurfaceMouseMove(object sender, MouseEventArgs e)
{
// Handle Adorners
var adorner = FindActiveAdorner(e);
@ -1417,7 +1417,7 @@ namespace Greenshot.Drawing
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void SurfaceDoubleClick(object sender, MouseEventArgs e)
private void SurfaceDoubleClick(object sender, MouseEventArgs e)
{
selectedElements.OnDoubleClick();
selectedElements.Invalidate();
@ -1459,7 +1459,7 @@ namespace Greenshot.Drawing
/// </summary>
/// <param name="sender"></param>
/// <param name="paintEventArgs">PaintEventArgs</param>
void SurfacePaint(object sender, PaintEventArgs paintEventArgs)
private void SurfacePaint(object sender, PaintEventArgs paintEventArgs)
{
Graphics targetGraphics = paintEventArgs.Graphics;
Rectangle clipRectangle = paintEventArgs.ClipRectangle;

4
Greenshot/Forms/AboutForm.cs
View file

@ -116,7 +116,7 @@ namespace Greenshot {
// 18 19 20 21 22 23
// The order in which we draw the dots & flow the collors.
readonly List<int> flowOrder = new List<int>() { 4, 3, 2, 1, 0, 5, 6, 7, 8, 9, 10, 14, 15, 18, 19, 20, 21, 22, 23, 16, 17, 13, 12, 11 };
private readonly List<int> flowOrder = new List<int>() { 4, 3, 2, 1, 0, 5, 6, 7, 8, 9, 10, 14, 15, 18, 19, 20, 21, 22, 23, 16, 17, 13, 12, 11 };
/// <summary>
/// Cleanup all the allocated resources
@ -211,7 +211,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void LinkLabelClicked(object sender, LinkLabelLinkClickedEventArgs e) {
private void LinkLabelClicked(object sender, LinkLabelLinkClickedEventArgs e) {
LinkLabel linkLabel = sender as LinkLabel;
if (linkLabel != null) {
try {

4
Greenshot/Forms/BugReportForm.cs
View file

@ -37,8 +37,8 @@ namespace Greenshot.Forms {
public BugReportForm(string bugText) : this() {
textBoxDescription.Text = bugText;
}
void LinkLblBugsLinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
private void LinkLblBugsLinkClicked(object sender, LinkLabelLinkClickedEventArgs e) {
openLink((LinkLabel)sender);
}

15
Greenshot/Forms/CaptureForm.cs
View file

@ -185,7 +185,7 @@ namespace Greenshot.Forms {
/// <summary>
/// Create an animation for the zoomer, depending on if it's active or not.
/// </summary>
void InitializeZoomer(bool isOn) {
private void InitializeZoomer(bool isOn) {
if (isOn) {
// Initialize the zoom with a invalid position
_zoomAnimator = new RectangleAnimator(Rectangle.Empty, new Rectangle(int.MaxValue, int.MaxValue, 0, 0), FramesForMillis(1000), EasingType.Quintic, EasingMode.EaseOut);
@ -196,7 +196,8 @@ namespace Greenshot.Forms {
}
#region key handling
void CaptureFormKeyUp(object sender, KeyEventArgs e) {
private void CaptureFormKeyUp(object sender, KeyEventArgs e) {
switch(e.KeyCode) {
case Keys.ShiftKey:
_fixMode = FixMode.None;
@ -212,7 +213,7 @@ namespace Greenshot.Forms {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void CaptureFormKeyDown(object sender, KeyEventArgs e) {
private void CaptureFormKeyDown(object sender, KeyEventArgs e) {
int step = _isCtrlPressed ? 10 : 1;
switch (e.KeyCode) {
@ -319,7 +320,7 @@ namespace Greenshot.Forms {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void OnMouseDown(object sender, MouseEventArgs e) {
private void OnMouseDown(object sender, MouseEventArgs e) {
if (e.Button == MouseButtons.Left) {
HandleMouseDown();
}
@ -360,7 +361,7 @@ namespace Greenshot.Forms {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void OnMouseUp(object sender, MouseEventArgs e) {
private void OnMouseUp(object sender, MouseEventArgs e) {
if (_mouseDown) {
HandleMouseUp();
}
@ -392,7 +393,7 @@ namespace Greenshot.Forms {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void OnMouseMove(object sender, MouseEventArgs e) {
private void OnMouseMove(object sender, MouseEventArgs e) {
// Make sure the mouse coordinates are fixed, when pressing shift
_mouseMovePos = FixMouseCoordinates(User32.GetCursorLocation());
_mouseMovePos = WindowCapture.GetLocationRelativeToScreenBounds(_mouseMovePos);
@ -704,7 +705,7 @@ namespace Greenshot.Forms {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void OnPaint(object sender, PaintEventArgs e) {
private void OnPaint(object sender, PaintEventArgs e) {
Graphics graphics = e.Graphics;
Rectangle clipRectangle = e.ClipRectangle;
//graphics.BitBlt((Bitmap)buffer, Point.Empty);

17
Greenshot/Forms/ColorDialog.cs
View file

@ -165,7 +165,8 @@ namespace Greenshot {
#endregion
#region textbox event handlers
void TextBoxHexadecimalTextChanged(object sender, EventArgs e) {
private void TextBoxHexadecimalTextChanged(object sender, EventArgs e) {
if (_updateInProgress) {
return;
}
@ -188,7 +189,7 @@ namespace Greenshot {
PreviewColor(opaqueColor, textBox);
}
void TextBoxRGBTextChanged(object sender, EventArgs e) {
private void TextBoxRGBTextChanged(object sender, EventArgs e) {
if (_updateInProgress) {
return;
}
@ -196,11 +197,11 @@ namespace Greenshot {
PreviewColor(Color.FromArgb(GetColorPartIntFromString(textBoxAlpha.Text), GetColorPartIntFromString(textBoxRed.Text), GetColorPartIntFromString(textBoxGreen.Text), GetColorPartIntFromString(textBoxBlue.Text)), textBox);
}
void TextBoxGotFocus(object sender, EventArgs e) {
private void TextBoxGotFocus(object sender, EventArgs e) {
textBoxHtmlColor.SelectAll();
}
void TextBoxKeyDown(object sender, KeyEventArgs e) {
private void TextBoxKeyDown(object sender, KeyEventArgs e) {
if (e.KeyCode == Keys.Return || e.KeyCode == Keys.Enter) {
AddToRecentColors(colorPanel.BackColor);
}
@ -208,15 +209,17 @@ namespace Greenshot {
#endregion
#region button event handlers
void ColorButtonClick(object sender, EventArgs e) {
private void ColorButtonClick(object sender, EventArgs e) {
Button b = (Button)sender;
PreviewColor(b.BackColor, b);
}
void BtnTransparentClick(object sender, EventArgs e) {
private void BtnTransparentClick(object sender, EventArgs e) {
ColorButtonClick(sender, e);
}
void BtnApplyClick(object sender, EventArgs e) {
private void BtnApplyClick(object sender, EventArgs e) {
DialogResult = DialogResult.OK;
Hide();
AddToRecentColors(colorPanel.BackColor);

4
Greenshot/Forms/LanguageDialog.cs
View file

@ -78,8 +78,8 @@ namespace Greenshot.Forms {
Close();
}
}
void BtnOKClick(object sender, EventArgs e) {
private void BtnOKClick(object sender, EventArgs e) {
properOkPressed = true;
// Fix for Bug #3431100
Language.CurrentLanguage = SelectedLanguage;

71
Greenshot/Forms/MainForm.cs
View file

@ -648,24 +648,26 @@ namespace Greenshot {
#region mainform events
void MainFormFormClosing(object sender, FormClosingEventArgs e) {
private void MainFormFormClosing(object sender, FormClosingEventArgs e) {
LOG.DebugFormat("Mainform closing, reason: {0}", e.CloseReason);
_instance = null;
Exit();
}
void MainFormActivated(object sender, EventArgs e) {
private void MainFormActivated(object sender, EventArgs e) {
Hide();
ShowInTaskbar = false;
}
#endregion
#region key handlers
void CaptureRegion() {
private void CaptureRegion() {
CaptureHelper.CaptureRegion(true);
}
void CaptureFile() {
private void CaptureFile() {
var openFileDialog = new OpenFileDialog();
openFileDialog.Filter = "Image files (*.greenshot, *.png, *.jpg, *.gif, *.bmp, *.ico, *.tiff, *.wmf)|*.greenshot; *.png; *.jpg; *.jpeg; *.gif; *.bmp; *.ico; *.tiff; *.tif; *.wmf";
if (openFileDialog.ShowDialog() == DialogResult.OK) {
@ -675,21 +677,21 @@ namespace Greenshot {
}
}
void CaptureFullScreen() {
private void CaptureFullScreen() {
CaptureHelper.CaptureFullscreen(true, _conf.ScreenCaptureMode);
}
void CaptureLastRegion() {
private void CaptureLastRegion() {
CaptureHelper.CaptureLastRegion(true);
}
void CaptureIE() {
private void CaptureIE() {
if (_conf.IECapture) {
CaptureHelper.CaptureIE(true, null);
}
}
void CaptureWindow() {
private void CaptureWindow() {
if (_conf.CaptureWindowsInteractive) {
CaptureHelper.CaptureWindowInteractive(true);
} else {
@ -700,7 +702,8 @@ namespace Greenshot {
#region contextmenu
void ContextMenuOpening(object sender, CancelEventArgs e) {
private void ContextMenuOpening(object sender, CancelEventArgs e) {
contextmenu_captureclipboard.Enabled = ClipboardHelper.ContainsImage();
contextmenu_capturelastregion.Enabled = coreConfiguration.LastCapturedRegion != Rectangle.Empty;
@ -735,8 +738,8 @@ namespace Greenshot {
contextmenu_donate.Image = (Image)resources.GetObject("contextmenu_present.Image");
}
}
void ContextMenuClosing(object sender, EventArgs e) {
private void ContextMenuClosing(object sender, EventArgs e) {
contextmenu_captureiefromlist.DropDownItems.Clear();
contextmenu_capturewindowfromlist.DropDownItems.Clear();
CleanupThumbnail();
@ -745,7 +748,7 @@ namespace Greenshot {
/// <summary>
/// Build a selectable list of IE tabs when we enter the menu item
/// </summary>
void CaptureIEMenuDropDownOpening(object sender, EventArgs e) {
private void CaptureIEMenuDropDownOpening(object sender, EventArgs e) {
if (!_conf.IECapture) {
return;
}
@ -903,43 +906,43 @@ namespace Greenshot {
}
}
void CaptureAreaToolStripMenuItemClick(object sender, EventArgs e) {
private void CaptureAreaToolStripMenuItemClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureRegion(false);
});
}
void CaptureClipboardToolStripMenuItemClick(object sender, EventArgs e) {
private void CaptureClipboardToolStripMenuItemClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureClipboard();
});
}
void OpenFileToolStripMenuItemClick(object sender, EventArgs e) {
private void OpenFileToolStripMenuItemClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureFile();
});
}
void CaptureFullScreenToolStripMenuItemClick(object sender, EventArgs e) {
private void CaptureFullScreenToolStripMenuItemClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureFullscreen(false, _conf.ScreenCaptureMode);
});
}
void Contextmenu_capturelastregionClick(object sender, EventArgs e) {
private void Contextmenu_capturelastregionClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureLastRegion(false);
});
}
void Contextmenu_capturewindow_Click(object sender,EventArgs e) {
private void Contextmenu_capturewindow_Click(object sender,EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
CaptureHelper.CaptureWindowInteractive(false);
});
}
void Contextmenu_capturewindowfromlist_Click(object sender,EventArgs e) {
private void Contextmenu_capturewindowfromlist_Click(object sender,EventArgs e) {
ToolStripMenuItem clickedItem = (ToolStripMenuItem)sender;
BeginInvoke((MethodInvoker)delegate {
try {
@ -950,12 +953,12 @@ namespace Greenshot {
}
});
}
void Contextmenu_captureie_Click(object sender, EventArgs e) {
private void Contextmenu_captureie_Click(object sender, EventArgs e) {
CaptureIE();
}
void Contextmenu_captureiefromlist_Click(object sender, EventArgs e) {
private void Contextmenu_captureiefromlist_Click(object sender, EventArgs e) {
if (!_conf.IECapture) {
LOG.InfoFormat("IE Capture is disabled.");
return;
@ -985,7 +988,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void Contextmenu_donateClick(object sender, EventArgs e) {
private void Contextmenu_donateClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
Process.Start("http://getgreenshot.org/support/");
});
@ -996,7 +999,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void Contextmenu_settingsClick(object sender, EventArgs e) {
private void Contextmenu_settingsClick(object sender, EventArgs e) {
BeginInvoke((MethodInvoker)delegate {
ShowSetting();
});
@ -1026,7 +1029,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void Contextmenu_aboutClick(object sender, EventArgs e) {
private void Contextmenu_aboutClick(object sender, EventArgs e) {
ShowAbout();
}
@ -1049,7 +1052,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void Contextmenu_helpClick(object sender, EventArgs e) {
private void Contextmenu_helpClick(object sender, EventArgs e) {
HelpFileLoader.LoadHelp();
}
@ -1058,7 +1061,7 @@ namespace Greenshot {
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void Contextmenu_exitClick(object sender, EventArgs e) {
private void Contextmenu_exitClick(object sender, EventArgs e) {
Exit();
}
@ -1150,8 +1153,8 @@ namespace Greenshot {
contextmenu_quicksettings.DropDownItems.Add(selectList);
}
}
void QuickSettingCaptureModeChanged(object sender, EventArgs e) {
private void QuickSettingCaptureModeChanged(object sender, EventArgs e) {
ToolStripMenuSelectListItem item = ((ItemCheckedChangedEventArgs)e).Item;
WindowCaptureMode windowsCaptureMode = (WindowCaptureMode)item.Data;
if (item.Checked) {
@ -1159,7 +1162,7 @@ namespace Greenshot {
}
}
void QuickSettingBoolItemChanged(object sender, EventArgs e) {
private void QuickSettingBoolItemChanged(object sender, EventArgs e) {
ToolStripMenuSelectListItem item = ((ItemCheckedChangedEventArgs)e).Item;
IniValue iniValue = item.Data as IniValue;
if (iniValue != null) {
@ -1168,7 +1171,7 @@ namespace Greenshot {
}
}
void QuickSettingDestinationChanged(object sender, EventArgs e) {
private void QuickSettingDestinationChanged(object sender, EventArgs e) {
ToolStripMenuSelectListItem item = ((ItemCheckedChangedEventArgs)e).Item;
IDestination selectedDestination = (IDestination)item.Data;
if (item.Checked) {

6
Greenshot/Forms/PrintOptionsDialog.cs
View file

@ -34,9 +34,9 @@ namespace Greenshot.Forms {
InitializeComponent();
checkbox_dontaskagain.Checked = false;
}
void Button_okClick(object sender, EventArgs e) {
private void Button_okClick(object sender, EventArgs e) {
// update config
coreConfiguration.OutputPrintPromptOptions = !checkbox_dontaskagain.Checked;
IniConfig.Save();

38
Greenshot/Forms/SettingsForm.cs
View file

@ -467,12 +467,12 @@ namespace Greenshot {
LOG.Warn("Problem checking registry, ignoring for now: ", e);
}
}
void Settings_cancelClick(object sender, EventArgs e) {
private void Settings_cancelClick(object sender, EventArgs e) {
DialogResult = DialogResult.Cancel;
}
void Settings_okayClick(object sender, EventArgs e) {
private void Settings_okayClick(object sender, EventArgs e) {
if (CheckSettings()) {
HotkeyControl.UnregisterHotkeys();
SaveSettings();
@ -486,8 +486,8 @@ namespace Greenshot {
tabcontrol.SelectTab(tab_output);
}
}
void BrowseClick(object sender, EventArgs e) {
private void BrowseClick(object sender, EventArgs e) {
// Get the storage location and replace the environment variables
folderBrowserDialog1.SelectedPath = FilenameHelper.FillVariables(textbox_storagelocation.Text, false);
if (folderBrowserDialog1.ShowDialog() == DialogResult.OK) {
@ -497,28 +497,28 @@ namespace Greenshot {
}
}
}
void TrackBarJpegQualityScroll(object sender, EventArgs e) {
private void TrackBarJpegQualityScroll(object sender, EventArgs e) {
textBoxJpegQuality.Text = trackBarJpegQuality.Value.ToString(CultureInfo.InvariantCulture);
}
void BtnPatternHelpClick(object sender, EventArgs e) {
private void BtnPatternHelpClick(object sender, EventArgs e) {
string filenamepatternText = Language.GetString(LangKey.settings_message_filenamepattern);
// Convert %NUM% to ${NUM} for old language files!
filenamepatternText = Regex.Replace(filenamepatternText, "%([a-zA-Z_0-9]+)%", @"${$1}");
MessageBox.Show(filenamepatternText, Language.GetString(LangKey.settings_filenamepattern));
}
void Listview_pluginsSelectedIndexChanged(object sender, EventArgs e) {
private void Listview_pluginsSelectedIndexChanged(object sender, EventArgs e) {
button_pluginconfigure.Enabled = PluginHelper.Instance.isSelectedItemConfigurable(listview_plugins);
}
void Button_pluginconfigureClick(object sender, EventArgs e) {
private void Button_pluginconfigureClick(object sender, EventArgs e) {
PluginHelper.Instance.ConfigureSelectedItem(listview_plugins);
}
void Combobox_languageSelectedIndexChanged(object sender, EventArgs e) {
private void Combobox_languageSelectedIndexChanged(object sender, EventArgs e) {
// Get the combobox values BEFORE changing the language
//EmailFormat selectedEmailFormat = GetSelected<EmailFormat>(combobox_emailformat);
WindowCaptureMode selectedWindowCaptureMode = GetSelected<WindowCaptureMode>(combobox_window_capture_mode);
@ -536,8 +536,8 @@ namespace Greenshot {
//SetEmailFormat(selectedEmailFormat);
SetWindowCaptureMode(selectedWindowCaptureMode);
}
void Combobox_window_capture_modeSelectedIndexChanged(object sender, EventArgs e) {
private void Combobox_window_capture_modeSelectedIndexChanged(object sender, EventArgs e) {
int windowsVersion = Environment.OSVersion.Version.Major;
WindowCaptureMode mode = GetSelected<WindowCaptureMode>(combobox_window_capture_mode);
if (windowsVersion >= 6) {
@ -553,7 +553,7 @@ namespace Greenshot {
/// <summary>
/// Check the destination settings
/// </summary>
void CheckDestinationSettings() {
private void CheckDestinationSettings() {
bool clipboardDestinationChecked = false;
bool pickerSelected = checkbox_picker.Checked;
bool destinationsEnabled = true;
@ -588,7 +588,7 @@ namespace Greenshot {
}
}
void DestinationsCheckStateChanged(object sender, EventArgs e) {
private void DestinationsCheckStateChanged(object sender, EventArgs e) {
CheckDestinationSettings();
}

2
Greenshot/GreenshotMain.cs
View file

@ -32,7 +32,7 @@ namespace Greenshot {
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
}
static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) {
private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) {
Assembly ayResult = null;
string sShortAssemblyName = args.Name.Split(',')[0];
Assembly[] ayAssemblies = AppDomain.CurrentDomain.GetAssemblies();

2
Greenshot/Helpers/PrintHelper.cs
View file

@ -155,7 +155,7 @@ namespace Greenshot.Helpers {
return ret;
}
void DrawImageForPrint(object sender, PrintPageEventArgs e) {
private void DrawImageForPrint(object sender, PrintPageEventArgs e) {
// Create the output settins

2
Greenshot/Helpers/ToolStripItemEndisabler.cs
View file

@ -29,7 +29,7 @@ namespace Greenshot.Helpers {
/// </summary>
public static class ToolStripItemEndisabler {
[Flags]
enum PropagationMode {NONE=0, CHILDREN=1, ANCESTORS=2};
private enum PropagationMode {NONE=0, CHILDREN=1, ANCESTORS=2};
/// <summary>
/// Enables all of a ToolStrip's children (recursively),

6
Greenshot/Memento/DrawableContainerBoundsChangeMemento.cs
View file

@ -31,9 +31,9 @@ namespace Greenshot.Memento
/// </summary>
public class DrawableContainerBoundsChangeMemento : IMemento
{
List<Point> points = new List<Point>();
List<Size> sizes = new List<Size>();
IDrawableContainerList listOfdrawableContainer;
private List<Point> points = new List<Point>();
private List<Size> sizes = new List<Size>();
private IDrawableContainerList listOfdrawableContainer;
private void StoreBounds()
{