paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-01 09:53:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

images: rename and move menu_save image to laz_save

Browse Source 
ide: use stock save, load buttons when possible

git-svn-id: trunk@19790 -
This commit is contained in:
paul 2009-05-04 04:59:13 +00:00
parent f602e242f8
commit 72c5a3cd8c
12 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -3025,6 +3025,7 @@ images/actions/laz_edit.png -text svneol=unset#image/png
images/actions/laz_open.png -text svneol=unset#image/png
images/actions/laz_paste.png -text svneol=unset#image/png
images/actions/laz_refresh.png -text svneol=unset#image/png
images/actions/laz_save.png -text svneol=unset#image/png
images/actions/laz_wand.png -text svneol=unset#image/png
images/bookmark.lrs svneol=native#text/pascal
images/bookmark.sh svneol=native#text/plain
@ -3305,7 +3306,6 @@ images/menu/menu_run.png -text svneol=unset#image/png
images/menu/menu_run_cursor.png -text svneol=unset#image/png
images/menu/menu_run_file.png -text svneol=unset#image/png
images/menu/menu_run_parameters.png -text svneol=unset#image/png
images/menu/menu_save.png -text svneol=unset#image/png
images/menu/menu_save_all.png -text svneol=unset#image/png
images/menu/menu_saveas.png -text
images/menu/menu_search_files.png -text svneol=unset#image/png

4
ide/buildlazdialog.pas
View File

@ -859,7 +859,9 @@ begin
IDEDialogLayoutList.ApplyLayout(Self, 520, 570);
CompileButton.LoadGlyphFromLazarusResource('menu_build');
SaveSettingsButton.LoadGlyphFromLazarusResource('menu_save');
SaveSettingsButton.LoadGlyphFromStock(idButtonSave);
if SaveSettingsButton.Glyph.Empty then
SaveSettingsButton.LoadGlyphFromLazarusResource('laz_save');
Load(FOptions);
end;

6
ide/compileroptionsdlg.pp
View File

@ -41,7 +41,7 @@ interface
uses
Forms, Classes, Math, LCLProc, SysUtils, InterfaceBase,
ComCtrls, Buttons, StdCtrls, ExtCtrls, Graphics, LResources, FileUtil,
Dialogs, Controls, GraphType,
Dialogs, Controls, GraphType, LCLType,
LinkScanner,
MacroIntf, ProjectIntf, IDEWindowIntf, IDEContextHelpEdit,
TransferMacros, PathEditorDlg, LazarusIDEStrConsts, IDEOptionDefs, LazConf,
@ -1676,7 +1676,9 @@ begin
btnCheck.Caption := lisCompTest;
btnLoadSave.Hint := dlgCOLoadSave;
btnLoadSave.Caption := '...';
btnLoadSave.LoadGlyphFromLazarusResource('menu_save');
btnLoadSave.LoadGlyphFromStock(idButtonSave);
if btnLoadSave.Glyph.Empty then
btnLoadSave.LoadGlyphFromLazarusResource('laz_save');
HelpButton.Caption:=lisPckEditHelp;
end;

12
ide/diffdialog.pas
View File

@ -41,7 +41,7 @@ interface
uses
Classes, SysUtils, Math, Forms, Controls, Buttons, StdCtrls, FileUtil,
LResources, LazarusIDEStrConsts, EditorOptions, IDEWindowIntf,
LResources, LazarusIDEStrConsts, EditorOptions, IDEWindowIntf, LCLType,
InputHistory, DiffPatch, ExtCtrls, Dialogs, SynEdit, IDEContextHelpEdit;
type
@ -262,8 +262,14 @@ begin
CloseButton.Caption:=lisMenuClose;
OpenInEditorButton.Caption:=lisDiffDlgOpenDiffInEditor;
SaveDiffButton.Caption:=lisSave;
OpenInEditorButton.LoadGlyphFromLazarusResource('laz_open');
SaveDiffButton.LoadGlyphFromLazarusResource('menu_save');
OpenInEditorButton.LoadGlyphFromStock(idButtonOpen);
if OpenInEditorButton.Glyph.Empty then
OpenInEditorButton.LoadGlyphFromLazarusResource('laz_open');
SaveDiffButton.LoadGlyphFromStock(idButtonSave);
if SaveDiffButton.Glyph.Empty then
SaveDiffButton.LoadGlyphFromLazarusResource('laz_save');
// dialogs
dlgOpen.Title:=lisOpenExistingFile;

10
ide/imexportcompileropts.pas
View File

