The Zoom buttons have been added to toolbar and it works fine.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1575 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
yangjixian
2011-04-17 15:47:47 +00:00
parent 2baee7171f
commit e4578aa604
4 changed files with 1533 additions and 1266 deletions

View File

@ -61,8 +61,8 @@
<IsVisibleTab Value="True"/>
<EditorIndex Value="0"/>
<WindowIndex Value="0"/>
<TopLine Value="705"/>
<CursorPos X="68" Y="733"/>
<TopLine Value="988"/>
<CursorPos X="3" Y="1007"/>
<UsageCount Value="62"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
@ -381,123 +381,123 @@
<JumpHistory Count="30" HistoryIndex="29">
<Position1>
<Filename Value="main.pas"/>
<Caret Line="247" Column="1" TopLine="238"/>
<Caret Line="248" Column="1" TopLine="229"/>
</Position1>
<Position2>
<Filename Value="main.pas"/>
<Caret Line="708" Column="3" TopLine="706"/>
<Caret Line="674" Column="3" TopLine="662"/>
</Position2>
<Position3>
<Filename Value="main.pas"/>
<Caret Line="726" Column="3" TopLine="722"/>
<Caret Line="687" Column="1" TopLine="675"/>
</Position3>
<Position4>
<Filename Value="main.pas"/>
<Caret Line="703" Column="3" TopLine="700"/>
<Caret Line="248" Column="1" TopLine="227"/>
</Position4>
<Position5>
<Filename Value="main.pas"/>
<Caret Line="726" Column="3" TopLine="710"/>
<Caret Line="692" Column="3" TopLine="689"/>
</Position5>
<Position6>
<Filename Value="main.pas"/>
<Caret Line="732" Column="3" TopLine="730"/>
<Caret Line="688" Column="1" TopLine="683"/>
</Position6>
<Position7>
<Filename Value="main.pas"/>
<Caret Line="736" Column="37" TopLine="719"/>
<Caret Line="246" Column="1" TopLine="227"/>
</Position7>
<Position8>
<Filename Value="main.pas"/>
<Caret Line="728" Column="29" TopLine="713"/>
<Caret Line="248" Column="1" TopLine="227"/>
</Position8>
<Position9>
<Filename Value="main.pas"/>
<Caret Line="730" Column="13" TopLine="711"/>
<Caret Line="246" Column="1" TopLine="227"/>
</Position9>
<Position10>
<Filename Value="main.pas"/>
<Caret Line="756" Column="3" TopLine="753"/>
<Caret Line="95" Column="100" TopLine="89"/>
</Position10>
<Position11>
<Filename Value="main.pas"/>
<Caret Line="728" Column="3" TopLine="724"/>
<Caret Line="725" Column="35" TopLine="708"/>
</Position11>
<Position12>
<Filename Value="main.pas"/>
<Caret Line="745" Column="2" TopLine="726"/>
<Caret Line="286" Column="33" TopLine="270"/>
</Position12>
<Position13>
<Filename Value="main.pas"/>
<Caret Line="751" Column="49" TopLine="733"/>
<Caret Line="733" Column="68" TopLine="705"/>
</Position13>
<Position14>
<Filename Value="main.pas"/>
<Caret Line="721" Column="3" TopLine="719"/>
<Caret Line="1122" Column="10" TopLine="1120"/>
</Position14>
<Position15>
<Filename Value="main.pas"/>
<Caret Line="359" Column="3" TopLine="357"/>
<Caret Line="1123" Column="10" TopLine="1121"/>
</Position15>
<Position16>
<Filename Value="main.pas"/>
<Caret Line="701" Column="3" TopLine="699"/>
<Caret Line="1130" Column="10" TopLine="1128"/>
</Position16>
<Position17>
<Filename Value="main.pas"/>
<Caret Line="357" Column="1" TopLine="430"/>
<Caret Line="473" Column="3" TopLine="460"/>
</Position17>
<Position18>
<Filename Value="main.pas"/>
<Caret Line="243" Column="1" TopLine="237"/>
<Caret Line="479" Column="6" TopLine="457"/>
</Position18>
<Position19>
<Filename Value="main.pas"/>
<Caret Line="248" Column="1" TopLine="229"/>
<Caret Line="795" Column="7" TopLine="763"/>
</Position19>
<Position20>
<Filename Value="main.pas"/>
<Caret Line="674" Column="3" TopLine="662"/>
<Caret Line="797" Column="7" TopLine="765"/>
</Position20>
<Position21>
<Filename Value="main.pas"/>
<Caret Line="687" Column="1" TopLine="675"/>
<Caret Line="799" Column="37" TopLine="767"/>
</Position21>
<Position22>
<Filename Value="main.pas"/>
<Caret Line="248" Column="1" TopLine="227"/>
<Caret Line="800" Column="40" TopLine="768"/>
</Position22>
<Position23>
<Filename Value="main.pas"/>
<Caret Line="692" Column="3" TopLine="689"/>
<Caret Line="4" Column="99" TopLine="1"/>
</Position23>
<Position24>
<Filename Value="main.pas"/>
<Caret Line="688" Column="1" TopLine="683"/>
<Caret Line="463" Column="51" TopLine="431"/>
</Position24>
<Position25>
<Filename Value="main.pas"/>
<Caret Line="246" Column="1" TopLine="227"/>
<Caret Line="479" Column="7" TopLine="447"/>
</Position25>
<Position26>
<Filename Value="main.pas"/>
<Caret Line="248" Column="1" TopLine="227"/>
<Caret Line="5" Column="101" TopLine="1"/>
</Position26>
<Position27>
<Filename Value="main.pas"/>
<Caret Line="246" Column="1" TopLine="227"/>
<Caret Line="497" Column="11" TopLine="476"/>
</Position27>
<Position28>
<Filename Value="main.pas"/>
<Caret Line="95" Column="100" TopLine="89"/>
<Caret Line="501" Column="6" TopLine="475"/>
</Position28>
<Position29>
<Filename Value="main.pas"/>
<Caret Line="725" Column="35" TopLine="708"/>
<Caret Line="500" Column="6" TopLine="474"/>
</Position29>
<Position30>
<Filename Value="main.pas"/>
<Caret Line="286" Column="33" TopLine="270"/>
<Caret Line="1007" Column="12" TopLine="988"/>
</Position30>
</JumpHistory>
</ProjectOptions>

View File

@ -243,16 +243,6 @@
Images = ImageListActions
ParentColor = False
TabOrder = 0
object LabelZoom: TLabel
Left = 385
Height = 32
Top = 0
Width = 40
Caption = 'Zoom:'
Constraints.MinHeight = 32
Layout = tlCenter
ParentColor = False
end
object ToolClose: TToolButton
Left = 109
Hint = 'Close'
@ -379,7 +369,7 @@
ShowHint = True
end
object PanelZoom: TPanel
Left = 425
Left = 421
Height = 32
Top = 0
Width = 77
@ -388,10 +378,10 @@
ClientWidth = 77
TabOrder = 0
object ComboBoxZoom: TComboBox
Left = 4
Left = 0
Height = 27
Top = 2
Width = 70
Width = 76
Anchors = [akLeft]
ItemHeight = 19
ItemIndex = 2
@ -411,6 +401,20 @@
Text = '100 %'
end
end
object ZoomInBtn: TToolButton
Left = 385
Top = 0
Caption = 'ZoomInBtn'
ImageIndex = 10
OnClick = ZoomInBtnClick
end
object ZoomOutBtn: TToolButton
Left = 498
Top = 0
Caption = 'ZoomOutBtn'
ImageIndex = 11
OnClick = ZoomOutBtnClick
end
end
object PanelOptions: TPanel
Left = 0
@ -3352,7 +3356,7 @@
left = 114
top = 192
Bitmap = {
4C690A0000001400000014000000FFFFFF00FFFFFF000000000C060606EE0A0A
4C690C0000001400000014000000FFFFFF00FFFFFF000000000C060606EE0A0A
0AF3090909F4080808F5070707F6070707F7060606F8050505F9040404FA0505
05FC0505058CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF0000000010080808F8F0F0F0FFF1F1F1FFF2F2F2FFF3F3F3FFF4F4
@ -3852,7 +3856,107 @@
001800010DE80A0B40F513136AFF000109F80000033DFFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF000000054102031BBF010215A90000000AFFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000010000215AF010216CD0000
002CFFFFFF00FFFFFF00FFFFFF00
002CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0053575501535755685357
55B9535755EB535755EC535755B95357556853575501FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF005357551B535755BF717572CBCCC6C0AAEBE2DAB0EBE3DAAECCC6BFAC7576
72D1545855C15357551BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
000000000000000000000000000053575501535755C09F9F9CA8F2E4D8AED8B0
8BB6CFA176F8CFA276F5D6B08BADF5ECE39DA2A09AB4545855C253575501FFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
5564707472CCF1E5DAABD2A77C71CFA076F9E6DDD4FFE7E1D9FFCE9E72FDD9BA
9D62F5EDE49B747572D453575565FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000535755BAC7C6C3A0D6AE89C1CFA073FBCE9E
71FFEAE9E6FFECEEEEFFC7976CFDC59569F6CDA47DA6C8C4BEAA555855BDFFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
55EBE9E3DDA8CFA176F9E6DFD7FFEBEBEAFFECEEEEFFECEEEEFFE7E2DDFFE1D7
CDFFB98356F8E9E3DDA7545755ECFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000535755EBE9E4DFA5CB9B6EFAE7E2DCFFECEE
EEFFECEEEEFFECEEEEFFECEEEEFFE7E3DFFFB1794BFAE9E3DDA8545755ECFFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
55B9C7C6C49ECEA37BCDC08B5EFDBD8A5DFDEBEBEAFFECEEEEFFB57F53FCAD72
43FEBA875FBBC7C3BDAD555855BCFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
000000000000000000000000000053575562707372D0F4EAE0A1CFA47980B57C
4EFDE5DFDAFFE6E1DCFFAA6F3FFCC99C745BF5ECE49C737572D653575562FFFF
FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF00535755BD9A9D9BAAF3E8DEA6C09068C5AC7141FAA96D3EF9B7835BC0F4EB
E2A19F9D98B8545755BEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF005357551A535755BD707372D0C7C4
C0A5E8E2DBABE7E0D9AEC7C3BDAC737472D5535755BD4C758DBD1F6D9EEB075D
936FFFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF0053575562535755B9535755EB535755EB535755B95357
5562FFFFFF001C6B9CEB82B7D9FF4285AFF7075C9271FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00055C926F3D82ADF68EC1
E3FF4385AFF7075D926FFFFFFF0000000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00055C92763C82ACF68EC1E3FF2F78A5F7055B91650000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00055C
92792B77A5F5AFD2E8FF095E94F300000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00065C9276075C92F5085F948F0000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000FFFFFF00FFFFFF0053575501535755685357
55B9535755EB535755EC535755B95357556853575501FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF005357551B535755BF717572CBCCC6C0AAEBE2DAB0EBE3DAAECCC6BFAC7576
72D1545855C15357551BFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
000000000000000000000000000053575501535755C09F9F9CA8F2E4D8AEE3C5
AB7ED7AF8A61D7B08B59E6CDB569F5ECE39DA2A09AB4545855C253575501FFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
5564707472CCF1E5DAABD2A77C71D5B29074DFCDBA92E4DACEA3E4D6CA96DDBF
A45AF5EDE49B747572D453575565FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000535755BAC7C6C3A0D6AE89C1CFA073FBCFA1
75FCCFA075FBCB9C71FBC9996FF9C6956AF5CDA47DA6C8C4BEAA555855BDFFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
55EBE9E3DDA8CFA176F9E6DFD7FFEAEAE8FFE9E8E5FFE8E6E2FFE7E4DFFFE1D7
CDFFB98356F8E9E3DDA7545755ECFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000535755EBE9E4DFA5CB9B6EFAE7E2DCFFECEE
EEFFECEEEEFFECEEEEFFECEEEEFFE7E3DFFFB1794BFAE9E3DDA8545755ECFFFF
FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000005357
55B9C7C6C49ECEA37BCDC08B5EFDBD895CFCB98355FCB67E4FFCB17849FCAD72
43FEBA875FBBC7C3BDAD555855BCFFFFFF00FFFFFF00FFFFFF00FFFFFF000000
000000000000000000000000000053575562707372D0F4EAE0A1CFA47980CC9C
6C73CC9B6C68CB996E5ECA9A6C54D0A47F51F5ECE49C737572D653575562FFFF
FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF00535755BD9A9D9BAAF3E8DEA6E1C4A885D6AF8868D6AF8A60E5CBB36FF4EB
E2A19F9D98B8545755BEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF005357551A535755BD707372D0C7C4
C0A5E8E2DBABE7E0D9AEC7C3BDAC737472D5535755BD4C758DBD1F6D9EEB075D
936FFFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF0053575562535755B9535755EB535755EB535755B95357
5562FFFFFF001C6B9CEB82B7D9FF4285AFF7075C9271FFFFFF00FFFFFF000000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00055C926F3D82ADF68EC1
E3FF4385AFF7075D926FFFFFFF0000000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00055C92763C82ACF68EC1E3FF2F78A5F7055B91650000
0000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00055C
92792B77A5F5AFD2E8FF095E94F300000000000000000000000000000000FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00065C9276075C92F5085F948F0000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000
}
end
object OpenPictureDialog: TOpenPictureDialog

