diff --git a/GreenshotInterop/OfficeExport/OutlookEmailExporter.cs b/GreenshotInterop/OfficeExport/OutlookEmailExporter.cs index 4c6b96000..6962d9441 100644 --- a/GreenshotInterop/OfficeExport/OutlookEmailExporter.cs +++ b/GreenshotInterop/OfficeExport/OutlookEmailExporter.cs @@ -294,16 +294,16 @@ namespace Greenshot.Interop.Office { //MailItem newMail = COMWrapper.Cast(newItem); MailItem newMail = (MailItem)newItem; newMail.Subject = subject; - if (!string.IsNullOrEmpty(to)) { - newMail.To = to; - } - if (!string.IsNullOrEmpty(CC)) { - newMail.CC = CC; - } - if (!string.IsNullOrEmpty(BCC)) { - newMail.BCC = BCC; - } - newMail.BodyFormat = OlBodyFormat.olFormatHTML; + if (!string.IsNullOrEmpty(to)) { + newMail.To = to; + } + if (!string.IsNullOrEmpty(CC)) { + newMail.CC = CC; + } + if (!string.IsNullOrEmpty(BCC)) { + newMail.BCC = BCC; + } + newMail.BodyFormat = OlBodyFormat.olFormatHTML; string bodyString = null; // Read the default signature, if nothing found use empty email try { @@ -396,7 +396,7 @@ namespace Greenshot.Interop.Office { /// /// The file to send, do not delete the file right away! /// true if it worked, false if not - public static bool ExportToOutlook(EmailFormat format, string tmpFile, string subject, string attachmentName, string to, string CC, string BCC) { + public static bool ExportToOutlook(EmailFormat format, string tmpFile, string subject, string attachmentName, string to, string CC, string BCC) { bool exported = false; try { using (IOutlookApplication outlookApplication = GetOrCreateOutlookApplication()) { diff --git a/GreenshotInterop/OfficeInterop/OneNoteInterop.cs b/GreenshotInterop/OfficeInterop/OneNoteInterop.cs index 079e03f08..89d6f4ed5 100644 --- a/GreenshotInterop/OfficeInterop/OneNoteInterop.cs +++ b/GreenshotInterop/OfficeInterop/OneNoteInterop.cs @@ -58,5 +58,5 @@ namespace Greenshot.Interop.Office { xs2007 = 0, xs2010 = 1, xsCurrent= xs2010 - } + } } diff --git a/GreenshotInterop/OfficeInterop/OutlookInterop.cs b/GreenshotInterop/OfficeInterop/OutlookInterop.cs index adbd0aefd..48addd0d4 100644 --- a/GreenshotInterop/OfficeInterop/OutlookInterop.cs +++ b/GreenshotInterop/OfficeInterop/OutlookInterop.cs @@ -85,10 +85,10 @@ namespace Greenshot.Interop.Office { string SenderName { get; } DateTime SentOn { get; } OlBodyFormat BodyFormat { get; set; } - string To { get; set; } - string CC { get; set; } - string BCC { get; set; } - } + string To { get; set; } + string CC { get; set; } + string BCC { get; set; } + } // See: http://msdn.microsoft.com/en-us/library/ff869026.aspx // See: http://msdn.microsoft.com/en-us/library/microsoft.office.interop.outlook.appointmentitem.aspx diff --git a/GreenshotInterop/OfficeInterop/OutlookUtils.cs b/GreenshotInterop/OfficeInterop/OutlookUtils.cs index e921e618b..fa27c4c7d 100644 --- a/GreenshotInterop/OfficeInterop/OutlookUtils.cs +++ b/GreenshotInterop/OfficeInterop/OutlookUtils.cs @@ -23,24 +23,24 @@ using System.Runtime.InteropServices; namespace Greenshot.Interop.Office { enum PT : uint { - PT_UNSPECIFIED = 0, /* (Reserved for interface use) type doesn't matter to caller */ - PT_NULL = 1, /* NULL property value */ - PT_I2 = 2, /* Signed 16-bit value */ - PT_LONG = 3, /* Signed 32-bit value */ - PT_R4 = 4, /* 4-byte floating point */ - PT_DOUBLE = 5, /* Floating point double */ - PT_CURRENCY = 6, /* Signed 64-bit int (decimal w/ 4 digits right of decimal pt) */ - PT_APPTIME = 7, /* Application time */ - PT_ERROR = 10, /* 32-bit error value */ - PT_BOOLEAN = 11, /* 16-bit boolean (non-zero true, */ + PT_UNSPECIFIED = 0, /* (Reserved for interface use) type doesn't matter to caller */ + PT_NULL = 1, /* NULL property value */ + PT_I2 = 2, /* Signed 16-bit value */ + PT_LONG = 3, /* Signed 32-bit value */ + PT_R4 = 4, /* 4-byte floating point */ + PT_DOUBLE = 5, /* Floating point double */ + PT_CURRENCY = 6, /* Signed 64-bit int (decimal w/ 4 digits right of decimal pt) */ + PT_APPTIME = 7, /* Application time */ + PT_ERROR = 10, /* 32-bit error value */ + PT_BOOLEAN = 11, /* 16-bit boolean (non-zero true, */ // Use PT_BOOLEAN_DESKTOP to be specific instead of using PT_BOOLEAN which is mapped to 2 in addrmapi.h - PT_BOOLEAN_DESKTOP = 11, /* 16-bit boolean (non-zero true) */ - PT_OBJECT = 13, /* Embedded object in a property */ - PT_I8 = 20, /* 8-byte signed integer */ - PT_STRING8 = 30, /* Null terminated 8-bit character string */ - PT_UNICODE = 31, /* Null terminated Unicode string */ - PT_SYSTIME = 64, /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */ - PT_CLSID = 72, /* OLE GUID */ + PT_BOOLEAN_DESKTOP = 11, /* 16-bit boolean (non-zero true) */ + PT_OBJECT = 13, /* Embedded object in a property */ + PT_I8 = 20, /* 8-byte signed integer */ + PT_STRING8 = 30, /* Null terminated 8-bit character string */ + PT_UNICODE = 31, /* Null terminated Unicode string */ + PT_SYSTIME = 64, /* FILETIME 64-bit int w/ number of 100ns periods since Jan 1,1601 */ + PT_CLSID = 72, /* OLE GUID */ PT_BINARY = 258, /* Uninterpreted (counted byte array) */ PT_TSTRING = PT_UNICODE @@ -192,7 +192,7 @@ namespace Greenshot.Interop.Office { PR_RECIPIENT_TYPE = PT.PT_LONG | 0x0C15 << 16, PR_REGISTERED_MAIL_TYPE = PT.PT_LONG | 0x0C16 << 16, PR_REPLY_REQUESTED = PT.PT_BOOLEAN | 0x0C17 << 16, - //PR_REQUESTED_DELIVERY_METHOD = PT.PT_LONG | 0x0C18 << 16, + //PR_REQUESTED_DELIVERY_METHOD = PT.PT_LONG | 0x0C18 << 16, PR_SENDER_ENTRYID = PT.PT_BINARY | 0x0C19 << 16, PR_SENDER_NAME = PT.PT_TSTRING | 0x0C1A << 16, PR_SENDER_NAME_W = PT.PT_UNICODE | 0x0C1A << 16, @@ -348,7 +348,7 @@ namespace Greenshot.Interop.Office { PR_START_DATE = PT.PT_SYSTIME | 0x0060 << 16, PR_END_DATE = PT.PT_SYSTIME | 0x0061 << 16, PR_OWNER_APPT_ID = PT.PT_LONG | 0x0062 << 16, - //PR_RESPONSE_REQUESTED = PT.PT_BOOLEAN | 0x0063 << 16, + //PR_RESPONSE_REQUESTED = PT.PT_BOOLEAN | 0x0063 << 16, PR_SENT_REPRESENTING_ADDRTYPE = PT.PT_TSTRING | 0x0064 << 16, PR_SENT_REPRESENTING_ADDRTYPE_W = PT.PT_UNICODE | 0x0064 << 16, @@ -495,62 +495,62 @@ namespace Greenshot.Interop.Office { int SetReadFlag(); } // [ComVisible(false)] - // [ComImport()] - // [Guid(IID_IMAPIFolder)] - // [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] - // interface IMAPIFolder : IMAPIContainer { - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int CreateMessage(IntPtr interf, uint uFlags, [MarshalAs(UnmanagedType.Interface)] ref IMessage pMsg); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int CopyMessages(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int CreateFolder(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int CopyFolder(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int DeleteFolder(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int SetReadFlags(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int GetMessageStatus(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int SetMessageStatus(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int SaveContentsSort(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int EmptyFolder(); - // } - // [ComVisible(false)] - // [ComImport()] - // [Guid(IID_IMAPIContainer)] - // [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] - // interface IMAPIContainer : IMAPIProp { - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int GetContentsTable(uint uFlags, [MarshalAs(UnmanagedType.Interface), Out] out outlook.Table tbl); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int GetHierarchyTable(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int OpenEntry(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int SetSearchCriteria(); - // [return: MarshalAs(UnmanagedType.I4)] - // [PreserveSig] - // int GetSearchCriteria(); - // } + // [ComImport()] + // [Guid(IID_IMAPIFolder)] + // [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] + // interface IMAPIFolder : IMAPIContainer { + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int CreateMessage(IntPtr interf, uint uFlags, [MarshalAs(UnmanagedType.Interface)] ref IMessage pMsg); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int CopyMessages(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int CreateFolder(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int CopyFolder(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int DeleteFolder(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int SetReadFlags(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int GetMessageStatus(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int SetMessageStatus(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int SaveContentsSort(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int EmptyFolder(); + // } + // [ComVisible(false)] + // [ComImport()] + // [Guid(IID_IMAPIContainer)] + // [InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)] + // interface IMAPIContainer : IMAPIProp { + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int GetContentsTable(uint uFlags, [MarshalAs(UnmanagedType.Interface), Out] out outlook.Table tbl); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int GetHierarchyTable(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int OpenEntry(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int SetSearchCriteria(); + // [return: MarshalAs(UnmanagedType.I4)] + // [PreserveSig] + // int GetSearchCriteria(); + // } [ComVisible(false)] [ComImport()] diff --git a/GreenshotJiraPlugin/Forms/JiraForm.Designer.cs b/GreenshotJiraPlugin/Forms/JiraForm.Designer.cs index ddcef9c23..298fc3e86 100644 --- a/GreenshotJiraPlugin/Forms/JiraForm.Designer.cs +++ b/GreenshotJiraPlugin/Forms/JiraForm.Designer.cs @@ -19,208 +19,208 @@ * along with this program. If not, see . */ namespace GreenshotJiraPlugin { - partial class JiraForm { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class JiraForm { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) { - if (disposing && (components != null)) { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) { + if (disposing && (components != null)) { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() { - this.jiraFilterBox = new System.Windows.Forms.ComboBox(); - this.label_jirafilter = new System.Windows.Forms.Label(); - this.label_jira = new System.Windows.Forms.Label(); - this.uploadButton = new System.Windows.Forms.Button(); - this.jiraListView = new System.Windows.Forms.ListView(); - this.jiraFilenameBox = new System.Windows.Forms.TextBox(); - this.label_filename = new System.Windows.Forms.Label(); - this.label_comment = new System.Windows.Forms.Label(); - this.jiraCommentBox = new System.Windows.Forms.TextBox(); - this.cancelButton = new System.Windows.Forms.Button(); - this.label1 = new System.Windows.Forms.Label(); - this.jiraKey = new System.Windows.Forms.TextBox(); - this.SuspendLayout(); - // - // jiraFilterBox - // - this.jiraFilterBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.jiraFilterBox.DisplayMember = "name"; - this.jiraFilterBox.FormattingEnabled = true; - this.jiraFilterBox.Location = new System.Drawing.Point(102, 11); - this.jiraFilterBox.Name = "jiraFilterBox"; - this.jiraFilterBox.Size = new System.Drawing.Size(604, 21); - this.jiraFilterBox.TabIndex = 23; - this.jiraFilterBox.SelectedIndexChanged += new System.EventHandler(this.jiraFilterBox_SelectedIndexChanged); - // - // label_jirafilter - // - this.label_jirafilter.AutoSize = true; - this.label_jirafilter.Location = new System.Drawing.Point(14, 14); - this.label_jirafilter.Name = "label_jirafilter"; - this.label_jirafilter.Size = new System.Drawing.Size(52, 13); - this.label_jirafilter.TabIndex = 24; - this.label_jirafilter.Text = "JIRA filter"; - // - // label_jira - // - this.label_jira.AutoSize = true; - this.label_jira.Location = new System.Drawing.Point(14, 41); - this.label_jira.Name = "label_jira"; - this.label_jira.Size = new System.Drawing.Size(30, 13); - this.label_jira.TabIndex = 31; - this.label_jira.Text = "JIRA"; - // - // uploadButton - // - this.uploadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.uploadButton.Enabled = false; - this.uploadButton.Location = new System.Drawing.Point(550, 281); - this.uploadButton.Name = "uploadButton"; - this.uploadButton.Size = new System.Drawing.Size(75, 23); - this.uploadButton.TabIndex = 32; - this.uploadButton.Text = "Upload"; - this.uploadButton.UseVisualStyleBackColor = true; - this.uploadButton.Click += new System.EventHandler(this.uploadButton_Click); - // - // jiraListView - // - this.jiraListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.jiraListView.FullRowSelect = true; - this.jiraListView.Location = new System.Drawing.Point(102, 41); - this.jiraListView.MultiSelect = false; - this.jiraListView.Name = "jiraListView"; - this.jiraListView.Size = new System.Drawing.Size(604, 172); - this.jiraListView.TabIndex = 33; - this.jiraListView.UseCompatibleStateImageBehavior = false; - this.jiraListView.View = System.Windows.Forms.View.Details; - this.jiraListView.SelectedIndexChanged += new System.EventHandler(this.jiraListView_SelectedIndexChanged); - this.jiraListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.jiraListView_ColumnClick); - // - // jiraFilenameBox - // - this.jiraFilenameBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.jiraFilenameBox.Location = new System.Drawing.Point(102, 219); - this.jiraFilenameBox.Name = "jiraFilenameBox"; - this.jiraFilenameBox.Size = new System.Drawing.Size(604, 20); - this.jiraFilenameBox.TabIndex = 34; - // - // label_filename - // - this.label_filename.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_filename.AutoSize = true; - this.label_filename.Location = new System.Drawing.Point(14, 222); - this.label_filename.Name = "label_filename"; - this.label_filename.Size = new System.Drawing.Size(49, 13); - this.label_filename.TabIndex = 35; - this.label_filename.Text = "Filename"; - // - // label_comment - // - this.label_comment.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label_comment.AutoSize = true; - this.label_comment.Location = new System.Drawing.Point(14, 248); - this.label_comment.Name = "label_comment"; - this.label_comment.Size = new System.Drawing.Size(51, 13); - this.label_comment.TabIndex = 36; - this.label_comment.Text = "Comment"; - // - // jiraCommentBox - // - this.jiraCommentBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.jiraCommentBox.Location = new System.Drawing.Point(102, 245); - this.jiraCommentBox.Name = "jiraCommentBox"; - this.jiraCommentBox.Size = new System.Drawing.Size(604, 20); - this.jiraCommentBox.TabIndex = 37; - // - // cancelButton - // - this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.cancelButton.Location = new System.Drawing.Point(631, 281); - this.cancelButton.Name = "cancelButton"; - this.cancelButton.Size = new System.Drawing.Size(75, 23); - this.cancelButton.TabIndex = 38; - this.cancelButton.Text = "Cancel"; - this.cancelButton.UseVisualStyleBackColor = true; - this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); - // - // label1 - // - this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(14, 274); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(23, 13); - this.label1.TabIndex = 39; - this.label1.Text = "Jira"; - // - // jiraKey - // - this.jiraKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.jiraKey.Location = new System.Drawing.Point(102, 271); - this.jiraKey.Name = "jiraKey"; - this.jiraKey.Size = new System.Drawing.Size(158, 20); - this.jiraKey.TabIndex = 40; - this.jiraKey.TextChanged += new System.EventHandler(this.JiraKeyTextChanged); - // - // JiraForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; - this.ClientSize = new System.Drawing.Size(720, 316); - this.Controls.Add(this.jiraKey); - this.Controls.Add(this.label1); - this.Controls.Add(this.cancelButton); - this.Controls.Add(this.jiraCommentBox); - this.Controls.Add(this.label_comment); - this.Controls.Add(this.label_filename); - this.Controls.Add(this.jiraFilenameBox); - this.Controls.Add(this.jiraListView); - this.Controls.Add(this.uploadButton); - this.Controls.Add(this.label_jira); - this.Controls.Add(this.label_jirafilter); - this.Controls.Add(this.jiraFilterBox); - this.Name = "JiraForm"; - this.Text = "JIRA Upload"; - this.TopMost = true; - this.ResumeLayout(false); - this.PerformLayout(); - } - private System.Windows.Forms.TextBox jiraKey; - private System.Windows.Forms.Label label1; + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() { + this.jiraFilterBox = new System.Windows.Forms.ComboBox(); + this.label_jirafilter = new System.Windows.Forms.Label(); + this.label_jira = new System.Windows.Forms.Label(); + this.uploadButton = new System.Windows.Forms.Button(); + this.jiraListView = new System.Windows.Forms.ListView(); + this.jiraFilenameBox = new System.Windows.Forms.TextBox(); + this.label_filename = new System.Windows.Forms.Label(); + this.label_comment = new System.Windows.Forms.Label(); + this.jiraCommentBox = new System.Windows.Forms.TextBox(); + this.cancelButton = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.jiraKey = new System.Windows.Forms.TextBox(); + this.SuspendLayout(); + // + // jiraFilterBox + // + this.jiraFilterBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.jiraFilterBox.DisplayMember = "name"; + this.jiraFilterBox.FormattingEnabled = true; + this.jiraFilterBox.Location = new System.Drawing.Point(102, 11); + this.jiraFilterBox.Name = "jiraFilterBox"; + this.jiraFilterBox.Size = new System.Drawing.Size(604, 21); + this.jiraFilterBox.TabIndex = 23; + this.jiraFilterBox.SelectedIndexChanged += new System.EventHandler(this.jiraFilterBox_SelectedIndexChanged); + // + // label_jirafilter + // + this.label_jirafilter.AutoSize = true; + this.label_jirafilter.Location = new System.Drawing.Point(14, 14); + this.label_jirafilter.Name = "label_jirafilter"; + this.label_jirafilter.Size = new System.Drawing.Size(52, 13); + this.label_jirafilter.TabIndex = 24; + this.label_jirafilter.Text = "JIRA filter"; + // + // label_jira + // + this.label_jira.AutoSize = true; + this.label_jira.Location = new System.Drawing.Point(14, 41); + this.label_jira.Name = "label_jira"; + this.label_jira.Size = new System.Drawing.Size(30, 13); + this.label_jira.TabIndex = 31; + this.label_jira.Text = "JIRA"; + // + // uploadButton + // + this.uploadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.uploadButton.Enabled = false; + this.uploadButton.Location = new System.Drawing.Point(550, 281); + this.uploadButton.Name = "uploadButton"; + this.uploadButton.Size = new System.Drawing.Size(75, 23); + this.uploadButton.TabIndex = 32; + this.uploadButton.Text = "Upload"; + this.uploadButton.UseVisualStyleBackColor = true; + this.uploadButton.Click += new System.EventHandler(this.uploadButton_Click); + // + // jiraListView + // + this.jiraListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.jiraListView.FullRowSelect = true; + this.jiraListView.Location = new System.Drawing.Point(102, 41); + this.jiraListView.MultiSelect = false; + this.jiraListView.Name = "jiraListView"; + this.jiraListView.Size = new System.Drawing.Size(604, 172); + this.jiraListView.TabIndex = 33; + this.jiraListView.UseCompatibleStateImageBehavior = false; + this.jiraListView.View = System.Windows.Forms.View.Details; + this.jiraListView.SelectedIndexChanged += new System.EventHandler(this.jiraListView_SelectedIndexChanged); + this.jiraListView.ColumnClick += new System.Windows.Forms.ColumnClickEventHandler(this.jiraListView_ColumnClick); + // + // jiraFilenameBox + // + this.jiraFilenameBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.jiraFilenameBox.Location = new System.Drawing.Point(102, 219); + this.jiraFilenameBox.Name = "jiraFilenameBox"; + this.jiraFilenameBox.Size = new System.Drawing.Size(604, 20); + this.jiraFilenameBox.TabIndex = 34; + // + // label_filename + // + this.label_filename.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_filename.AutoSize = true; + this.label_filename.Location = new System.Drawing.Point(14, 222); + this.label_filename.Name = "label_filename"; + this.label_filename.Size = new System.Drawing.Size(49, 13); + this.label_filename.TabIndex = 35; + this.label_filename.Text = "Filename"; + // + // label_comment + // + this.label_comment.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label_comment.AutoSize = true; + this.label_comment.Location = new System.Drawing.Point(14, 248); + this.label_comment.Name = "label_comment"; + this.label_comment.Size = new System.Drawing.Size(51, 13); + this.label_comment.TabIndex = 36; + this.label_comment.Text = "Comment"; + // + // jiraCommentBox + // + this.jiraCommentBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.jiraCommentBox.Location = new System.Drawing.Point(102, 245); + this.jiraCommentBox.Name = "jiraCommentBox"; + this.jiraCommentBox.Size = new System.Drawing.Size(604, 20); + this.jiraCommentBox.TabIndex = 37; + // + // cancelButton + // + this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.cancelButton.Location = new System.Drawing.Point(631, 281); + this.cancelButton.Name = "cancelButton"; + this.cancelButton.Size = new System.Drawing.Size(75, 23); + this.cancelButton.TabIndex = 38; + this.cancelButton.Text = "Cancel"; + this.cancelButton.UseVisualStyleBackColor = true; + this.cancelButton.Click += new System.EventHandler(this.cancelButton_Click); + // + // label1 + // + this.label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(14, 274); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(23, 13); + this.label1.TabIndex = 39; + this.label1.Text = "Jira"; + // + // jiraKey + // + this.jiraKey.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.jiraKey.Location = new System.Drawing.Point(102, 271); + this.jiraKey.Name = "jiraKey"; + this.jiraKey.Size = new System.Drawing.Size(158, 20); + this.jiraKey.TabIndex = 40; + this.jiraKey.TextChanged += new System.EventHandler(this.JiraKeyTextChanged); + // + // JiraForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; + this.ClientSize = new System.Drawing.Size(720, 316); + this.Controls.Add(this.jiraKey); + this.Controls.Add(this.label1); + this.Controls.Add(this.cancelButton); + this.Controls.Add(this.jiraCommentBox); + this.Controls.Add(this.label_comment); + this.Controls.Add(this.label_filename); + this.Controls.Add(this.jiraFilenameBox); + this.Controls.Add(this.jiraListView); + this.Controls.Add(this.uploadButton); + this.Controls.Add(this.label_jira); + this.Controls.Add(this.label_jirafilter); + this.Controls.Add(this.jiraFilterBox); + this.Name = "JiraForm"; + this.Text = "JIRA Upload"; + this.TopMost = true; + this.ResumeLayout(false); + this.PerformLayout(); + } + private System.Windows.Forms.TextBox jiraKey; + private System.Windows.Forms.Label label1; - #endregion + #endregion - private System.Windows.Forms.ComboBox jiraFilterBox; - private System.Windows.Forms.Label label_jirafilter; - private System.Windows.Forms.Label label_jira; - private System.Windows.Forms.Button uploadButton; - private System.Windows.Forms.ListView jiraListView; - private System.Windows.Forms.TextBox jiraFilenameBox; - private System.Windows.Forms.Label label_filename; - private System.Windows.Forms.Label label_comment; - private System.Windows.Forms.TextBox jiraCommentBox; - private System.Windows.Forms.Button cancelButton; - } + private System.Windows.Forms.ComboBox jiraFilterBox; + private System.Windows.Forms.Label label_jirafilter; + private System.Windows.Forms.Label label_jira; + private System.Windows.Forms.Button uploadButton; + private System.Windows.Forms.ListView jiraListView; + private System.Windows.Forms.TextBox jiraFilenameBox; + private System.Windows.Forms.Label label_filename; + private System.Windows.Forms.Label label_comment; + private System.Windows.Forms.TextBox jiraCommentBox; + private System.Windows.Forms.Button cancelButton; + } } \ No newline at end of file diff --git a/GreenshotJiraPlugin/Forms/JiraForm.cs b/GreenshotJiraPlugin/Forms/JiraForm.cs index 31e249b76..61b392412 100644 --- a/GreenshotJiraPlugin/Forms/JiraForm.cs +++ b/GreenshotJiraPlugin/Forms/JiraForm.cs @@ -196,7 +196,7 @@ namespace GreenshotJiraPlugin { this.jiraListView.Sort(); } - void JiraKeyTextChanged(object sender, EventArgs e) { + void JiraKeyTextChanged(object sender, EventArgs e) { string jiranumber = jiraKey.Text; uploadButton.Enabled = false; int dashIndex = jiranumber.IndexOf('-'); @@ -206,6 +206,6 @@ namespace GreenshotJiraPlugin { uploadButton.Enabled = true; } } - } + } } } diff --git a/GreenshotOCRCommand/Properties/AssemblyInfo.cs b/GreenshotOCRCommand/Properties/AssemblyInfo.cs index ea3dbece7..bfc901eec 100644 --- a/GreenshotOCRCommand/Properties/AssemblyInfo.cs +++ b/GreenshotOCRCommand/Properties/AssemblyInfo.cs @@ -24,10 +24,10 @@ using System.Runtime.InteropServices; // Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: // -// Hauptversion -// Nebenversion -// Buildnummer -// Revision +// Hauptversion +// Nebenversion +// Buildnummer +// Revision // // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: diff --git a/GreenshotOfficePlugin/Destinations/ExcelDestination.cs b/GreenshotOfficePlugin/Destinations/ExcelDestination.cs index 56742db0a..e80fb0ddc 100644 --- a/GreenshotOfficePlugin/Destinations/ExcelDestination.cs +++ b/GreenshotOfficePlugin/Destinations/ExcelDestination.cs @@ -110,7 +110,7 @@ namespace GreenshotOfficePlugin { public override ExportInformation ExportCapture(bool manuallyInitiated, ISurface surface, ICaptureDetails captureDetails) { ExportInformation exportInformation = new ExportInformation(this.Designation, this.Description); string tmpFile = captureDetails.Filename; - if (tmpFile == null || surface.Modified) { + if (tmpFile == null || surface.Modified) { using (Image image = surface.GetImageForExport()) { tmpFile = ImageOutput.SaveNamedTmpFile(image, captureDetails, new OutputSettings()); } diff --git a/GreenshotOfficePlugin/Destinations/PowerpointDestination.cs b/GreenshotOfficePlugin/Destinations/PowerpointDestination.cs index 5181d1b8b..2ab80f329 100644 --- a/GreenshotOfficePlugin/Destinations/PowerpointDestination.cs +++ b/GreenshotOfficePlugin/Destinations/PowerpointDestination.cs @@ -112,7 +112,7 @@ namespace GreenshotOfficePlugin { ExportInformation exportInformation = new ExportInformation(this.Designation, this.Description); string tmpFile = captureDetails.Filename; Size imageSize = Size.Empty; - if (tmpFile == null || surface.Modified) { + if (tmpFile == null || surface.Modified) { using (Image image = surface.GetImageForExport()) { tmpFile = ImageOutput.SaveNamedTmpFile(image, captureDetails, new OutputSettings()); imageSize = image.Size; diff --git a/GreenshotOfficePlugin/OfficeConfiguration.cs b/GreenshotOfficePlugin/OfficeConfiguration.cs index 6b93fd51e..006be0279 100644 --- a/GreenshotOfficePlugin/OfficeConfiguration.cs +++ b/GreenshotOfficePlugin/OfficeConfiguration.cs @@ -31,15 +31,15 @@ namespace GreenshotOfficePlugin { public class OfficeConfiguration : IniSection { [IniProperty("OutlookEmailFormat", Description = "Default type for emails. (Text, HTML)", DefaultValue="HTML")] public EmailFormat OutlookEmailFormat; - [IniProperty("EmailSubjectPattern", Description = "Email subject pattern, works like the OutputFileFilenamePattern", DefaultValue = "${title}")] - public string EmailSubjectPattern; - [IniProperty("EmailTo", Description = "Default value for the to in emails that are created", DefaultValue = "")] - public string EmailTo; - [IniProperty("EmailCC", Description = "Default value for the CC in emails that are created", DefaultValue = "")] - public string EmailCC; - [IniProperty("EmailBCC", Description = "Default value for the BCC in emails that are created", DefaultValue = "")] - public string EmailBCC; - [IniProperty("OutlookAllowExportInMeetings", Description = "Allow export in meeting items", DefaultValue = "False")] + [IniProperty("EmailSubjectPattern", Description = "Email subject pattern, works like the OutputFileFilenamePattern", DefaultValue = "${title}")] + public string EmailSubjectPattern; + [IniProperty("EmailTo", Description = "Default value for the to in emails that are created", DefaultValue = "")] + public string EmailTo; + [IniProperty("EmailCC", Description = "Default value for the CC in emails that are created", DefaultValue = "")] + public string EmailCC; + [IniProperty("EmailBCC", Description = "Default value for the BCC in emails that are created", DefaultValue = "")] + public string EmailBCC; + [IniProperty("OutlookAllowExportInMeetings", Description = "Allow export in meeting items", DefaultValue = "False")] public bool OutlookAllowExportInMeetings; } } \ No newline at end of file