From c777060f2cfbc5829119d8c66c112f063839f653 Mon Sep 17 00:00:00 2001 From: Jaex Date: Fri, 17 Jan 2014 18:40:40 +0200 Subject: [PATCH] Notification hover url background is black, added label near notification combobox --- ShareX/Enums.cs | 6 +++--- ShareX/Forms/NotificationForm.cs | 4 ++-- ShareX/Forms/TaskSettingsForm.Designer.cs | 16 ++++++++++++++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ShareX/Enums.cs b/ShareX/Enums.cs index 603a33e69..7a6ce3ec4 100644 --- a/ShareX/Enums.cs +++ b/ShareX/Enums.cs @@ -177,11 +177,11 @@ public enum HotkeyStatus public enum PopUpNotificationType { - [Description("Show nothing after task is completed")] + [Description("Show nothing")] None, - [Description("Show tray balloon tip after task is completed")] + [Description("Show tray balloon tip")] BalloonTip, - [Description("Show toast notification with preview after task is completed")] + [Description("Show toast notification with preview")] ToastNotification } } \ No newline at end of file diff --git a/ShareX/Forms/NotificationForm.cs b/ShareX/Forms/NotificationForm.cs index 6e93b47f2..6e9630452 100644 --- a/ShareX/Forms/NotificationForm.cs +++ b/ShareX/Forms/NotificationForm.cs @@ -139,12 +139,12 @@ protected override void OnPaint(PaintEventArgs e) { Rectangle textRect = new Rectangle(0, 0, rect.Width, 40); - using (SolidBrush brush = new SolidBrush(Color.FromArgb(150, 255, 255, 255))) + using (SolidBrush brush = new SolidBrush(Color.FromArgb(100, 0, 0, 0))) { g.FillRectangle(brush, textRect); } - g.DrawString(ToastURL, textFont, Brushes.Black, textRect.RectangleOffset(-urlPadding)); + g.DrawString(ToastURL, textFont, Brushes.White, textRect.RectangleOffset(-urlPadding)); } } else if (!string.IsNullOrEmpty(ToastText)) diff --git a/ShareX/Forms/TaskSettingsForm.Designer.cs b/ShareX/Forms/TaskSettingsForm.Designer.cs index 40be6fe8e..6f8dd5ab6 100644 --- a/ShareX/Forms/TaskSettingsForm.Designer.cs +++ b/ShareX/Forms/TaskSettingsForm.Designer.cs @@ -155,6 +155,7 @@ private void InitializeComponent() this.tpAdvanced = new System.Windows.Forms.TabPage(); this.pgTaskSettings = new System.Windows.Forms.PropertyGrid(); this.chkUseDefaultAdvancedSettings = new System.Windows.Forms.CheckBox(); + this.lblAfterTaskNotification = new System.Windows.Forms.Label(); this.tcHotkeySettings.SuspendLayout(); this.tpTask.SuspendLayout(); this.tpGeneral.SuspendLayout(); @@ -454,6 +455,7 @@ private void InitializeComponent() // panelGeneral // this.panelGeneral.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panelGeneral.Controls.Add(this.lblAfterTaskNotification); this.panelGeneral.Controls.Add(this.cboPopUpNotification); this.panelGeneral.Controls.Add(this.chkShowAfterUploadForm); this.panelGeneral.Controls.Add(this.cbShowAfterCaptureTasksForm); @@ -470,9 +472,9 @@ private void InitializeComponent() // this.cboPopUpNotification.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cboPopUpNotification.FormattingEnabled = true; - this.cboPopUpNotification.Location = new System.Drawing.Point(8, 80); + this.cboPopUpNotification.Location = new System.Drawing.Point(128, 80); this.cboPopUpNotification.Name = "cboPopUpNotification"; - this.cboPopUpNotification.Size = new System.Drawing.Size(304, 21); + this.cboPopUpNotification.Size = new System.Drawing.Size(224, 21); this.cboPopUpNotification.TabIndex = 20; this.cboPopUpNotification.SelectedIndexChanged += new System.EventHandler(this.cboPopUpNotification_SelectedIndexChanged); // @@ -1632,6 +1634,15 @@ private void InitializeComponent() this.chkUseDefaultAdvancedSettings.UseVisualStyleBackColor = true; this.chkUseDefaultAdvancedSettings.CheckedChanged += new System.EventHandler(this.chkUseDefaultAdvancedSettings_CheckedChanged); // + // lblAfterTaskNotification + // + this.lblAfterTaskNotification.AutoSize = true; + this.lblAfterTaskNotification.Location = new System.Drawing.Point(8, 84); + this.lblAfterTaskNotification.Name = "lblAfterTaskNotification"; + this.lblAfterTaskNotification.Size = new System.Drawing.Size(117, 13); + this.lblAfterTaskNotification.TabIndex = 21; + this.lblAfterTaskNotification.Text = "After task is completed:"; + // // TaskSettingsForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -1827,6 +1838,7 @@ private void InitializeComponent() private System.Windows.Forms.CheckBox chkOverrideFTP; private System.Windows.Forms.ComboBox cboFTPaccounts; private System.Windows.Forms.ComboBox cboPopUpNotification; + private System.Windows.Forms.Label lblAfterTaskNotification;