Skip to content

Commit

Permalink
New Version 1.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
XusinboyBekchanov committed Dec 14, 2020
1 parent ae7ecce commit a19b590
Show file tree
Hide file tree
Showing 24 changed files with 665 additions and 535 deletions.
2 changes: 1 addition & 1 deletion MyFbFramework_Change.log
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ Version 1.0.1 (August 19, 2018)
Version 1.0.0 (July 14, 2018)
- Added: GUI elements
- Added: Drawing classes
and others.
and others.
52 changes: 32 additions & 20 deletions Settings/VisualFBEditor32.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ LeftWidth=256
RightClosed=false
RightWidth=198
BottomClosed=false
BottomHeight=150
BottomHeight=280
ProjectFolders=true
ToolLabels=true
UseDebugger=false
CompileGUI=false
RecentFiles=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfs
RecentFiles=
[Compilers]
DefaultCompiler32=FreeBASIC-1.07.1-win32
DefaultCompiler64=FreeBASIC-1.07.1-win64
Expand Down Expand Up @@ -60,8 +60,8 @@ Path_2=.\Help\win32_fb.chm
[IncludePaths]
[LibraryPaths]
[Options]
IncludeMFFPath=false
MFFPath=
IncludeMFFPath=true
MFFPath=./MyFbFramework
ProjectsPath=./Projects
Language=english
TabWidth=4
Expand Down Expand Up @@ -99,11 +99,12 @@ WhenVisualFBEditorStarts=0
[MRUProjects]
MRUProject_00=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfp
MRUProject_01=\\xusinboy\GitHub\VisualFBEditor\VisualFBEditor.vfp
MRUProject_02=D:\GitHub\VisualFBEditor\Projects\Project1.vfp
MRUProject_02=F:\Install\Install2\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_03=D:\GitHub\FBMemCheck\FBMemCheck.vfp
MRUProject_04=D:\GitHub\VisualFBEditor\VisualFBEditor.vfp
MRUProject_05=D:\GitHub\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_06=F:\Install\Install2\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_04=D:\GitHub\FBMemCheckAssist\FBMemCheckAssist.vfp
MRUProject_05=D:\GitHub\VisualFBEditor\Projects\Project1.vfp
MRUProject_06=D:\GitHub\VisualFBEditor\VisualFBEditor.vfp
MRUProject_07=D:\GitHub\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
[MRUSessions]
MRUSession_00=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfs
MRUSession_01=ĺ:\GitHub\VisualFBEditor\VisualFBEditor.vfs
Expand All @@ -116,17 +117,19 @@ MRUFile_01=D:\GitHub\VisualFBEditor\Tools\COMBuilder\SimpleVariantPlusTemplate.b
MRUFile_02=F:\Install\Install2\VisualFBEditor\Templates\Files\Form.frm
MRUFile_03=F:\Install\Install2\VisualFBEditor\Projects\SimpleVariantPlus.bi
MRUFile_04=C:\Users\User\Documents\VBStyleCode\FB-Backend\Form1.frm
MRUFile_05=D:\GitHub\VisualFBEditor\Projects\2.bas
MRUFile_06=D:\GitHub\VisualFBEditor\Projects\Module1.bas
MRUFile_07=D:\GitHub\VisualFBEditor\Examples\Add-In\Help Add-In.bas
MRUFile_08=D:\GitHub\VisualFBEditor\Templates\Projects\Addin Project\Module1.bas
MRUFile_09=D:\GitHub\VisualFBEditor\Templates\Files\Manifest.xml
MRUFile_010=D:\GitHub\VisualFBEditor\Projects\Manifest.xml
MRUFile_011=D:\GitHub\VisualFBEditor\Projects\Form.frm
MRUFile_012=D:\GitHub\VisualFBEditor\Projects\Form2.frm
MRUFile_013=D:\GitHub\VisualFBEditor\Projects\Form1.frm
MRUFile_014=D:\GitHub\FBMemCheck\FBMemCheck.bas
MRUFile_015=F:\Install\Install2\VisualFBEditor\Projects\1.bas
MRUFile_05=D:\GitHub\VisualFBEditor\Projects\Module1.bas
MRUFile_06=D:\GitHub\VisualFBEditor\Examples\Add-In\Help Add-In.bas
MRUFile_07=D:\GitHub\VisualFBEditor\Templates\Projects\Addin Project\Module1.bas
MRUFile_08=D:\GitHub\VisualFBEditor\Templates\Files\Manifest.xml
MRUFile_09=D:\GitHub\VisualFBEditor\Projects\Manifest.xml
MRUFile_010=D:\GitHub\VisualFBEditor\Projects\Form2.frm
MRUFile_011=D:\GitHub\VisualFBEditor\Projects\Form1.frm
MRUFile_012=D:\GitHub\FBMemCheck\FBMemCheck.bas
MRUFile_013=F:\Install\Install2\VisualFBEditor\Projects\1.bas
MRUFile_014=D:\GitHub\VisualFBEditor\Projects\2.bas
MRUFile_015=D:\GitHub\VisualFBEditor\src\frmOptions.frm
MRUFile_016=D:\GitHub\VisualFBEditor\Projects\Form.frm
MRUFile_017=D:\GitHub\VisualFBEditor\Projects\Untitled
[Parameters]
Compiler32Arguments=-exx
Compiler64Arguments=-exx
Expand All @@ -136,4 +139,13 @@ RunArguments=
Debug32Arguments=
Debug64Arguments=
[Find]
Find_0=pBuff
Find_0=CheckedListBox
Find_1=Textbo
Find_2=toolbutton
Find_3=toolbar
Find_4=tooltips
Find_5=Combobox
Find_6=toolpa
Find_7=grid
Find_8=IPAddress
Find_9=tabpage
45 changes: 23 additions & 22 deletions Settings/VisualFBEditor64.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Compilers]
DefaultCompiler32=FreeBASIC-1.07.1-win32
DefaultCompiler64=FreeBASIC-1.07.1-win64 1
DefaultCompiler64=FreeBASIC-1.07.1-win64
Version_0=FreeBASIC-1.07.1-win32
Path_0=D:\FreeBasic\FreeBASIC-1.07.1-win32\fbc.exe
Version_1=FreeBASIC-1.07.1-win64
Expand Down Expand Up @@ -83,19 +83,19 @@ DefaultProjectFile=Files/Form.frm
WhenVisualFBEditorStarts=2
CreateNonStaticEventHandlers=true
[MainWindow]
MainWidth=1936
MainHeight=1056
MainWidth=1440
MainHeight=759
LeftClosed=false
LeftWidth=204
RightClosed=false
RightWidth=205
BottomClosed=false
BottomHeight=512
BottomHeight=287
ProjectFolders=true
ToolLabels=true
UseDebugger=true
UseDebugger=false
CompileGUI=false
RecentFiles=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfs
RecentFiles=
[MRUFolders]
MRUFolder_00=D:\GitHub\VisualFBEditor
[MRUFiles]
Expand All @@ -110,32 +110,33 @@ MRUFile_07=D:\GitHub\VisualFBEditor\src\frmTemplates.frm
MRUFile_08=D:\GitHub\VisualFBEditor\MyFbFramework\mff\FBMemCheck.bi
MRUFile_09=D:\GitHub\FBMemCheck\Module1.bas
MRUFile_010=D:\GitHub\FBMemCheck\FBMemCheck.bas
MRUFile_011=D:\GitHub\VisualFBEditor\Projects\1.bas
MRUFile_011=D:\GitHub\VisualFBEditor\src\frmOptions.frm
MRUFile_012=D:\GitHub\VisualFBEditor\Projects\1.bas
[MRUProjects]
MRUProject_00=D:\GitHub\VisualFBEditor\VisualFBEditor.vfp
MRUProject_01=D:\GitHub\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_02=D:\GitHub\FBMemCheck\FBMemCheck.vfp
MRUProject_03=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfp
MRUProject_04=F:\Install\Install2\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_01=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfp
MRUProject_02=F:\Install\Install2\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
MRUProject_03=D:\GitHub\FBMemCheck\FBMemCheck.vfp
MRUProject_04=D:\GitHub\VisualFBEditor\MyFbFramework\MyFbFramework.vfp
[MRUSessions]
MRUSession_00=D:\GitHub\VisualFBEditor\VisualFBEditor.vfs
MRUSession_01=F:\Install\Install2\VisualFBEditor\VisualFBEditor.vfs
[Parameters]
Compiler32Arguments=-exx
Compiler64Arguments=-exx
Compiler64Arguments=-exx -Wc -gdwarf-2
Make1Arguments=
Make2Arguments=clean
RunArguments=
Debug32Arguments=
Debug64Arguments=
[Find]
Find_0=pz
Find_1=AppendMenu
Find_2=""
Find_3=Clear
Find_4=__FBMLD__
Find_5=txtPropertyValue_LostFocus
Find_6=?1
Find_7=DblClick
Find_8=CreateMenusAndToolBars
Find_9=Load
Find_0=DeleteAllObjectsFunc
Find_1=wreallocate
Find_2=Load
Find_3=CreateMenusAndToolBars
Find_4=DblClick
Find_5=?1
Find_6=txtPropertyValue_LostFocus
Find_7=__FBMLD__
Find_8=Clear
Find_9=""
11 changes: 8 additions & 3 deletions Settings/VisualFBEditorX64.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ Compiler32Arguments=-exx
Compiler64Arguments=-exx
Make1Arguments=
Make2Arguments=clean
RunArguments=
RunArguments=
Debug32Arguments=
Debug64Arguments=
[MainWindow]
MainWidth=1000
MainHeight=600
Expand All @@ -17,11 +19,12 @@ ProjectFolders=true
ToolLabels=true
UseDebugger=false
CompileGUI=true
RecentFiles=/media/GitHub/VisualFBEditor/VisualFBEditor.vfs
RecentFiles=
[MRUProjects]
MRUProject_00=/media/GitHub/VisualFBEditor/MyFbFramework/MyFbFramework.vfp
MRUProject_01=/media/GitHub/VisualFBEditor/src/VisualFBEditor.vfp
MRUProject_02=/media/GitHub/VisualFBEditor/VisualFBEditor.vfp
MRUProject_02=/media/FreeBasic/VisualFBEditor.1.2.4/src/VisualFBEditor.vfp
MRUProject_03=/media/GitHub/VisualFBEditor/VisualFBEditor.vfp
[Compilers]
DefaultCompiler32=
DefaultCompiler64=FreeBASIC-1.07.1-linux-x86_64
Expand Down Expand Up @@ -191,3 +194,5 @@ LimitDebug=false
DisplayWarningsInDebug=false
[MRUSessions]
MRUSession_00=/media/GitHub/VisualFBEditor/VisualFBEditor.vfs
[MRUFiles]
MRUFile_00=/media/GitHub/VisualFBEditor/Projects/1.bas
2 changes: 1 addition & 1 deletion Temp/GDBCommands.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
file "F:/Install/Install2/VisualFBEditor/src/../VisualFBEditor32.exe"
file "D:/GitHub/VisualFBEditor/src/../VisualFBEditor32.exe"
r
2 changes: 1 addition & 1 deletion VisualFBEditor.vfp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ ProjectDescription="IDE for FreeBasic"
MajorVersion=1
MinorVersion=2
RevisionVersion=6
BuildVersion=1823
BuildVersion=1942
AutoIncrementVersion=false
ApplicationTitle=" "
ApplicationIcon=" "
Expand Down
27 changes: 25 additions & 2 deletions changes_en.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
Version 1.2.5 (August 2, 2020)
Version 1.2.6 (December 14, 2020)
- Added: UserControl file template
- Added: UserControl Design functionality
- Added: Paths Count in Options unlimited
- Added: Create non-static event handlers option
- Added: Default Debugger 64-bit option
- Added: Ctrl+Up, Ctrl+Down, Ctrl+PageUp, Ctrl+PageDown for EditControl
- Added: Bring to Front function to Designer
- Added: Option to Choosing templates when VisualFBEditor starts
- Added: Project Templates
- Added: Addin Template
- Added: Read & Write Enum types in Properties Window
- Added: New Project dialog to choose templates
- Added: Extern ... End Extern to FormatCode
- Added: FBMemCheck Assist Addin
- Fixed: MemLeaks
- Fixed: Copy and Paste Hierarchy of Controls
- Fixed: FormatCode function
- Fixed: Command Prompt function
- Fixed: Designer ChangeName function
- Fixed: Switch From ToDo to Change log
- Fixed: Reload function
- Fixed: ToolBox top position on scroll.
Version 1.2.5 (August 2, 2020)
- Added: COMWrapperBuilder tool
- Added: Prompt to reload file after changes by external program
- Added: Current row, column and etc. to Statusbar
Expand All @@ -24,7 +47,7 @@
- Added: Overwrite changes in Intellisense
- Added: Project Path initial dir on Open Project
- Fixed: EditControl.LoadFromFile to load long lines
- Fixed: Save new file to Projects path
- Fixed: Save New file to Projects path
- Fixed: Changelogging and ToDo List
- Fixed: Slowness on Paint in 64-bit EditControl
- Fixed: Code Indent
Expand Down
25 changes: 24 additions & 1 deletion changes_ru.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
Версия 1.2.5 (2 августа, 2020)
Версия 1.2.6 (14 декабря, 2020)
- Добавлен: Файл-шаблон UserControl
- Добавлен: Функция дизайнера UserControl
- Добавлен: Функционал безграничных путей в опциях
- Добавлен: Опция создания нестатических обработчиков событий
- Добавлен: Возможность выбора по умолчанию 64-разрядную версию отладчика
- Добавлен: Ctrl+Up, Ctrl+Down, Ctrl+PageUp, Ctrl+PageDown для EditControl
- Добавлен: Функция Переместить на передный план на дизайнер
- Добавлен: Опция для выбора шаблонов во время запуска VisualFBEditor
- Добавлен: Шаблоны проектов
- Добавлен: Аддин-шаблон
- Добавлен: Прочитать и записать значения перечислений в окне Свойств
- Добавлен: Диалог Новый проект для выбора шаблонов
- Добавлен: Extern ... End Extern для форматирования кода
- Добавлен: Аддин FBMemCheck Assist
- Исправлен: Утечки памяти
- Исправлен: Копирование и Вставка иерархию контролов
- Исправлен: Функция FormatCode
- Исправлен: Функция Командной строки
- Исправлен: Функция ChangeName дизайнера
- Исправлен: Переключение из окна ToDo к окну Change log
- Исправлен: Функция перезагрузки кода
- Исправлен: Верхнее положение ToolBox при прокрутке
Версия 1.2.5 (2 августа, 2020)
- Добавлен: Инструмент COMWrapperBuilder
- Добавлен: Предложить перезагрузить файл после изменений внешней программой
- Добавлен: Текущая строка, столбец и т.д. в строке состояния
Expand Down
14 changes: 7 additions & 7 deletions license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ your programs, too.
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
want it, that you can change the software or use pieces of it in New
free programs, and that you know you can do these things.

