Skip to content
Snippets Groups Projects
Commit 1def9c65 authored by Benoît Minisini's avatar Benoît Minisini :church:
Browse files

Allows to apply properties of controls declared in the current component...

Allows to apply properties of controls declared in the current component project if that component is actually used by the IDE.

[DEVELOPMENT ENVIRONMENT]
* NEW: Version control: The commit history now works the same way everywhere.
* BUG: Allows to apply properties of controls declared in the current component project if that component is actually used by the IDE.
parent 2cb8c6cd
No related branches found
No related tags found
No related merge requests found
Pipeline #1270272264 passed
......@@ -255,7 +255,7 @@ Public Sub InitControl()
Endif
Endif
If hSym.Component = CComponent.PROJECT_NAME And If Not DrawWith Then
If hSym.Component = CComponent.PROJECT_NAME And If Not Components.Exist(Project.Name) And If Not DrawWith Then
bDoNotApply = True
Else If Family <> "Form" Then
If MultiContainer Then
......
......@@ -494,9 +494,3 @@ Public Sub tlbRepository_Configure()
btnAddBranch.Visible = VersionControl.CanCreateBranch
End
Public Sub gvwHistory_Open(Commit As String)
FVersionHistory.Run(Commit, VersionControl.History(False, Project.Dir,, True, "@" & Commit))
End
......@@ -4,8 +4,6 @@ Export
Inherits GridView
Event Open(Commit As String)
Property Selectable As Boolean Use $bSelectable
Private $hSpinner As Spinner
......@@ -364,8 +362,11 @@ Public Sub GridView_DblClick()
End
Public Sub mnuOpen_Click()
Dim sCommit As String
Raise Open(Trim(Mid$($aCommit[$Y], 7)))
sCommit = Trim(Mid$($aCommit[$Y], 7))
FVersionHistory.Run(sCommit, VersionControl.History(False, Project.Dir,, True, "@" & sCommit))
End
......@@ -32,7 +32,6 @@ Private Sub FillBranch()
Dim sBranch As String
Dim sFilter As String
Dim iCurrent As Integer = -1
Dim H As Integer
sFilter = Trim(txtFilter.Text)
......
......@@ -14,6 +14,7 @@ Public Sub Form_Open()
edtHistory.ShowLineNumber = False
edtHistory.TabSize = 8
edtHistory.ShowExpand = True
edtHistory.Wrap = True
edtHistory.ReadOnly = True
VersionControl.InitHistory(edtHistory)
edtHistory.SetFocus
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment