mirror of
https://github.com/FellippeHeitor/InForm.git
synced 2025-01-14 19:49:33 +00:00
InForm now accounts for renamed and deleted controls after editing forms.
This commit is contained in:
FellippeHeitor
parent
8e350826e9
commit
b0e9d5854e
3 changed files with 139 additions and 7 deletions
|
|
@ -1,5 +1,5 @@
|
|||
'Starting with v1.0, __UI_VersionNumber is actually the current build.
|
||||
CONST __UI_Version = "v1.3"
|
||||
CONST __UI_VersionNumber = 16
|
||||
CONST __UI_VersionNumber = 17
|
||||
CONST __UI_VersionIsBeta = -1
|
||||
CONST __UI_CopyrightSpan = "2016-2020"
|
||||
|
|
|
|||
|
|
@ -165,6 +165,7 @@ DIM SHARED totalBytesSent AS _UNSIGNED _INTEGER64
|
|||
DIM SHARED RecentMenuItem(1 TO 9) AS LONG, RecentListBuilt AS _BYTE
|
||||
DIM SHARED LoadedWithGifExtension AS _BYTE, AddGifExtension AS _BYTE
|
||||
DIM SHARED TotalGifLoaded AS LONG, SetBindingDialogOpen AS _BYTE
|
||||
DIM SHARED InitialControlSet AS STRING
|
||||
|
||||
TYPE newInputBox
|
||||
ID AS LONG
|
||||
|
|
@ -834,6 +835,7 @@ SUB __UI_Click (id AS LONG)
|
|||
LastFormData$ = ""
|
||||
Stream$ = ""
|
||||
FormDataReceived = False
|
||||
InitialControlSet = ""
|
||||
ELSE
|
||||
Answer = MessageBox("File not found.", "", MsgBox_OkOnly + MsgBox_Critical)
|
||||
Control(FileList).Value = 0
|
||||
|
|
@ -1634,6 +1636,23 @@ SUB __UI_BeforeUpdateDisplay
|
|||
CASE "SHOWINVISIBLECONTROLS"
|
||||
__UI_ShowInvisibleControls = CVI(thisData$)
|
||||
Control(ViewMenuShowInvisibleControls).Value = __UI_ShowInvisibleControls
|
||||
CASE "CONTROLRENAMED"
|
||||
IF LEN(InitialControlSet) THEN
|
||||
DIM insertionPoint AS LONG, endPoint
|
||||
insertionPoint = INSTR(InitialControlSet, CHR$(10) + LEFT$(thisData$, INSTR(thisData$, CHR$(10))))
|
||||
IF insertionPoint THEN
|
||||
endPoint = INSTR(insertionPoint + 1, InitialControlSet, CHR$(10))
|
||||
InitialControlSet = LEFT$(InitialControlSet, endPoint - 1) + CHR$(11) + MID$(thisData$, INSTR(thisData$, CHR$(10)) + 1) + MID$(InitialControlSet, endPoint)
|
||||
ELSE
|
||||
'not found... maybe renamed previously in this session?
|
||||
insertionPoint = INSTR(InitialControlSet, CHR$(11) + LEFT$(thisData$, INSTR(thisData$, CHR$(10)) - 1) + CHR$(10))
|
||||
IF insertionPoint THEN
|
||||
insertionPoint = INSTR(insertionPoint, InitialControlSet, CHR$(11))
|
||||
endPoint = INSTR(insertionPoint + 1, InitialControlSet, CHR$(10))
|
||||
InitialControlSet = LEFT$(InitialControlSet, insertionPoint) + MID$(thisData$, INSTR(thisData$, CHR$(10)) + 1) + MID$(InitialControlSet, endPoint)
|
||||
END IF
|
||||
END IF
|
||||
END IF
|
||||
CASE "SHOWBINDCONTROLDIALOG"
|
||||
__UI_Click EditMenuBindControls
|
||||
CASE "ORIGINALIMAGEWIDTH"
|
||||
|
|
@ -1669,6 +1688,15 @@ SUB __UI_BeforeUpdateDisplay
|
|||
|
||||
IF NOT FormDataReceived THEN EXIT SUB
|
||||
|
||||
IF InitialControlSet = "" THEN
|
||||
InitialControlSet = CHR$(1)
|
||||
FOR i = 1 TO UBOUND(PreviewControls)
|
||||
IF PreviewControls(i).ID > 0 AND PreviewControls(i).Type <> __UI_Type_Font AND PreviewControls(i).Type <> __UI_Type_MenuPanel THEN
|
||||
InitialControlSet = InitialControlSet + CHR$(10) + RTRIM$(PreviewControls(i).Name) + CHR$(10)
|
||||
END IF
|
||||
NEXT
|
||||
END IF
|
||||
|
||||
Control(EditMenuRestoreDimensions).Disabled = True
|
||||
SetCaption EditMenuRestoreDimensions, "Restore &image dimensions"
|
||||
IF TotalSelected = 1 AND PreviewControls(FirstSelected).Type = __UI_Type_PictureBox AND OriginalImageWidth > 0 AND OriginalImageHeight > 0 THEN
|
||||
|
|
@ -4559,7 +4587,83 @@ SUB SaveForm (ExitToQB64 AS _BYTE, SaveOnlyFrm AS _BYTE)
|
|||
IF PreserveBackup THEN
|
||||
DIM insertionPoint AS LONG, endPoint AS LONG, firstCASE AS LONG
|
||||
DIM temp$, thisBlock$, addedItems$, indenting AS LONG
|
||||
DIM checkConditionResult AS _BYTE
|
||||
DIM checkConditionResult AS _BYTE, controlToRemove$, found AS _BYTE
|
||||
DIM charSep$
|
||||
|
||||
charSep$ = " =<>+-/\^:;,*()'" + CHR$(10)
|
||||
|
||||
'Check which controls got removed/renamed since this form was loaded
|
||||
IF LEN(InitialControlSet) THEN
|
||||
insertionPoint = INSTR(InitialControlSet, CHR$(10))
|
||||
DO
|
||||
endPoint = INSTR(insertionPoint + 1, InitialControlSet, CHR$(10))
|
||||
thisBlock$ = MID$(InitialControlSet, insertionPoint + 1, endPoint - insertionPoint - 1)
|
||||
temp$ = thisBlock$
|
||||
controlToRemove$ = ""
|
||||
|
||||
IF INSTR(temp$, CHR$(11)) THEN
|
||||
'control was in the initial state but got renamed
|
||||
controlToRemove$ = LEFT$(temp$, INSTR(temp$, CHR$(11)) - 1)
|
||||
temp$ = MID$(temp$, INSTR(temp$, CHR$(11)) + 1)
|
||||
ELSE
|
||||
controlToRemove$ = temp$
|
||||
END IF
|
||||
|
||||
found = False
|
||||
FOR i = 1 TO UBOUND(PreviewControls)
|
||||
IF PreviewControls(i).ID > 0 AND PreviewControls(i).Type <> __UI_Type_Font AND PreviewControls(i).Type <> __UI_Type_MenuPanel THEN
|
||||
IF LCASE$(RTRIM$(PreviewControls(i).Name)) = LCASE$(temp$) THEN
|
||||
found = True
|
||||
EXIT FOR
|
||||
END IF
|
||||
END IF
|
||||
NEXT
|
||||
|
||||
IF found THEN
|
||||
IF INSTR(thisBlock$, CHR$(11)) THEN
|
||||
'controlToRemove$ was in the initial state but got renamed to temp$
|
||||
insertionPoint = INSTR(BackupCode$, controlToRemove$)
|
||||
DO WHILE insertionPoint > 0
|
||||
found = True
|
||||
IF OutsideQuotes(BackupCode$, insertionPoint) THEN
|
||||
a$ = MID$(BackupCode$, insertionPoint - 1, 1)
|
||||
b$ = MID$(BackupCode$, insertionPoint + LEN(controlToRemove$), 1)
|
||||
IF LEN(a$) > 0 AND INSTR(charSep$, a$) = 0 THEN found = False
|
||||
IF LEN(b$) > 0 AND INSTR(charSep$, b$) = 0 THEN found = False
|
||||
IF found THEN
|
||||
BackupCode$ = LEFT$(BackupCode$, insertionPoint - 1) + temp$ + MID$(BackupCode$, insertionPoint + LEN(controlToRemove$))
|
||||
END IF
|
||||
END IF
|
||||
insertionPoint = INSTR(insertionPoint + 1, BackupCode$, controlToRemove$)
|
||||
LOOP
|
||||
END IF
|
||||
ELSE
|
||||
'comment next controlToRemove$ occurrences, since the control no longer exists
|
||||
insertionPoint = INSTR(BackupCode$, controlToRemove$)
|
||||
DO WHILE insertionPoint > 0
|
||||
found = True
|
||||
COLOR 8: PRINT insertionPoint, MID$(BackupCode$, insertionPoint, 30)
|
||||
IF OutsideQuotes(BackupCode$, insertionPoint) THEN
|
||||
a$ = MID$(BackupCode$, insertionPoint - 1, 1)
|
||||
b$ = MID$(BackupCode$, insertionPoint + LEN(controlToRemove$), 1)
|
||||
IF LEN(a$) > 0 AND INSTR(charSep$, a$) = 0 THEN found = False
|
||||
IF LEN(b$) > 0 AND INSTR(charSep$, b$) = 0 THEN found = False
|
||||
IF found THEN
|
||||
endPoint = INSTR(insertionPoint, BackupCode$, CHR$(10))
|
||||
IF endPoint = 0 THEN endPoint = LEN(BackupCode$)
|
||||
temp$ = " '<-- " + CHR$(34) + controlToRemove$ + CHR$(34) + " was deleted from your form on " + DATE$
|
||||
BackupCode$ = LEFT$(BackupCode$, endPoint - 1) + temp$ + MID$(BackupCode$, endPoint)
|
||||
COLOR 14: PRINT insertionPoint, MID$(BackupCode$, insertionPoint, 30)
|
||||
END IF
|
||||
END IF
|
||||
SLEEP
|
||||
insertionPoint = INSTR(insertionPoint + 1, BackupCode$, controlToRemove$)
|
||||
LOOP
|
||||
END IF
|
||||
|
||||
insertionPoint = endPoint + 1
|
||||
LOOP WHILE insertionPoint < LEN(InitialControlSet)
|
||||
END IF
|
||||
|
||||
'Find insertion points in BackupCode$ for eventual new controls
|
||||
'1- Controls' IDs
|
||||
|
|
@ -5310,3 +5414,19 @@ FUNCTION SpecialCharsToEscapeCode$ (Text$)
|
|||
NEXT
|
||||
SpecialCharsToEscapeCode$ = Temp$ + CHR$(34)
|
||||
END FUNCTION
|
||||
|
||||
'---------------------------------------------------------------------------------
|
||||
FUNCTION OutsideQuotes%% (text$, position AS LONG)
|
||||
DIM quote%%
|
||||
DIM start AS LONG
|
||||
DIM i AS LONG
|
||||
|
||||
start = _INSTRREV(position, text$, CHR$(10)) + 1
|
||||
quote%% = False
|
||||
FOR i = start TO position
|
||||
IF ASC(text$, i) = 34 THEN quote%% = NOT quote%%
|
||||
IF ASC(text$, i) = 10 THEN EXIT FOR
|
||||
NEXT
|
||||
OutsideQuotes%% = NOT quote%%
|
||||
END FUNCTION
|
||||
|
||||
|
|
|
|||
|
|
@ -658,7 +658,7 @@ SUB __UI_BeforeUpdateDisplay
|
|||
PropertyApplied = False
|
||||
IF TotalLockedControls THEN LockedControlsGOSUB = True ELSE LockedControlsGOSUB = False
|
||||
DO WHILE LEN(Property$)
|
||||
DIM FloatValue AS _FLOAT
|
||||
DIM FloatValue AS _FLOAT, temp$, temp2$
|
||||
'Editor sent property value
|
||||
b$ = ReadSequential$(Property$, 2)
|
||||
TempValue = CVI(b$)
|
||||
|
|
@ -669,12 +669,21 @@ SUB __UI_BeforeUpdateDisplay
|
|||
b$ = ReadSequential$(Property$, 4)
|
||||
b$ = ReadSequential$(Property$, CVL(b$))
|
||||
IF TotalLockedControls = 1 THEN
|
||||
Control(LockedControls(1)).Name = AdaptName$(b$, LockedControls(1))
|
||||
temp$ = AdaptName$(b$, LockedControls(1))
|
||||
temp2$ = RTRIM$(Control(LockedControls(1)).Name) + CHR$(10) + temp$
|
||||
SendData temp2$, "CONTROLRENAMED"
|
||||
Control(LockedControls(1)).Name = temp$
|
||||
ELSE
|
||||
IF __UI_TotalSelectedControls = 1 THEN
|
||||
Control(__UI_FirstSelectedID).Name = AdaptName$(b$, __UI_FirstSelectedID)
|
||||
temp$ = AdaptName$(b$, __UI_FirstSelectedID)
|
||||
temp2$ = RTRIM$(Control(__UI_FirstSelectedID).Name) + CHR$(10) + temp$
|
||||
SendData temp2$, "CONTROLRENAMED"
|
||||
Control(__UI_FirstSelectedID).Name = temp$
|
||||
ELSEIF __UI_TotalSelectedControls = 0 THEN
|
||||
Control(__UI_FormID).Name = AdaptName$(b$, __UI_FormID)
|
||||
temp$ = AdaptName$(b$, __UI_FormID)
|
||||
temp2$ = RTRIM$(Control(__UI_FormID).Name) + CHR$(10) + temp$
|
||||
SendData temp2$, "CONTROLRENAMED"
|
||||
Control(__UI_FormID).Name = temp$
|
||||
END IF
|
||||
END IF
|
||||
CASE 2 'Caption
|
||||
|
|
@ -736,7 +745,10 @@ SUB __UI_BeforeUpdateDisplay
|
|||
CASE __UI_Type_PictureBox: NewName$ = NewName$ + "PX"
|
||||
END SELECT
|
||||
|
||||
Control(i).Name = AdaptName$(NewName$, i)
|
||||
temp$ = AdaptName$(NewName$, i)
|
||||
temp2$ = RTRIM$(Control(i).Name) + CHR$(10) + temp$
|
||||
SendData temp2$, "CONTROLRENAMED"
|
||||
Control(i).Name = temp$
|
||||
END IF
|
||||
RETURN
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue