mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Use split container in image effects form
This commit is contained in:
Jaex
parent
442391b272
commit
dea9c7daf2
3 changed files with 133 additions and 49 deletions
|
|
@ -132,6 +132,12 @@ private static void ApplyCustomThemeToControl(Control control)
|
|||
lv.BackColor = Theme.LightBackgroundColor;
|
||||
lv.SupportCustomTheme();
|
||||
return;
|
||||
case SplitContainerCustomSplitter sccs:
|
||||
sccs.SplitterColor = Theme.BackgroundColor;
|
||||
sccs.SplitterLineColor = Theme.BorderColor;
|
||||
sccs.Panel1.BackColor = Theme.BackgroundColor;
|
||||
sccs.Panel2.BackColor = Theme.BackgroundColor;
|
||||
break;
|
||||
case SplitContainer sc:
|
||||
sc.Panel1.BackColor = Theme.BackgroundColor;
|
||||
sc.Panel2.BackColor = Theme.BackgroundColor;
|
||||
|
|
|
|||
30
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
30
ShareX.ImageEffectsLib/ImageEffectsForm.Designer.cs
generated
|
|
@ -57,7 +57,12 @@ private void InitializeComponent()
|
|||
this.btnDuplicatePreset = new System.Windows.Forms.Button();
|
||||
this.lblPresets = new System.Windows.Forms.Label();
|
||||
this.btnPackager = new System.Windows.Forms.Button();
|
||||
this.scMain = new ShareX.HelpersLib.SplitContainerCustomSplitter();
|
||||
this.cmsLoadImage.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
|
||||
this.scMain.Panel1.SuspendLayout();
|
||||
this.scMain.Panel2.SuspendLayout();
|
||||
this.scMain.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// pgSettings
|
||||
|
|
@ -140,9 +145,9 @@ private void InitializeComponent()
|
|||
//
|
||||
// pbResult
|
||||
//
|
||||
resources.ApplyResources(this.pbResult, "pbResult");
|
||||
this.pbResult.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.pbResult.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
resources.ApplyResources(this.pbResult, "pbResult");
|
||||
this.pbResult.DrawCheckeredBackground = true;
|
||||
this.pbResult.EnableRightClickMenu = true;
|
||||
this.pbResult.FullscreenOnClick = true;
|
||||
|
|
@ -267,12 +272,28 @@ private void InitializeComponent()
|
|||
this.btnPackager.UseVisualStyleBackColor = true;
|
||||
this.btnPackager.Click += new System.EventHandler(this.btnPackager_Click);
|
||||
//
|
||||
// scMain
|
||||
//
|
||||
resources.ApplyResources(this.scMain, "scMain");
|
||||
this.scMain.Name = "scMain";
|
||||
//
|
||||
// scMain.Panel1
|
||||
//
|
||||
this.scMain.Panel1.Controls.Add(this.pgSettings);
|
||||
//
|
||||
// scMain.Panel2
|
||||
//
|
||||
this.scMain.Panel2.Controls.Add(this.pbResult);
|
||||
this.scMain.SplitterColor = System.Drawing.Color.White;
|
||||
this.scMain.SplitterLineColor = System.Drawing.Color.FromArgb(((int)(((byte)(189)))), ((int)(((byte)(189)))), ((int)(((byte)(189)))));
|
||||
//
|
||||
// ImageEffectsForm
|
||||
//
|
||||
resources.ApplyResources(this, "$this");
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.SystemColors.Window;
|
||||
this.CancelButton = this.btnClose;
|
||||
this.Controls.Add(this.scMain);
|
||||
this.Controls.Add(this.btnPackager);
|
||||
this.Controls.Add(this.lblPresets);
|
||||
this.Controls.Add(this.btnDuplicatePreset);
|
||||
|
|
@ -292,13 +313,15 @@ private void InitializeComponent()
|
|||
this.Controls.Add(this.btnClear);
|
||||
this.Controls.Add(this.btnRemove);
|
||||
this.Controls.Add(this.btnAdd);
|
||||
this.Controls.Add(this.pgSettings);
|
||||
this.Controls.Add(this.lvEffects);
|
||||
this.Controls.Add(this.pbResult);
|
||||
this.Name = "ImageEffectsForm";
|
||||
this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
|
||||
this.Shown += new System.EventHandler(this.ImageEffectsForm_Shown);
|
||||
this.cmsLoadImage.ResumeLayout(false);
|
||||
this.scMain.Panel1.ResumeLayout(false);
|
||||
this.scMain.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
|
||||
this.scMain.ResumeLayout(false);
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
|
|
@ -333,6 +356,7 @@ private void InitializeComponent()
|
|||
private System.Windows.Forms.Button btnDuplicatePreset;
|
||||
private System.Windows.Forms.Label lblPresets;
|
||||
private System.Windows.Forms.Button btnPackager;
|
||||
private HelpersLib.SplitContainerCustomSplitter scMain;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -118,15 +118,15 @@
|
|||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="pgSettings.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left</value>
|
||||
<data name="pgSettings.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="pgSettings.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>184, 72</value>
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="pgSettings.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>336, 424</value>
|
||||
<value>330, 424</value>
|
||||
</data>
|
||||
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="pgSettings.TabIndex" type="System.Int32, mscorlib">
|
||||
|
|
@ -139,10 +139,10 @@
|
|||
<value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>pgSettings.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
<value>scMain.Panel1</value>
|
||||
</data>
|
||||
<data name=">>pgSettings.ZOrder" xml:space="preserve">
|
||||
<value>21</value>
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="btnAdd.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>408, 40</value>
|
||||
|
|
@ -166,14 +166,11 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAdd.ZOrder" xml:space="preserve">
|
||||
<value>20</value>
|
||||
<value>21</value>
|
||||
</data>
|
||||
<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, 72</value>
|
||||
</data>
|
||||
|
|
@ -195,6 +192,9 @@
|
|||
<data name=">>lvEffects.ZOrder" xml:space="preserve">
|
||||
<value>22</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>520, 40</value>
|
||||
</data>
|
||||
|
|
@ -217,7 +217,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>19</value>
|
||||
<value>20</value>
|
||||
</data>
|
||||
<data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>744, 40</value>
|
||||
|
|
@ -241,7 +241,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnClear.ZOrder" xml:space="preserve">
|
||||
<value>18</value>
|
||||
<value>19</value>
|
||||
</data>
|
||||
<data name="btnDuplicate.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>632, 40</value>
|
||||
|
|
@ -265,7 +265,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnDuplicate.ZOrder" xml:space="preserve">
|
||||
<value>17</value>
|
||||
<value>18</value>
|
||||
</data>
|
||||
<data name="btnSaveImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -298,7 +298,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnSaveImage.ZOrder" xml:space="preserve">
|
||||
<value>16</value>
|
||||
<value>17</value>
|
||||
</data>
|
||||
<data name="eiImageEffects.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -322,16 +322,16 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>eiImageEffects.ZOrder" xml:space="preserve">
|
||||
<value>15</value>
|
||||
<value>16</value>
|
||||
</data>
|
||||
<data name="pbResult.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
<data name="pbResult.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="pbResult.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>528, 72</value>
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="pbResult.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>432, 424</value>
|
||||
<value>440, 424</value>
|
||||
</data>
|
||||
<data name="pbResult.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>16</value>
|
||||
|
|
@ -343,10 +343,10 @@
|
|||
<value>ShareX.HelpersLib.MyPictureBox, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>pbResult.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
<value>scMain.Panel2</value>
|
||||
</data>
|
||||
<data name=">>pbResult.ZOrder" xml:space="preserve">
|
||||
<value>23</value>
|
||||
<value>0</value>
|
||||
</data>
|
||||
<metadata name="cmsEffects.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
|
||||
<value>17, 17</value>
|
||||
|
|
@ -369,18 +369,6 @@
|
|||
<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>
|
||||
|
|
@ -412,7 +400,19 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>mbLoadImage.ZOrder" xml:space="preserve">
|
||||
<value>14</value>
|
||||
<value>15</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>
|
||||
<data name="btnAddPreset.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>408, 8</value>
|
||||
|
|
@ -436,7 +436,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnAddPreset.ZOrder" xml:space="preserve">
|
||||
<value>13</value>
|
||||
<value>14</value>
|
||||
</data>
|
||||
<data name="btnRemovePreset.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>552, 8</value>
|
||||
|
|
@ -460,7 +460,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemovePreset.ZOrder" xml:space="preserve">
|
||||
<value>12</value>
|
||||
<value>13</value>
|
||||
</data>
|
||||
<data name="cbPresets.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>104, 10</value>
|
||||
|
|
@ -481,7 +481,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>cbPresets.ZOrder" xml:space="preserve">
|
||||
<value>11</value>
|
||||
<value>12</value>
|
||||
</data>
|
||||
<data name="lblPresetName.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -508,7 +508,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblPresetName.ZOrder" xml:space="preserve">
|
||||
<value>10</value>
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="txtPresetName.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>104, 42</value>
|
||||
|
|
@ -529,7 +529,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>txtPresetName.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
<value>10</value>
|
||||
</data>
|
||||
<data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
|
|
@ -556,7 +556,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnClose.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Right</value>
|
||||
|
|
@ -586,7 +586,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnOK.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>8</value>
|
||||
</data>
|
||||
<data name="btnUploadImage.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -616,7 +616,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnUploadImage.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name="btnRefresh.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>856, 40</value>
|
||||
|
|
@ -640,7 +640,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRefresh.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="btnDuplicatePreset.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>696, 8</value>
|
||||
|
|
@ -664,7 +664,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnDuplicatePreset.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="lblPresets.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -691,7 +691,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>lblPresets.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="btnPackager.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Bottom, Left</value>
|
||||
|
|
@ -718,7 +718,61 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnPackager.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name="scMain.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>184, 72</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel1.Name" xml:space="preserve">
|
||||
<value>scMain.Panel1</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel1.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel1.Parent" xml:space="preserve">
|
||||
<value>scMain</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel1.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel2.Name" xml:space="preserve">
|
||||
<value>scMain.Panel2</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel2.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel2.Parent" xml:space="preserve">
|
||||
<value>scMain</value>
|
||||
</data>
|
||||
<data name=">>scMain.Panel2.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="scMain.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>776, 424</value>
|
||||
</data>
|
||||
<data name="scMain.SplitterDistance" type="System.Int32, mscorlib">
|
||||
<value>330</value>
|
||||
</data>
|
||||
<data name="scMain.SplitterWidth" type="System.Int32, mscorlib">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="scMain.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>22</value>
|
||||
</data>
|
||||
<data name=">>scMain.Name" xml:space="preserve">
|
||||
<value>scMain</value>
|
||||
</data>
|
||||
<data name=">>scMain.Type" xml:space="preserve">
|
||||
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=13.1.1.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>scMain.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>scMain.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">
|
||||
<value>True</value>
|
||||
|
|
|
|||
Loading…
Reference in a new issue