mirror of
https://github.com/greenshot/greenshot
synced 2025-07-16 10:03:44 -07:00
Fixed update issue with Dropper/Zoomer, now called Pipette and I will rename the zoomer.
git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1657 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
parent
c1330fb88c
commit
1116ff8a25
8 changed files with 70 additions and 72 deletions
25
Greenshot/Forms/ColorDialog.Designer.cs
generated
25
Greenshot/Forms/ColorDialog.Designer.cs
generated
|
@ -47,6 +47,7 @@ namespace Greenshot {
|
|||
private void InitializeComponent()
|
||||
{
|
||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ColorDialog));
|
||||
this.SuspendLayout();
|
||||
this.btnTransparent = new System.Windows.Forms.Button();
|
||||
this.colorPanel = new System.Windows.Forms.Panel();
|
||||
this.labelHtmlColor = new System.Windows.Forms.Label();
|
||||
|
@ -61,8 +62,7 @@ namespace Greenshot {
|
|||
this.textBoxAlpha = new System.Windows.Forms.TextBox();
|
||||
this.labelAlpha = new System.Windows.Forms.Label();
|
||||
this.btnApply = new System.Windows.Forms.Button();
|
||||
this.dropper = new Greenshot.Controls.Dropper();
|
||||
this.SuspendLayout();
|
||||
this.pipette = new Greenshot.Controls.Pipette();
|
||||
//
|
||||
// btnTransparent
|
||||
//
|
||||
|
@ -208,23 +208,22 @@ namespace Greenshot {
|
|||
this.btnApply.UseVisualStyleBackColor = false;
|
||||
this.btnApply.Click += new System.EventHandler(this.BtnApplyClick);
|
||||
//
|
||||
// dropper
|
||||
// pipette
|
||||
//
|
||||
this.dropper.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.dropper.Cursor = System.Windows.Forms.Cursors.Arrow;
|
||||
this.dropper.Image = ((System.Drawing.Image)(resources.GetObject("dropper.Image")));
|
||||
this.dropper.Location = new System.Drawing.Point(255, 30);
|
||||
this.dropper.Name = "dropper";
|
||||
this.dropper.Size = new System.Drawing.Size(33, 23);
|
||||
this.dropper.TabIndex = 13;
|
||||
this.dropper.DropperUsed += new System.EventHandler<Greenshot.Controls.DropperUsedArgs>(this.dropperUsed);
|
||||
this.pipette.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
||||
this.pipette.Cursor = System.Windows.Forms.Cursors.Arrow;
|
||||
this.pipette.Location = new System.Drawing.Point(255, 30);
|
||||
this.pipette.Name = "pipette";
|
||||
this.pipette.Size = new System.Drawing.Size(33, 23);
|
||||
this.pipette.TabIndex = 13;
|
||||
this.pipette.PipetteUsed += new System.EventHandler<Greenshot.Controls.PipetteUsedArgs>(this.pipetteUsed);
|
||||
//
|
||||
// ColorDialog
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
|
||||
this.ClientSize = new System.Drawing.Size(292, 218);
|
||||
this.Controls.Add(this.dropper);
|
||||
this.Controls.Add(this.pipette);
|
||||
this.Controls.Add(this.btnApply);
|
||||
this.Controls.Add(this.textBoxAlpha);
|
||||
this.Controls.Add(this.labelAlpha);
|
||||
|
@ -265,7 +264,7 @@ namespace Greenshot {
|
|||
private System.Windows.Forms.TextBox textBoxBlue;
|
||||
private System.Windows.Forms.Panel colorPanel;
|
||||
private System.Windows.Forms.Button btnTransparent;
|
||||
private Greenshot.Controls.Dropper dropper;
|
||||
private Greenshot.Controls.Pipette pipette;
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue