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

added shortcut keys and menu items for speech bubble and counter label tools

Browse source
This commit is contained in:
JKlingen 2014-11-04 21:12:14 +01:00
parent 99b93a7e21
commit d3dce880dd
5 changed files with 72 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -105,6 +105,8 @@ namespace Greenshot {
this.drawArrowToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.drawArrowToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.drawFreehandToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.drawFreehandToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.addTextBoxToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.addTextBoxToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.addSpeechBubbleToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.addCounterToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.selectAllToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.selectAllToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
this.removeObjectToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem(); this.removeObjectToolStripMenuItem = new GreenshotPlugin.Controls.GreenshotToolStripMenuItem();
@ -672,6 +674,8 @@ namespace Greenshot {
this.drawArrowToolStripMenuItem, this.drawArrowToolStripMenuItem,
this.drawFreehandToolStripMenuItem, this.drawFreehandToolStripMenuItem,
this.addTextBoxToolStripMenuItem, this.addTextBoxToolStripMenuItem,
this.addSpeechBubbleToolStripMenuItem,
this.addCounterToolStripMenuItem,
this.toolStripSeparator8, this.toolStripSeparator8,
this.selectAllToolStripMenuItem, this.selectAllToolStripMenuItem,
this.removeObjectToolStripMenuItem, this.removeObjectToolStripMenuItem,
@ -725,6 +729,20 @@ namespace Greenshot {
this.addTextBoxToolStripMenuItem.LanguageKey = "editor_drawtextbox"; this.addTextBoxToolStripMenuItem.LanguageKey = "editor_drawtextbox";
this.addTextBoxToolStripMenuItem.Name = "addTextBoxToolStripMenuItem"; this.addTextBoxToolStripMenuItem.Name = "addTextBoxToolStripMenuItem";
this.addTextBoxToolStripMenuItem.Click += new System.EventHandler(this.AddTextBoxToolStripMenuItemClick); this.addTextBoxToolStripMenuItem.Click += new System.EventHandler(this.AddTextBoxToolStripMenuItemClick);
//
// addSpeechBubbleToolStripMenuItem
//
this.addSpeechBubbleToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnSpeechBubble.Image")));
this.addSpeechBubbleToolStripMenuItem.LanguageKey = "editor_speechbubble";
this.addSpeechBubbleToolStripMenuItem.Name = "addSpeechBubbleToolStripMenuItem";
this.addSpeechBubbleToolStripMenuItem.Click += new System.EventHandler(this.AddSpeechBubbleToolStripMenuItemClick);
//
// addCounterToolStripMenuItem
//
this.addCounterToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("btnStepLabel01.Image")));
this.addCounterToolStripMenuItem.LanguageKey = "editor_counter";
this.addCounterToolStripMenuItem.Name = "addCounterToolStripMenuItem";
this.addCounterToolStripMenuItem.Click += new System.EventHandler(this.AddCounterToolStripMenuItemClick);
// //
// toolStripSeparator8 // toolStripSeparator8
// //
@ -1713,6 +1731,8 @@ namespace Greenshot {
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem fileStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem fileStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem removeObjectToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem removeObjectToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addTextBoxToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addTextBoxToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addSpeechBubbleToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addCounterToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addEllipseToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addEllipseToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addRectangleToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem addRectangleToolStripMenuItem;
private GreenshotPlugin.Controls.GreenshotToolStripMenuItem objectToolStripMenuItem; private GreenshotPlugin.Controls.GreenshotToolStripMenuItem objectToolStripMenuItem;

24
Greenshot/Forms/ImageEditorForm.cs
View file

@ -568,6 +568,14 @@ namespace Greenshot {
BtnTextClick(sender, e); BtnTextClick(sender, e);
} }
void AddSpeechBubbleToolStripMenuItemClick(object sender, EventArgs e) {
BtnSpeechBubbleClick(sender, e);
}
void AddCounterToolStripMenuItemClick(object sender, EventArgs e) {
BtnStepLabelClick(sender, e);
}
void DrawLineToolStripMenuItemClick(object sender, EventArgs e) { void DrawLineToolStripMenuItemClick(object sender, EventArgs e) {
BtnLineClick(sender, e); BtnLineClick(sender, e);
} }
@ -759,6 +767,12 @@ namespace Greenshot {
case Keys.T: case Keys.T:
BtnTextClick(sender, e); BtnTextClick(sender, e);
break; break;
case Keys.S:
BtnSpeechBubbleClick(sender, e);
break;
case Keys.I:
BtnStepLabelClick(sender, e);
break;
case Keys.H: case Keys.H:
BtnHighlightClick(sender, e); BtnHighlightClick(sender, e);
break; break;
@ -1013,12 +1027,16 @@ namespace Greenshot {
/// </summary> /// </summary>
private void refreshEditorControls() { private void refreshEditorControls() {
int stepLabels = surface.CountStepLabels(null); int stepLabels = surface.CountStepLabels(null);
Image icon;
if (stepLabels <= 20) { if (stepLabels <= 20) {
this.btnStepLabel.Image = ((System.Drawing.Image)(resources.GetObject(string.Format("btnStepLabel{0:00}.Image", stepLabels)))); icon = ((System.Drawing.Image)(resources.GetObject(string.Format("btnStepLabel{0:00}.Image", stepLabels))));
} else { } else {
this.btnStepLabel.Image = ((System.Drawing.Image)(resources.GetObject("btnStepLabel20+.Image"))); icon = ((System.Drawing.Image)(resources.GetObject("btnStepLabel20+.Image")));
} }
FieldAggregator props = surface.FieldAggregator; this.btnStepLabel.Image = icon;
this.addCounterToolStripMenuItem.Image = icon;
FieldAggregator props = surface.FieldAggregator;
// if a confirmable element is selected, we must disable most of the controls // if a confirmable element is selected, we must disable most of the controls
// since we demand confirmation or cancel for confirmable element // since we demand confirmation or cancel for confirmable element
if (props.HasFieldValue(FieldType.FLAGS) && ((FieldType.Flag)props.GetFieldValue(FieldType.FLAGS) & FieldType.Flag.CONFIRMABLE) == FieldType.Flag.CONFIRMABLE) { if (props.HasFieldValue(FieldType.FLAGS) && ((FieldType.Flag)props.GetFieldValue(FieldType.FLAGS) & FieldType.Flag.CONFIRMABLE) == FieldType.Flag.CONFIRMABLE) {

4
Greenshot/Languages/language-de-DE.xml
View file

@ -302,8 +302,8 @@ Sie können aber auch alle Greenshot-Funktionen über das Kontextmenü des Green
<resource name="editor_tornedge_bottom">Untere Seite einreißen</resource> <resource name="editor_tornedge_bottom">Untere Seite einreißen</resource>
<resource name="editor_tornedge_shadow">Schatten erstellen</resource> <resource name="editor_tornedge_shadow">Schatten erstellen</resource>
<resource name="editor_counter">Zähler hinzufügen</resource> <resource name="editor_counter">Zähler hinzufügen (I)</resource>
<resource name="editor_speechbubble">Sprechblase hinzufügen</resource> <resource name="editor_speechbubble">Sprechblase hinzufügen (S)</resource>
<resource name="editor_resize">Skalieren</resource> <resource name="editor_resize">Skalieren</resource>
<resource name="editor_resize_settings">Einstellungen für Skalierung</resource> <resource name="editor_resize_settings">Einstellungen für Skalierung</resource>

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

@ -299,8 +299,8 @@ All Greenshot features still work directly from the tray icon context menu witho
<resource name="editor_tornedge_bottom">Tear bottom side</resource> <resource name="editor_tornedge_bottom">Tear bottom side</resource>
<resource name="editor_tornedge_shadow">Generate shadow</resource> <resource name="editor_tornedge_shadow">Generate shadow</resource>
<resource name="editor_counter">Add counter</resource> <resource name="editor_counter">Add counter (I)</resource>
<resource name="editor_speechbubble">Add speechbubble</resource> <resource name="editor_speechbubble">Add speechbubble (S)</resource>
<resource name="editor_resize">Resize</resource> <resource name="editor_resize">Resize</resource>
<resource name="editor_resize_settings">Resize settings</resource> <resource name="editor_resize_settings">Resize settings</resource>

4
Greenshot/Languages/language-nl-NL.xml
View file

@ -272,8 +272,8 @@ Alle Greenshot functies werken ook over het context menu.</resource>
<resource name="editor_tornedge_bottom">Onderkant scheuern</resource> <resource name="editor_tornedge_bottom">Onderkant scheuern</resource>
<resource name="editor_tornedge_shadow">Schaduw</resource> <resource name="editor_tornedge_shadow">Schaduw</resource>
<resource name="editor_counter">Teller toevoegen</resource> <resource name="editor_counter">Teller toevoegen (I)</resource>
<resource name="editor_speechbubble">Tekstballon toevoegen</resource> <resource name="editor_speechbubble">Tekstballon toevoegen (S)</resource>
<resource name="editor_resize">Grootte veranderen</resource> <resource name="editor_resize">Grootte veranderen</resource>
<resource name="editor_resize_settings">Grootte veranderen</resource> <resource name="editor_resize_settings">Grootte veranderen</resource>