diff --git a/.gitattributes b/.gitattributes index 1c57650c7b..3bdc885f1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7158,11 +7158,15 @@ images/actions/laz_refresh.png -text svneol=unset#image/png images/actions/laz_save.png -text svneol=unset#image/png images/actions/laz_save_150.png -text images/actions/laz_save_200.png -text -images/actions/laz_set_color_default.png -text svneol=unset#image/png -images/actions/laz_set_colors_default.png -text svneol=unset#image/png images/actions/laz_tick.png -text svneol=unset#image/png images/actions/laz_wand.png -text svneol=unset#image/png images/actions/preferences.png -text +images/actions/restore_default.png -text svneol=unset#image/png +images/actions/restore_default_150.png -text svneol=unset#image/png +images/actions/restore_default_200.png -text svneol=unset#image/png +images/actions/restore_defaults.png -text svneol=unset#image/png +images/actions/restore_defaults_150.png -text svneol=unset#image/png +images/actions/restore_defaults_200.png -text svneol=unset#image/png images/bookmark.res -text images/bookmark.sh svneol=native#text/plain images/bookmark_images.bat svneol=native#text/plain diff --git a/ide/frames/componentpalette_options.pas b/ide/frames/componentpalette_options.pas index 49255c12b6..e129069800 100644 --- a/ide/frames/componentpalette_options.pas +++ b/ide/frames/componentpalette_options.pas @@ -166,6 +166,7 @@ begin AddPageButton.Caption := lisBtnDlgAdd; IDEImages.AssignImage(AddPageButton, 'laz_add'); RestoreButton.Caption := lisCmpRestoreDefaults; + IDEImages.AssignImage(RestoreButton, 'restore_defaults'); ImportDividerBevel.Caption := lisExportImport; IDEImages.AssignImage(ImportButton, 'laz_open'); ImportButton.Caption := lisDlgImport; diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas index 71479bcc95..4d12497420 100644 --- a/ide/frames/editor_color_options.pas +++ b/ide/frames/editor_color_options.pas @@ -1469,9 +1469,9 @@ begin LanguageButton.Hint := dlgLang; ColorSchemeButton.Hint := dlgClrScheme; FileExtensionsComboBox.hint := dlgFileExts; - SetAttributeToDefaultButton.ImageIndex := IDEImages.LoadImage('laz_set_color_default'); + SetAttributeToDefaultButton.ImageIndex := IDEImages.LoadImage('restore_default'); SetAttributeToDefaultButton.Hint := dlgSetElementDefault; - SetAllAttributesToDefaultButton.ImageIndex := IDEImages.LoadImage('laz_set_colors_default'); + SetAllAttributesToDefaultButton.ImageIndex := IDEImages.LoadImage('restore_defaults'); SetAllAttributesToDefaultButton.Hint := dlgSetAllElementDefault; btnExport.ImageIndex := IDEImages.LoadImage('laz_save'); btnExport.Hint := lisExport; diff --git a/ide/frames/editortoolbar_options.pas b/ide/frames/editortoolbar_options.pas index e3e761aa5d..cd223a75e3 100644 --- a/ide/frames/editortoolbar_options.pas +++ b/ide/frames/editortoolbar_options.pas @@ -34,7 +34,7 @@ uses // LazControls DividerBevel, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, // IDE LazarusIDEStrConsts, EnvironmentOpts, EditorToolbarStatic, ToolbarConfig; @@ -110,7 +110,9 @@ begin cbCoolBarVisible.Caption := lisEditorToolbarVisible; lblpos.Caption := lisPosition; bDefaultToolbar.Caption := lisCmpRestoreDefaults; + IDEImages.AssignImage(bDefaultToolbar, 'restore_defaults'); bConfig.Caption := lisCoolbarConfigure; + IDEImages.AssignImage(bConfig, 'preferences'); end; procedure TEditorToolbarOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); diff --git a/ide/frames/fpdoc_options.lfm b/ide/frames/fpdoc_options.lfm index 4bdb89580e..73b0596054 100644 --- a/ide/frames/fpdoc_options.lfm +++ b/ide/frames/fpdoc_options.lfm @@ -33,11 +33,9 @@ object FpDocOptionsFrame: TFpDocOptionsFrame BorderSpacing.Around = 6 ItemHeight = 0 OnSelectionChange = LazDocListBoxSelectionChange - ScrollWidth = 458 TabOrder = 0 - TopIndex = -1 end - object LazDocAddPathButton: TButton + object LazDocAddPathButton: TBitBtn AnchorSideLeft.Control = LazDocPathsGroupBox AnchorSideTop.Control = LazDocListBox AnchorSideTop.Side = asrBottom @@ -52,7 +50,7 @@ object FpDocOptionsFrame: TFpDocOptionsFrame OnClick = LazDocAddPathButtonClick TabOrder = 1 end - object LazDocDeletePathButton: TButton + object LazDocDeletePathButton: TBitBtn AnchorSideLeft.Control = LazDocAddPathButton AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = LazDocAddPathButton diff --git a/ide/frames/fpdoc_options.pas b/ide/frames/fpdoc_options.pas index 28787a462e..e29cadc7f9 100644 --- a/ide/frames/fpdoc_options.pas +++ b/ide/frames/fpdoc_options.pas @@ -27,11 +27,11 @@ interface uses SysUtils, // LCL - Dialogs, StdCtrls, EditBtn, + Dialogs, StdCtrls, EditBtn, Buttons, // LazUtils LazStringUtils, // IdeIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, // IDE EnvironmentOpts, LazarusIDEStrConsts; @@ -40,8 +40,8 @@ type { TFpDocOptionsFrame } TFpDocOptionsFrame = class(TAbstractIDEOptionsEditor) - LazDocAddPathButton: TButton; - LazDocDeletePathButton: TButton; + LazDocAddPathButton: TBitBtn; + LazDocDeletePathButton: TBitBtn; LazDocListBox: TListBox; LazDocPathEdit: TDirectoryEdit; LazDocPathsGroupBox: TGroupBox; @@ -73,7 +73,9 @@ procedure TFpDocOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog); begin LazDocPathsGroupBox.Caption := lisCodeHelpGroupBox; LazDocAddPathButton.Caption := lisCodeHelpAddPathButton; + IDEImages.AssignImage(LazDocAddPathButton, 'laz_add'); LazDocDeletePathButton.Caption := lisCodeHelpDeletePathButton; + IDEImages.AssignImage(LazDocDeletePathButton, 'laz_delete'); LazDocPathEdit.Clear; end; diff --git a/ide/frames/idecoolbar_options.pas b/ide/frames/idecoolbar_options.pas index 3ad7a8bc29..20961d2c66 100644 --- a/ide/frames/idecoolbar_options.pas +++ b/ide/frames/idecoolbar_options.pas @@ -34,7 +34,7 @@ uses // LazControls DividerBevel, // IDEIntf - IDEOptionsIntf, IDEOptEditorIntf, + IDEOptionsIntf, IDEOptEditorIntf, IDEImagesIntf, // IDE LazarusIDEStrConsts, EnvironmentOpts, IdeCoolbarData; @@ -136,12 +136,7 @@ end; procedure TIdeCoolbarOptionsFrame.Setup(ADialog: TAbstractOptionsEditorDialog); begin - dbAddConfigDelete.Caption := lisCoolbarAddConfigDelete; dbGeneralSettings.Caption := lisCoolbarGeneralSettings; - bDefaultToolbar.Caption := lisCoolbarRestoreDefaults; - bAdd.Caption := lisBtnAdd; - bConfig.Caption := lisCoolbarConfigure; - bDelete.Caption := lisBtnDelete; cbCoolBarVisible.Caption := lisCoolbarVisible; lbCoolBarWidth.Caption := lisCoolbarWidth; gbGrabStyle.Caption := lisCoolbarGrabStyle; @@ -156,6 +151,17 @@ begin cbBorderStyle.Items.Strings[0] := lisCoolbarBorderStyleItem0; cbBorderStyle.Items.Strings[1] := lisCoolbarBorderStyleItem1; bDefaultGeneral.Caption := lisCoolbarRestoreDefaults; + IDEImages.AssignImage(bDefaultGeneral, 'restore_default'); + + dbAddConfigDelete.Caption := lisCoolbarAddConfigDelete; + bAdd.Caption := lisBtnAdd; + IDEImages.AssignImage(bAdd, 'laz_add'); + bConfig.Caption := lisCoolbarConfigure; + IDEImages.AssignImage(bConfig, 'preferences'); + bDelete.Caption := lisBtnDelete; + IDEImages.AssignImage(bDelete, 'laz_delete'); + bDefaultToolbar.Caption := lisCoolbarRestoreDefaults; + IDEImages.AssignImage(bDefaultToolbar, 'restore_defaults'); end; procedure TIdeCoolbarOptionsFrame.ReadSettings(AOptions: TAbstractIDEOptions); diff --git a/images/actions/laz_set_color_default.png b/images/actions/laz_set_color_default.png deleted file mode 100644 index 8c71b6660a..0000000000 Binary files a/images/actions/laz_set_color_default.png and /dev/null differ diff --git a/images/actions/laz_set_colors_default.png b/images/actions/laz_set_colors_default.png deleted file mode 100644 index 40647882a5..0000000000 Binary files a/images/actions/laz_set_colors_default.png and /dev/null differ diff --git a/images/actions/restore_default.png b/images/actions/restore_default.png new file mode 100644 index 0000000000..fd1154d730 Binary files /dev/null and b/images/actions/restore_default.png differ diff --git a/images/actions/restore_default_150.png b/images/actions/restore_default_150.png new file mode 100644 index 0000000000..a6da6bdd25 Binary files /dev/null and b/images/actions/restore_default_150.png differ diff --git a/images/actions/restore_default_200.png b/images/actions/restore_default_200.png new file mode 100644 index 0000000000..376bd12e20 Binary files /dev/null and b/images/actions/restore_default_200.png differ diff --git a/images/actions/restore_defaults.png b/images/actions/restore_defaults.png new file mode 100644 index 0000000000..6433eae374 Binary files /dev/null and b/images/actions/restore_defaults.png differ diff --git a/images/actions/restore_defaults_150.png b/images/actions/restore_defaults_150.png new file mode 100644 index 0000000000..578a19d684 Binary files /dev/null and b/images/actions/restore_defaults_150.png differ diff --git a/images/actions/restore_defaults_200.png b/images/actions/restore_defaults_200.png new file mode 100644 index 0000000000..1a82d0bda8 Binary files /dev/null and b/images/actions/restore_defaults_200.png differ diff --git a/images/copyright.txt b/images/copyright.txt index 6cbdcae109..29d75db434 100644 --- a/images/copyright.txt +++ b/images/copyright.txt @@ -52,6 +52,12 @@ laz_open_unit_200.png laz_save.png laz_save_150.png laz_save_200.png +restore_default.png +restore_default_150.png +restore_default_200.png +restore_defaults.png +restore_defaults_150.png +restore_defaults_200.png debugger directory: diff --git a/images/laz_images.res b/images/laz_images.res index 92dec167c9..8485f856db 100644 Binary files a/images/laz_images.res and b/images/laz_images.res differ diff --git a/images/laz_images_list.txt b/images/laz_images_list.txt index 4701141174..87159ca904 100644 --- a/images/laz_images_list.txt +++ b/images/laz_images_list.txt @@ -66,11 +66,15 @@ actions/laz_refresh.png actions/laz_save.png actions/laz_save_150.png actions/laz_save_200.png -actions/laz_set_colors_default.png -actions/laz_set_color_default.png actions/laz_tick.png actions/laz_wand.png actions/preferences.png +actions/restore_default.png +actions/restore_default_150.png +actions/restore_default_200.png +actions/restore_defaults.png +actions/restore_defaults_150.png +actions/restore_defaults_200.png codecompletion/cc_class.png codecompletion/cc_class_150.png codecompletion/cc_class_200.png