mirror of
https://github.com/ShareX/ShareX.git
synced 2024-06-28 11:10:23 +12:00
Added WrapAfter option to ImageCombinerForm
This commit is contained in:
Jaex
parent
6af7de1a22
commit
58dce8e309
32
ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs
generated
32
ShareX.MediaLib/Forms/ImageCombinerForm.Designer.cs
generated
|
|
@ -46,8 +46,12 @@ private void InitializeComponent()
|
|||
this.rbOrientationHorizontal = new System.Windows.Forms.RadioButton();
|
||||
this.rbOrientationVertical = new System.Windows.Forms.RadioButton();
|
||||
this.cbAutoFillBackground = new System.Windows.Forms.CheckBox();
|
||||
this.lblWrapAfter = new System.Windows.Forms.Label();
|
||||
this.nudWrapAfter = new System.Windows.Forms.NumericUpDown();
|
||||
this.lblWrapAfterImages = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudSpace)).BeginInit();
|
||||
this.flpOrientation.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudWrapAfter)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// btnAdd
|
||||
|
|
@ -175,6 +179,27 @@ private void InitializeComponent()
|
|||
this.cbAutoFillBackground.UseVisualStyleBackColor = true;
|
||||
this.cbAutoFillBackground.CheckedChanged += new System.EventHandler(this.cbAutoFillBackground_CheckedChanged);
|
||||
//
|
||||
// lblWrapAfter
|
||||
//
|
||||
resources.ApplyResources(this.lblWrapAfter, "lblWrapAfter");
|
||||
this.lblWrapAfter.Name = "lblWrapAfter";
|
||||
//
|
||||
// nudWrapAfter
|
||||
//
|
||||
resources.ApplyResources(this.nudWrapAfter, "nudWrapAfter");
|
||||
this.nudWrapAfter.Maximum = new decimal(new int[] {
|
||||
1000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.nudWrapAfter.Name = "nudWrapAfter";
|
||||
this.nudWrapAfter.ValueChanged += new System.EventHandler(this.nudWrapAfter_ValueChanged);
|
||||
//
|
||||
// lblWrapAfterImages
|
||||
//
|
||||
resources.ApplyResources(this.lblWrapAfterImages, "lblWrapAfterImages");
|
||||
this.lblWrapAfterImages.Name = "lblWrapAfterImages";
|
||||
//
|
||||
// ImageCombinerForm
|
||||
//
|
||||
this.AcceptButton = this.btnCombine;
|
||||
|
|
@ -182,6 +207,9 @@ private void InitializeComponent()
|
|||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.Controls.Add(this.lblWrapAfterImages);
|
||||
this.Controls.Add(this.nudWrapAfter);
|
||||
this.Controls.Add(this.lblWrapAfter);
|
||||
this.Controls.Add(this.cbAutoFillBackground);
|
||||
this.Controls.Add(this.flpOrientation);
|
||||
this.Controls.Add(this.cbAlignment);
|
||||
|
|
@ -202,6 +230,7 @@ private void InitializeComponent()
|
|||
((System.ComponentModel.ISupportInitialize)(this.nudSpace)).EndInit();
|
||||
this.flpOrientation.ResumeLayout(false);
|
||||
this.flpOrientation.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.nudWrapAfter)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -226,5 +255,8 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.RadioButton rbOrientationHorizontal;
|
||||
private System.Windows.Forms.RadioButton rbOrientationVertical;
|
||||
private System.Windows.Forms.CheckBox cbAutoFillBackground;
|
||||
private System.Windows.Forms.Label lblWrapAfter;
|
||||
private System.Windows.Forms.NumericUpDown nudWrapAfter;
|
||||
private System.Windows.Forms.Label lblWrapAfterImages;
|
||||
}
|
||||
}
|
||||
|
|
@ -57,6 +57,7 @@ public ImageCombinerForm(ImageCombinerOptions options)
|
|||
|
||||
UpdateAlignmentComboBox();
|
||||
nudSpace.SetValue(Options.Space);
|
||||
nudWrapAfter.SetValue(Options.WrapAfter);
|
||||
cbAutoFillBackground.Checked = Options.AutoFillBackground;
|
||||
}
|
||||
|
||||
|
|
@ -165,6 +166,11 @@ private void nudSpace_ValueChanged(object sender, EventArgs e)
|
|||
Options.Space = (int)nudSpace.Value;
|
||||
}
|
||||
|
||||
private void nudWrapAfter_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
Options.WrapAfter = (int)nudWrapAfter.Value;
|
||||
}
|
||||
|
||||
private void cbAutoFillBackground_CheckedChanged(object sender, EventArgs e)
|
||||
{
|
||||
Options.AutoFillBackground = cbAutoFillBackground.Checked;
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAdd.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>136, 8</value>
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="btnMoveUp.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>264, 8</value>
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnMoveUp.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="btnMoveDown.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>392, 8</value>
|
||||
|
|
@ -213,7 +213,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnMoveDown.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>13</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">
|
||||
|
|
@ -229,7 +229,7 @@
|
|||
<value>8, 40</value>
|
||||
</data>
|
||||
<data name="lvImages.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>504, 344</value>
|
||||
<value>504, 320</value>
|
||||
</data>
|
||||
<data name="lvImages.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>4</value>
|
||||
|
|
@ -238,13 +238,13 @@
|
|||
<value>lvImages</value>
|
||||
</data>
|
||||
<data name=">>lvImages.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=13.7.2.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<value>ShareX.HelpersLib.MyListView, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>lvImages.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lvImages.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="btnCombine.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left, Right</value>
|
||||
|
|
@ -256,7 +256,7 @@
|
|||
<value>504, 31</value>
|
||||
</data>
|
||||
<data name="btnCombine.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>13</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="btnCombine.Text" xml:space="preserve">
|
||||
<value>Combine images and save/upload depending on after capture settings</value>
|
||||
|
|
@ -271,7 +271,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnCombine.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="lblSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -280,7 +280,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 448</value>
|
||||
<value>5, 424</value>
|
||||
</data>
|
||||
<data name="lblSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>121, 13</value>
|
||||
|
|
@ -301,13 +301,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblSpace.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="nudSpace.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="nudSpace.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 444</value>
|
||||
<value>200, 420</value>
|
||||
</data>
|
||||
<data name="nudSpace.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>64, 20</value>
|
||||
|
|
@ -328,7 +328,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>nudSpace.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="lblOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -337,7 +337,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblOrientation.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 400</value>
|
||||
<value>5, 376</value>
|
||||
</data>
|
||||
<data name="lblOrientation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>103, 13</value>
|
||||
|
|
@ -358,7 +358,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblOrientation.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="lblSpacePixel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblSpacePixel.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>272, 448</value>
|
||||
<value>272, 424</value>
|
||||
</data>
|
||||
<data name="lblSpacePixel.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>33, 13</value>
|
||||
|
|
@ -388,7 +388,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblSpacePixel.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="lblImageAlignment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -397,7 +397,7 @@
|
|||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblImageAlignment.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 424</value>
|
||||
<value>5, 400</value>
|
||||
</data>
|
||||
<data name="lblImageAlignment.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>87, 13</value>
|
||||
|
|
@ -418,13 +418,13 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblImageAlignment.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="cbAlignment.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="cbAlignment.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 420</value>
|
||||
<value>200, 396</value>
|
||||
</data>
|
||||
<data name="cbAlignment.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>120, 21</value>
|
||||
|
|
@ -442,7 +442,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbAlignment.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -508,7 +508,7 @@
|
|||
<value>1</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 395</value>
|
||||
<value>200, 371</value>
|
||||
</data>
|
||||
<data name="flpOrientation.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>141, 23</value>
|
||||
|
|
@ -526,7 +526,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpOrientation.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="cbAutoFillBackground.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -541,7 +541,7 @@
|
|||
<value>120, 17</value>
|
||||
</data>
|
||||
<data name="cbAutoFillBackground.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>12</value>
|
||||
<value>15</value>
|
||||
</data>
|
||||
<data name="cbAutoFillBackground.Text" xml:space="preserve">
|
||||
<value>Auto fill background</value>
|
||||
|
|
@ -556,6 +556,93 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbAutoFillBackground.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>5, 448</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>60, 13</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="lblWrapAfter.Text" xml:space="preserve">
|
||||
<value>Wrap after:</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfter.Name" xml:space="preserve">
|
||||
<value>lblWrapAfter</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfter.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=">>lblWrapAfter.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfter.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>200, 444</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>64, 20</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="nudWrapAfter.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
|
||||
<value>Center</value>
|
||||
</data>
|
||||
<data name=">>nudWrapAfter.Name" xml:space="preserve">
|
||||
<value>nudWrapAfter</value>
|
||||
</data>
|
||||
<data name=">>nudWrapAfter.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>nudWrapAfter.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>nudWrapAfter.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>272, 448</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>40, 13</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="lblWrapAfterImages.Text" xml:space="preserve">
|
||||
<value>images</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfterImages.Name" xml:space="preserve">
|
||||
<value>lblWrapAfterImages</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfterImages.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=">>lblWrapAfterImages.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblWrapAfterImages.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">
|
||||
|
|
|
|||
Loading…
Reference in a new issue