Zoom out added

fixed; B1199407 'Use current' gradient option bug
2005-06-05 06:52:05 +00:00 · 2005-06-05 06:52:05 +00:00 · dec7ba3333
commit dec7ba3333
parent b9c5631e6d
2 changed files with 114 additions and 72 deletions
--- a/2.10/Source/Main.dfm
+++ b/2.10/Source/Main.dfm
@ -27,7 +27,7 @@ object MainForm: TMainForm
    Left = 160
    Top = 28
    Width = 4
-    Height = 482
+    Height = 474
  end
  object ToolBar: TToolBar
    Left = 0
@ -218,17 +218,27 @@ object MainForm: TMainForm
    object tbzoomwindow: TToolButton
      Left = 431
      Top = 0
-      Hint = 'Zoom To rectangle'
+      Hint = 'Zoom to rectangle'
      Caption = 'tbzoomwindow'
      Down = True
      Grouped = True
-      ImageIndex = 28
+      ImageIndex = 50
      Style = tbsCheck
      OnClick = tbzoomwindowClick
    end
-    object tbDrag: TToolButton
+    object tbzoomoutwindow: TToolButton
      Left = 454
      Top = 0
+      Hint = 'Zoom out using rectangle'
+      Caption = 'tbzoomoutwindow'
+      Grouped = True
+      ImageIndex = 49
+      Style = tbsCheck
+      OnClick = tbzoomoutwindowClick
+    end
+    object tbDrag: TToolButton
+      Left = 477
+      Top = 0
      Hint = 'Translate image'
      Caption = 'tbDrag'
      Grouped = True
@ -237,7 +247,7 @@ object MainForm: TMainForm
      OnClick = tbDragClick
    end
    object tbRotate: TToolButton
-      Left = 477
+      Left = 500
      Top = 0
      Hint = 'Rotate'
      Caption = 'tbRotate'
@ -251,7 +261,7 @@ object MainForm: TMainForm
    Left = 0
    Top = 28
    Width = 160
-    Height = 482
+    Height = 474
    Align = alLeft
    Columns = <
      item
@ -270,7 +280,7 @@ object MainForm: TMainForm
    Left = 164
    Top = 28
    Width = 402
-    Height = 482
+    Height = 474
    Align = alClient
    BevelInner = bvLowered
    BevelOuter = bvNone
@ -281,7 +291,7 @@ object MainForm: TMainForm
      Left = 1
      Top = 1
      Width = 400
-      Height = 480
+      Height = 472
      Align = alClient
      AutoSize = True
      PopupMenu = DisplayPopup
@ -293,7 +303,7 @@ object MainForm: TMainForm
  end
  object StatusBar: TStatusBar
    Left = 0
-    Top = 510
+    Top = 502
    Width = 566
    Height = 19
    Panels = <
