From c4dd95751e84f75749cb9e2ebb10f00391ee2fb6 Mon Sep 17 00:00:00 2001 From: Jaex Date: Mon, 16 May 2016 08:24:59 +0300 Subject: [PATCH] Removed UpdatePanel from main window, it will be added next release --- .../BlackStyle/UpdatePanel.Designer.cs | 6 +-- ShareX/Forms/MainForm.Designer.cs | 8 ---- ShareX/Forms/MainForm.resx | 37 +++---------------- 3 files changed, 8 insertions(+), 43 deletions(-) diff --git a/ShareX.HelpersLib/Controls/BlackStyle/UpdatePanel.Designer.cs b/ShareX.HelpersLib/Controls/BlackStyle/UpdatePanel.Designer.cs index 03f24f5f0..83bc60ce2 100644 --- a/ShareX.HelpersLib/Controls/BlackStyle/UpdatePanel.Designer.cs +++ b/ShareX.HelpersLib/Controls/BlackStyle/UpdatePanel.Designer.cs @@ -37,7 +37,7 @@ private void InitializeComponent() this.btnChangelog.Anchor = System.Windows.Forms.AnchorStyles.Right; this.btnChangelog.Font = new System.Drawing.Font("Arial", 12F); this.btnChangelog.ForeColor = System.Drawing.Color.White; - this.btnChangelog.Location = new System.Drawing.Point(186, 4); + this.btnChangelog.Location = new System.Drawing.Point(184, 5); this.btnChangelog.Name = "btnChangelog"; this.btnChangelog.Size = new System.Drawing.Size(154, 32); this.btnChangelog.TabIndex = 1; @@ -48,7 +48,7 @@ private void InitializeComponent() this.btnDownload.Anchor = System.Windows.Forms.AnchorStyles.Right; this.btnDownload.Font = new System.Drawing.Font("Arial", 12F); this.btnDownload.ForeColor = System.Drawing.Color.White; - this.btnDownload.Location = new System.Drawing.Point(344, 4); + this.btnDownload.Location = new System.Drawing.Point(342, 5); this.btnDownload.Name = "btnDownload"; this.btnDownload.Size = new System.Drawing.Size(154, 32); this.btnDownload.TabIndex = 0; @@ -61,7 +61,7 @@ private void InitializeComponent() this.Controls.Add(this.btnChangelog); this.Controls.Add(this.btnDownload); this.Name = "UpdatePanel"; - this.Size = new System.Drawing.Size(502, 39); + this.Size = new System.Drawing.Size(500, 41); this.ResumeLayout(false); } diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index ac91c31bd..a3847a36a 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -31,7 +31,6 @@ private void InitializeComponent() this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter(); - this.upUpdate = new ShareX.HelpersLib.UpdatePanel(); this.pbTips = new System.Windows.Forms.PictureBox(); this.lblMainFormTip = new System.Windows.Forms.Label(); this.lblSplitter = new System.Windows.Forms.Label(); @@ -258,7 +257,6 @@ private void InitializeComponent() // // scMain.Panel1 // - this.scMain.Panel1.Controls.Add(this.upUpdate); this.scMain.Panel1.Controls.Add(this.pbTips); this.scMain.Panel1.Controls.Add(this.lblMainFormTip); this.scMain.Panel1.Controls.Add(this.lblSplitter); @@ -270,11 +268,6 @@ private void InitializeComponent() this.scMain.SplitterColor = System.Drawing.Color.DarkGray; this.scMain.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.scMain_SplitterMoved); // - // upUpdate - // - resources.ApplyResources(this.upUpdate, "upUpdate"); - this.upUpdate.Name = "upUpdate"; - // // pbTips // resources.ApplyResources(this.pbTips, "pbTips"); @@ -2098,6 +2091,5 @@ private void InitializeComponent() private System.Windows.Forms.Label lblTips; private System.Windows.Forms.ToolStripMenuItem tsmiTextCapture; private System.Windows.Forms.ToolStripMenuItem tsmiTrayTextCapture; - private HelpersLib.UpdatePanel upUpdate; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index a8c52b522..ba2698163 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -125,34 +125,6 @@ 160, 0 - - Bottom - - - 1, 366 - - - 334, 41 - - - - 3 - - - False - - - upUpdate - - - ShareX.HelpersLib.UpdatePanel, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - scMain.Panel1 - - - 0 - Top, Right @@ -165,6 +137,7 @@ CenterImage + 3 @@ -178,7 +151,7 @@ scMain.Panel1 - 1 + 0 Top, Bottom, Left, Right @@ -211,7 +184,7 @@ scMain.Panel1 - 2 + 1 Left @@ -235,7 +208,7 @@ scMain.Panel1 - 3 + 2 Filename @@ -298,7 +271,7 @@ scMain.Panel1 - 4 + 3 scMain.Panel1