paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-21 22:39:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

EditorToolbar package updates by G. Colla. Issue #26692.

Browse Source 
git-svn-id: trunk@46183 -
This commit is contained in:
juha 2014-09-11 16:22:17 +00:00
parent 07712d3201
commit 2471a0a5b2
17 changed files with 91 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/editortoolbar/editortoolbar.lpk
View File

@ -19,7 +19,7 @@
"/>
<License Value="GPL
"/>
<Version Minor="8"/>
<Version Minor="8" Release="2"/>
<Files Count="4">
<Item1>
<Filename Value="jumpto_impl.pas"/>
@ -42,6 +42,7 @@
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="languages"/>
<EnableI18NForLFM Value="True"/>
</i18n>
<Type Value="DesignTime"/>
<RequiredPkgs Count="5">

12
components/editortoolbar/editortoolbar_impl.pas
View File

@ -105,7 +105,7 @@ var
bToolBarShow: boolean;
EditorMenuCommand:TIDEMenuCommand;
ProfileMask: array [0..4] of Integer = (iAll,iDesign,iDebug,iHTML,iCustom);
ProfileNames: array [0..4] of String = (rsAll,rsDesign,rsDebug,rsHTML,rsCustom);
sLocalizedProfileNames: array[0..4] of string;
implementation
@ -253,7 +253,7 @@ function TEditorToolbar.CreateProfileItem(ProfIndx: Integer; O: TComponent
begin
Result := TMenuItem.Create(O);
Result.Tag := ProfIndx;
Result.Caption := ProfileNames[ProfIndx];
Result.Caption := sLocalizedProfileNames[ProfIndx];
Result.GroupIndex := 1;
Result.RadioItem := True;
//Result.AutoCheck := True;
@ -295,11 +295,17 @@ begin
uEditorToolbarList.AddBar(Self);
if assigned(TB) then exit;
sLocalizedProfileNames[0] := rsAll;
sLocalizedProfileNames[1] := rsDesign;
sLocalizedProfileNames[2] := rsDebug;
sLocalizedProfileNames[3] := rsHTML;
sLocalizedProfileNames[4] := rsCustom;
FJumpHandler := TJumpHandler.Create(nil);
FWindow := TSourceEditorWindowInterface(AOwner);
PPUP := TPopupMenu.Create(FWindow);
for c := 0 to High(ProfileNames) do begin
for c := 0 to High(sLocalizedProfileNames) do begin
PPUP.Items.Add(CreateProfileItem(c,FWindow));
end;

1
components/editortoolbar/editortoolbar_str.pas
View File

@ -30,6 +30,7 @@ resourcestring
rsRight = 'Right';
rsEditorToolbar = 'Editor ToolBar';
rsMenuView = 'View';
rsProfile = 'Profile';
rsAll = 'All';
rsDesign = 'Design';
rsDebug = 'Debug';

40
components/editortoolbar/edttbconfigfrm.lfm
View File

@ -173,7 +173,7 @@ object EdtTbConfigForm: TEdtTbConfigForm
Width = 100
Anchors = [akLeft, akBottom]
BorderSpacing.Bottom = 6
ItemHeight = 0
ItemHeight = 17
ItemIndex = 0
Items.Strings = (
'All'
@ -249,7 +249,7 @@ object EdtTbConfigForm: TEdtTbConfigForm
Width = 100
Anchors = [akRight, akBottom]
BorderSpacing.Bottom = 6
ItemHeight = 0
ItemHeight = 17
ItemIndex = 0
Items.Strings = (
'Top'
@ -328,42 +328,6 @@ object EdtTbConfigForm: TEdtTbConfigForm
Top = 276
Width = 22
BorderSpacing.Top = 50
Glyph.Data = {
36040000424D3604000000000000360000002800000010000000100000000100
2000000000000004000064000000640000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000000000008F9091FF8F90
91FF8F9091FF8F9091FF8F9091FF8F9091FF8F9091FF8F9091FF8F9091FF8F90
91FF8F9091FF8F9091FF8F9091FF8F9091FF8F9091FF8F9091FFC7CFD3FFC8D0
D4FFC6CED1FFC4CCD0FFC5CDD1FFC6CED2FFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFBAC0C3FFA0A3A5FF999C9DFFC3CBCFFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFBAC0C3FFA0A3A5FF999C9DFFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFD5DADDFFD2D6D8FF8F9192FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFD5DADDFFD2D6D8FF8F9192FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFDCE1E3FFE0E4E7FF929495FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFDCE1E3FFE0E4E7FF929495FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFD8DEE1FFEFF2F2FFA1A3A4FFC2CACDFFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFD8DEE1FFEFF2F2FFA1A3A4FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC8D0
D4FFC9D1D5FFCED5D8FFC2C9CCFFC6CED2FFC7CFD3FFD5DADDFF8F9091FFC7CF
D3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFC7CFD3FFE4E8EAFFE4E7
EAFFE4E7EAFFE4E7EAFFE4E8EAFFE4E7EAFFE4E7EAFFE4E7EAFFE4E8EAFFE4E7
EAFFE4E7EAFFE4E8EAFFE4E7EAFFE4E7EAFFE4E7EAFFE4E8EAFFD4D9DDFFD4D9
DCFFD4D9DCFFD4D9DCFFD4D9DDFFD4D9DCFFD4D9DCFFD4D9DCFFD4D9DDFFD4D9
DCFFD4D9DCFFD4D9DDFFD4D9DCFFD4D9DCFFD4D9DCFFD4D9DDFF
}
OnClick = btnAddDividerClick
ShowHint = True
ParentShowHint = False

23
components/editortoolbar/edttbconfigfrm.pas
View File

@ -177,6 +177,7 @@ begin
btnMoveDown.LoadGlyphFromResourceName(HInstance, 'arrow_down');
btnClear.LoadGlyphFromResourceName(HINSTANCE,'menu_close');
btnHelp.LoadGlyphFromResourceName(HINSTANCE, 'menu_help');
sbAddDivider.LoadGlyphFromResourceName(HINSTANCE, 'menu_divider16');
btnAdd.Hint := rsAddSelected;
btnRemove.Hint := rsRemoveSelected;
@ -195,8 +196,8 @@ begin
MainList := TStringList.Create;
MainList.OwnsObjects:= True; // it should be the default, but just to make sure...
LoadStyleSettings;
SetupCaptions;
LoadStyleSettings;
LoadCategories;
LoadSettings;
end;
@ -319,8 +320,6 @@ end;
procedure TEdtTbConfigForm.ExchangeMainListItem(Item1, Item2: TListItem);
var
I,J: Integer;
MainListItem1,MainListItem2: TLvItem;
MainIndex1,MainIndex2: Integer;
aMainListItem: TLvItem;
begin
@ -600,19 +599,21 @@ begin
lblMenuTree.Caption := rsMenuTree;
lblToolbar.Caption := rsToolbar;
lblpos.Caption := rsPosition;
lblProfile.Caption := rsProfile;
sLocalizedPosValues[0] := rsTop;
sLocalizedPosValues[1] := rsBottom;
sLocalizedPosValues[2] := rsRight;
sLocalizedPosValues[3] := rsLeft;
for i := 0 to 3 do
for i := 0 to high(sLocalizedPosValues) do
begin
cbPos.Items[i] := sLocalizedPosValues[i]; // localized
end;
cbProfile.Items[0] := rsAll;
cbProfile.Items[1] := rsDesign;
cbProfile.Items[2] := rsDebug;
cbProfile.Items[3] := rsHTML;
cbProfile.Items[4] := rsCustom;
for i := 0 to high(sLocalizedProfileNames) do
begin
cbProfile.Items[i] := sLocalizedProfileNames[i];
end;
end;
procedure TEdtTbConfigForm.LoadCategories;
@ -638,7 +639,6 @@ var
aProfileMask: Integer;
mi: TIDEMenuItem;
ms: TIDEMenuSection;
lvItem: TListItem;
begin
cfg := GetIDEConfigStorage(cSettingsFile, True);
try
@ -689,7 +689,8 @@ begin
value := cfg.GetValue('Profile',iAll);
CurrProfile := value;
value := GetProfileIndex(value);
cbProfile.ItemIndex:= value;
//cbProfile.ItemIndex:= value;
cbProfile.Text:= sLocalizedProfileNames[value];
finally
cfg.Free;
end;

3
components/editortoolbar/images/toolbar.txt
View File

@ -4,4 +4,5 @@ arrowright_blue16.xpm
arrowup_blue16.xpm
execute16.xpm
jumpto16.xpm
preferences16.xpm
preferences16.xpm
menu_divider16.xpm

4
components/editortoolbar/languages/editortoolbar_str.cs.po
View File

@ -142,6 +142,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Odstranit položku z panelu nástrojů"

4
components/editortoolbar/languages/editortoolbar_str.de.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Gewähltes Element aus der Toolbar entfernen"

4
components/editortoolbar/languages/editortoolbar_str.es.po
View File

@ -141,6 +141,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Eliminar el elemento seleccionado de la barra de herramientas"

4
components/editortoolbar/languages/editortoolbar_str.hu.po
View File

@ -143,6 +143,10 @@ msgstr "Csomagszerkesztő fájljai"
msgid "Position"
msgstr "Elhelyezés"
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "A kijelölt elem eltávolítása az eszköztárról"

50
components/editortoolbar/languages/editortoolbar_str.it.po
View File

@ -1,6 +1,6 @@
msgid ""
msgstr ""
"PO-Revision-Date: 2014-07-17 19:57+0100\n"
"PO-Revision-Date: 2014-09-01 16:52+0100\n"
"Last-Translator: Giuliano Colla <giuliano.colla@fastwebnet.it>\n"
"Language-Team: PincoPallo Team\n"
"Language: it\n"
@ -22,7 +22,7 @@ msgstr "Aggiungere alla barra degli strumenti"
#: editortoolbar_str.rsall
msgid "All"
msgstr ""
msgstr "Tutti"
#: editortoolbar_str.rsbottom
msgid "Bottom"
@ -34,15 +34,15 @@ msgstr "Annulla"
#: editortoolbar_str.rsclearselection
msgid "Clear selection"
msgstr ""
msgstr "Annulla selezione"
#: editortoolbar_str.rscodeexplorer
msgid "Code Explorer"
msgstr ""
msgstr "Esplora codice"
#: editortoolbar_str.rscodetemplates
msgid "Code Templates"
msgstr ""
msgstr "Modelli di codice"
#: editortoolbar_str.rsconfiguretoo
msgid "Configure Toolbar"
@ -50,19 +50,19 @@ msgstr "Configura la toolbar"
#: editortoolbar_str.rscustom
msgid "Custom"
msgstr ""
msgstr "Personale"
#: editortoolbar_str.rsdebug
msgid "Debug"
msgstr ""
msgstr "Debug"
#: editortoolbar_str.rsdesign
msgid "Design"
msgstr ""
msgstr "Progetto"
#: editortoolbar_str.rsdesigner
msgid "Designer"
msgstr ""
msgstr "Progettazione"
#: editortoolbar_str.rseditortoolbar
msgid "Editor ToolBar"
@ -74,31 +74,31 @@ msgstr "Editor di configurazione toolbar"
#: editortoolbar_str.rshelp1
msgid "The \"Add\" button inserts a Menu Item before the selected Item of the Toolbar."
msgstr ""
msgstr "Il bottone \"Aggiungi\" inserisce una voce prima di quella selezionata nella Barra Strumenti."
#: editortoolbar_str.rshelp2
msgid "If none is selected, the Item will be appended at the end of the Toolbar."
msgstr ""
msgstr "Se nessuna è selezionata, la voce sarà aggiunta alla fine."
#: editortoolbar_str.rshelp3
msgid "You may rearrage Toolbar Items with \"Move Up\" and \"Move Down\" buttons."
msgstr ""
msgstr "Potete riposizionare le voci della barra con i bottoni \"Sposta su\" e \"Sposta giù\"."
#: editortoolbar_str.rshelp4
msgid "Hint: to append an Item at the end, use \"Clear selection\""
msgstr ""
msgstr "Consiglio: per aggiungere una voce in fondo, usa \"Annulla selezione\""
#: editortoolbar_str.rshint
msgid "You may add here your favorite commands"
msgstr ""
msgstr "Potete aggiungere qui i vostri comandi preferiti"
#: editortoolbar_str.rshtml
msgid "HTML"
msgstr ""
msgstr "HTML"
#: editortoolbar_str.rsidemainmenu
msgid "IDE Main Menu"
msgstr ""
msgstr "Menu principale"
#: editortoolbar_str.rsjumpto
msgid "Jump To"
@ -119,15 +119,15 @@ msgstr "Visualizza"
#: editortoolbar_str.rsmessages
msgid "Messages"
msgstr ""
msgstr "Messaggi"
#: editortoolbar_str.rsmoveselecteddown
msgid "Move selected toolbar item down"
msgstr "Spostare in basso"
msgstr "Spostare in giù"
#: editortoolbar_str.rsmoveselectedup
msgid "Move selected toolbar item up"
msgstr "Spostare in alto"
msgstr "Spostare in su"
#: editortoolbar_str.rsok
msgid "OK"
@ -135,16 +135,20 @@ msgstr "OK"
#: editortoolbar_str.rspackageeditor
msgid "Package Editor"
msgstr ""
msgstr "Editor Pacchetti"
#: editortoolbar_str.rspackageeditorfiles
msgid "Package Editor Files"
msgstr ""
msgstr "File di editor pacchetti"
#: editortoolbar_str.rsposition
msgid "Position"
msgstr "Posizione"
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr "Profilo"
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Rimuovere dalla barra degli strumenti"
@ -155,11 +159,11 @@ msgstr "Destra"
#: editortoolbar_str.rssourceeditor
msgid "Source Editor"
msgstr ""
msgstr "Editor sorgente"
#: editortoolbar_str.rssourcetab
msgid "Source Tab"
msgstr ""
msgstr "Linguette editor sorgente"
#: editortoolbar_str.rstoolbar
#| msgid "Toolbar"

4
components/editortoolbar/languages/editortoolbar_str.lt.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Iš įrankių juostos pašalinti pažymėtą elementą"

4
components/editortoolbar/languages/editortoolbar_str.po
View File

@ -133,6 +133,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr ""

4
components/editortoolbar/languages/editortoolbar_str.pt_BR.po
View File

@ -142,6 +142,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Excluir item selecionado da barra de ferramentas"

4
components/editortoolbar/languages/editortoolbar_str.ru.po
View File

@ -142,6 +142,10 @@ msgstr "Файлы в редакторе пакетов"
msgid "Position"
msgstr "Положение"
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr "Удалить выбранный элемент с панели"

4
components/editortoolbar/languages/editortoolbar_str.uk.po
View File

@ -143,6 +143,10 @@ msgstr ""
msgid "Position"
msgstr ""
#: editortoolbar_str.rsprofile
msgid "Profile"
msgstr ""
#: editortoolbar_str.rsremoveselected
msgid "Remove selected item from toolbar"
msgstr ""

BIN
components/editortoolbar/toolbar.res
View File

Binary file not shown.