@ -311,7 +321,7 @@ object MainForm: TMainForm
    Left = 8
    Top = 56
    Bitmap = {
-      494C010131003600040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010133003600040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600
      000000000000360000002800000040000000E0000000010020000000000000E0
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@ -444,6 +454,10 @@ object MainForm: TMainForm
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000292B2F000000
+      00002F3236000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000292B2F000000
+      00002F3236000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@ -456,6 +470,10 @@ object MainForm: TMainForm
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000003F43480000000000575C
+      6400000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000003F43480000000000575C
+      6400000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@ -468,97 +486,89 @@ object MainForm: TMainForm
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000393C410000000000626871000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000393C410000000000626871000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006E52440033262100382A22000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000006E52440033262100382A22000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000008668
+      5A002A080000B57E5D00EFE4DF00E0CFC500AD7150002D0F0200957464000000
+      0000000000000000000000000000000000000000000000000000000000008668
+      5A002A080000B57E5D00EFE4DF00E0CFC500AD7150002D0F0200957464000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000350B
+      0500E9DAC900FDF5E600FCEFE300FBEDE300FCF3EA00E2D1C8003B160B00A288
+      800000000000000000000000000000000000000000000000000000000000350B
+      0500E9DAC900FDF5E600FCEFE300FBEDE300FCF3EA00E2D1C8003B160B00A288
+      8000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000000000000000000000000000000000003C2D2400D0AB
+      9600FCECD800F8DCC700F3D7C500F3D9C900F9E3D100FCF3E400D2B4A1002219
+      14000000000000000000000000000000000000000000000000003C2D2400D0AB
+      9600FCECD800F8DCC7000000000000000000F9E3D100FCF3E400D2B4A1002219
+      1400000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000001010100F6E3
+      D300F9D1BB00EEBEA500EDBCA200ECC2A800F0CDB800FAE2CD00FEFCE2000000
+      000000000000000000000000000000000000000000000000000001010100F6E3
+      D300F9D1BB00EEBEA5000000000000000000F0CDB800FAE2CD00FEFCE2000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FDEA
+      D900000000000000000000000000000000000000000000000000FFEED3000A08
+      050000000000000000000000000000000000000000000000000000000000FDEA
+      D900000000000000000000000000000000000000000000000000FFEED3000A08
+      0500000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000000000000FBE2
+      D300F8BCA300EC9D7F00E6978000E79D8400ECAD8D00F7C4A800EBCAB0000C09
+      080000000000000000000000000000000000000000000000000000000000FBE2
+      D300F8BCA300EC9D7F000000000000000000ECAD8D00F7C4A800EBCAB0000C09
+      0800000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000000000000000000067565100B57C
+      5F00FDD1BA00F5AD9400F19B7E00F09D8200F6B29500FDC7A400925039006655
+      500000000000000000000000000000000000000000000000000067565100B57C
+      5F00FDD1BA00F5AD94000000000000000000F6B29500FDC7A400925039006655
+      5000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000000000006147
+      3800BD8B7100FEDECC00FED2BF00FCC0A900FEC7A9008E4C36001D1713000000
+      0000000000000000000000000000000000000000000000000000000000006147
+      3800BD8B7100FEDECC00FED2BF00FCC0A900FEC7A9008E4C36001D1713000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
+      00005144400005030200583B2700452D1F000000000042383400000000000000
      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
+      00005144400005030200583B2700452D1F000000000042383400000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@ -2111,11 +2121,11 @@ object MainForm: TMainForm
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
-      00000000000000000000000000000000FBF7000000000000FBF7000000000000
-      F7F7000000000000EFFB000000000000DFFB000000000000DFFD000000000000
-      BFFD00000000000077FD00000000000067FE00000000000097F6000000000000
-      EDB6000000000000CDB2000000000000D9B5000000000000E5B7000000000000
-      FD8F000000000000FE7F000000000000FFFF0000FFFFFFFFFFFF0000FC010001
+      00000000000000000000000000000000FBF7FFC7FFC70000FBF7FFCFFFCF0000
+      F7F7FF8FFF8F0000EFFBFF9FFF9F0000DFFBFF1FFF1F0000DFFDF83FF83F0000
+      BFFDE01FE01F000077FDE00FE00F000067FEC00FC00F000097F6C00FC00F0000
+      EDB6C00FC00F0000CDB2C00FC00F0000D9B5C00FC00F0000E5B7E01FE01F0000
+      FD8FF03FF03F0000FE7FFFFFFFFF0000FFFF0000FFFFFFFFFFFF0000FC010001
      FE7F0000FC010001FE3F0000E0010001FE1F0000E0010001C00F000000010001
      C007000000010001C003000000010001C003000000010805C007000000030001
      C00F000000070001FE1F0000000F0001FE3F0000003F0001FE7F0000007F0001
@ -2163,8 +2173,7 @@ object MainForm: TMainForm
      C003000F80018000C003000780018000C003000380018000C003000180018000
      C003000180018000C003001F80018000C003001F80018001C003001F80018001
      C0038FF180018001C007FFF980018001C00FFF7580018001C01FFF8F80018001
-      C03FFFFF80018001FFFFFFFFFFFFFFFF00000000000000000000000000000000
-      000000000000}
+      C03FFFFF80018001FFFFFFFFFFFFFFFF}
  end
  object SmallImages: TImageList
    Left = 40
