mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 11:10:23 +12:00
Added image count
This commit is contained in:
Jaex
parent
58dce8e309
commit
eb6ac4e05e
|
|
@ -49,6 +49,7 @@ private void InitializeComponent()
|
|||
this.lblWrapAfter = new System.Windows.Forms.Label();
|
||||
this.nudWrapAfter = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblWrapAfterImages = new System.Windows.Forms.Label();
|
||||
this.lblImageCount = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudSpace)).BeginInit();
|
||||
this.flpOrientation.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudWrapAfter)).BeginInit();
|
||||
|
|
@ -200,6 +201,11 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this.lblWrapAfterImages, "lblWrapAfterImages");
|
||||
this.lblWrapAfterImages.Name = "lblWrapAfterImages";
|
||||
//
|
||||
// lblImageCount
|
||||
//
|
||||
resources.ApplyResources(this.lblImageCount, "lblImageCount");
|
||||
this.lblImageCount.Name = "lblImageCount";
|
||||
//
|
||||
// ImageCombinerForm
|
||||
//
|
||||
this.AcceptButton = this.btnCombine;
|
||||
|
|
@ -207,6 +213,7 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.Controls.Add(this.lblImageCount);
|
||||
this.Controls.Add(this.lblWrapAfterImages);
|
||||
this.Controls.Add(this.nudWrapAfter);
|
||||
this.Controls.Add(this.lblWrapAfter);
|
||||
|
|
@ -258,5 +265,6 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.Label lblWrapAfter;
|
||||
private System.Windows.Forms.NumericUpDown nudWrapAfter;
|
||||
private System.Windows.Forms.Label lblWrapAfterImages;
|
||||
private System.Windows.Forms.Label lblImageCount;
|
||||
}
|
||||
}
|
||||
|
|
@ -61,6 +61,19 @@ public ImageCombinerForm(ImageCombinerOptions options)
|
|||
cbAutoFillBackground.Checked = Options.AutoFillBackground;
|
||||
}
|
||||
|
||||
public ImageCombinerForm(ImageCombinerOptions options, IEnumerable<string> imageFiles) : this(options)
|
||||
{
|
||||
if (imageFiles != null)
|
||||
{
|
||||
foreach (string image in imageFiles)
|
||||
{
|
||||
lvImages.Items.Add(image);
|
||||
}
|
||||
|
||||
lblImageCount.Text = lvImages.Items.Count.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateOrientation()
|
||||
{
|
||||
if (rbOrientationHorizontal.Checked)
|
||||
|
|
@ -93,17 +106,6 @@ private void UpdateAlignmentComboBox()
|
|||
cbAlignment.SelectedIndex = (int)Options.Alignment;
|
||||
}
|
||||
|
||||
public ImageCombinerForm(ImageCombinerOptions options, IEnumerable<string> imageFiles) : this(options)
|
||||
{
|
||||
if (imageFiles != null)
|
||||
{
|
||||
foreach (string image in imageFiles)
|
||||
{
|
||||
lvImages.Items.Add(image);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void btnAdd_Click(object sender, EventArgs e)
|
||||
{
|
||||
string[] images = ImageHelpers.OpenImageFileDialog(true);
|
||||
|
|
@ -114,6 +116,8 @@ private void btnAdd_Click(object sender, EventArgs e)
|
|||
{
|
||||
lvImages.Items.Add(image);
|
||||
}
|
||||
|
||||
lblImageCount.Text = lvImages.Items.Count.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -125,6 +129,8 @@ private void btnRemove_Click(object sender, EventArgs e)
|
|||
{
|
||||
lvImages.Items.Remove(lvi);
|
||||
}
|
||||
|
||||
lblImageCount.Text = lvImages.Items.Count.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -228,6 +234,8 @@ private void ImageCombinerForm_DragDrop(object sender, DragEventArgs e)
|
|||
{
|
||||
lvImages.Items.Add(file);
|
||||
}
|
||||
|
||||
lblImageCount.Text = lvImages.Items.Count.ToString();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
<value>8, 8</value>
|
||||
</data>
|
||||
<data name="btnAdd.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 23</value>
|
||||
<value>120, 25</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="btnAdd.TabIndex" type="System.Int32, mscorlib">
|
||||
|
|
@ -141,13 +141,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAdd.ZOrder" xml:space="preserve">
|
||||
<value>16</value>
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>136, 8</value>
|
||||
</data>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 23</value>
|
||||
<value>120, 25</value>
|
||||
</data>
|
||||
<data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>1</value>
|
||||
|
|
@ -165,13 +165,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>15</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="btnMoveUp.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>264, 8</value>
|
||||
</data>
|
||||
<data name="btnMoveUp.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 23</value>
|
||||
<value>120, 25</value>
|
||||
</data>
|
||||
<data name="btnMoveUp.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>2</value>
|
||||
|
|
@ -189,13 +189,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnMoveUp.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="btnMoveDown.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>392, 8</value>
|
||||
</data>
|
||||
<data name="btnMoveDown.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 23</value>
|
||||
<value>120, 25</value>
|
||||
</data>
|
||||
<data name="btnMoveDown.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>3</value>
|
||||
|
|
@ -213,18 +213,12 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnMoveDown.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>14</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="lvImages.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="chFilepath.Text" xml:space="preserve">
|
||||
<value>Image file path</value>
|
||||
</data>
|
||||
<data name="chFilepath.Width" type="System.Int32, mscorlib">
|
||||
<value>487</value>
|
||||
</data>
|
||||
<data name="lvImages.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>8, 40</value>
|
||||
</data>
|
||||
|
|
@ -244,7 +238,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lvImages.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="chFilepath.Text" xml:space="preserve">
|
||||
<value>Image file path</value>
|
||||
</data>
|
||||
<data name="chFilepath.Width" type="System.Int32, mscorlib">
|
||||
<value>487</value>
|
||||
</data>
|
||||
<data name="btnCombine.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left, Right</value>
|
||||
|
|
@ -271,7 +271,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCombine.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="lblSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -301,7 +301,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblSpace.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="nudSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -328,7 +328,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>nudSpace.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="lblOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -358,7 +358,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblOrientation.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="lblSpacePixel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -388,7 +388,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblSpacePixel.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="lblImageAlignment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -418,7 +418,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblImageAlignment.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="cbAlignment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -442,7 +442,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbAlignment.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -450,6 +450,51 @@
|
|||
<data name="flpOrientation.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationHorizontal.Name" xml:space="preserve">
|
||||
<value>rbOrientationHorizontal</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationHorizontal.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationHorizontal.Parent" xml:space="preserve">
|
||||
<value>flpOrientation</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationHorizontal.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationVertical.Name" xml:space="preserve">
|
||||
<value>rbOrientationVertical</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationVertical.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationVertical.Parent" xml:space="preserve">
|
||||
<value>flpOrientation</value>
|
||||
</data>
|
||||
<data name=">>rbOrientationVertical.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 371</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>141, 23</value>
|
||||
</data>
|
||||
<data name="flpOrientation.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Name" xml:space="preserve">
|
||||
<value>flpOrientation</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="rbOrientationHorizontal.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
|
|
@ -507,27 +552,6 @@
|
|||
<data name=">>rbOrientationVertical.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 371</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>141, 23</value>
|
||||
</data>
|
||||
<data name="flpOrientation.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Name" xml:space="preserve">
|
||||
<value>flpOrientation</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="cbAutoFillBackground.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
|
|
@ -556,7 +580,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbAutoFillBackground.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -586,7 +610,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfter.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -613,7 +637,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>nudWrapAfter.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -643,6 +667,36 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfterImages.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblImageCount.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
</data>
|
||||
<data name="lblImageCount.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>472, 368</value>
|
||||
</data>
|
||||
<data name="lblImageCount.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 24</value>
|
||||
</data>
|
||||
<data name="lblImageCount.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="lblImageCount.Text" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="lblImageCount.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
|
||||
<value>TopRight</value>
|
||||
</data>
|
||||
<data name=">>lblImageCount.Name" xml:space="preserve">
|
||||
<value>lblImageCount</value>
|
||||
</data>
|
||||
<data name=">>lblImageCount.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=">>lblImageCount.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblImageCount.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
|
|
@ -654,6 +708,9 @@
|
|||
<data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>521, 536</value>
|
||||
</data>
|
||||
<data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
|
||||
<value>537, 400</value>
|
||||
</data>
|
||||
<data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
|
||||
<value>CenterScreen</value>
|
||||
</data>
|
||||
|
|
|
|||
Loading…
Reference in a new issue