github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-07-15 09:33:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix for designer issue and Bug #3538953

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1938 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-06-29 12:38:40 +00:00
parent c10b8201a0
commit f4ddfb2e79
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Greenshot/Forms/ImageEditorForm.Designer.cs generated
View file

@ -1580,7 +1580,6 @@ namespace Greenshot {
this.ClientSize = new System.Drawing.Size(785, 485); this.ClientSize = new System.Drawing.Size(785, 485);
this.Controls.Add(this.toolStripContainer1); this.Controls.Add(this.toolStripContainer1);
this.KeyPreview = true; this.KeyPreview = true;
this.ManualLanguageApply = true;
this.LanguageKey = "editor_title"; this.LanguageKey = "editor_title";
this.Name = "ImageEditorForm"; this.Name = "ImageEditorForm";
this.Activated += new System.EventHandler(this.ImageEditorFormActivated); this.Activated += new System.EventHandler(this.ImageEditorFormActivated);

3
Greenshot/Forms/ImageEditorForm.cs
View file

@ -94,6 +94,7 @@ namespace Greenshot {
// //
// The InitializeComponent() call is required for Windows Forms designer support. // The InitializeComponent() call is required for Windows Forms designer support.
// //
this.ManualLanguageApply = true;
InitializeComponent(); InitializeComponent();
updateUI(); updateUI();
@ -768,7 +769,9 @@ namespace Greenshot {
this.redoToolStripMenuItem.Enabled = canRedo; this.redoToolStripMenuItem.Enabled = canRedo;
string redoAction = ""; string redoAction = "";
if (canRedo) { if (canRedo) {
if (surface.RedoActionKey != LangKey.none) {
redoAction = Language.GetString(surface.RedoActionKey); redoAction = Language.GetString(surface.RedoActionKey);
}
} }
string redoText = Language.GetFormattedString(LangKey.editor_redo, redoAction); string redoText = Language.GetFormattedString(LangKey.editor_redo, redoAction);
this.btnRedo.Text = redoText; this.btnRedo.Text = redoText;