@ -2919,9 +2928,8 @@ object MainForm: TMainForm
  end
  object HTTP: TIdHTTP
    OnStatus = HTTPStatus
-    MaxLineAction = maException
-    ReadTimeout = 0
    AuthRetries = 0
+    AuthProxyRetries = 0
    AllowCookies = True
    ProxyParams.BasicAuthentication = False
    ProxyParams.ProxyPort = 0
--- a/2.10/Source/Main.pas
+++ b/2.10/Source/Main.pas
@ -39,7 +39,7 @@ const
  RS_VO = 3;

 type
-  TMouseMoveState = (msUsual, msZoomWindow, msZoomWindowMove, msDrag, msDragMove, msRotate, msRotateMove);
+  TMouseMoveState = (msUsual, msZoomWindow, msZoomOutWindow, msZoomWindowMove, msZoomOutWindowMove, msDrag, msDragMove, msRotate, msRotateMove);

 type
  TWin32Version = (wvUnknown, wvWin95, wvWin98, wvWinNT, wvWin2000, wvWinXP);
@ -177,6 +177,8 @@ type
    tbDrag: TToolButton;
    tbRotate: TToolButton;
    mnuimage: TMenuItem;
+    tbzoomoutwindow: TToolButton;
+    procedure tbzoomoutwindowClick(Sender: TObject);
    procedure mnuimageClick(Sender: TObject);
    procedure mnuExitClick(Sender: TObject);
    procedure mnuSaveUPRClick(Sender: TObject);
@ -661,6 +663,7 @@ var
 *)
 begin
  cp1.Free;
+  cp1 := nil;
  cp1 := RandomFlame(MainCP, alg);
 (*
  Min := randMinTransforms;
@ -4005,6 +4008,13 @@ begin
        DrawZoomWindow(FSelectRect);
        FMouseMoveState := msZoomWindowMove;
      end;
+    msZoomOutWindow:
+      begin
+        FSelectRect.TopLeft := Point(x, y);
+        FSelectRect.BottomRight := Point(x, y);
+        DrawZoomWindow(FSelectRect);
+        FMouseMoveState := msZoomOutWindowMove;
+      end;
    msDrag:
      begin
        if not assigned(FViewBMP) then
@ -4053,7 +4063,8 @@ var
  FOffs : TPoint;
 begin
  case FMouseMoveState of
-    msZoomWindowMove:
+    msZoomWindowMove,
+    msZoomOutWindowMove:
      begin
        DrawZoomWindow(FSelectRect);
        FSelectRect.BottomRight := Point(x, y);
@ -4107,6 +4118,22 @@ begin
        UpdateUndo;
        MainCp.ZoomtoRect(FSelectRect);

+        RedrawTimer.Enabled := True;
+        UpdateWindows;
+      end;
+    msZoomOutWindowMove:
+      begin
+        DrawZoomWindow(FSelectRect);
+        FSelectRect.BottomRight := Point(x, y);
+        FMouseMoveState := msZoomOutWindow;
+        if (abs(FSelectRect.Left - FSelectRect.Right) < 10) or
+           (abs(FSelectRect.Top - FSelectRect.Bottom) < 10) then
+          Exit; // zoom to much or double clicked
+
+        StopThread;
+        UpdateUndo;
+        MainCp.ZoomOuttoRect(FSelectRect);
+
        RedrawTimer.Enabled := True;
        UpdateWindows;
      end;
@ -4212,6 +4239,12 @@ begin
  FMouseMoveState := msZoomWindow;
 end;

+///////////////////////////////////////////////////////////////////////////////
+procedure TMainForm.tbzoomoutwindowClick(Sender: TObject);
+begin
+  FMouseMoveState := msZoomOutWindow;
+end;
+
 ///////////////////////////////////////////////////////////////////////////////
 procedure TMainForm.tbDragClick(Sender: TObject);
 begin
@ -4256,5 +4289,6 @@ begin
  UpdateWindows;
 end;

+
 ///////////////////////////////////////////////////////////////////////////////
 end.