mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Added ShowImageSizeLabel to picture box control so every picture box can show image size on mouse hover
This commit is contained in:
parent
8a7a6fff1d
commit
debb488dfc
16 changed files with 193 additions and 168 deletions
10
ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs
generated
10
ShareX.HelpersLib/Controls/MyPictureBox.Designer.cs
generated
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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;
|
||||
|
|
|
@ -148,7 +148,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblStatus.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="pbMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
|
@ -175,17 +175,11 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pbMain.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<metadata name="cmsMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
</metadata>
|
||||
<data name="tsmiCopyImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>113, 22</value>
|
||||
</data>
|
||||
<data name="tsmiCopyImage.Text" xml:space="preserve">
|
||||
<value>Copy image</value>
|
||||
</data>
|
||||
<data name="cmsMenu.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>114, 26</value>
|
||||
</data>
|
||||
|
@ -195,6 +189,48 @@
|
|||
<data name=">>cmsMenu.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name="tsmiCopyImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>113, 22</value>
|
||||
</data>
|
||||
<data name="tsmiCopyImage.Text" xml:space="preserve">
|
||||
<value>Copy image</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Arial, 8.25pt</value>
|
||||
</data>
|
||||
<data name="lblImageSize.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>35, 133</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>81, 18</value>
|
||||
</data>
|
||||
<data name="lblImageSize.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="lblImageSize.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleCenter</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Name" xml:space="preserve">
|
||||
<value>lblImageSize</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
|
@ -87,6 +87,7 @@ private void InitializeComponent()
|
|||
this.pbClipboard.DrawCheckeredBackground = true;
|
||||
this.pbClipboard.FullscreenOnClick = true;
|
||||
this.pbClipboard.Name = "pbClipboard";
|
||||
this.pbClipboard.ShowImageSizeLabel = true;
|
||||
//
|
||||
// ClipboardContentViewer
|
||||
//
|
||||
|
|
|
@ -336,9 +336,6 @@
|
|||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>420, 360</value>
|
||||
</data>
|
||||
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>375, 375</value>
|
||||
</data>
|
||||
|
|
15
ShareX.HistoryLib/HistoryForm.Designer.cs
generated
15
ShareX.HistoryLib/HistoryForm.Designer.cs
generated
|
@ -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;
|
||||
|
|
|
@ -153,6 +153,30 @@
|
|||
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="chIcon.Text" xml:space="preserve">
|
||||
<value />
|
||||
</data>
|
||||
<data name="chIcon.Width" type="System.Int32, mscorlib">
|
||||
<value>24</value>
|
||||
</data>
|
||||
<data name="chDateTime.Text" xml:space="preserve">
|
||||
<value>Date</value>
|
||||
</data>
|
||||
<data name="chDateTime.Width" type="System.Int32, mscorlib">
|
||||
<value>115</value>
|
||||
</data>
|
||||
<data name="chFilename.Text" xml:space="preserve">
|
||||
<value>Filename</value>
|
||||
</data>
|
||||
<data name="chFilename.Width" type="System.Int32, mscorlib">
|
||||
<value>170</value>
|
||||
</data>
|
||||
<data name="chURL.Text" xml:space="preserve">
|
||||
<value>URL</value>
|
||||
</data>
|
||||
<data name="chURL.Width" type="System.Int32, mscorlib">
|
||||
<value>230</value>
|
||||
</data>
|
||||
<data name="lvHistory.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
|
@ -199,7 +223,7 @@
|
|||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="pbThumbnail.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>412, 368</value>
|
||||
<value>410, 368</value>
|
||||
</data>
|
||||
<data name="pbThumbnail.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
@ -568,7 +592,7 @@
|
|||
<value>8, 384</value>
|
||||
</data>
|
||||
<data name="gbFilters.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>412, 250</value>
|
||||
<value>410, 250</value>
|
||||
</data>
|
||||
<data name="gbFilters.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
@ -627,30 +651,6 @@
|
|||
<data name=">>scMain.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="chIcon.Text" xml:space="preserve">
|
||||
<value />
|
||||
<comment>@Invariant</comment></data>
|
||||
<data name="chIcon.Width" type="System.Int32, mscorlib">
|
||||
<value>24</value>
|
||||
</data>
|
||||
<data name="chDateTime.Text" xml:space="preserve">
|
||||
<value>Date</value>
|
||||
</data>
|
||||
<data name="chDateTime.Width" type="System.Int32, mscorlib">
|
||||
<value>115</value>
|
||||
</data>
|
||||
<data name="chFilename.Text" xml:space="preserve">
|
||||
<value>Filename</value>
|
||||
</data>
|
||||
<data name="chFilename.Width" type="System.Int32, mscorlib">
|
||||
<value>170</value>
|
||||
</data>
|
||||
<data name="chURL.Text" xml:space="preserve">
|
||||
<value>URL</value>
|
||||
<comment>@Invariant</comment></data>
|
||||
<data name="chURL.Width" type="System.Int32, mscorlib">
|
||||
<value>230</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
|
@ -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);
|
||||
//
|
||||
|
|
|
@ -171,6 +171,9 @@
|
|||
<data name="lvEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left</value>
|
||||
</data>
|
||||
<data name="chEffect.Width" type="System.Int32, mscorlib">
|
||||
<value>164</value>
|
||||
</data>
|
||||
<data name="lvEffects.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 40</value>
|
||||
</data>
|
||||
|
@ -192,9 +195,6 @@
|
|||
<data name=">>lvEffects.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="chEffect.Width" type="System.Int32, mscorlib">
|
||||
<value>164</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>96, 8</value>
|
||||
</data>
|
||||
|
@ -447,6 +447,18 @@
|
|||
<metadata name="cmsLoadImage.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>126, 17</value>
|
||||
</metadata>
|
||||
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromFile.Text" xml:space="preserve">
|
||||
<value>From file...</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
|
||||
<value>From clipboard</value>
|
||||
</data>
|
||||
<data name="cmsLoadImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>131, 48</value>
|
||||
</data>
|
||||
|
@ -477,18 +489,6 @@
|
|||
<data name=">>mbLoadImage.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromFile.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromFile.Text" xml:space="preserve">
|
||||
<value>From file...</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>130, 22</value>
|
||||
</data>
|
||||
<data name="tsmiLoadImageFromClipboard.Text" xml:space="preserve">
|
||||
<value>From clipboard</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
</metadata>
|
||||
|
|
89
ShareX/Forms/AfterCaptureForm.Designer.cs
generated
89
ShareX/Forms/AfterCaptureForm.Designer.cs
generated
|
@ -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;
|
||||
}
|
||||
}
|
|
@ -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);
|
||||
|
|
|
@ -148,7 +148,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnContinue.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="btnCancel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
@ -178,32 +178,8 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCancel.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="pbImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="pbImage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>320, 8</value>
|
||||
</data>
|
||||
<data name="pbImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>456, 410</value>
|
||||
</data>
|
||||
<data name="pbImage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name=">>pbImage.Name" xml:space="preserve">
|
||||
<value>pbImage</value>
|
||||
</data>
|
||||
<data name=">>pbImage.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>pbImage.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pbImage.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="btnCopy.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
|
@ -235,7 +211,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCopy.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="tcTasks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left</value>
|
||||
|
@ -310,7 +286,7 @@
|
|||
<value>ucBeforeUpload</value>
|
||||
</data>
|
||||
<data name=">>ucBeforeUpload.Type" xml:space="preserve">
|
||||
<value>ShareX.BeforeUploadControl, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.BeforeUploadControl, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>ucBeforeUpload.Parent" xml:space="preserve">
|
||||
<value>tpBeforeUpload</value>
|
||||
|
@ -418,7 +394,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>tcTasks.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblFileName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
@ -451,7 +427,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblFileName.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="txtFileName.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
@ -475,43 +451,31 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>txtFileName.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top</value>
|
||||
<data name="pbImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Font" type="System.Drawing.Font, System.Drawing">
|
||||
<value>Arial, 8.25pt</value>
|
||||
<data name="pbImage.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>320, 8</value>
|
||||
</data>
|
||||
<data name="lblImageSize.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
<data name="pbImage.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>456, 410</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>508, 3</value>
|
||||
<data name="pbImage.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>81, 18</value>
|
||||
<data name=">>pbImage.Name" xml:space="preserve">
|
||||
<value>pbImage</value>
|
||||
</data>
|
||||
<data name="lblImageSize.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
<data name=">>pbImage.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name="lblImageSize.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>MiddleCenter</value>
|
||||
</data>
|
||||
<data name="lblImageSize.Visible" type="System.Boolean, mscorlib">
|
||||
<value>False</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Name" xml:space="preserve">
|
||||
<value>lblImageSize</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.Parent" xml:space="preserve">
|
||||
<data name=">>pbImage.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblImageSize.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<data name=">>pbImage.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
|
@ -522,6 +486,9 @@
|
|||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>784, 426</value>
|
||||
</data>
|
||||
<data name="$this.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>800, 445</value>
|
||||
</data>
|
||||
|
|
1
ShareX/Forms/AfterUploadForm.designer.cs
generated
1
ShareX/Forms/AfterUploadForm.designer.cs
generated
|
@ -52,6 +52,7 @@ private void InitializeComponent()
|
|||
this.pbPreview.EnableRightClickMenu = true;
|
||||
this.pbPreview.FullscreenOnClick = true;
|
||||
this.pbPreview.Name = "pbPreview";
|
||||
this.pbPreview.ShowImageSizeLabel = true;
|
||||
//
|
||||
// btnCopyImage
|
||||
//
|
||||
|
|
1
ShareX/Forms/BeforeUploadForm.Designer.cs
generated
1
ShareX/Forms/BeforeUploadForm.Designer.cs
generated
|
@ -65,6 +65,7 @@ private void InitializeComponent()
|
|||
this.pbPreview.EnableRightClickMenu = true;
|
||||
this.pbPreview.FullscreenOnClick = true;
|
||||
this.pbPreview.Name = "pbPreview";
|
||||
this.pbPreview.ShowImageSizeLabel = true;
|
||||
//
|
||||
// ucBeforeUpload
|
||||
//
|
||||
|
|
|
@ -256,7 +256,7 @@
|
|||
<value>ucBeforeUpload</value>
|
||||
</data>
|
||||
<data name=">>ucBeforeUpload.Type" xml:space="preserve">
|
||||
<value>ShareX.BeforeUploadControl, ShareX, Version=10.7.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.BeforeUploadControl, ShareX, Version=10.9.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>ucBeforeUpload.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
|
|
1
ShareX/Forms/MainForm.Designer.cs
generated
1
ShareX/Forms/MainForm.Designer.cs
generated
|
@ -337,6 +337,7 @@ private void InitializeComponent()
|
|||
this.pbPreview.EnableRightClickMenu = true;
|
||||
this.pbPreview.FullscreenOnClick = true;
|
||||
this.pbPreview.Name = "pbPreview";
|
||||
this.pbPreview.ShowImageSizeLabel = true;
|
||||
//
|
||||
// tsMain
|
||||
//
|
||||
|
|
Loading…
Reference in a new issue