diff --git a/Greenshot/Configuration/LanguageKeys.cs b/Greenshot/Configuration/LanguageKeys.cs index c25e3808b..2ebd634ae 100644 --- a/Greenshot/Configuration/LanguageKeys.cs +++ b/Greenshot/Configuration/LanguageKeys.cs @@ -191,6 +191,10 @@ namespace Greenshot.Configuration { settings_output, settings_playsound, settings_plugins, + settings_plugins_name, + settings_plugins_version, + settings_plugins_createdby, + settings_plugins_dllpath, settings_preferredfilesettings, settings_primaryimageformat, settings_printer, diff --git a/Greenshot/Forms/ImageEditorForm.resx b/Greenshot/Forms/ImageEditorForm.resx index cd540ef22..164398c67 100644 --- a/Greenshot/Forms/ImageEditorForm.resx +++ b/Greenshot/Forms/ImageEditorForm.resx @@ -190,11 +190,11 @@ ZFx3npGxHachKU1bt6Q0bQlDVxAQEKDm4OCQ/6+09P8jd/eXaxgYXDAMSWnalpbavHVm6KpVzMiSMM1/ //79v2bNmqurGBiOYHVBUvOWU0DbjZEl9y1lsN80i3HL9WNB//esMv7AycnZgdP5qfXbHiTX7xCCKYBp /vmi+v+VPX6vWvMZDuMPwOZt01Mat87IzMwUxNCcw3Y+Ozs7OC8vzystLY0LXyA21td4vlnYL/oWZPOJ - PUE/GmIk/0K8t3VVavOWrSnN254DwysEqyELyxnk5lbx1L67m/Z/y0Kz9y25HFfq6+tZkBWntG1VAxq0 + PUE/GsIk/0K8t3VVavOWrSnN254DwysEqyELyxnk5lbx1L67m/Z/y0Kz9y25HFfq6+tZkBWntG1VAxq0 Oq1+kwiKIf8ZGBj7sxmb/r87878ojHFBhj9DFS6npjZtW5HStF0bRb4thbHn2dVl/3OCGJdnBDB44guw 1KYtS5Jbt+mhq/mf7s+4KsWXAdVkNFWpLdslk5u3bsTwAjAaXwADqC2tZasJLtuBmriAzm8FqmvCTIn1 22SAoVue0rhtO9CJF4GhviCteVsF0K8JQHZcSvPWouSmbWuAqXV+Vv0WCZxeBIY6U0b9TjGgU72BthUC - NbcDDe5Mad5ek9KyzYKEzEucUgAUGtp4QlTz8wAAAABJRU5ErkJggg== + NbcDDe5Mad5ek9KyzYKEzEucUgAHMNpyRhUBZAAAAABJRU5ErkJggg== @@ -266,26 +266,26 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVDhPY2AYMiCp9fWy6JZXkiQ5OLL64f/g4usOIE0g - dmTVw0kEDXDPuKjumXPurGXOxT+uORcfeOVc/A/SBKIDCk69804/L43XEKuoA+vtEo6aghRZxRz475x8 + dmTVw0kEDXDPuKjumXPurHHOxT+uORcfeOVc/A/SBKIDCk69804/L43XEKuoA+vtEo6aghRZxRz475x8 HOwCELtl3rULljEH8LvCIGibFzYbdPw2/b/68P0R46Ct7/S9N+N3BcSA/4za+Vs0tfM3g12g4rb6/4sP 365U9Z2+quK6Gr8rNLLXCWvmbvRPn3miUiNnQyrIACWXtf/vvPh84sLd98dUnde8U3XC4gr7+v0sytnr LO2qtmUtP3x/1vWHn46pZa3LBBmg7rnj//kHHw5eAuLS3kuX1Ty3o7pCPn25gmr6qoSKRafaj958s3Hr 2aer9l1+sVU5bVUuyAD9wBP/Vx17vGzCtltT9lx4scUw6MQ7/ZBj0gyioVN4JGMX+jtVbaneevrJ2lO3 3xzac+XVjm3nnm5etP/uCsmYRWUgAyyibv5fsvfp/i3nnm06eP3V7vrpT66YRd2YxCAUPjsIiOvw4CCQ - AQ5Jz5Y5Jj//j4xBYgQT1uBXAACkr9T87nq/GQAAAABJRU5ErkJggg== + AQ5Jz5Y5Jj//j4xBYgQT1uBXAACS/dT2EjRCSQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGcSURBVDhPY2AYdCC65ZVkUuvrZWQ7LLLq4aTI6of/QQYE - F193gLGJMtA7/bx0QMGpd145F8EGgGjXnIsPLHMu/vHMOXfWPeOiOl6DLGMOTGqZd+2CVcwBsAHOyccd + F193gLGJMtA7/bx0QMGpd145F8EGgGjXnIsPjHMu/vHMOXfWPeOiOl6DLGMOTGqZd+2CVcwBsAHOyccd YGy7hKOmVlEH1uM0QN97s7Rx0NZ3Vx++P6LjtwlsADowCNrmhdMAFdfVk6r6Tl998eHbFRW31WADtPM3 O2jnb9FkYPjPiNfpqk6bpVWd17y7cPf9sTsvPp9QclkLNkAjZ0Nq+swTlZq5G/01stcJ4zREzXP7pNLe S5cvPfhw8DwQq3vuABuglrUu8/rDT8eWH74/y65qW5Zy9jpL+/r9LCgG6YcckzYMOvFuz4UXWyZsuzVl 1bHHy/QDT4ANUE5blbvv8outW88+XXX05puNFYtOtaumr0qQT1+uADfELOrGpPrpT64cvP5q95ZzzzYt 2ft0v0XUTbABkjGLyhbtv7ti27mnm/dcebXj1O03h7aefrLWqWpLtWTsQn/R0Ck8DA5Jz5Y5Jj//j4xB - YiADhMJnBwFxHR4cRFQCG9yKAB0i1PzDQ4/OAAAAAElFTkSuQmCC + YiADhMJnBwFxHR4cRFQCG9yKAAu41PZCFeCYAAAAAElFTkSuQmCC @@ -845,12 +845,12 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG4SURBVDhPY2AYWmCNhDzDKtEzDCtFPUh3+Hx+AYZlIhvS 3pX/Z1gucoZhGSmGrGJgY1gsPE/nmP3TqEfZ/+Pvx/9mWAQ0hCjwn4GRYb5wq8JWo3sBNxL/e1/1+cWz - XO4Sw0IRH1T9swU9GGYLngFiVP/NFsgUWKZ8w21p+D/7/fZ/+ZcoXmOYK5SMqnkKUNN0wTP2Bzz/gmgG - EB8Epgn4cMyVuCw/X/63Wqv5P74F8rcYpgtUY7p8Ev8Zn6e5vzwuRP6PuJL5hwHIZ5jIl8s0VfC00GKT + XO4Sw0IRH1T9swU9GGYLngFiVP/NFsgUWKZ8w21++D/7/fZ/+ZcoXmOYK5SMqnkKUNN0wTP2+53/gmgG + EB8Epgn4cMyVuCw/X/63Wr35P74F8rcYpgtUY7p8Ev8Zn6e5vzwuRP6PuJL5hwHIZ5jIl8s0VfC00GKT H4qbjP5zz5a+DxTrYahnYMI0oJfPg6GX54z9zfifSnuM/5udCPgB4kttkv8svUPnP98iuScMPXzzgJo5 cIdbG9CQdp4zWqecv0kc1vyvccbyv/ghjf/8i+VeMbTyrmPoB0YjQdDM5cHQxH1G+oDSF+GzKv/Zt4m/ Z2zk2c3QwilNUC9cQQS7B0MB+xnWBQIvGMvYjjCEs2kSoxkUMPxALA/EugxGTGkM8UxnGLQYQoF8kAFK - QCwFxMJAzAPEbEDMiGwwiAMKIJA/xaGKJaFsUSAtCMS8QMwF1cyMbgAxrsSqBgCFJIYT6s+r4QAAAABJ + QCwFxMJAzAPEbEDMiGwwiAMKIJA/xaGKJaFsUSAtCMS8QMwF1cyMbgAxrsSqBgBak4YA10f9zAAAAABJ RU5ErkJggg== @@ -858,15 +858,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIMSURBVDhPrZI9SCNRFIWvY2RUAskQ8qOIFjbiYqEELJNG - SJNGsBEbiZ2ihQEbF3FBY2CLNFqICoKJUVARFcVmCgVFEhTdFcZ23CJYpBCUQfF5T9h5EA1WDhx48+45 - 373z3hB995MhatwgGtkkyrBO/yuDPdS+7Jclim7V1em57m6zMDRkPY2OCqgQi1m5ri4TNXgqQtJc2HG7 - 82JiQjyPjYklv99IqOolhPVZT0/xcXhY7DideXjLIEs8Wra2Vn+Nx8XL+LhYbmoypogm54hc0DRRiN83 - t9vb7wuDgyJdU6MjIyEr/H0nPOJDLFYKoxMHcqyIbZol8gByGAwWj9vaTGQkYJFo3QiFrJTbXeqM8L+B - gU8QTJJUVePY67WQkYB5Pu2/0aiYUZRLjIzOgFyHw2UQ1H6x56ClRSAjASl+uYpEBIowoWBDLjo7JcQG - HDU0CGQk4DePoweDVqq62sCYdsGGnLW22pBJeI48HgsZCWDySNbnM/c1rYiDwoF9hJwHAiXIrqoW1xwO - ExkJSPKVJKuq9JvmZpGur78HBJPY12gf7KqmveU0TcCLTNm/8JN/joSi5G+9XnHIXRZ41Fk+Ewhr7P3h - MDzwVvwbe7kQZ/oKj6i7XNYdByCssYcaPJXCDt70s34E+ArDRIk+or1+onMIa+yhxp4OFi8JGfkovHKy - fCx821dCI3iRoXfrI+bvqsqEJAAAAABJRU5ErkJggg== + SJNGsBEbiZ2ihQEbF3FBY2CLNFr4V5kYBRVRUWymUFAkQdFdYWzHLYJFCkEZFJ/3hJ0H0WDlwIE3757z + 3TvvDdF3Pxmixg2ikU2iDOv0vzLYQ+3Lflmi6FZdnZ7r7jYLQ0PW0+iogAqxmJXr6jJRg6ciJM2FHbc7 + LyYmxPPYmFj2+42Eql5CWJ/19BQfh4fFjtOZh7cMssyjZWtr9dd4XLyMj4uVpiZjimhyjsgFTROF+H1z + u739vjA4KNI1NToyErLK33fCIz7EYqUwOnEgx4rYplkiDyCHwWDxuK3NREYCFonWjVDISrndpc4I/xsY + +ATBJElVNY69XgsZCZjn0/4bjYoZRbnEyOgMyHU4XAZB7Rd7DlpaBDISkOKXq0hEoAgTCjbkorNTQmzA + UUODQEYCfvM4ejBopaqrDYxpF2zIWWurDZmE58jjsZCRACaPZH0+c1/TijgoHNhHyHkgUILsqmpxzeEw + kZGAJF9JsqpKv2luFun6+ntAMIl9jfbBLmnaW07TBLzIlP0LP/nnSChK/tbrFYfcZYFHneUzgbDG3h8O + wwNvxb+xlwtxpq/yiLrLZd1xAMIae6jBUyns4E0/60eArzBMlOgj2usnOoewxh5q7Olg8ZKQkY/CKyfL + x8K3fSU0ghcZegfkk+bpTvG6RAAAAABJRU5ErkJggg== @@ -879,20 +879,6 @@ tRquKxXsFgo4KRYhT4zYaAEBmxDYJnhRKuEgl/M6yuehnTwx0YJ1GpvUmNAW4XPeesZwKu3kiREbPIGW G7+Au2IwJnliFhXIcLcMp9K8YBd+xFXCDwyn0rzG26SYF7zCCsGEoWeW6NTMoEkxLyhgyJYZWmJYp+a0 IOYFBf/9IzP/jT+zZw/Woa9yPwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAA1JREFUGFdjePPy - xn8ACR8DrWYMYwcAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAA1JREFUGFdjePPy - xn8ACR8DrWYMYwcAAAAASUVORK5CYII= diff --git a/Greenshot/Forms/SettingsForm.Designer.cs b/Greenshot/Forms/SettingsForm.Designer.cs index b6acdcd35..42e078685 100644 --- a/Greenshot/Forms/SettingsForm.Designer.cs +++ b/Greenshot/Forms/SettingsForm.Designer.cs @@ -839,7 +839,7 @@ namespace Greenshot { this.checkbox_printgrayscale.Location = new System.Drawing.Point(12, 167); this.checkbox_printgrayscale.Name = "checkbox_printgrayscale"; this.checkbox_printgrayscale.PropertyName = "OutputPrintGrayscale"; - this.checkbox_printgrayscale.Size = new System.Drawing.Size(394, 19); + this.checkbox_printgrayscale.Size = new System.Drawing.Size(394, 20); this.checkbox_printgrayscale.TabIndex = 32; this.checkbox_printgrayscale.UseVisualStyleBackColor = true; // @@ -851,7 +851,7 @@ namespace Greenshot { this.checkboxPrintInverted.Location = new System.Drawing.Point(12, 144); this.checkboxPrintInverted.Name = "checkboxPrintInverted"; this.checkboxPrintInverted.PropertyName = "OutputPrintInverted"; - this.checkboxPrintInverted.Size = new System.Drawing.Size(394, 16); + this.checkboxPrintInverted.Size = new System.Drawing.Size(394, 20); this.checkboxPrintInverted.TabIndex = 31; this.checkboxPrintInverted.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxPrintInverted.UseVisualStyleBackColor = true; @@ -862,7 +862,7 @@ namespace Greenshot { this.checkbox_alwaysshowprintoptionsdialog.Location = new System.Drawing.Point(12, 200); this.checkbox_alwaysshowprintoptionsdialog.Name = "checkbox_alwaysshowprintoptionsdialog"; this.checkbox_alwaysshowprintoptionsdialog.PropertyName = "OutputPrintPromptOptions"; - this.checkbox_alwaysshowprintoptionsdialog.Size = new System.Drawing.Size(394, 19); + this.checkbox_alwaysshowprintoptionsdialog.Size = new System.Drawing.Size(394, 20); this.checkbox_alwaysshowprintoptionsdialog.TabIndex = 17; this.checkbox_alwaysshowprintoptionsdialog.UseVisualStyleBackColor = true; // @@ -874,7 +874,7 @@ namespace Greenshot { this.checkboxTimestamp.Location = new System.Drawing.Point(12, 121); this.checkboxTimestamp.Name = "checkboxTimestamp"; this.checkboxTimestamp.PropertyName = "OutputPrintFooter"; - this.checkboxTimestamp.Size = new System.Drawing.Size(394, 16); + this.checkboxTimestamp.Size = new System.Drawing.Size(394, 20); this.checkboxTimestamp.TabIndex = 30; this.checkboxTimestamp.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxTimestamp.UseVisualStyleBackColor = true; @@ -887,7 +887,7 @@ namespace Greenshot { this.checkboxAllowCenter.Location = new System.Drawing.Point(12, 96); this.checkboxAllowCenter.Name = "checkboxAllowCenter"; this.checkboxAllowCenter.PropertyName = "OutputPrintCenter"; - this.checkboxAllowCenter.Size = new System.Drawing.Size(394, 18); + this.checkboxAllowCenter.Size = new System.Drawing.Size(394, 20); this.checkboxAllowCenter.TabIndex = 29; this.checkboxAllowCenter.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowCenter.UseVisualStyleBackColor = true; @@ -900,7 +900,7 @@ namespace Greenshot { this.checkboxAllowRotate.Location = new System.Drawing.Point(12, 72); this.checkboxAllowRotate.Name = "checkboxAllowRotate"; this.checkboxAllowRotate.PropertyName = "OutputPrintAllowRotate"; - this.checkboxAllowRotate.Size = new System.Drawing.Size(394, 17); + this.checkboxAllowRotate.Size = new System.Drawing.Size(394, 20); this.checkboxAllowRotate.TabIndex = 28; this.checkboxAllowRotate.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowRotate.UseVisualStyleBackColor = true; @@ -913,7 +913,7 @@ namespace Greenshot { this.checkboxAllowEnlarge.Location = new System.Drawing.Point(12, 47); this.checkboxAllowEnlarge.Name = "checkboxAllowEnlarge"; this.checkboxAllowEnlarge.PropertyName = "OutputPrintAllowEnlarge"; - this.checkboxAllowEnlarge.Size = new System.Drawing.Size(394, 19); + this.checkboxAllowEnlarge.Size = new System.Drawing.Size(394, 20); this.checkboxAllowEnlarge.TabIndex = 27; this.checkboxAllowEnlarge.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowEnlarge.UseVisualStyleBackColor = true; @@ -926,7 +926,7 @@ namespace Greenshot { this.checkboxAllowShrink.Location = new System.Drawing.Point(12, 22); this.checkboxAllowShrink.Name = "checkboxAllowShrink"; this.checkboxAllowShrink.PropertyName = "OutputPrintAllowShrink"; - this.checkboxAllowShrink.Size = new System.Drawing.Size(394, 17); + this.checkboxAllowShrink.Size = new System.Drawing.Size(394, 20); this.checkboxAllowShrink.TabIndex = 26; this.checkboxAllowShrink.TextAlign = System.Drawing.ContentAlignment.TopLeft; this.checkboxAllowShrink.UseVisualStyleBackColor = true; @@ -1020,7 +1020,7 @@ namespace Greenshot { // this.checkbox_reuseeditor.LanguageKey = "expertsettings_reuseeditorifpossible"; this.checkbox_reuseeditor.Location = new System.Drawing.Point(10, 231); - this.checkbox_reuseeditor.Name = "greenshotCheckBox1"; + this.checkbox_reuseeditor.Name = "checkbox_reuseeditor"; this.checkbox_reuseeditor.PropertyName = "ReuseEditor"; this.checkbox_reuseeditor.SectionName = "Editor"; this.checkbox_reuseeditor.Size = new System.Drawing.Size(394, 19); @@ -1064,7 +1064,7 @@ namespace Greenshot { this.label_counter.LanguageKey = "expertsettings_counter"; this.label_counter.Location = new System.Drawing.Point(7, 285); this.label_counter.Name = "label_counter"; - this.label_counter.Size = new System.Drawing.Size(246, 13); + this.label_counter.Size = new System.Drawing.Size(0, 13); this.label_counter.TabIndex = 27; // // textbox_counter @@ -1081,7 +1081,7 @@ namespace Greenshot { this.label_footerpattern.LanguageKey = "expertsettings_footerpattern"; this.label_footerpattern.Location = new System.Drawing.Point(7, 259); this.label_footerpattern.Name = "label_footerpattern"; - this.label_footerpattern.Size = new System.Drawing.Size(103, 13); + this.label_footerpattern.Size = new System.Drawing.Size(0, 13); this.label_footerpattern.TabIndex = 25; // // textbox_footerpattern @@ -1128,7 +1128,7 @@ namespace Greenshot { this.label_clipboardformats.LanguageKey = "expertsettings_clipboardformats"; this.label_clipboardformats.Location = new System.Drawing.Point(7, 39); this.label_clipboardformats.Name = "label_clipboardformats"; - this.label_clipboardformats.Size = new System.Drawing.Size(88, 13); + this.label_clipboardformats.Size = new System.Drawing.Size(0, 13); this.label_clipboardformats.TabIndex = 20; // // checkbox_enableexpert diff --git a/Greenshot/Forms/SettingsForm.cs b/Greenshot/Forms/SettingsForm.cs index 0c57dad3d..12c05b088 100644 --- a/Greenshot/Forms/SettingsForm.cs +++ b/Greenshot/Forms/SettingsForm.cs @@ -177,7 +177,11 @@ namespace Greenshot { listview_plugins.BeginUpdate(); listview_plugins.Items.Clear(); listview_plugins.Columns.Clear(); - string[] columns = { "Name", "Version", "Created by", "DLL path"}; + string[] columns = { + Language.GetString("settings_plugins_name"), + Language.GetString("settings_plugins_version"), + Language.GetString("settings_plugins_createdby"), + Language.GetString("settings_plugins_dllpath")}; foreach (string column in columns) { listview_plugins.Columns.Add(column); } diff --git a/Greenshot/Languages/language-en-US.xml b/Greenshot/Languages/language-en-US.xml index 26455fc92..f5ab26686 100644 --- a/Greenshot/Languages/language-en-US.xml +++ b/Greenshot/Languages/language-en-US.xml @@ -180,6 +180,11 @@ will generate a folder for the current day in your default storage location, e.g time, e.g. 11_58_32 (plus extension defined in the settings) Output Play camera sound + Plugins + Name + Version + Created by + DLL Path Preferred Output File Settings Image format Printer diff --git a/GreenshotImgurPlugin/Forms/SettingsForm.Designer.cs b/GreenshotImgurPlugin/Forms/SettingsForm.Designer.cs index a1851fdc2..7bd47db9c 100644 --- a/GreenshotImgurPlugin/Forms/SettingsForm.Designer.cs +++ b/GreenshotImgurPlugin/Forms/SettingsForm.Designer.cs @@ -81,11 +81,11 @@ namespace GreenshotImgurPlugin { // this.combobox_uploadimageformat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combobox_uploadimageformat.FormattingEnabled = true; - this.combobox_uploadimageformat.Location = new System.Drawing.Point(102, 7); + this.combobox_uploadimageformat.Location = new System.Drawing.Point(168, 7); this.combobox_uploadimageformat.Name = "combobox_uploadimageformat"; this.combobox_uploadimageformat.PropertyName = "UploadFormat"; this.combobox_uploadimageformat.SectionName = "Imgur"; - this.combobox_uploadimageformat.Size = new System.Drawing.Size(276, 21); + this.combobox_uploadimageformat.Size = new System.Drawing.Size(210, 21); this.combobox_uploadimageformat.TabIndex = 8; // // label_upload_format @@ -93,7 +93,7 @@ namespace GreenshotImgurPlugin { this.label_upload_format.LanguageKey = "imgur.label_upload_format"; this.label_upload_format.Location = new System.Drawing.Point(12, 10); this.label_upload_format.Name = "label_upload_format"; - this.label_upload_format.Size = new System.Drawing.Size(84, 20); + this.label_upload_format.Size = new System.Drawing.Size(150, 20); this.label_upload_format.TabIndex = 9; // // historyButton @@ -115,7 +115,7 @@ namespace GreenshotImgurPlugin { this.checkbox_anonymous_access.Name = "checkbox_anonymous_access"; this.checkbox_anonymous_access.PropertyName = "AnonymousAccess"; this.checkbox_anonymous_access.SectionName = "Imgur"; - this.checkbox_anonymous_access.Size = new System.Drawing.Size(139, 17); + this.checkbox_anonymous_access.Size = new System.Drawing.Size(15, 14); this.checkbox_anonymous_access.TabIndex = 13; this.checkbox_anonymous_access.UseVisualStyleBackColor = true; // @@ -127,7 +127,7 @@ namespace GreenshotImgurPlugin { this.checkbox_usepagelink.Name = "checkbox_usepagelink"; this.checkbox_usepagelink.PropertyName = "UsePageLink"; this.checkbox_usepagelink.SectionName = "Imgur"; - this.checkbox_usepagelink.Size = new System.Drawing.Size(251, 17); + this.checkbox_usepagelink.Size = new System.Drawing.Size(15, 14); this.checkbox_usepagelink.TabIndex = 13; this.checkbox_usepagelink.UseVisualStyleBackColor = true; // @@ -150,7 +150,6 @@ namespace GreenshotImgurPlugin { this.Name = "SettingsForm"; this.ResumeLayout(false); this.PerformLayout(); - } private GreenshotPlugin.Controls.GreenshotButton historyButton; private GreenshotPlugin.Controls.GreenshotComboBox combobox_uploadimageformat; diff --git a/GreenshotImgurPlugin/Forms/SettingsForm.resx b/GreenshotImgurPlugin/Forms/SettingsForm.resx new file mode 100644 index 000000000..5ea0895e3 --- /dev/null +++ b/GreenshotImgurPlugin/Forms/SettingsForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj index 5c72f9225..fa6ae6255 100644 --- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj +++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj @@ -53,6 +53,9 @@ + + SettingsForm.cs + Never diff --git a/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs b/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs index eb786979d..0cf415d15 100644 --- a/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs +++ b/GreenshotJiraPlugin/Forms/SettingsForm.Designer.cs @@ -80,38 +80,40 @@ namespace GreenshotJiraPlugin { // // label_url // + this.label_url.LanguageKey = "label_url"; this.label_url.Location = new System.Drawing.Point(12, 21); this.label_url.Name = "label_url"; - this.label_url.Size = new System.Drawing.Size(84, 20); + this.label_url.Size = new System.Drawing.Size(146, 20); this.label_url.TabIndex = 7; this.label_url.Text = "Url"; // // textBoxUrl // this.textBoxUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.textBoxUrl.Location = new System.Drawing.Point(102, 21); + this.textBoxUrl.Location = new System.Drawing.Point(164, 21); this.textBoxUrl.Name = "textBoxUrl"; this.textBoxUrl.PropertyName = "Url"; this.textBoxUrl.SectionName = "Jira"; - this.textBoxUrl.Size = new System.Drawing.Size(276, 20); + this.textBoxUrl.Size = new System.Drawing.Size(214, 20); this.textBoxUrl.TabIndex = 6; // // combobox_uploadimageformat // this.combobox_uploadimageformat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combobox_uploadimageformat.FormattingEnabled = true; - this.combobox_uploadimageformat.Location = new System.Drawing.Point(102, 47); + this.combobox_uploadimageformat.Location = new System.Drawing.Point(164, 47); this.combobox_uploadimageformat.Name = "combobox_uploadimageformat"; this.combobox_uploadimageformat.PropertyName = "UploadFormat"; this.combobox_uploadimageformat.SectionName = "Jira"; - this.combobox_uploadimageformat.Size = new System.Drawing.Size(276, 21); + this.combobox_uploadimageformat.Size = new System.Drawing.Size(214, 21); this.combobox_uploadimageformat.TabIndex = 8; // // label_upload_format // + this.label_upload_format.LanguageKey = "label_upload_format"; this.label_upload_format.Location = new System.Drawing.Point(12, 50); this.label_upload_format.Name = "label_upload_format"; - this.label_upload_format.Size = new System.Drawing.Size(84, 20); + this.label_upload_format.Size = new System.Drawing.Size(146, 20); this.label_upload_format.TabIndex = 9; this.label_upload_format.Text = "Upload format"; // @@ -133,7 +135,6 @@ namespace GreenshotJiraPlugin { this.Text = "Please enter your Jira data"; this.ResumeLayout(false); this.PerformLayout(); - } private GreenshotPlugin.Controls.GreenshotComboBox combobox_uploadimageformat; private GreenshotPlugin.Controls.GreenshotLabel label_upload_format; diff --git a/GreenshotJiraPlugin/Forms/SettingsForm.cs b/GreenshotJiraPlugin/Forms/SettingsForm.cs index dccd5058e..1373847dc 100644 --- a/GreenshotJiraPlugin/Forms/SettingsForm.cs +++ b/GreenshotJiraPlugin/Forms/SettingsForm.cs @@ -26,8 +26,8 @@ namespace GreenshotJiraPlugin { /// /// Description of PasswordRequestForm. /// - public partial class SettingsForm : GreenshotPlugin.Controls.GreenshotForm { - public SettingsForm(JiraConfiguration config) { + public partial class SettingsForm : JiraFormBase { + public SettingsForm(JiraConfiguration config) :base () { // // The InitializeComponent() call is required for Windows Forms designer support. // diff --git a/GreenshotJiraPlugin/Forms/SettingsForm.resx b/GreenshotJiraPlugin/Forms/SettingsForm.resx new file mode 100644 index 000000000..5ea0895e3 --- /dev/null +++ b/GreenshotJiraPlugin/Forms/SettingsForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj index f2ad2f97a..415da91dd 100644 --- a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj +++ b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj @@ -37,6 +37,7 @@ JiraForm.cs + Form @@ -55,6 +56,9 @@ True Reference.map + + SettingsForm.cs + Always