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

Added feature #3521446: Now there are two additional settings for: 1) Trayicon visible 2) Settings visible

Browse source 
Also fixed a missing translation.

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1823 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-05-02 10:45:07 +00:00
parent ffb2e892cf
commit cf2ef1235b
6 changed files with 279 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Greenshot/Configuration/LanguageKeys.cs
View file

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

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

@ -176,6 +176,7 @@ namespace Greenshot {
this.fileSavedStatusContextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.copyPathMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.openDirectoryMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripContainer1.BottomToolStripPanel.SuspendLayout();
this.toolStripContainer1.ContentPanel.SuspendLayout();
this.toolStripContainer1.LeftToolStripPanel.SuspendLayout();
@ -530,6 +531,7 @@ namespace Greenshot {
this.preferencesToolStripMenuItem,
this.toolStripSeparator5,
this.autoCropToolStripMenuItem,
this.toolStripSeparator17,
this.insert_window_toolstripmenuitem});
this.editToolStripMenuItem.Name = "editToolStripMenuItem";
this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20);
@ -542,7 +544,7 @@ namespace Greenshot {
this.undoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("undoToolStripMenuItem.Image")));
this.undoToolStripMenuItem.Name = "undoToolStripMenuItem";
this.undoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Z)));
this.undoToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.undoToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.undoToolStripMenuItem.Text = "Undo";
this.undoToolStripMenuItem.Click += new System.EventHandler(this.UndoToolStripMenuItemClick);
//
@ -552,14 +554,14 @@ namespace Greenshot {
this.redoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("redoToolStripMenuItem.Image")));
this.redoToolStripMenuItem.Name = "redoToolStripMenuItem";
this.redoToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.Y)));
this.redoToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.redoToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.redoToolStripMenuItem.Text = "Redo";
this.redoToolStripMenuItem.Click += new System.EventHandler(this.RedoToolStripMenuItemClick);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(163, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(165, 6);
//
// cutToolStripMenuItem
//
@ -567,7 +569,7 @@ namespace Greenshot {
this.cutToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("cutToolStripMenuItem.Image")));
this.cutToolStripMenuItem.Name = "cutToolStripMenuItem";
this.cutToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.X)));
this.cutToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.cutToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.cutToolStripMenuItem.Text = "Cut";
this.cutToolStripMenuItem.Click += new System.EventHandler(this.CutToolStripMenuItemClick);
//
@ -577,7 +579,7 @@ namespace Greenshot {
this.copyToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("copyToolStripMenuItem.Image")));
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
this.copyToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.C)));
this.copyToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.copyToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.copyToolStripMenuItem.Text = "Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.CopyToolStripMenuItemClick);
//
@ -587,53 +589,53 @@ namespace Greenshot {
this.pasteToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("pasteToolStripMenuItem.Image")));
this.pasteToolStripMenuItem.Name = "pasteToolStripMenuItem";
this.pasteToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.V)));
this.pasteToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.pasteToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.pasteToolStripMenuItem.Text = "Paste";
this.pasteToolStripMenuItem.Click += new System.EventHandler(this.PasteToolStripMenuItemClick);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(163, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(165, 6);
//
// duplicateToolStripMenuItem
//
this.duplicateToolStripMenuItem.Enabled = false;
this.duplicateToolStripMenuItem.Name = "duplicateToolStripMenuItem";
this.duplicateToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.D)));
this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.duplicateToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.duplicateToolStripMenuItem.Text = "Duplicate";
this.duplicateToolStripMenuItem.Click += new System.EventHandler(this.DuplicateToolStripMenuItemClick);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(163, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(165, 6);
//
// preferencesToolStripMenuItem
//
this.preferencesToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("preferencesToolStripMenuItem.Image")));
this.preferencesToolStripMenuItem.Name = "preferencesToolStripMenuItem";
this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.preferencesToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.preferencesToolStripMenuItem.Text = "Preferences...";
this.preferencesToolStripMenuItem.Click += new System.EventHandler(this.PreferencesToolStripMenuItemClick);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(163, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(165, 6);
//
// autoCropToolStripMenuItem
//
this.autoCropToolStripMenuItem.Name = "autoCropToolStripMenuItem";
this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(166, 22);
this.autoCropToolStripMenuItem.Size = new System.Drawing.Size(168, 22);
this.autoCropToolStripMenuItem.Text = "Auto Crop";
this.autoCropToolStripMenuItem.Click += new System.EventHandler(this.AutoCropToolStripMenuItemClick);
//
// insert_window_toolstripmenuitem
//
this.insert_window_toolstripmenuitem.Name = "insert_window_toolstripmenuitem";
this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(166, 22);
this.insert_window_toolstripmenuitem.Size = new System.Drawing.Size(168, 22);
this.insert_window_toolstripmenuitem.Text = "Insert window";
this.insert_window_toolstripmenuitem.MouseEnter += new System.EventHandler(this.Insert_window_toolstripmenuitemMouseEnter);
//
@ -1177,7 +1179,7 @@ namespace Greenshot {
this.fontFamilyComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.fontFamilyComboBox.MaxDropDownItems = 20;
this.fontFamilyComboBox.Name = "fontFamilyComboBox";
this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 21);
this.fontFamilyComboBox.Size = new System.Drawing.Size(200, 23);
this.fontFamilyComboBox.Text = "Agency FB";
this.fontFamilyComboBox.GotFocus += new System.EventHandler(this.ToolBarFocusableElementGotFocus);
this.fontFamilyComboBox.LostFocus += new System.EventHandler(this.ToolBarFocusableElementLostFocus);
@ -1558,6 +1560,11 @@ namespace Greenshot {
this.openDirectoryMenuItem.Text = "Open directory in Windows Explorer";
this.openDirectoryMenuItem.Click += new System.EventHandler(this.OpenDirectoryMenuItemClick);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(165, 6);
//
// ImageEditorForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
@ -1591,6 +1598,7 @@ namespace Greenshot {
this.propertiesToolStrip.PerformLayout();
this.fileSavedStatusContextMenu.ResumeLayout(false);
this.ResumeLayout(false);
}
private System.Windows.Forms.ToolStripMenuItem invertToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem grayscaleToolStripMenuItem;
@ -1721,5 +1729,6 @@ namespace Greenshot {
private Greenshot.Controls.ToolStripColorButton btnFillColor;
private Greenshot.Controls.ToolStripColorButton btnLineColor;
private System.Windows.Forms.ToolStripMenuItem autoCropToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
}
}

9
Greenshot/Forms/ImageEditorForm.cs
View file

@ -93,6 +93,12 @@ namespace Greenshot {
InitializeComponent();
this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon();
// Disable access to the settings, for feature #3521446
preferencesToolStripMenuItem.Visible = !coreConf.DisableSettings;
toolStripSeparator12.Visible = !coreConf.DisableSettings;
toolStripSeparator11.Visible = !coreConf.DisableSettings;
btnSettings.Visible = !coreConf.DisableSettings;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ImageEditorForm));
Image backgroundForTransparency = GreenshotPlugin.Core.GreenshotResources.getImage("Checkerboard.Image");
surface.TransparencyBackgroundBrush = new TextureBrush(backgroundForTransparency, WrapMode.Tile);
@ -380,8 +386,7 @@ namespace Greenshot {
this.saveElementsToolStripMenuItem.Text = Language.GetString(LangKey.editor_save_objects);
this.loadElementsToolStripMenuItem.Text = Language.GetString(LangKey.editor_load_objects);
this.autoCropToolStripMenuItem.Text = Language.GetString(LangKey.editor_autocrop);
this.editToolStripMenuItem.DropDownItems.Add(new ToolStripSeparator());
this.editToolStripMenuItem.DropDownItems.Add(insert_window_toolstripmenuitem);
this.insert_window_toolstripmenuitem.Text = Language.GetString(LangKey.editor_insertwindow);
}
public ISurface Surface {

9
Greenshot/Forms/MainForm.cs
View file

@ -298,6 +298,9 @@ namespace Greenshot {
this.notifyIcon.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon();
this.Icon = GreenshotPlugin.Core.GreenshotResources.getGreenshotIcon();
// Disable access to the settings, for feature #3521446
contextmenu_settings.Visible = !conf.DisableSettings;
IniConfig.IniChanged += new FileSystemEventHandler(ReloadConfiguration);
// Make sure all hotkeys pass this window!
@ -335,9 +338,9 @@ namespace Greenshot {
SoundHelper.Initialize();
// Enable the Greenshot icon to be visible, this prevents Problems with the context menu
notifyIcon.Visible = true;
// Set the Greenshot icon visibility depending on the configuration. (Added for feature #3521446)
// Setting it to true this late prevents Problems with the context menu
notifyIcon.Visible = !conf.HideTrayicon;
// Create a new instance of the class: copyData = new CopyData();
copyData = new CopyData();

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

@ -571,6 +571,9 @@ time, e.g. 11_58_32 (plus extension defined in the settings)
<resource name="editor_redo">
Redo {0}
</resource>
<resource name="editor_insertwindow">
Insert window
</resource>
<resource name="settings_waittime">
Milliseconds to wait before capture
</resource>

6
GreenshotPlugin/Core/CoreConfiguration.cs
View file

@ -151,10 +151,14 @@ namespace GreenshotPlugin.Core {
[IniProperty("UpdateCheckInterval", Description="How many days between every update check? (0=no checks)", DefaultValue="1")]
public int UpdateCheckInterval;
[IniProperty("LastUpdateCheck", Description="Last update check")]
public DateTime LastUpdateCheck;
[IniProperty("DisableSettings", Description = "Enable/disable the access to the settings, can only be changed manually in this .ini", DefaultValue = "False")]
public bool DisableSettings;
[IniProperty("DisableTrayicon", Description = "Disable the trayicon, can only be changed manually in this .ini", DefaultValue = "False")]
public bool HideTrayicon;
[IniProperty("ThumnailPreview", Description="Enable/disable thumbnail previews", DefaultValue="True")]
public bool ThumnailPreview;