File diff suppressed because it is too large Load Diff

View File

@ -95,7 +95,6 @@ type
ColorDialog: TColorDialog;
ImageListActions: TImageList;
LabelFillOutline: TLabel;
LabelZoom: TLabel;
MenuItem4: TMenuItem;
MenuItemMaskRemove: TMenuItem;
MenuItemMaskInvert: TMenuItem;
@ -164,6 +163,8 @@ type
PanelTools: TPanel;
ExportResourceDialog: TSaveDialog;
SavePictureDialog: TSavePictureDialog;
ZoomInBtn: TToolButton;
ZoomOutBtn: TToolButton;
ToolCircleShape: TSpeedButton;
ToolMaskEllipse: TSpeedButton;
ToolMaskFloodFill: TSpeedButton;
@ -256,6 +257,8 @@ type
procedure Rotate270Execute(Sender: TObject);
procedure Rotate90Execute(Sender: TObject);
procedure spinFillAlphaChange(Sender: TObject);
procedure ZoomInBtnClick(Sender: TObject);
procedure ZoomOutBtnClick(Sender: TObject);
procedure ToolCircleShapeClick(Sender: TObject);
procedure ToolColorPickClick(Sender: TObject);
procedure ToolEllClick(Sender: TObject);
@ -459,6 +462,44 @@ begin
ActivePictureEdit.FillAlpha := spinFillAlpha.Value;
end;
procedure TMainForm.ZoomInBtnClick(Sender: TObject);
var
V, E: integer;
S: string;
begin
if not Pictures.CanEdit then
Exit;
if Pos('%', ComboBoxZoom.Text) > 0 then
S := Trim(Copy(ComboBoxZoom.Text, 1, Pos('%', ComboBoxZoom.Text) - 1))
else
S := Trim(ComboBoxZoom.Text);
E := StrToInt(S);
V := E + 10;
if V <= 0 then
V := 100;
ActivePictureEdit.Zoom := V / 100;
ComboBoxZoom.Text := IntToStr(V) + '%';
end;
procedure TMainForm.ZoomOutBtnClick(Sender: TObject);
var
V, E: integer;
S: string;
begin
if not Pictures.CanEdit then
Exit;
if Pos('%', ComboBoxZoom.Text) > 0 then
S := Trim(Copy(ComboBoxZoom.Text, 1, Pos('%', ComboBoxZoom.Text) - 1))
else
S := Trim(ComboBoxZoom.Text);
E := StrToInt(S);
V := E - 10;
if V <= 0 then
V := 100;
ActivePictureEdit.Zoom := V / 100;
ComboBoxZoom.Text := IntToStr(V) + '%';
end;
procedure TMainForm.ToolCircleShapeClick(Sender: TObject);
begin
if not Pictures.CanEdit then
@ -963,7 +1004,7 @@ begin
EditUndo.Hint := lieHintEditUndo;
//Labels
LabelZoom.Caption := lieLabelZoom;
// LabelZoom.Caption := lieLabelZoom;
LabelShape.Caption := lieLabelShape;
LabelFillOutline.Caption := lieLabelFillOutline;
LabelMaskTool.Caption := lieLabelMaskTool;