Skip to content

Commit

Permalink
SpTBXLib now supports ImageName. vilImagesByIndex removed and updated…
Browse files Browse the repository at this point in the history 
… TB2KPatch-2.2.2.zip

Updated a few icons.
Fixed spelling in dlgAboutPyScripter.pas
  • Loading branch information
@pyscripter
pyscripter committed Apr 30, 2021
1 parent 40c3b47 commit 4336213
Show file tree
Hide file tree
Showing 10 changed files with 87 additions and 160 deletions.
11 changes: 4 additions & 7 deletions Art/Icons/default/Scalable-Material/Toolbar_images/ExternalRun.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 6 additions & 9 deletions Art/Icons/default/Scalable-Material/Toolbar_images/ExternalRunLast.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 5 additions & 8 deletions Art/Icons/default/Scalable-Material/Toolbar_images/ExternalRunSetup.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Components/ThirdParty/TB2KPatch-2.2.2.zip
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions Source/dlgAboutPyScripter.pas
View file
Expand Up @@ -98,8 +98,8 @@ implementation

SAboutBoxCreditsDonations =
'Donations from numerous users have provided a strong incentive to develop this project.' + SLineBreak +
'Finanancial and moral support from Embarcadero (https://www.embarcadero.com/) makers of Delphi' +
'the programming environment with which PyScripter is built and generous support'+
'Financial and moral support from Embarcadero (https://www.embarcadero.com/) makers of Delphi, ' +
'the programming environment with which PyScripter is built, and generous support '+
'from Tranquil IT (https://www.tranquil.it) makers of WAPT (apt-get for Windows) '+
'(https://www.wapt.fr) is thankfully acknowledged.';

