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

Fixed editor "DrawableContainer" context-menu translations.

Browse source 
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1827 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-05-03 08:34:54 +00:00
parent 9596ecbec4
commit cfb370a697
4 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Greenshot/Configuration/LanguageKeys.cs
View file

@ -137,6 +137,7 @@ namespace Greenshot.Configuration {
editor_undo, editor_undo,
editor_redo, editor_redo,
editor_insertwindow, editor_insertwindow,
editor_resetsize,
error, error,
error_multipleinstances, error_multipleinstances,
error_nowriteaccess, error_nowriteaccess,

26
Greenshot/Drawing/DrawableContainerList.cs
View file

@ -459,7 +459,7 @@ namespace Greenshot.Drawing {
} }
} }
if (canReset) { if (canReset) {
item = new ToolStripMenuItem("Reset size"); item = new ToolStripMenuItem(Language.GetString(LangKey.editor_resetsize));
//item.Image = ((System.Drawing.Image)(editorFormResources.GetObject("removeObjectToolStripMenuItem.Image"))); //item.Image = ((System.Drawing.Image)(editorFormResources.GetObject("removeObjectToolStripMenuItem.Image")));
item.Click += delegate { item.Click += delegate {
foreach (DrawableContainer container in this) { foreach (DrawableContainer container in this) {
@ -478,20 +478,18 @@ namespace Greenshot.Drawing {
} }
public virtual void ShowContextMenu(MouseEventArgs e, Surface surface) { public virtual void ShowContextMenu(MouseEventArgs e, Surface surface) {
if (conf.isExperimentalFeatureEnabled("Contextmenu")) { bool hasMenu = false;
bool hasMenu = false; foreach (DrawableContainer container in this) {
foreach (DrawableContainer container in this) { if (container.hasContextMenu) {
if (container.hasContextMenu) { hasMenu = true;
hasMenu = true; break;
break;
}
} }
if (hasMenu) { }
ContextMenuStrip menu = new ContextMenuStrip(); if (hasMenu) {
AddContextMenuItems(menu, surface); ContextMenuStrip menu = new ContextMenuStrip();
if (menu.Items.Count > 0) { AddContextMenuItems(menu, surface);
menu.Show(surface, e.Location); if (menu.Items.Count > 0) {
} menu.Show(surface, e.Location);
} }
} }
} }

3
Greenshot/Languages/language-en-US.xml
View file

@ -574,6 +574,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings)
<resource name="editor_insertwindow"> <resource name="editor_insertwindow">
Insert window Insert window
</resource> </resource>
<resource name="editor_resetsize">
Reset size
</resource>
<resource name="settings_waittime"> <resource name="settings_waittime">
Milliseconds to wait before capture Milliseconds to wait before capture
</resource> </resource>

2
GreenshotPlugin/Core/CoreConfiguration.cs
View file

@ -179,7 +179,7 @@ namespace GreenshotPlugin.Core {
[IniProperty("TitleFixReplacer", Description="The replacements for the matchers.")] [IniProperty("TitleFixReplacer", Description="The replacements for the matchers.")]
public Dictionary<string, string> TitleFixReplacer; public Dictionary<string, string> TitleFixReplacer;
[IniProperty("ExperimentalFeatures", Description="A list which allows us to enable certain experimental features", ExcludeIfNull=true)] [IniProperty("ExperimentalFeatures", Description="A list of experimental features, this allows us to test certain features before releasing them.", ExcludeIfNull=true)]
public List<string> ExperimentalFeatures; public List<string> ExperimentalFeatures;
/// <summary> /// <summary>