@ -33,7 +33,7 @@ interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Buttons, IDEProcs, FileUtil, Laz_XMLCfg,
Buttons, IDEProcs, FileUtil, Laz_XMLCfg, LCLType,
LazarusIDEStrConsts, InputHistory, CompilerOptions, CompilerOptionsDlg;
type
@ -231,8 +231,12 @@ begin
SaveButton.Caption:=lisIECOSaveToFile;
OpenButton.Caption:=lisIECOLoadFromFile;
CancelButton.Caption:=dlgCancel;
OpenButton.LoadGlyphFromLazarusResource('laz_open');
SaveButton.LoadGlyphFromLazarusResource('menu_save');
OpenButton.LoadGlyphFromStock(idButtonOpen);
if OpenButton.Glyph.Empty then
OpenButton.LoadGlyphFromLazarusResource('laz_open');
SaveButton.LoadGlyphFromStock(idButtonSave);
if SaveButton.Glyph.Empty then
SaveButton.LoadGlyphFromLazarusResource('laz_save');
LoadRecentList;
end;

2
ide/main.pp
View File

@ -1667,7 +1667,7 @@ begin
MainIDEBar.OpenFileArrowSpeedBtn.Width := 12;
ButtonLeft := n+12+1;
MainIDEBar.SaveSpeedBtn := CreateButton('SaveSpeedBtn' , 'menu_save' , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuSaveClicked, lisHintSave);
MainIDEBar.SaveSpeedBtn := CreateButton('SaveSpeedBtn' , 'laz_save' , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuSaveClicked, lisHintSave);
MainIDEBar.SaveAllSpeedBtn := CreateButton('SaveAllSpeedBtn' , 'menu_save_all', 1, ButtonLeft, ButtonTop, [mfLeft], @mnuSaveAllClicked, lisHintSaveAll);
MainIDEBar.NewFormSpeedBtn := CreateButton('NewFormSpeedBtn' , 'item_form' , 1, ButtonLeft, ButtonTop, [mfLeft], @mnuNewFormClicked, lisMenuNewForm);
MainIDEBar.ToggleFormSpeedBtn := CreateButton('ToggleFormSpeedBtn' , 'menu_view_toggle_form_unit' , 1, ButtonLeft, ButtonTop, [mfLeft, mfTop], @mnuToggleFormUnitCLicked, lisHintToggleFormUnit);

2
ide/mainbase.pas
View File

@ -367,7 +367,7 @@ begin
CreateMenuItem(ParentMI, itmFileOpen, 'itmFileOpen', lisMenuOpen, 'laz_open');
CreateMenuItem(ParentMI,itmFileRevert,'itmFileRevert',lisMenuRevert, 'menu_file_revert');
CreateMenuSubSection(ParentMI,itmFileRecentOpen,'itmFileRecentOpen',lisMenuOpenRecent);
CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'menu_save');
CreateMenuItem(ParentMI,itmFileSave,'itmFileSave',lisMenuSave,'laz_save');
CreateMenuItem(ParentMI,itmFileSaveAs,'itmFileSaveAs',lisMenuSaveAs,'menu_saveas');
CreateMenuItem(ParentMI,itmFileSaveAll,'itmFileSaveAll',lisMenuSaveAll,'menu_save_all');
CreateMenuItem(ParentMI,itmFileClose,'itmFileClose',lisMenuClose,'menu_close',false);

10
ide/projectopts.pp
View File

@ -38,7 +38,7 @@ interface
uses
Arrow, Buttons, StdCtrls, SysUtils, LCLProc, Classes, CodeToolManager,
Controls, Dialogs, LCLIntf, LResources, ExtCtrls, Forms, Graphics, Spin,
FileUtil, IDEContextHelpEdit, EnvironmentOpts,
FileUtil, IDEContextHelpEdit, EnvironmentOpts, LCLType,
IDEWindowIntf, IDEImagesIntf, ProjectIntf, IDEDialogs,
IDEOptionDefs, LazarusIDEStrConsts, Project, IDEProcs, W32VersionInfo,
VersionInfoAdditionalInfo, W32Manifest, ApplicationBundle, ExtDlgs,
@ -305,8 +305,12 @@ begin
LoadIconButton.Caption := dlgPOLoadIcon;
SaveIconButton.Caption := dlgPOSaveIcon;
ClearIconButton.Caption := dlgPOClearIcon;
LoadIconButton.LoadGlyphFromLazarusResource('laz_open');
SaveIconButton.LoadGlyphFromLazarusResource('menu_save');
LoadIconButton.LoadGlyphFromStock(idButtonOpen);
if LoadIconButton.Glyph.Empty then
LoadIconButton.LoadGlyphFromLazarusResource('laz_open');
SaveIconButton.LoadGlyphFromStock(idButtonSave);
if SaveIconButton.Glyph.Empty then
SaveIconButton.LoadGlyphFromLazarusResource('laz_save');
ClearIconButton.LoadGlyphFromLazarusResource('menu_clean');
IconImagePictureChanged(nil);
end;

