From bbdbabb72a274bb32137f095caef8455ef877b3e Mon Sep 17 00:00:00 2001 From: Jaex Date: Sat, 10 Jun 2017 01:38:13 +0300 Subject: [PATCH] Added close button to News panel --- ShareX/Forms/MainForm.Designer.cs | 37 +- ShareX/Forms/MainForm.cs | 7 +- ShareX/Forms/MainForm.resx | 657 ++++++++++++++++-------------- 3 files changed, 388 insertions(+), 313 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index e3158f9d3..9be2ba8ad 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -106,6 +106,7 @@ private void InitializeComponent() this.tsmiTestFileUpload = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTestURLShortener = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiTestURLSharing = new System.Windows.Forms.ToolStripMenuItem(); + this.tsbNews = new ShareX.HelpersLib.ToolStripButtonColorAnimation(); this.tsbDonate = new ShareX.HelpersLib.ToolStripButtonColorAnimation(); this.tsbAbout = new System.Windows.Forms.ToolStripButton(); this.cmsTaskInfo = new System.Windows.Forms.ContextMenuStrip(this.components); @@ -239,7 +240,8 @@ private void InitializeComponent() this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components); this.ttMain = new System.Windows.Forms.ToolTip(this.components); this.ucNews = new ShareX.NewsListControl(); - this.tsbNews = new ShareX.HelpersLib.ToolStripButtonColorAnimation(); + this.pNews = new System.Windows.Forms.Panel(); + this.btnCloseNews = new System.Windows.Forms.Button(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -250,6 +252,7 @@ private void InitializeComponent() this.tsMain.SuspendLayout(); this.cmsTaskInfo.SuspendLayout(); this.cmsTray.SuspendLayout(); + this.pNews.SuspendLayout(); this.SuspendLayout(); // // scMain @@ -861,6 +864,14 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiTestURLSharing, "tsmiTestURLSharing"); this.tsmiTestURLSharing.Click += new System.EventHandler(this.tsmiTestURLSharing_Click); // + // tsbNews + // + this.tsbNews.Image = global::ShareX.Properties.Resources.megaphone; + resources.ApplyResources(this.tsbNews, "tsbNews"); + this.tsbNews.Name = "tsbNews"; + this.tsbNews.ToColor = System.Drawing.Color.LimeGreen; + this.tsbNews.Click += new System.EventHandler(this.tsbNews_Click); + // // tsbDonate // this.tsbDonate.AnimationSpeed = 0.8F; @@ -1856,14 +1867,19 @@ private void InitializeComponent() resources.ApplyResources(this.ucNews, "ucNews"); this.ucNews.Name = "ucNews"; // - // tsbNews + // pNews // - this.tsbNews.CheckOnClick = true; - this.tsbNews.Image = global::ShareX.Properties.Resources.megaphone; - resources.ApplyResources(this.tsbNews, "tsbNews"); - this.tsbNews.Name = "tsbNews"; - this.tsbNews.ToColor = System.Drawing.Color.LimeGreen; - this.tsbNews.Click += new System.EventHandler(this.tsbNews_Click); + this.pNews.Controls.Add(this.btnCloseNews); + this.pNews.Controls.Add(this.ucNews); + resources.ApplyResources(this.pNews, "pNews"); + this.pNews.Name = "pNews"; + // + // btnCloseNews + // + resources.ApplyResources(this.btnCloseNews, "btnCloseNews"); + this.btnCloseNews.Name = "btnCloseNews"; + this.btnCloseNews.UseVisualStyleBackColor = true; + this.btnCloseNews.Click += new System.EventHandler(this.btnCloseNews_Click); // // MainForm // @@ -1871,7 +1887,7 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; - this.Controls.Add(this.ucNews); + this.Controls.Add(this.pNews); this.Controls.Add(this.flpPatreon); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); @@ -1898,6 +1914,7 @@ private void InitializeComponent() this.tsMain.PerformLayout(); this.cmsTaskInfo.ResumeLayout(false); this.cmsTray.ResumeLayout(false); + this.pNews.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2115,5 +2132,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiSearchImage; private NewsListControl ucNews; private HelpersLib.ToolStripButtonColorAnimation tsbNews; + private System.Windows.Forms.Panel pNews; + private System.Windows.Forms.Button btnCloseNews; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index c30877702..7bec4254c 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1264,6 +1264,11 @@ private void pbPatreonHide_Click(object sender, EventArgs e) Program.Settings.ShowPatreonButton = false; } + private void btnCloseNews_Click(object sender, EventArgs e) + { + pNews.Visible = false; + } + #region Menu events private void tsmiFullscreen_Click(object sender, EventArgs e) @@ -1548,7 +1553,7 @@ private void tsmiTestURLSharing_Click(object sender, EventArgs e) private void tsbNews_Click(object sender, EventArgs e) { - ucNews.Visible = !ucNews.Visible; + pNews.Visible = !pNews.Visible; } private void tsbDonate_Click(object sender, EventArgs e) diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 844a3b38c..cc68adbc1 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -423,6 +423,30 @@ Left + + 0, 0 + + + 6, 6, 6, 6 + + + 160, 429 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 5 + MiddleLeft @@ -435,6 +459,84 @@ Capture + + 191, 22 + + + Fullscreen + + + 191, 22 + + + Window + + + 191, 22 + + + Monitor + + + 191, 22 + + + Region + + + 191, 22 + + + Region (Light) + + + 191, 22 + + + Region (Transparent) + + + 191, 22 + + + Last region + + + 191, 22 + + + Screen recording + + + 191, 22 + + + Screen recording (GIF) + + + 191, 22 + + + Scrolling capture... + + + 191, 22 + + + Webpage capture... + + + 191, 22 + + + Text capture (OCR)... + + + 191, 22 + + + Auto capture... + MiddleLeft @@ -447,6 +549,36 @@ Upload + + 203, 22 + + + Upload file... + + + 203, 22 + + + Upload folder... + + + 203, 22 + + + Upload from clipboard... + + + 203, 22 + + + Upload from URL... + + + 203, 22 + + + Drag and drop upload... + BottomLeft @@ -471,6 +603,90 @@ Tools + + 183, 22 + + + Color picker... + + + 183, 22 + + + Screen color picker... + + + 183, 22 + + + Annotate image... + + + 183, 22 + + + Image effects... + + + 183, 22 + + + Hash check... + + + 183, 22 + + + DNS changer... + + + 183, 22 + + + QR code... + + + 183, 22 + + + Ruler... + + + 183, 22 + + + Directory indexer... + + + 183, 22 + + + Image combiner... + + + 183, 22 + + + Video thumbnailer... + + + 183, 22 + + + FTP client... + + + 183, 22 + + + Tweet message... + + + 183, 22 + + + Monitor test... + 147, 6 @@ -510,6 +726,45 @@ Destinations + + 187, 22 + + + Image uploaders + + + 187, 22 + + + Text uploaders + + + 187, 22 + + + File uploaders + + + 187, 22 + + + URL shorteners + + + 187, 22 + + + URL sharing services + + + 184, 6 + + + 187, 22 + + + Destination settings... + MiddleLeft @@ -597,297 +852,6 @@ Debug - - MiddleLeft - - - Magenta - - - 147, 20 - - - News - - - MiddleLeft - - - Magenta - - - 147, 20 - - - Donate... - - - MiddleLeft - - - Magenta - - - 147, 20 - - - About... - - - 0, 0 - - - 6, 6, 6, 6 - - - 160, 429 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - - - 191, 22 - - - Fullscreen - - - 191, 22 - - - Window - - - 191, 22 - - - Monitor - - - 191, 22 - - - Region - - - 191, 22 - - - Region (Light) - - - 191, 22 - - - Region (Transparent) - - - 191, 22 - - - Last region - - - 191, 22 - - - Screen recording - - - 191, 22 - - - Screen recording (GIF) - - - 191, 22 - - - Scrolling capture... - - - 191, 22 - - - Webpage capture... - - - 191, 22 - - - Text capture (OCR)... - - - 191, 22 - - - Auto capture... - - - 203, 22 - - - Upload file... - - - 203, 22 - - - Upload folder... - - - 203, 22 - - - Upload from clipboard... - - - 203, 22 - - - Upload from URL... - - - 203, 22 - - - Drag and drop upload... - - - 183, 22 - - - Color picker... - - - 183, 22 - - - Screen color picker... - - - 183, 22 - - - Annotate image... - - - 183, 22 - - - Image effects... - - - 183, 22 - - - Hash check... - - - 183, 22 - - - DNS changer... - - - 183, 22 - - - QR code... - - - 183, 22 - - - Ruler... - - - 183, 22 - - - Directory indexer... - - - 183, 22 - - - Image combiner... - - - 183, 22 - - - Video thumbnailer... - - - 183, 22 - - - FTP client... - - - 183, 22 - - - Tweet message... - - - 183, 22 - - - Monitor test... - - - 187, 22 - - - Image uploaders - - - 187, 22 - - - Text uploaders - - - 187, 22 - - - File uploaders - - - 187, 22 - - - URL shorteners - - - 187, 22 - - - URL sharing services - - - 184, 6 - - - 187, 22 - - - Destination settings... - 172, 22 @@ -924,6 +888,42 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 147, 20 + + + News + + + MiddleLeft + + + Magenta + + + 147, 20 + + + Donate... + + + MiddleLeft + + + Magenta + + + 147, 20 + + + About... + 286, 17 @@ -1729,7 +1729,7 @@ Fill - 160, 0 + 0, 0 0, 0, 0, 0 @@ -1740,9 +1740,6 @@ 4 - - False - ucNews @@ -1750,10 +1747,64 @@ ShareX.NewsListControl, ShareX, Version=11.8.0.0, Culture=neutral, PublicKeyToken=null - $this + pNews - 2 + 1 + + + Bottom, Right + + + 560, 400 + + + 91, 23 + + + 5 + + + Close + + + btnCloseNews + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + pNews + + + 0 + + + Fill + + + 160, 0 + + + 674, 429 + + + 5 + + + False + + + pNews + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 True @@ -2181,6 +2232,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsbNews + + + ShareX.HelpersLib.ToolStripButtonColorAnimation, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + tsbDonate @@ -2961,12 +3018,6 @@ System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - tsbNews - - - ShareX.HelpersLib.ToolStripButtonColorAnimation, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - MainForm