New Version 1.3.4

XusinboyBekchanov · Mar 5, 2023 · 3aa616c · 3aa616c
1 parent 97ace15
commit 3aa616c
Show file tree

Hide file tree

Showing 28 changed files with 540 additions and 783 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,7 @@
             "label": "FreeBASIC Build",
             "type": "shell",
             "windows": {
-                "command": "D:/FreeBasic/FreeBASIC-1.07.1-win32/fbc.exe",
+                "command": "D:/FreeBasic/FreeBASIC-1.09.0-winlibs-gcc-9.3.0/fbc32.exe",
                 "args": [
                     "-g",
                     "VisualFBEditor.bas",

diff --git a/Examples/AndroidProject/AndroidProject.vfp b/Examples/AndroidProject/AndroidProject.vfp
@@ -11,7 +11,7 @@ OpenProjectAsFolder=true
 MajorVersion=0
 MinorVersion=0
 RevisionVersion=0
-BuildVersion=44
+BuildVersion=56
 AutoIncrementVersion=false
 ApplicationTitle=""
 ApplicationIcon=""

diff --git a/Examples/AndroidProject/gradlew.bat b/Examples/AndroidProject/gradlew.bat
@@ -5,8 +5,8 @@
 @rem
 @rem ##########################################################################
 
-set FBC=D:\GitHub\fbc-android9\bin\fbc.exe
-set MFF=D:\GitHub\VisualFBEditor\Controls\MyFbFramework
+set FBC=D:\FreeBasic\fbc-android\bin\fbc.exe
+set MFF=D:\GitHub\VisualFBEditor/./Controls/MyFbFramework
 set NDK=D:\GitHub\android-ndk-r12b-windows-x86\android-ndk-r12b
 @rem make --directory ./app/src/main/bas
 "%FBC%" ./app/src/main/bas/Form1.bas -x "./app/src/main/jniLibs/x86/libmff-app.so" -target i686-linux-android -i "%MFF%" -v -dll -exx -sysroot "%NDK%/platforms/android-9/arch-x86" -Wl "-L %NDK%/platforms/android-9/arch-x86/usr/lib"

diff --git a/Examples/MultipleDisplay/MultipleDisplay.vfp b/Examples/MultipleDisplay/MultipleDisplay.vfp
@@ -6,10 +6,11 @@ ProjectName="Display"
 HelpFileName=""
 ProjectDescription="MultipleDisplay"
 PassAllModuleFilesToCompiler=false
+OpenProjectAsFolder=false
 MajorVersion=0
 MinorVersion=0
 RevisionVersion=0
-BuildVersion=110
+BuildVersion=111
 AutoIncrementVersion=true
 ApplicationTitle="MultipleDisplay"
 ApplicationIcon=""

diff --git a/Examples/MultipleDisplay/frmDisplay.rc b/Examples/MultipleDisplay/frmDisplay.rc
@@ -3,8 +3,8 @@
 #define APP_TITLE_STR               "MultipleDisplay\0"
 #define VER_FILEDESCRIPTION_STR     "MultipleDisplay\0"
 
-#define VER_FILEVERSION             0,0,0,110
-#define VER_FILEVERSION_STR         "0.0.0.110\0"
+#define VER_FILEVERSION             0,0,0,111
+#define VER_FILEVERSION_STR         "0.0.0.111\0"
 
 #define VER_LEGALCOPYRIGHT_STR      "Cm.Wang\0"
 

diff --git a/Examples/PageScroller/Form1.rc b/Examples/PageScroller/Form1.rc
@@ -0,0 +1,51 @@
+1 24 "Manifest.xml"
+
+#define APP_TITLE_STR               "Form1\0"
+#define VER_FILEDESCRIPTION_STR     "Form1\0"
+
+#define VER_FILEVERSION             1,0,0,44
+#define VER_FILEVERSION_STR         "1.0.0.44\0"
+
+#define VER_LEGALCOPYRIGHT_STR      "\0"
+
+#define VER_INTERNALNAME_STR        "Form1\0"
+#define VER_ORIGINALFILENAME_STR    "Form1.exe\0"
+#define VER_PRODUCTNAME_STR         "Form1\0"
+
+#define VER_PRODUCTVERSION          1,0,0,0
+#define VER_PRODUCTVERSION_STR      "1.0\0"
+#define VER_COMPANYNAME_STR         "My Company\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+        	VALUE "ApplicationTitle", APP_TITLE_STR
+            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
+            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "InternalName",     VER_INTERNALNAME_STR
+            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
+            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
+            VALUE "ProductName",      VER_PRODUCTNAME_STR
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+            VALUE "CompanyName",      VER_COMPANYNAME_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* The following line should only be modified for localized versions.     */
+        /* It consists of any number of WORD,WORD pairs, with each pair           */
+        /* describing a language,codepage combination supported by the file.      */
+        /*                                                                        */
+        /* For example, a file might have values "0x409,1252" indicating that it  */
+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/Examples/PageScroller/Manifest.xml b/Examples/PageScroller/Manifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="*"
+        name="Form1"
+        type="win32"
+    />
+    <description></description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+        <security>
+            <requestedPrivileges>
+                <!-- <requestedExecutionLevel level="asInvoker" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="highestAvailable" uiAccess="false" /> -->
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <asmv3:application>
+        <asmv3:windowsSettings>
+        <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </asmv3:windowsSettings>
+    </asmv3:application>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+            />
+        </dependentAssembly>
+    </dependency>
+</assembly>
diff --git a/Examples/PageScroller/PageScroller Example.bas b/Examples/PageScroller/PageScroller Example.bas
@@ -31,7 +31,9 @@
 			.Name = "PageScroller1"
 			.Text = "PageScroller1"
 			.TabIndex = 0
-			.SetBounds 30, 50, 260, 120
+			'.Style = PageScrollerStyle.psHorizontal
+			.Align = DockStyle.alClient
+			.SetBounds 0, 0, 334, 261
 			.Designer = @This
 			.OnScroll = @PageScroller1_Scroll_
 			.Parent = @This

diff --git a/Examples/ReBar Example/Form1.rc b/Examples/ReBar Example/Form1.rc
@@ -0,0 +1,51 @@
+1 24 "Manifest.xml"
+
+#define APP_TITLE_STR               "Form1\0"
+#define VER_FILEDESCRIPTION_STR     "Form1\0"
+
+#define VER_FILEVERSION             1,0,0,5
+#define VER_FILEVERSION_STR         "1.0.0.5\0"
+
+#define VER_LEGALCOPYRIGHT_STR      "\0"
+
+#define VER_INTERNALNAME_STR        "Form1\0"
+#define VER_ORIGINALFILENAME_STR    "Form1.exe\0"
+#define VER_PRODUCTNAME_STR         "Form1\0"
+
+#define VER_PRODUCTVERSION          1,0,0,0
+#define VER_PRODUCTVERSION_STR      "1.0\0"
+#define VER_COMPANYNAME_STR         "My Company\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+        	VALUE "ApplicationTitle", APP_TITLE_STR
+            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
+            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "InternalName",     VER_INTERNALNAME_STR
+            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
+            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
+            VALUE "ProductName",      VER_PRODUCTNAME_STR
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+            VALUE "CompanyName",      VER_COMPANYNAME_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* The following line should only be modified for localized versions.     */
+        /* It consists of any number of WORD,WORD pairs, with each pair           */
+        /* describing a language,codepage combination supported by the file.      */
+        /*                                                                        */
+        /* For example, a file might have values "0x409,1252" indicating that it  */
+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/Examples/ReBar Example/Manifest.xml b/Examples/ReBar Example/Manifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="*"
+        name="Form1"
+        type="win32"
+    />
+    <description></description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+        <security>
+            <requestedPrivileges>
+                <!-- <requestedExecutionLevel level="asInvoker" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="highestAvailable" uiAccess="false" /> -->
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <asmv3:application>
+        <asmv3:windowsSettings>
+        <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </asmv3:windowsSettings>
+    </asmv3:application>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+            />
+        </dependentAssembly>
+    </dependency>
+</assembly>
diff --git a/Examples/WebBrowser/Manifest.xml b/Examples/WebBrowser/Manifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+    <assemblyIdentity
+        version="1.0.0.0"
+        processorArchitecture="*"
+        name="Form1"
+        type="win32"
+    />
+    <description></description>
+    <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+        <security>
+            <requestedPrivileges>
+                <!-- <requestedExecutionLevel level="asInvoker" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> -->
+                <!-- <requestedExecutionLevel level="highestAvailable" uiAccess="false" /> -->
+            </requestedPrivileges>
+        </security>
+    </trustInfo>
+    <asmv3:application>
+        <asmv3:windowsSettings>
+        <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
+        <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </asmv3:windowsSettings>
+    </asmv3:application>
+    <dependency>
+        <dependentAssembly>
+            <assemblyIdentity
+                type="win32"
+                name="Microsoft.Windows.Common-Controls"
+                version="6.0.0.0"
+                processorArchitecture="*"
+                publicKeyToken="6595b64144ccf1df"
+                language="*"
+            />
+        </dependentAssembly>
+    </dependency>
+</assembly>
diff --git a/Examples/WebBrowser/WebBrowser Example.rc b/Examples/WebBrowser/WebBrowser Example.rc
@@ -0,0 +1,51 @@
+1 24 "Manifest.xml"
+
+#define APP_TITLE_STR               "Form1\0"
+#define VER_FILEDESCRIPTION_STR     "Form1\0"
+
+#define VER_FILEVERSION             1,0,0,3
+#define VER_FILEVERSION_STR         "1.0.0.3\0"
+
+#define VER_LEGALCOPYRIGHT_STR      "\0"
+
+#define VER_INTERNALNAME_STR        "Form1\0"
+#define VER_ORIGINALFILENAME_STR    "Form1.exe\0"
+#define VER_PRODUCTNAME_STR         "Form1\0"
+
+#define VER_PRODUCTVERSION          1,0,0,0
+#define VER_PRODUCTVERSION_STR      "1.0\0"
+#define VER_COMPANYNAME_STR         "My Company\0"
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION     VER_FILEVERSION
+PRODUCTVERSION  VER_PRODUCTVERSION
+FILEOS          VOS__WINDOWS32
+FILETYPE        VFT_APP
+FILESUBTYPE     VFT2_UNKNOWN
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"
+        BEGIN
+        	VALUE "ApplicationTitle", APP_TITLE_STR
+            VALUE "FileDescription",  VER_FILEDESCRIPTION_STR
+            VALUE "FileVersion",      VER_FILEVERSION_STR
+            VALUE "InternalName",     VER_INTERNALNAME_STR
+            VALUE "LegalCopyright",   VER_LEGALCOPYRIGHT_STR
+            VALUE "OriginalFilename", VER_ORIGINALFILENAME_STR
+            VALUE "ProductName",      VER_PRODUCTNAME_STR
+            VALUE "ProductVersion",   VER_PRODUCTVERSION_STR
+            VALUE "CompanyName",      VER_COMPANYNAME_STR
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        /* The following line should only be modified for localized versions.     */
+        /* It consists of any number of WORD,WORD pairs, with each pair           */
+        /* describing a language,codepage combination supported by the file.      */
+        /*                                                                        */
+        /* For example, a file might have values "0x409,1252" indicating that it  */
+        /* supports English language (0x409) in the Windows ANSI codepage (1252). */
+        VALUE "Translation", 0x409, 1252
+    END
+END
diff --git a/Resources/Change.png b/Resources/Change.png