6
ide/publishprojectdlg.pas
View File

@ -38,7 +38,7 @@ interface
uses
Classes, SysUtils, FileUtil, Forms, Controls, Graphics, LResources, Buttons,
StdCtrls, Dialogs,
StdCtrls, Dialogs, LCLType,
IDEWindowIntf,
ProjectDefs, PackageDefs, PublishModule, IDEOptionDefs, InputHistory,
LazarusIDEStrConsts, ExtCtrls, IDEContextHelpEdit, ButtonPanel;
@ -174,7 +174,9 @@ begin
ButtonPanel1.CloseButton.Caption := lisSaveSettings;
ButtonPanel1.CloseButton.ModalResult := mrNone;
ButtonPanel1.CloseButton.Kind := bkCustom;
ButtonPanel1.CloseButton.LoadGlyphFromLazarusResource('menu_save');
ButtonPanel1.CloseButton.LoadGlyphFromStock(idButtonSave);
if ButtonPanel1.CloseButton.Glyph.Empty then
ButtonPanel1.CloseButton.LoadGlyphFromLazarusResource('laz_save');
ButtonPanel1.CloseButton.OnClick := @SaveSettingsButtonCLICK;
ButtonPanel1.HelpButton.OnClick := @HelpButtonClick;

0
images/menu/menu_save.png → images/actions/laz_save.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 564 B

After

Width:  |  Height:  |  Size: 564 B

50
images/laz_images.lrs
View File

@ -5535,6 +5535,31 @@ LazarusResources.Add('laz_refresh','PNG',[
+#144'R'#197#13']'#155'!'#194'P'#213#145#135'l'#203#252#219#15#247'.Uvj'#19
+'e'#204#198#0#0#0#0'IEND'#174'B`'#130
]);
LazarusResources.Add('laz_save','PNG',[
#137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+#0#0#1#251'IDATx^'#141#146#191'kTA'#16#199'?'#243#238#229'B'#130#146#168'`'
+#132'DD'#3#10'V'#1'%'#144#248#163#21#255#4#11#209'"U'#132#160'EJm'#172#172'D'
+'D'#17'b'#161#216#10'v'#130'ba'#149'"'#22#22#193'N'#197'B'#180#18#197#4'/'
+#151#221#157#175'w'#195#227#176'J'#252#242#134#25#216#153#157#207#204'>'#155
+#189#246#230#6'p'#4'8'#11#28#3#246#128'j'#192#16#161'VeT='#147#28'w~'#181#135
+#248#216#233#166';k'#15'/>'#175#129#147'+'#203#243#11'`'#156#152#28'F'#128'\'
+'l'#231#158'%'#143#226#145#225#10'3'#216#236'8'#155'[e'#236#243#247#205#153
+#167#175'>='#154']|9V'#1#231#16#188'X'#251#141#11'$'#177't'#255#29#238#2'3'
+#134#234#232#30#23'v'#146#147#29'+T'#245#149#11#211#7'F'#134#219#15'*'#224
+#144' '#10'R'#246#158#9#128#228#162'n'#17#23#184#139#206'vs&'#241'v}'#131#246
+'P'#139'N7'#183'k`4'#187#128'H'#2#160'2'#3#245#139'+'#12'c+y/Y'#184#250'F'
+#248'o?'#182'@'#178#26'T'#23#9#9#186'M'#247#155'Wg'#162#184#247#145#138#248
+#211'u'#178#199#2#17'B'#222#167')HNl'#219#11' q'#251#201'{'#204#140#202#154
+#238'@v'#145#179'#'#6'b||?)'#183'@'#162'&'#144#28#247#194#193#137'I00'#4#2'h'
+#144#221'Q'#224'+b'#204'H)CC@) '#17#178'A'#0#129','#1'"'#156#20#231#146#147
+#146#13'F '#23#135#6'R'#8#195' '#18'c^D'#196'A)'#23#194#233'&5'#4#136#226#2
+#193#173'KS'#252#143#150'W>'#144#179#8#130#202#140#226'4]'#224#222#234#2';ii'
+'n'#133'Rr'#252'X'#177'DbVa'#132#152#159#186#204'n'#242#226#148'$'#192#169'%'
+#169#184#12#4#192#234#215'g'#236#164#211#135#207'SJ!'#21'!I'#181#139'/'#219
+#217#143#158#154#30#197#12#174#159'y'#204'n'#154#216#235#148'"'#128#159'6'
+#187#248#250#174#164#227#160'9'#164'}'#224'H'#2'9'#146#255#235#7'/'#19#1#218
+#192#170#245#191'!|n'#139'x'#27'h`'#0#0#0#0'IEND'#174'B`'#130
]);
LazarusResources.Add('laz_wand','PNG',[
#137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+#0#0#0#4'gAMA'#0#0#175#200'7'#5#138#233#0#0#0#25'tEXtSoftware'#0'Adobe Image'
@ -7153,31 +7178,6 @@ LazarusResources.Add('menu_run_parameters','PNG',[
+#10#241#215'(o'#30'\t'#217'y?'#153#224#185'''F'#153'i'#237#159#203#0'?'#0'!'
+#146#25#190'!'#6'j~'#0#0#0#0'IEND'#174'B`'#130
]);
LazarusResources.Add('menu_save','PNG',[
#137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+#0#0#1#251'IDATx^'#141#146#191'kTA'#16#199'?'#243#238#229'B'#130#146#168'`'
+#132'DD'#3#10'V'#1'%'#144#248#163#21#255#4#11#209'"U'#132#160'EJm'#172#172'D'
+'D'#17'b'#161#216#10'v'#130'ba'#149'"'#22#22#193'N'#197'B'#180#18#197#4'/'
+#151#221#157#175'w'#195#227#176'J'#252#242#134#25#216#153#157#207#204'>'#155
+#189#246#230#6'p'#4'8'#11#28#3#246#128'j'#192#16#161'VeT='#147#28'w~'#181#135
+#248#216#233#166';k'#15'/>'#175#129#147'+'#203#243#11'`'#156#152#28'F'#128'\'
+'l'#231#158'%'#143#226#145#225#10'3'#216#236'8'#155'[e'#236#243#247#205#153
+#167#175'>='#154']|9V'#1#231#16#188'X'#251#141#11'$'#177't'#255#29#238#2'3'
+#134#234#232#30#23'v'#146#147#29'+T'#245#149#11#211#7'F'#134#219#15'*'#224
+#144' '#10'R'#246#158#9#128#228#162'n'#17#23#184#139#206'vs&'#241'v}'#131#246
+'P'#139'N7'#183'k`4'#187#128'H'#2#160'2'#3#245#139'+'#12'c+y/Y'#184#250'F'
+#248'o?'#182'@'#178#26'T'#23#9#9#186'M'#247#155'Wg'#162#184#247#145#138#248
+#211'u'#178#199#2#17'B'#222#167')HNl'#219#11' q'#251#201'{'#204#140#202#154
+#238'@v'#145#179'#'#6'b||?)'#183'@'#162'&'#144#28#247#194#193#137'I00'#4#2'h'
+#144#221'Q'#224'+b'#204'H)CC@) '#17#178'A'#0#129','#1'"'#156#20#231#146#147
+#146#13'F '#23#135#6'R'#8#195' '#18'c^D'#196'A)'#23#194#233'&5'#4#136#226#2
+#193#173'KS'#252#143#150'W>'#144#179#8#130#202#140#226'4]'#224#222#234#2';ii'
+'n'#133'Rr'#252'X'#177'DbVa'#132#152#159#186#204'n'#242#226#148'$'#192#169'%'
+#169#184#12#4#192#234#215'g'#236#164#211#135#207'SJ!'#21'!I'#181#139'/'#219
+#217#143#158#154#30#197#12#174#159'y'#204'n'#154#216#235#148'"'#128#159'6'
+#187#248#250#174#164#227#160'9'#164'}'#224'H'#2'9'#146#255#235#7'/'#19#1#218
+#192#170#245#191'!|n'#139'x'#27'h`'#0#0#0#0'IEND'#174'B`'#130
]);
LazarusResources.Add('menu_saveas','PNG',[
#137'PNG'#13#10#26#10#0#0#0#13'IHDR'#0#0#0#16#0#0#0#16#8#6#0#0#0#31#243#255'a'
+#0#0#0#6'bKGD'#0#255#0#255#0#255#160#189#167#147#0#0#0#9'pHYs'#0#0#11#19#0#0

2
images/laz_images_list.txt
View File

@ -14,6 +14,7 @@ actions/laz_edit.png
actions/laz_open.png
actions/laz_paste.png
actions/laz_refresh.png
actions/laz_save.png
actions/laz_wand.png
items/item_character.png
items/item_filter.png
@ -73,7 +74,6 @@ menu/menu_run.png
menu/menu_run_cursor.png
menu/menu_run_file.png
menu/menu_run_parameters.png
menu/menu_save.png
menu/menu_saveas.png
menu/menu_save_all.png
menu/menu_search_files.png