Expand Down
74 changes: 23 additions & 51 deletions Source/dmCommands.dfm
View file
Expand Up @@ -3561,65 +3561,37 @@ object CommandsDataModule: TCommandsDataModule
item
IconName = 'ExternalRun'
SVGText =
'<svg viewBox="0 0 32 32">'#13#10#9'<path d="M19.5,0.6H2c-0.8,0-1.5,0.7-' +
'1.5,1.5v27c0,0.8,0.7,1.5,1.5,1.5h10v-3H3.5V3.6H28v6.1l3,1.9V2.1C' +
'31,1.3,30.4,0.6,29.5,0.6'#13#10#9#9'z"/>'#13#10#9'<path fill="#22AA22" d="M29.8' +
',19l-4.4-2.8L21,13.4l-0.7-0.5L18,11.4l-4.5-2.9v22.9l10.9-6.9l6.8' +
'-4.4l0.2-0.1L29.8,19z M25,20.6l-8.2,5.1V14.8'#13#10#9#9'l1.3,0.8l1.4,0.9' +
'l1.6,1l1,0.7l3.4,2.2L25,20.6z"/>'#13#10' <path transform="translate' +
'(-20,-2) scale(1.8)"'#13#10' d="M 16.684887,6.046032 14.284884,4' +
'.7159102 q -0.180723,-0.101205 -0.242169,-0.1807231 -0.05783,-0.' +
'079518 -0.05783,-0.2024099 0,-0.1554218 0.112048,-0.2674701 0.11' +
'2048,-0.1120483 0.263856,-0.1120483 0.09398,0 0.289157,0.1048194' +
' l 3.574702,1.9879538 -3.574702,1.9879538 q -0.195181,0.1084339 ' +
'-0.289157,0.1084339 -0.151808,0 -0.263856,-0.1120483 -0.112048,-' +
'0.1120483 -0.112048,-0.2710846 0,-0.1228917 0.05783,-0.2024099 0' +
'.06145,-0.079518 0.242169,-0.1807231 L 16.684887,6.046032 Z"'#13#10' ' +
' />'#13#10'</svg>'
'<svg viewBox="0 0 32 32">'#13#10#9'<path d="M30.6,2.6H1.4c-0.7,0-1.3,0.' +
'6-1.2,1.3v2L1,6.4l1.9,1.2V5.3h26.3v18.8H11.6l-0.2,0.1l-4.3,2.7h2' +
'3.4c0.7,0,1.3-0.6,1.3-1.4'#13#10#9#9'V3.9C31.9,3.2,31.4,2.6,30.6,2.6z"/>' +
#13#10#9'<path fill="#22AA22" d="M2.9,9.4L0.1,7.7l0,0v21.7l4-2.5l4.4-2' +
'.8l2-1.3l3.7-2.3l1.9-1.2l1.2-0.8L2.9,9.4z M3.2,23.8V13.4l8.2,5.2' +
#13#10#9#9'L3.2,23.8z"/>'#13#10'</svg>'
end
item
IconName = 'ExternalRunLast'
SVGText =
'<svg viewBox="0 0 32 32">'#13#10#9'<path d="M19.5,0.6H2c-0.8,0-1.5,0.7-' +
'1.5,1.5v27c0,0.8,0.7,1.5,1.5,1.5h10v-3H3.5V3.6H28v6.1l3,1.9V2.1C' +
'31,1.3,30.4,0.6,29.5,0.6'#13#10#9#9'z"/>'#13#10#9'<path transform="translate(4,' +
'4) scale(0.9)" fill="#22AA22" d="M29.8,19l-4.4-2.8L21,13.4l-0.7-' +
'0.5L18,11.4l-4.5-2.9v22.9l10.9-6.9l6.8-4.4l0.2-0.1L29.8,19z M25,' +
'20.6l-8.2,5.1V14.8'#13#10#9#9'l1.3,0.8l1.4,0.9l1.6,1l1,0.7l3.4,2.2L25,20' +
'.6z"/>'#13#10' <path transform="translate(-20,-2) scale(1.8)"'#13#10' ' +
' d="M 16.684887,6.046032 14.284884,4.7159102 q -0.180723,-0.10' +
'1205 -0.242169,-0.1807231 -0.05783,-0.079518 -0.05783,-0.2024099' +
' 0,-0.1554218 0.112048,-0.2674701 0.112048,-0.1120483 0.263856,-' +
'0.1120483 0.09398,0 0.289157,0.1048194 l 3.574702,1.9879538 -3.5' +
'74702,1.9879538 q -0.195181,0.1084339 -0.289157,0.1084339 -0.151' +
'808,0 -0.263856,-0.1120483 -0.112048,-0.1120483 -0.112048,-0.271' +
'0846 0,-0.1228917 0.05783,-0.2024099 0.06145,-0.079518 0.242169,' +
'-0.1807231 L 16.684887,6.046032 Z"'#13#10' />'#13#10#9'<path transform="t' +
'ranslate(-2,-5)" d="M18.6,28.8c0.1,0.1,0.1,2,0.1,2h-8.4c-2.2,0-4' +
'-1.7-4-4c0-0.3,0.1-0.7,0.2-1.1c0.5-1.7,2-2.9,3.8-2.9h7v-3l4,4l-4' +
',4v-3h-7'#13#10#9#9'c-1.1,0-2,0.9-2,2s0.9,2,2,2H18.6L18.6,28.8z"/>'#13#10'</sv' +
'g>'
'<svg viewBox="0 0 32 32">'#13#10#9'<path d="M30.6,0.3h-29c-0.8,0-1.4,0.' +
'6-1.4,1.4v2.2c0.1,0,0.2,0,0.3,0c0.3,0,0.6,0.1,0.8,0.3l1.5,1V3h26' +
'.3v18.8h-7.7l0.4,0.4'#13#10#9#9'c0.6,0.6,0.6,1.6,0,2.3v0.1h8.7c0.7,0,1.3' +
'-0.6,1.3-1.4V1.6C31.9,0.9,31.3,0.3,30.6,0.3z"/>'#13#10#9'<path fill="#2' +
'2AA22" d="M0.1,5.4v21.7l0.8-0.5c0.1-3.4,2.9-6.1,6.3-6.1h3.3l3.7-' +
'2.3l1.9-1.2l1.2-0.8L0.1,5.4z M3.2,21.5V11.1l8.2,5.2'#13#10#9#9'L3.2,21.5' +
'z"/>'#13#10#9'<path d="M17.2,29.3c0.1,0.1,0.1,2.4,0.1,2.4H7.2c-2.6,0-4.' +
'8-2.1-4.8-4.8c0-0.4,0.1-0.9,0.2-1.3c0.6-2,2.4-3.5,4.6-3.5h8.4v-3' +
'.6'#13#10#9#9'l4.8,4.8l-4.8,4.8v-3.6H7.2c-1.3,0-2.4,1.1-2.4,2.4s1.1,2.4,' +
'2.4,2.4L17.2,29.3L17.2,29.3z"/>'#13#10'</svg>'
end
item
IconName = 'ExternalRunSetup'
SVGText =
'<svg viewBox="0 0 32 32">'#13#10'<g transform="scale(0.8, 0.8) transla' +
'te(4,2)">'#13#10#9'<path d="M19.5,0.6H2c-0.8,0-1.5,0.7-1.5,1.5v27c0,0.8' +
',0.7,1.5,1.5,1.5h10v-3H3.5V3.6H28v6.1l3,1.9V2.1C31,1.3,30.4,0.6,' +
'29.5,0.6z"/>'#13#10#9'<path fill="#22AA22" d="M29.8,19l-4.4-2.8L21,13.4' +
'l-0.7-0.5L18,11.4l-4.5-2.9v22.9l10.9-6.9l6.8-4.4l0.2-0.1L29.8,19' +
'z M25,20.6l-8.2,5.1V14.8'#13#10#9#9'l1.3,0.8l1.4,0.9l1.6,1l1,0.7l3.4,2.2' +
'L25,20.6z"/>'#13#10' <path transform="translate(-20,-2) scale(1.8)"' +
#13#10' d="M 16.684887,6.046032 14.284884,4.7159102 q -0.180723' +
',-0.101205 -0.242169,-0.1807231 -0.05783,-0.079518 -0.05783,-0.2' +
'024099 0,-0.1554218 0.112048,-0.2674701 0.112048,-0.1120483 0.26' +
'3856,-0.1120483 0.09398,0 0.289157,0.1048194 l 3.574702,1.987953' +
'8 -3.574702,1.9879538 q -0.195181,0.1084339 -0.289157,0.1084339 ' +
'-0.151808,0 -0.263856,-0.1120483 -0.112048,-0.1120483 -0.112048,' +
'-0.2710846 0,-0.1228917 0.05783,-0.2024099 0.06145,-0.079518 0.2' +
'42169,-0.1807231 L 16.684887,6.046032 Z"/>'#13#10'</g>'#9' '#13#10'<path tran' +
'sform="scale(1.3, 1.3)" d="M15,24V22H17V24H15M11,24V22H13V24H11M' +
'7,24V22H9V24H7Z" />'#13#10'</svg>'
'<svg viewBox="0 0 32 32">'#13#10#9'<path d="M19.9,31.2v-2.6h2.6v2.6H19.' +
'9 M14.7,31.2v-2.6h2.6v2.6H14.7 M9.5,31.2v-2.6h2.6v2.6H9.5z"/>'#13#10#9 +
'<path d="M30.6,1.7H1.3C0.6,1.7,0,2.3,0.1,3v2l0.8,0.5l1.9,1.2V4.4' +
'h26.3v18.8H11.5l-0.2,0.1L7.1,26h23.4c0.7,0,1.3-0.6,1.3-1.4V3'#13#10#9#9 +
'C31.9,2.3,31.3,1.7,30.6,1.7z"/>'#13#10#9'<path fill="#22AA22" d="M2.8,8' +
'.6L0.1,6.9l0,0v21.7l4-2.5l4.4-2.8l2-1.3l3.7-2.3l1.9-1.2l1.2-0.8L' +
'2.8,8.6z M3.2,23V12.6l8.2,5.2'#13#10#9#9'L3.2,23z"/>'#13#10'</svg>'
end
item
IconName = 'Favorite'
Expand Down
10 changes: 7 additions & 3 deletions Source/frmEditor.dfm
View file
Expand Up @@ -35,7 +35,7 @@ object EditorForm: TEditorForm
OnEnter = FGPanelEnter
OnExit = FGPanelExit
ActiveTabIndex = 0
Images = PyIDEMainForm.vilImagesByIndex
Images = PyIDEMainForm.vilImages
OnActiveTabChange = ViewsTabControlActiveTabChange
HiddenItems = <>
object tabSource: TSpTBXTabItem
Expand All @@ -48,13 +48,15 @@ object EditorForm: TEditorForm
object tbiUpdateView: TSpTBXItem
Caption = 'Update View'
Hint = 'Update View|Update the selected view'
ImageIndex = 10
ImageIndex = 29
ImageName = 'Refresh'
OnClick = mnUpdateViewClick
end
object tbiCloseTab: TSpTBXItem
Caption = 'Close Tab'
Hint = 'Close active tab'
ImageIndex = 7
ImageIndex = 92
ImageName = 'TabClose'
OnClick = mnCloseTabClick
end
object tbshSource: TSpTBXTabSheet
Expand Down Expand Up @@ -1040,12 +1042,14 @@ object EditorForm: TEditorForm
Caption = 'Update View'
Hint = 'Update View|Update the selected view'
ImageIndex = 39
ImageName = 'Breakpoint'
OnClick = mnUpdateViewClick
end
object mnCloseTab: TSpTBXItem
Caption = 'Close Tab'
Hint = 'Close active tab'
ImageIndex = 52
ImageName = 'PageSetup'
OnClick = mnCloseTabClick
end
end
Expand Down
6 changes: 3 additions & 3 deletions Source/frmEditor.pas
View file
Expand Up @@ -1133,7 +1133,7 @@ procedure TEditor.ExecPrintPreview;
CommandsDataModule.SynEditPrint.SynEdit := fForm.SynEdit;
CommandsDataModule.SynEditPrint.Title := GetFileTitle;
CommandsDataModule.SynEditPrint.Highlighter := fForm.SynEdit.Highlighter;
with TPrintPreviewDlg.Create(PyIDEMainForm) do
with TPrintPreviewDlg.Create(Application.MainForm) do
begin
SynEditPrintPreview.SynEditPrint := CommandsDataModule.SynEditPrint;
ShowModal;
Expand Down Expand Up @@ -2677,7 +2677,7 @@ procedure TEditorForm.SynEditMouseDown(Sender: TObject; Button: TMouseButton;
begin
fHotIdentInfo.HaveHotIdent := False;
fHotIdentInfo.SynEdit.InvalidateLine(fHotIdentInfo.StartCoord.Line);
PostMessage(PyIDEMainForm.Handle, WM_FINDDEFINITION,
PostMessage(Application.MainForm.Handle, WM_FINDDEFINITION,
fHotIdentInfo.StartCoord.Char, fHotIdentInfo.StartCoord.Line);
end;
if CommandsDataModule.SynParamCompletion.Form.Visible then
Expand Down Expand Up @@ -3224,7 +3224,7 @@ procedure TEditorForm.DoOnIdle;
end).Start;

if HasSyntaxError then
ParentTabItem.ImageIndex := 6
ParentTabItem.ImageIndex := PyIDEMainForm.vilImages.GetIndexByName('Bug')
else
ParentTabItem.ImageIndex := -1;
end;
Expand Down

0 comments on commit 4336213

Please sign in to comment.