From debb488dfc079bec3ad1220a1e756a4477d8a5bb Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 21 Apr 2016 17:11:14 +0300 Subject: [PATCH] Added ShowImageSizeLabel to picture box control so every picture box can show image size on mouse hover --- .../Controls/MyPictureBox.Designer.cs | 10 +++ ShareX.HelpersLib/Controls/MyPictureBox.cs | 20 +++++ ShareX.HelpersLib/Controls/MyPictureBox.resx | 52 +++++++++-- .../Forms/ClipboardContentViewer.Designer.cs | 1 + .../Forms/ClipboardContentViewer.resx | 3 - ShareX.HistoryLib/HistoryForm.Designer.cs | 15 ++-- ShareX.HistoryLib/HistoryForm.resx | 52 +++++------ .../ImageEffectsForm.Designer.cs | 1 + ShareX.ImageEffectsLib/ImageEffectsForm.resx | 30 +++---- ShareX/Forms/AfterCaptureForm.Designer.cs | 89 +++++++++---------- ShareX/Forms/AfterCaptureForm.cs | 2 - ShareX/Forms/AfterCaptureForm.resx | 81 +++++------------ ShareX/Forms/AfterUploadForm.designer.cs | 1 + ShareX/Forms/BeforeUploadForm.Designer.cs | 1 + ShareX/Forms/BeforeUploadForm.resx | 2 +- ShareX/Forms/MainForm.Designer.cs | 1 + 16 files changed, 193 insertions(+), 168 deletions(-) diff --git a/ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs b/ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs index 0390db6bb..8ac5f2eeb 100644 --- a/ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs +++ b/ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs @@ -34,6 +34,7 @@ private void InitializeComponent() this.pbMain = new System.Windows.Forms.PictureBox(); this.cmsMenu = new System.Windows.Forms.ContextMenuStrip(this.components); this.tsmiCopyImage = new System.Windows.Forms.ToolStripMenuItem(); + this.lblImageSize = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.pbMain)).BeginInit(); this.cmsMenu.SuspendLayout(); this.SuspendLayout(); @@ -66,10 +67,18 @@ private void InitializeComponent() resources.ApplyResources(this.tsmiCopyImage, "tsmiCopyImage"); this.tsmiCopyImage.Click += new System.EventHandler(this.tsmiCopyImage_Click); // + // lblImageSize + // + resources.ApplyResources(this.lblImageSize, "lblImageSize"); + this.lblImageSize.BackColor = System.Drawing.Color.White; + this.lblImageSize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.lblImageSize.Name = "lblImageSize"; + // // MyPictureBox // resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.lblImageSize); this.Controls.Add(this.lblStatus); this.Controls.Add(this.pbMain); this.Name = "MyPictureBox"; @@ -85,5 +94,6 @@ private void InitializeComponent() private System.Windows.Forms.PictureBox pbMain; private System.Windows.Forms.ContextMenuStrip cmsMenu; private System.Windows.Forms.ToolStripMenuItem tsmiCopyImage; + private System.Windows.Forms.Label lblImageSize; } } \ No newline at end of file diff --git a/ShareX.HelpersLib/Controls/MyPictureBox.cs b/ShareX.HelpersLib/Controls/MyPictureBox.cs index ad81a0182..c68e5cd85 100644 --- a/ShareX.HelpersLib/Controls/MyPictureBox.cs +++ b/ShareX.HelpersLib/Controls/MyPictureBox.cs @@ -93,6 +93,9 @@ public bool DrawCheckeredBackground [DefaultValue(false)] public bool EnableRightClickMenu { get; set; } + [DefaultValue(false)] + public bool ShowImageSizeLabel { get; set; } + public new event MouseEventHandler MouseDown { add @@ -158,9 +161,24 @@ public MyPictureBox() pbMain.LoadCompleted += pbMain_LoadCompleted; pbMain.Resize += pbMain_Resize; pbMain.MouseUp += MyPictureBox_MouseUp; + pbMain.MouseEnter += PbMain_MouseEnter; + pbMain.MouseLeave += PbMain_MouseLeave; MouseDown += MyPictureBox_MouseDown; } + private void PbMain_MouseEnter(object sender, EventArgs e) + { + if (ShowImageSizeLabel && IsValidImage) + { + lblImageSize.Visible = true; + } + } + + private void PbMain_MouseLeave(object sender, EventArgs e) + { + lblImageSize.Visible = false; + } + private void pbMain_Resize(object sender, EventArgs e) { UpdateCheckers(); @@ -291,6 +309,8 @@ private void AutoSetSizeMode() { if (IsValidImage) { + lblImageSize.Text = $"{Image.Width} x {Image.Height}"; + if (Image.Width > pbMain.ClientSize.Width || Image.Height > pbMain.ClientSize.Height) { pbMain.SizeMode = PictureBoxSizeMode.Zoom; diff --git a/ShareX.HelpersLib/Controls/MyPictureBox.resx b/ShareX.HelpersLib/Controls/MyPictureBox.resx index 87c2b16fb..0f90fb585 100644 --- a/ShareX.HelpersLib/Controls/MyPictureBox.resx +++ b/ShareX.HelpersLib/Controls/MyPictureBox.resx @@ -148,7 +148,7 @@ $this - 1 + 2 Fill @@ -175,17 +175,11 @@ $this - 2 + 3 17, 17 - - 113, 22 - - - Copy image - 114, 26 @@ -195,6 +189,48 @@ System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 113, 22 + + + Copy image + + + Bottom + + + Arial, 8.25pt + + + NoControl + + + 35, 133 + + + 81, 18 + + + 7 + + + MiddleCenter + + + False + + + lblImageSize + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + True diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs b/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs index 0869ceb57..85c0699e1 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.Designer.cs @@ -87,6 +87,7 @@ private void InitializeComponent() this.pbClipboard.DrawCheckeredBackground = true; this.pbClipboard.FullscreenOnClick = true; this.pbClipboard.Name = "pbClipboard"; + this.pbClipboard.ShowImageSizeLabel = true; // // ClipboardContentViewer // diff --git a/ShareX.HelpersLib/Forms/ClipboardContentViewer.resx b/ShareX.HelpersLib/Forms/ClipboardContentViewer.resx index 1aca6f9d9..fe060b46d 100644 --- a/ShareX.HelpersLib/Forms/ClipboardContentViewer.resx +++ b/ShareX.HelpersLib/Forms/ClipboardContentViewer.resx @@ -336,9 +336,6 @@ 420, 360 - - NoControl - 375, 375 diff --git a/ShareX.HistoryLib/HistoryForm.Designer.cs b/ShareX.HistoryLib/HistoryForm.Designer.cs index 5d073333e..05a1f0070 100644 --- a/ShareX.HistoryLib/HistoryForm.Designer.cs +++ b/ShareX.HistoryLib/HistoryForm.Designer.cs @@ -39,6 +39,7 @@ private void InitializeComponent() this.chURL = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.pbThumbnail = new ShareX.HelpersLib.MyPictureBox(); this.gbFilters = new System.Windows.Forms.GroupBox(); + this.cbHostFilterSelection = new System.Windows.Forms.ComboBox(); this.btnRemoveFilters = new System.Windows.Forms.Button(); this.cbTypeFilterSelection = new System.Windows.Forms.ComboBox(); this.cbHostFilter = new System.Windows.Forms.CheckBox(); @@ -51,7 +52,6 @@ private void InitializeComponent() this.dtpFilterTo = new System.Windows.Forms.DateTimePicker(); this.txtFilenameFilter = new System.Windows.Forms.TextBox(); this.cbFilenameFilterMethod = new System.Windows.Forms.ComboBox(); - this.cbHostFilterSelection = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -128,6 +128,7 @@ private void InitializeComponent() this.pbThumbnail.DrawCheckeredBackground = true; this.pbThumbnail.FullscreenOnClick = true; this.pbThumbnail.Name = "pbThumbnail"; + this.pbThumbnail.ShowImageSizeLabel = true; // // gbFilters // @@ -149,6 +150,12 @@ private void InitializeComponent() this.gbFilters.Name = "gbFilters"; this.gbFilters.TabStop = false; // + // cbHostFilterSelection + // + this.cbHostFilterSelection.FormattingEnabled = true; + resources.ApplyResources(this.cbHostFilterSelection, "cbHostFilterSelection"); + this.cbHostFilterSelection.Name = "cbHostFilterSelection"; + // // btnRemoveFilters // resources.ApplyResources(this.btnRemoveFilters, "btnRemoveFilters"); @@ -225,12 +232,6 @@ private void InitializeComponent() resources.ApplyResources(this.cbFilenameFilterMethod, "cbFilenameFilterMethod"); this.cbFilenameFilterMethod.Name = "cbFilenameFilterMethod"; // - // cbHostFilterSelection - // - this.cbHostFilterSelection.FormattingEnabled = true; - resources.ApplyResources(this.cbHostFilterSelection, "cbHostFilterSelection"); - this.cbHostFilterSelection.Name = "cbHostFilterSelection"; - // // HistoryForm // this.AcceptButton = this.btnApplyFilters; diff --git a/ShareX.HistoryLib/HistoryForm.resx b/ShareX.HistoryLib/HistoryForm.resx index d5c6a1809..763ce807d 100644 --- a/ShareX.HistoryLib/HistoryForm.resx +++ b/ShareX.HistoryLib/HistoryForm.resx @@ -153,6 +153,30 @@ 0, 0 + + + + + 24 + + + Date + + + 115 + + + Filename + + + 170 + + + URL + + + 230 + Fill @@ -199,7 +223,7 @@ 8, 8 - 412, 368 + 410, 368 1 @@ -568,7 +592,7 @@ 8, 384 - 412, 250 + 410, 250 2 @@ -627,30 +651,6 @@ 0 - - - @Invariant - - 24 - - - Date - - - 115 - - - Filename - - - 170 - - - URL - @Invariant - - 230 - True diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs b/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs index edf63d3ab..96f1dd81c 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs @@ -157,6 +157,7 @@ private void InitializeComponent() this.pbResult.EnableRightClickMenu = true; this.pbResult.FullscreenOnClick = true; this.pbResult.Name = "pbResult"; + this.pbResult.ShowImageSizeLabel = true; this.pbResult.DragDrop += new System.Windows.Forms.DragEventHandler(this.pbResult_DragDrop); this.pbResult.DragEnter += new System.Windows.Forms.DragEventHandler(this.pbResult_DragEnter); // diff --git a/ShareX.ImageEffectsLib/ImageEffectsForm.resx b/ShareX.ImageEffectsLib/ImageEffectsForm.resx index 5892b598a..70c66cc77 100644 --- a/ShareX.ImageEffectsLib/ImageEffectsForm.resx +++ b/ShareX.ImageEffectsLib/ImageEffectsForm.resx @@ -171,6 +171,9 @@ Top, Bottom, Left + + 164 + 8, 40 @@ -192,9 +195,6 @@ 14 - - 164 - 96, 8 @@ -447,6 +447,18 @@ 126, 17 + + 130, 22 + + + From file... + + + 130, 22 + + + From clipboard + 131, 48 @@ -477,18 +489,6 @@ 2 - - 130, 22 - - - From file... - - - 130, 22 - - - From clipboard - True diff --git a/ShareX/Forms/AfterCaptureForm.Designer.cs b/ShareX/Forms/AfterCaptureForm.Designer.cs index d276f248e..cffd4e729 100644 --- a/ShareX/Forms/AfterCaptureForm.Designer.cs +++ b/ShareX/Forms/AfterCaptureForm.Designer.cs @@ -31,20 +31,19 @@ private void InitializeComponent() System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AfterCaptureForm)); this.btnContinue = new System.Windows.Forms.Button(); this.btnCancel = new System.Windows.Forms.Button(); - this.pbImage = new ShareX.HelpersLib.MyPictureBox(); this.btnCopy = new System.Windows.Forms.Button(); this.tcTasks = new System.Windows.Forms.TabControl(); this.tpAfterCapture = new System.Windows.Forms.TabPage(); - this.lvAfterCaptureTasks = new ShareX.HelpersLib.MyListView(); - this.chAfterCapture = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.tpBeforeUpload = new System.Windows.Forms.TabPage(); - this.ucBeforeUpload = new ShareX.BeforeUploadControl(); this.tpAfterUpload = new System.Windows.Forms.TabPage(); - this.lvAfterUploadTasks = new ShareX.HelpersLib.MyListView(); - this.chAfterUpload = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); this.lblFileName = new System.Windows.Forms.Label(); this.txtFileName = new System.Windows.Forms.TextBox(); - this.lblImageSize = new System.Windows.Forms.Label(); + this.lvAfterCaptureTasks = new ShareX.HelpersLib.MyListView(); + this.chAfterCapture = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.ucBeforeUpload = new ShareX.BeforeUploadControl(); + this.lvAfterUploadTasks = new ShareX.HelpersLib.MyListView(); + this.chAfterUpload = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); + this.pbImage = new ShareX.HelpersLib.MyPictureBox(); this.tcTasks.SuspendLayout(); this.tpAfterCapture.SuspendLayout(); this.tpBeforeUpload.SuspendLayout(); @@ -66,17 +65,6 @@ private void InitializeComponent() this.btnCancel.Name = "btnCancel"; this.btnCancel.UseVisualStyleBackColor = true; // - // pbImage - // - resources.ApplyResources(this.pbImage, "pbImage"); - this.pbImage.BackColor = System.Drawing.Color.White; - this.pbImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pbImage.Cursor = System.Windows.Forms.Cursors.Default; - this.pbImage.DrawCheckeredBackground = true; - this.pbImage.EnableRightClickMenu = true; - this.pbImage.FullscreenOnClick = true; - this.pbImage.Name = "pbImage"; - // // btnCopy // resources.ApplyResources(this.btnCopy, "btnCopy"); @@ -101,6 +89,30 @@ private void InitializeComponent() this.tpAfterCapture.Name = "tpAfterCapture"; this.tpAfterCapture.UseVisualStyleBackColor = true; // + // tpBeforeUpload + // + this.tpBeforeUpload.Controls.Add(this.ucBeforeUpload); + resources.ApplyResources(this.tpBeforeUpload, "tpBeforeUpload"); + this.tpBeforeUpload.Name = "tpBeforeUpload"; + this.tpBeforeUpload.UseVisualStyleBackColor = true; + // + // tpAfterUpload + // + this.tpAfterUpload.Controls.Add(this.lvAfterUploadTasks); + resources.ApplyResources(this.tpAfterUpload, "tpAfterUpload"); + this.tpAfterUpload.Name = "tpAfterUpload"; + this.tpAfterUpload.UseVisualStyleBackColor = true; + // + // lblFileName + // + resources.ApplyResources(this.lblFileName, "lblFileName"); + this.lblFileName.Name = "lblFileName"; + // + // txtFileName + // + resources.ApplyResources(this.txtFileName, "txtFileName"); + this.txtFileName.Name = "txtFileName"; + // // lvAfterCaptureTasks // this.lvAfterCaptureTasks.AutoFillColumn = true; @@ -118,25 +130,11 @@ private void InitializeComponent() this.lvAfterCaptureTasks.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvAfterCaptureTasks_ItemSelectionChanged); this.lvAfterCaptureTasks.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lvAfterCaptureTasks_MouseDown); // - // tpBeforeUpload - // - this.tpBeforeUpload.Controls.Add(this.ucBeforeUpload); - resources.ApplyResources(this.tpBeforeUpload, "tpBeforeUpload"); - this.tpBeforeUpload.Name = "tpBeforeUpload"; - this.tpBeforeUpload.UseVisualStyleBackColor = true; - // // ucBeforeUpload // resources.ApplyResources(this.ucBeforeUpload, "ucBeforeUpload"); this.ucBeforeUpload.Name = "ucBeforeUpload"; // - // tpAfterUpload - // - this.tpAfterUpload.Controls.Add(this.lvAfterUploadTasks); - resources.ApplyResources(this.tpAfterUpload, "tpAfterUpload"); - this.tpAfterUpload.Name = "tpAfterUpload"; - this.tpAfterUpload.UseVisualStyleBackColor = true; - // // lvAfterUploadTasks // this.lvAfterUploadTasks.AutoFillColumn = true; @@ -154,22 +152,17 @@ private void InitializeComponent() this.lvAfterUploadTasks.ItemSelectionChanged += new System.Windows.Forms.ListViewItemSelectionChangedEventHandler(this.lvAfterUploadTasks_ItemSelectionChanged); this.lvAfterUploadTasks.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lvAfterUploadTasks_MouseDown); // - // lblFileName + // pbImage // - resources.ApplyResources(this.lblFileName, "lblFileName"); - this.lblFileName.Name = "lblFileName"; - // - // txtFileName - // - resources.ApplyResources(this.txtFileName, "txtFileName"); - this.txtFileName.Name = "txtFileName"; - // - // lblImageSize - // - resources.ApplyResources(this.lblImageSize, "lblImageSize"); - this.lblImageSize.BackColor = System.Drawing.Color.White; - this.lblImageSize.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.lblImageSize.Name = "lblImageSize"; + resources.ApplyResources(this.pbImage, "pbImage"); + this.pbImage.BackColor = System.Drawing.Color.White; + this.pbImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.pbImage.Cursor = System.Windows.Forms.Cursors.Default; + this.pbImage.DrawCheckeredBackground = true; + this.pbImage.EnableRightClickMenu = true; + this.pbImage.FullscreenOnClick = true; + this.pbImage.Name = "pbImage"; + this.pbImage.ShowImageSizeLabel = true; // // AfterCaptureForm // @@ -177,7 +170,6 @@ private void InitializeComponent() resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.CancelButton = this.btnCancel; - this.Controls.Add(this.lblImageSize); this.Controls.Add(this.txtFileName); this.Controls.Add(this.lblFileName); this.Controls.Add(this.tcTasks); @@ -215,6 +207,5 @@ private void InitializeComponent() private System.Windows.Forms.ColumnHeader chAfterCapture; private HelpersLib.MyListView lvAfterUploadTasks; private System.Windows.Forms.ColumnHeader chAfterUpload; - private System.Windows.Forms.Label lblImageSize; } } \ No newline at end of file diff --git a/ShareX/Forms/AfterCaptureForm.cs b/ShareX/Forms/AfterCaptureForm.cs index 5f0c0510e..d4cfa3cfc 100644 --- a/ShareX/Forms/AfterCaptureForm.cs +++ b/ShareX/Forms/AfterCaptureForm.cs @@ -59,8 +59,6 @@ public AfterCaptureForm(Image img, TaskSettings taskSettings) { pbImage.LoadImage(img); btnCopy.Enabled = true; - lblImageSize.Visible = true; - lblImageSize.Text = $"{img.Width} x {img.Height}"; } FileName = TaskHelpers.GetFilename(TaskSettings, null, img); diff --git a/ShareX/Forms/AfterCaptureForm.resx b/ShareX/Forms/AfterCaptureForm.resx index bbd7c1850..0e1881b56 100644 --- a/ShareX/Forms/AfterCaptureForm.resx +++ b/ShareX/Forms/AfterCaptureForm.resx @@ -148,7 +148,7 @@ $this - 6 + 5 Bottom, Left @@ -178,32 +178,8 @@ $this - 5 - - - Top, Bottom, Left, Right - - - 320, 8 - - - 456, 410 - - 4 - - pbImage - - - ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 7 - Bottom, Left @@ -235,7 +211,7 @@ $this - 4 + 3 Top, Bottom, Left @@ -310,7 +286,7 @@ ucBeforeUpload - ShareX.BeforeUploadControl, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null + ShareX.BeforeUploadControl, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null tpBeforeUpload @@ -418,7 +394,7 @@ $this - 3 + 2 Bottom, Left @@ -451,7 +427,7 @@ $this - 2 + 1 Bottom, Left @@ -475,43 +451,31 @@ $this - 1 + 0 - - Top + + Top, Bottom, Left, Right - - Arial, 8.25pt + + 320, 8 - - NoControl + + 456, 410 - - 508, 3 + + 4 - - 81, 18 + + pbImage - - 6 + + ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - MiddleCenter - - - False - - - lblImageSize - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - + $this - - 0 + + 6 True @@ -522,6 +486,9 @@ 784, 426 + + NoControl + 800, 445 diff --git a/ShareX/Forms/AfterUploadForm.designer.cs b/ShareX/Forms/AfterUploadForm.designer.cs index ba9f95f1b..e48c81b6a 100644 --- a/ShareX/Forms/AfterUploadForm.designer.cs +++ b/ShareX/Forms/AfterUploadForm.designer.cs @@ -52,6 +52,7 @@ private void InitializeComponent() this.pbPreview.EnableRightClickMenu = true; this.pbPreview.FullscreenOnClick = true; this.pbPreview.Name = "pbPreview"; + this.pbPreview.ShowImageSizeLabel = true; // // btnCopyImage // diff --git a/ShareX/Forms/BeforeUploadForm.Designer.cs b/ShareX/Forms/BeforeUploadForm.Designer.cs index 542e74a3c..8be429c9c 100644 --- a/ShareX/Forms/BeforeUploadForm.Designer.cs +++ b/ShareX/Forms/BeforeUploadForm.Designer.cs @@ -65,6 +65,7 @@ private void InitializeComponent() this.pbPreview.EnableRightClickMenu = true; this.pbPreview.FullscreenOnClick = true; this.pbPreview.Name = "pbPreview"; + this.pbPreview.ShowImageSizeLabel = true; // // ucBeforeUpload // diff --git a/ShareX/Forms/BeforeUploadForm.resx b/ShareX/Forms/BeforeUploadForm.resx index 5d4a46dc3..efda169e0 100644 --- a/ShareX/Forms/BeforeUploadForm.resx +++ b/ShareX/Forms/BeforeUploadForm.resx @@ -256,7 +256,7 @@ ucBeforeUpload - ShareX.BeforeUploadControl, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null + ShareX.BeforeUploadControl, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null $this diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 58cdc54a7..6a75128f2 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -337,6 +337,7 @@ private void InitializeComponent() this.pbPreview.EnableRightClickMenu = true; this.pbPreview.FullscreenOnClick = true; this.pbPreview.Name = "pbPreview"; + this.pbPreview.ShowImageSizeLabel = true; // // tsMain //