To protect your rights, we need to prevent others from denying you
Expand Down Expand Up @@ -434,7 +434,7 @@ your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
reinstated, you do not qualify to receive New licenses for the same))
material under section 10.

9. Acceptance Not Required for Having Copies.
Expand Down Expand Up @@ -567,10 +567,10 @@ combination as such.

14. Revised Versions of this License.

The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
The Free Software Foundation may publish revised and/or New versions of))
the GNU General Public License from time to time. Such New versions will))
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
address New problems or concerns.))

Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Expand Down Expand Up @@ -625,9 +625,9 @@ copy of the Program in return for a fee.

END OF TERMS AND CONDITIONS

How to Apply These Terms to Your New Programs
How to Apply These Terms to Your New Programs))

If you develop a new program, and you want it to be of the greatest
If you develop a New program, and you want it to be of the greatest))
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

Expand Down
20 changes: 10 additions & 10 deletions src/Debug.bas
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@ Dim Shared exedate As Double 'serial date
Dim Shared brkv2 As tbrkv 'copie for use inside brkv_box
Dim Shared brkvhnd As HWND 'handle

Const VRRMAX=100000
Const VRRMAX=200000
Type tvrr
ad As UInteger 'address
tv As HTREEITEM 'tview handle
Expand Down Expand Up @@ -5899,13 +5899,13 @@ Sub RunWithDebug(Param As Any Ptr)
Next i
Print #Fn, "r"
Close #Fn
WLet CmdL, """" & WGet(DebuggerPath) & """ -x """ & ExePath & "/Temp/GDBCommands.txt"""
WLet(CmdL, """" & WGet(DebuggerPath) & """ -x """ & ExePath & "/Temp/GDBCommands.txt""")
Else
WLet CmdL, """" & WGet(DebuggerPath) & """ """ & GetFileName(exename) & """ "
WLet(CmdL, """" & WGet(DebuggerPath) & """ """ & GetFileName(exename) & """ ")
End If
Else
WLet CmdL, """" & GetFileName(exename) & """ " & *RunArguments
If Project Then WLet CmdL, *CmdL & " " & WGet(Project->CommandLineArguments)
WLet(CmdL, """" & GetFileName(exename) & """ " & *RunArguments)
If Project Then WLetEx(CmdL, *CmdL & " " & WGet(Project->CommandLineArguments), True)
End If
#ifndef __USE_GTK__
exename = Replace(exename, "/", "\")
Expand All @@ -5919,7 +5919,7 @@ Sub RunWithDebug(Param As Any Ptr)
Pos1 = InStr(Pos1 + 1, exename, "\")
Wend
If Pos1 = 0 Then Pos1 = Len(exename)
WLet Workdir, Left(exename, Pos1)
WLet(Workdir, Left(exename, Pos1))
#ifndef __USE_GTK__
SInfo.cb = Len(SInfo)
SInfo.dwFlags = STARTF_USESHOWWINDOW
Expand All @@ -5944,8 +5944,8 @@ Sub RunWithDebug(Param As Any Ptr)
' run_exit_cb(pid, 0, win)
' End If
Dim As WString Ptr Arguments
WLet Arguments, *RunArguments
If Project Then WLet Arguments, *Arguments & " " & WGet(Project->CommandLineArguments)
WLet(Arguments, *RunArguments)
If Project Then WLet(Arguments, *Arguments & " " & WGet(Project->CommandLineArguments))
If 0 Then
Shell """" & WGet(TerminalPath) & """ --wait -- """ & build_create_shellscript(GetFolderName(exename), exename, False, True) & """"
Else
Expand Down Expand Up @@ -5999,8 +5999,8 @@ Sub RunWithDebug(Param As Any Ptr)
ShowMessages(Time & ": " & ML("Application finished. Returned code") & ": " & Result & " - " & Err2Description(Result))
ThreadsLeave()
#endif
If WorkDir Then Deallocate_( WorkDir)
If CmdL Then Deallocate_( CmdL)
If WorkDir <> 0 Then Deallocate_( WorkDir)
If CmdL <> 0 Then Deallocate_( CmdL)
ChangeEnabledDebug True, False, False
#ifndef __USE_GTK__
If CurrentTimer <> 0 Then KillTimer 0, CurrentTimer
Expand Down
Loading

0 comments on commit a19b590

Please sign in to comment.