Fix a Icon Error and change the top TEdit to TSpinEdit.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1739 8e941d3f-bd1b-0410-a28a-d453659cc2b4

applications/lazimageeditor/main.lfm

@@ -169,7 +169,7 @@
         Hint = 'Text'
         Top = 442
         Grouped = True
-        ImageIndex = 11
+        ImageIndex = 12
         OnClick = ToolTextClick
         ParentShowHint = False
         ShowHint = True
@@ -180,7 +180,7 @@
         Hint = 'Institute Color'
         Top = 482
         Grouped = True
-        ImageIndex = 12
+        ImageIndex = 11
         OnClick = ToolcolorReplacerClick
         ParentShowHint = False
         ShowHint = True
@@ -1032,7 +1032,7 @@
           Left = 36
           Height = 32
           Top = 2
-          Width = 42
+          Width = 32
           Anchors = [akLeft]
           Glyph.Data = {
             36090000424D3609000000000000360000002800000018000000180000000100
@@ -1115,7 +1115,7 @@
           OnClick = ToolMaskEllipseClick
         end
         object ToolMaskFloodFill: TSpeedButton
-          Left = 78
+          Left = 68
           Height = 32
           Top = 2
           Width = 32
@@ -1290,28 +1290,14 @@
         ClientHeight = 34
         ClientWidth = 67
         TabOrder = 0
-        object EditSize: TEdit
-          Left = 3
+        object EditSize: TSpinEdit
+          Left = 4
           Height = 27
           Top = 3
-          Width = 43
-          Anchors = [akLeft]
+          Width = 50
           OnChange = EditSizeChange
           TabOrder = 0
-          Text = '10'
-        end
-        object UpDownSize: TUpDown
-          Left = 46
-          Height = 27
-          Top = 3
-          Width = 17
-          Associate = EditSize
-          Min = 1
-          Max = 200
-          Position = 10
-          TabOrder = 1
-          Thousands = False
-          Wrap = False
+          Value = 10
         end
       end
       object PanelDensity: TPanel
@@ -1324,27 +1310,14 @@
         ClientHeight = 34
         ClientWidth = 69
         TabOrder = 1
-        object EditDensity: TEdit
-          Left = 3
+        object EditDensity: TSpinEdit
+          Left = 4
           Height = 27
           Top = 3
-          Width = 42
-          Anchors = [akLeft]
+          Width = 56
           OnChange = EditDensityChange
           TabOrder = 0
-          Text = '100'
-        end
-        object UpDownDensity: TUpDown
-          Left = 45
-          Height = 27
-          Top = 3
-          Width = 17
-          Associate = EditDensity
-          Min = 0
-          Position = 100
-          TabOrder = 1
-          Thousands = False
-          Wrap = False
+          Value = 100
         end
       end
       object PanelRoundness: TPanel
@@ -1357,28 +1330,13 @@
         ClientHeight = 34
         ClientWidth = 68
         TabOrder = 2
-        object EditRoundness: TEdit
-          Left = 4
+        object EditRoundness: TSpinEdit
+          Left = 5
           Height = 27
           Top = 3
-          Width = 42
-          Anchors = [akLeft]
+          Width = 50
           OnChange = EditRoundnessChange
           TabOrder = 0
-          Text = '0'
-        end
-        object UpDownRoundness: TUpDown
-          Left = 46
-          Height = 27
-          Top = 3
-          Width = 17
-          Associate = EditRoundness
-          Min = 0
-          Max = 4096
-          Position = 0
-          TabOrder = 1
-          Thousands = False
-          Wrap = False
         end
       end
       object PanelTolerance: TPanel
@@ -1391,27 +1349,13 @@
         ClientHeight = 34
         ClientWidth = 68
         TabOrder = 3
-        object EditTolerance: TEdit
-          Left = 2
+        object EditTolerance: TSpinEdit
+          Left = 6
           Height = 27
           Top = 3
-          Width = 42
-          Anchors = [akLeft]
+          Width = 54
           OnChange = EditToleranceChange
           TabOrder = 0
-          Text = '0'
-        end
-        object UpDownTolerance: TUpDown
-          Left = 44
-          Height = 27
-          Top = 3
-          Width = 17
-          Associate = EditTolerance
-          Min = 0
-          Position = 0
-          TabOrder = 1
-          Thousands = False
-          Wrap = False
         end
       end
       object LabelTolerance1: TLabel
@@ -4143,8 +4087,8 @@
     Filter = 'Graphic (*.tga;*.jpeg;*.jpg;*.pbm;*.pgm;*.ppm;*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp)|*.tga;*.jpeg;*.jpg;*.pbm;*.pgm;*.ppm;*.ico;*.ppm;*.pgm;*.pbm;*.png;*.xpm;*.bmp|TGA Image File (*.tga)|*.tga|JPEG Image File (*.jpeg)|*.jpeg|JPEG Image File (*.jpg)|*.'
     FilterIndex = 0
     Options = [ofAllowMultiSelect, ofFileMustExist, ofEnableSizing]
-    left = 150
-    top = 90
+    left = 312
+    top = 112
   end
   object ColorDialog: TColorDialog
     Color = clBlack
@@ -4170,8 +4114,8 @@
       'ColorS=F0FBFF'
       'ColorT=A4A0A0'
     )
-    left = 186
-    top = 90
+    left = 352
+    top = 112
   end
   object SavePictureDialog: TSavePictureDialog
     Title = 'Save file as'
@@ -4193,8 +4137,8 @@
   end
   object ActionList: TActionList
     Images = ImageListActions
-    left = 112
-    top = 88
+    left = 264
+    top = 112
     object FileNew: TAction
       Category = 'File'
       Caption = '&New...'

applications/lazimageeditor/main.pas

@@ -64,6 +64,10 @@ type
     FileSaveAs: TAction;
     FlipHorizontally: TAction;
     FlipVertically: TAction;
+    EditSize: TSpinEdit;
+    EditRoundness: TSpinEdit;
+    EditDensity: TSpinEdit;
+    EditTolerance: TSpinEdit;
     ToolsImageList: TImageList;
     PolyNum: TSpinEdit;
     Label1: TLabel;
@@ -91,10 +95,6 @@ type
     MenuItemView: TMenuItem;
     MenuItemClipPaperToMask: TMenuItem;
     Bevel2: TBevel;
-    EditDensity: TEdit;
-    EditRoundness: TEdit;
-    EditSize: TEdit;
-    EditTolerance: TEdit;
     LabelDensity: TLabel;
     LabelRoundness: TLabel;
     LabelShape: TLabel;
@@ -217,11 +217,7 @@ type
     ToolPen: TToolButton;
     ToolColorPick: TToolButton;
     ToolMask: TToolButton;
-    UpDownDensity: TUpDown;
-    UpDownRoundness: TUpDown;
-    UpDownSize: TUpDown;
     UpDownSize1: TUpDown;
-    UpDownTolerance: TUpDown;
     ViewShowGrid: TAction;
     ViewShowMask: TAction;
     procedure checkFuzzyChange(Sender: TObject);
@@ -396,8 +392,8 @@ begin
     PanelFill.Color := FillColor;
     PanelPaper.Color := PaperColor;
 
-    UpDownDensity.Position := Round(RandomDensity * 100);
-    UpDownSize.Position := Size;
+//    UpDownDensity.Position := Round(RandomDensity * 100);
+//    UpDownSize.Position := Size;
 
     case Shape of
       psRect: ToolRectShape.Down := True;
@@ -416,8 +412,8 @@ begin
       mtFloodFill: ToolMaskFloodFill.Down := True;
     end;
 
-    UpDownRoundness.Position := RectangleRoundness;
-    UpDownTolerance.Position := Round(FloodFillTolerance * 100);
+//    UpDownRoundness.Position := RectangleRoundness;
+//    UpDownTolerance.Position := Round(FloodFillTolerance * 100);
 
     ComboBoxZoom.Text := Format('%d %%', [Round(Zoom * 100)]);
 
@@ -1331,7 +1327,7 @@ procedure TMainForm.EditDensityChange(Sender: TObject);
 begin
   if not Pictures.CanEdit then
     Exit;
-  ActivePictureEdit.RandomDensity := UpDownDensity.Position / 100;
+  ActivePictureEdit.RandomDensity := EditDensity.Value / 100;
 end;
 
 procedure TMainForm.EditPasteExecute(Sender: TObject);
@@ -1343,7 +1339,7 @@ procedure TMainForm.EditRoundnessChange(Sender: TObject);
 begin
   if not Pictures.CanEdit then
     Exit;
-  ActivePictureEdit.RectangleRoundness := UpDownRoundness.Position;
+  ActivePictureEdit.RectangleRoundness := EditRoundness.Value;
 end;
 
 procedure TMainForm.EditSelectAllExecute(Sender: TObject);
@@ -1404,14 +1400,14 @@ procedure TMainForm.EditSizeChange(Sender: TObject);
 begin
   if not Pictures.CanEdit then
     Exit;
-  ActivePictureEdit.Size := UpDownSize.Position;
+  ActivePictureEdit.Size := EditSize.Value;
 end;
 
 procedure TMainForm.EditToleranceChange(Sender: TObject);
 begin
   if not Pictures.CanEdit then
     Exit;
-  ActivePictureEdit.FloodFillTolerance := UpDownTolerance.Position / 100;
+  ActivePictureEdit.FloodFillTolerance := EditTolerance.Value / 100;
 end;