From d867fcd1aea06958585f9004e70c3451949f02ca Mon Sep 17 00:00:00 2001 From: fredvs Date: Mon, 25 Apr 2022 21:39:09 +0200 Subject: [PATCH] Release v2.220425 --- examples/consoleplay.prj | 53 +++--- examples/deviceinfos_fpGUI.pas | 10 +- examples/deviceinfos_fpGUI.prj | 168 +++++++++++------- examples/fpg_style_chrome_silver_flatmenu.pas | 2 +- examples/morseTL.lpi | 18 +- examples/uos.pas | 2 +- log.txt | 2 + readme.md | 2 +- src/uos.pas | 2 +- 9 files changed, 143 insertions(+), 116 deletions(-) diff --git a/examples/consoleplay.prj b/examples/consoleplay.prj index 94947755..15f8d3c0 100644 --- a/examples/consoleplay.prj +++ b/examples/consoleplay.prj @@ -1561,8 +1561,9 @@ envvarons=0 [edit] hintwidth=382 hintheight=0 -finddtext=InputUpdateTag +finddtext=inline findhistory=20 + inline InputUpdateTag Data.comment MPinfo @@ -1582,31 +1583,15 @@ findhistory=20 po_ po_font createnewlang - font findoptions=1 -editpos=4 - 0,171 - 0,-1073741823 - 0,2545 - 0,-1073741823 +editpos=1 + 0,0 bookmarks0=0 -bookmarks1=0 -bookmarks2=0 -bookmarks3=0 -sourcefiles=4 +sourcefiles=1 /home/fred/uos/examples/consoleplay.pas - ${PROJECTDIR}/uos_flat.pas - /home/fred/uos/examples/uos.pas - ${PROJECTDIR}/uos_mpg123.pas -relpaths=4 +relpaths=1 consoleplay.pas - uos_flat.pas - uos.pas - uos_mpg123.pas -ismoduletexts=4 - 0 - 0 - 0 +ismoduletexts=1 0 modules=0 moduleoptions=0 @@ -1614,9 +1599,9 @@ visiblemodules=0 nomenumodules=0 [sourcefo.files_tab] firsttab=0 -index=2 +index=0 [layout] -windowlayout=522 +windowlayout=524 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -2048,7 +2033,7 @@ windowlayout=522 x=0 y=0 cx=1221 - cy=52 + cy=54 rcx=0 rcy=0 [debuggerfo.basedock] @@ -2059,11 +2044,11 @@ windowlayout=522 mdistate=0 nx=0 ny=0 - ncx=1219 + ncx=1221 ncy=60 x=0 y=0 - cx=1206 + cx=1221 cy=60 rcx=0 rcy=0 @@ -2074,8 +2059,10 @@ windowlayout=522 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/uos/examples/uos.pas - history=2 + value=/home/fred/uos/examples/uos_flat.pas + history=4 + /home/fred/uos/examples/uos_flat.pas + /home/fred/uos/examples/uos.pas /home/fred/uos/examples/consoleplay.pas ${PROJECTDIR}/main.pas [debuggerfo.project_options] @@ -2095,12 +2082,12 @@ windowlayout=522 x=0 y=0 cx=1221 - cy=454 + cy=452 rcx=0 rcy=0 [sourcefo.files_tab] firsttab=0 - index=2 + index=0 [confideufo.usedefaulteditoroptions] value=0 [cpuc86_64fo] @@ -2134,9 +2121,9 @@ windowlayout=522 ncx=0 ncy=0 x=0 - y=55 + y=57 cx=1221 - cy=454 + cy=452 rcx=0 rcy=0 [targetconsole] diff --git a/examples/deviceinfos_fpGUI.pas b/examples/deviceinfos_fpGUI.pas index c6fb44c0..efe1e883 100644 --- a/examples/deviceinfos_fpGUI.pas +++ b/examples/deviceinfos_fpGUI.pas @@ -95,6 +95,8 @@ TDevicesInfos = class(TfpgForm) infos_grid.Cells[12, x] := UOSDeviceInfos[x].DeviceType; Inc(x); end; + MouseCursor := mcnone; + end; @@ -124,6 +126,8 @@ TDevicesInfos = class(TfpgForm) sleep(500); Show; end; + MouseCursor := mcNone; + end; procedure TDevicesInfos.btnReLoadClick(Sender: TObject); @@ -266,7 +270,8 @@ TDevicesInfos = class(TfpgForm) {@VFD_BODY_END: DevicesInfos} {%endregion} - + MouseCursor := mcNone; + ////////////////////// ordir := IncludeTrailingBackslash(ExtractFilePath(ParamStr(0))); @@ -319,11 +324,14 @@ TDevicesInfos = class(TfpgForm) FilenameEdit1.FileName := ordir + 'lib/Linux/aarch64_raspberrypi/libportaudio_aarch64.so'; {$ENDIF} FilenameEdit1.Initialdir := ordir + 'lib'; + end; procedure TDevicesInfos.UOS_logo(Sender: TObject); begin + + with Custom1 do begin diff --git a/examples/deviceinfos_fpGUI.prj b/examples/deviceinfos_fpGUI.prj index 82265c82..27fcbae8 100644 --- a/examples/deviceinfos_fpGUI.prj +++ b/examples/deviceinfos_fpGUI.prj @@ -108,16 +108,18 @@ findinfiledialog=94 "*.pas" "*.pp" "*.inc" "*.prj" [findinfileadialogfo.dir] filenames=1 - /home/fred/lazarus/ + /home/fred/fpc-ootb_322ok/ filecolwidth=150 x=466 y=190 cx=608 cy=346 filehistory=20 + /home/fred/fpc-ootb_322ok/ + /home/fred/mseide-msegui/ + /home/fred/fpGUI-maint/ /home/fred/lazarus/ /home/fred/fpc-ootb_322/ - /home/fred/mseide-msegui/ /home/fred/strumpract/ /home/fred/bgrabitmap-11.4/ /home/fred/fpc-ootb_322/installer/ @@ -133,13 +135,18 @@ findinfiledialog=94 /home/fred/svnfpc32/fixes_3_2/ /home/fred/mseide-msegui-avantcircular/ /home/fred/CodeTyphonIns700/CodeTyphonIns/ - /home/fred/freepascal-ootb/ - /home/fred/eschecs_mse/ filefilterindex=0 filefilter="*.pas" "*.pp" "*.inc" [findinfileadialogfo.findtext] - value=DEFAULT_PITCH + value=XC_arrow history=20 + XC_arrow + crarrow + crNone + crnone + XC_crosshair + mcDefault + SetMouseCursor DEFAULT_PITCH Screen.Fonts fonts. @@ -153,13 +160,6 @@ findinfiledialog=94 messagefontname usedefaulteditoroptions editfontname - deflayout - encoding - fontname - backupfilecount - confideufo.encoding - fonts - TMSEFontRenderer [findinfileadialogfo] stackedunder= x=594 @@ -296,7 +296,7 @@ options=114 value= [projectoptionsfo.makegroupbox] firsttab=0 - index=2 + index=3 [projectoptionsfo.exceptionsgrid] propcolwidthref=860 width0=47 @@ -320,8 +320,8 @@ options=114 index=2 [projectoptionsfo] stackedunder= - x=275 - y=66 + x=262 + y=50 cx=920 cy=593 settaborder=15 @@ -673,12 +673,12 @@ makedir= unitdirs=8 /usr/lib/gcc/x86_64-linux-gnu/10/32 /usr/lib/gcc/x86_64-linux-gnu/10 - ${MSEDIR}lib/addon/*/ - ${MSELIBDIR}kernel/windows - ${MSELIBDIR}kernel/linux - ${MSELIBDIR}kernel/$TARGETOSDIR - ${MSELIBDIR}kernel/ - ${MSELIBDIR}*/ + ${FPGUIDIR}/src/corelib/x11 + ${FPGUIDIR}/src/corelib/gdi + /home/fred/Downloads/fpGUI-develop/src/corelib + ${FPGUIDIR}/src/* + ${FPGUIDIR}/src + /home/fred/Downloads/fpGUI-develop/src/3rdparty/regex unitpref=-Fu incpref=-Fi libpref=-Fl @@ -938,7 +938,7 @@ makeoptionson=15 4095 4095 17 - 130 + 134 2046 4095 192 @@ -1025,10 +1025,10 @@ aftcommandon=0 unitdirson=8 983048 983095 - 198655 + 198463 196800 - 65536 - 65855 + 196815 + 66047 198655 67583 macroon=0 @@ -1561,8 +1561,12 @@ envvarons=0 [edit] hintwidth=382 hintheight=0 -finddtext=caption +finddtext=DoSetMouseCursor findhistory=20 + DoSetMouseCursor + TMouseCursor + case FMouseCursor of + FMouseCursor caption ANSI_CHARSET GetCharSet @@ -1579,19 +1583,30 @@ findhistory=20 po_font createnewlang font - conflangfo.sh - conflangfo.ok - setlangi - uses findoptions=1 -editpos=1 +editpos=4 + 0,78 + 0,-1073741823 0,0 + 0,-1073741823 bookmarks0=0 -sourcefiles=1 - ${PROJECTDIR}/deviceinfos_fpGUI.pas -relpaths=1 +bookmarks1=0 +bookmarks2=0 +bookmarks3=0 +sourcefiles=4 + /home/fred/uos/examples/deviceinfos_fpGUI.pas + /home/fred/fpGUI-maint/src/corelib/fpg_base.pas + /home/fred/mseide-msegui/lib/common/kernel/linux/mseguiintf.pas + /home/fred/fpGUI/src/corelib/gdi/fpg_gdi.pas +relpaths=4 deviceinfos_fpGUI.pas -ismoduletexts=1 + fpGUI-maint/src/corelib/fpg_base.pas + ../mseide-msegui/lib/common/kernel/linux/mseguiintf.pas + fpGUI/src/corelib/gdi/fpg_gdi.pas +ismoduletexts=4 + 0 + 0 + 0 0 modules=0 moduleoptions=0 @@ -1601,7 +1616,7 @@ nomenumodules=0 firsttab=0 index=0 [layout] -windowlayout=521 +windowlayout=540 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -1615,13 +1630,13 @@ windowlayout=521 ny=0 ncx=0 ncy=0 - x=65 - y=70 + x=132 + y=109 cx=1231 cy=621 rcx=0 rcy=0 - wsize=0 + wsize=6 active=1 visible=1 [findmessagefo.findtext] @@ -1670,7 +1685,7 @@ windowlayout=521 [memoryfo] splitdir=0 useroptions=268451963 - stackedunder=findmessagefo + stackedunder=dialogfilesfo parent= mdistate=0 nx=0 @@ -1723,16 +1738,16 @@ windowlayout=521 ny=0 ncx=0 ncy=0 - x=239 - y=115 - cx=678 - cy=414 + x=0 + y=29 + cx=1368 + cy=711 rcx=0 rcy=0 [projecttreefo] splitdir=0 useroptions=268484715 - stackedunder=mainfo + stackedunder=conflangfo parent= mdistate=3 nx=0 @@ -1816,7 +1831,7 @@ windowlayout=521 [breakpointsfo] splitdir=0 useroptions=268451947 - stackedunder=conflangfo + stackedunder=projecttreefo parent= mdistate=0 nx=0 @@ -1835,10 +1850,10 @@ windowlayout=521 [breakpointsfo.bkptson] value=1 [objectinspectorfo.grid] - propcolwidthref=394 - width0=94 + propcolwidthref=369 + width0=88 sortdescend0=0 - width1=294 + width1=275 sortdescend1=0 [symbolfo] splitdir=0 @@ -1931,8 +1946,8 @@ windowlayout=521 ncx=0 ncy=0 x=0 - y=512 - cx=1221 + y=602 + cx=1358 cy=88 rcx=0 rcy=0 @@ -2002,7 +2017,7 @@ windowlayout=521 [componentpalettefo] splitdir=0 useroptions=268460139 - stackedunder=targetconsolefo + stackedunder= parent= mdistate=0 nx=0 @@ -2032,8 +2047,8 @@ windowlayout=521 ncy=0 x=0 y=0 - cx=1221 - cy=69 + cx=1358 + cy=54 rcx=0 rcy=0 [debuggerfo.basedock] @@ -2044,12 +2059,12 @@ windowlayout=521 mdistate=0 nx=0 ny=0 - ncx=1221 - ncy=77 + ncx=1356 + ncy=62 x=0 y=0 - cx=1221 - cy=77 + cx=1358 + cy=62 rcx=0 rcy=0 [debuggerfo.edit_options] @@ -2059,9 +2074,28 @@ windowlayout=521 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/uos/examples/deviceinfos_fpGUI.pas - history=1 - ${PROJECTDIR}/main.pas + value=/home/fred/fpGUI-maint/src/corelib/fpg_base.pas + history=20 + /home/fred/fpGUI-maint/src/corelib/fpg_base.pas + /home/fred/Downloads/fpGUI-develop/src/corelib/x11/fpg_x11.pas + /home/fred/Downloads/fpGUI-develop/src/corelib/fpg_base.pas + /home/fred/fpGUI/src/corelib/gdi/fpg_gdi.pas + /home/fred/fpGUI/src/corelib/x11/fpg_x11.pas + /home/fred/fpGUI/src/corelib/fpg_base.pas + /home/fred/fpGUI-maint/src/corelib/gdi/fpg_gdi.pas + /home/fred/mseide-msegui/lib/common/kernel/linux/mseguiintf.pas + /home/fred/mseide-msegui/lib/common/kernel/linux/mseuniintf.pas + /home/fred/mseide-msegui/lib/common/kernel/linux/msesysintf.pas + /home/fred/mseide-msegui/lib/common/kernel/msectypes.pas + /home/fred/cafecentral/cc_backuplast.bat + /home/fred/ideu/src/ideU (copy 1).pas + /home/fred/strumpract/src/uos_flat.pas + /home/fred/uos/src/uos.pas + /home/fred/strumpract/src/uos.pas + /home/fred/strumpract/src/infos.pas + /home/fred/strumpract/src/conflang.pas + /home/fred/ideu/src/conflang.pas + /home/fred/ideu/src/mo4stock.pas [debuggerfo.project_options] value=1 [debuggerfo.hints] @@ -2078,8 +2112,8 @@ windowlayout=521 ncy=0 x=0 y=0 - cx=1221 - cy=437 + cx=1358 + cy=542 rcx=0 rcy=0 [sourcefo.files_tab] @@ -2091,7 +2125,7 @@ windowlayout=521 irqoff=0 splitdir=0 useroptions=268451947 - stackedunder=componentpalettefo + stackedunder=mainfo parent= mdistate=0 nx=0 @@ -2118,9 +2152,9 @@ windowlayout=521 ncx=0 ncy=0 x=0 - y=72 - cx=1221 - cy=437 + y=57 + cx=1358 + cy=542 rcx=0 rcy=0 [targetconsole] diff --git a/examples/fpg_style_chrome_silver_flatmenu.pas b/examples/fpg_style_chrome_silver_flatmenu.pas index ccb386d6..414f4f1b 100644 --- a/examples/fpg_style_chrome_silver_flatmenu.pas +++ b/examples/fpg_style_chrome_silver_flatmenu.pas @@ -8,7 +8,7 @@ {$mode objfpc}{$H+} /// for custom compil, like using fpgui-dvelop => edit define.inc -{$I define.inc} +//{$I define.inc} interface diff --git a/examples/morseTL.lpi b/examples/morseTL.lpi index 113da386..5af093c5 100755 --- a/examples/morseTL.lpi +++ b/examples/morseTL.lpi @@ -1,13 +1,13 @@ - + + - <UseAppBundle Value="False"/> <ResourceType Value="res"/> @@ -15,21 +15,17 @@ <i18n> <EnableI18N LFM="False"/> </i18n> - <VersionInfo> - <StringTable ProductVersion=""/> - </VersionInfo> <BuildModes Count="1" Active="Default"> <Item1 Name="Default" Default="True"/> </BuildModes> <PublishOptions> <Version Value="2"/> - <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> - <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/> </PublishOptions> <RunParams> - <local> - <FormatVersion Value="1"/> - </local> + <FormatVersion Value="2"/> + <Modes Count="1"> + <Mode0 Name="default"/> + </Modes> </RunParams> <RequiredPackages Count="1"> <Item1> @@ -50,7 +46,7 @@ <HasResources Value="True"/> <ResourceBaseClass Value="Form"/> <IsVisibleTab Value="True"/> - <TopLine Value="110"/> + <TopLine Value="120"/> <CursorPos X="15" Y="146"/> <UsageCount Value="30"/> <Loaded Value="True"/> diff --git a/examples/uos.pas b/examples/uos.pas index ef186218..c3527326 100644 --- a/examples/uos.pas +++ b/examples/uos.pas @@ -75,7 +75,7 @@ interface Classes, ctypes, Math, sysutils; const - uos_version : cint32 = 2220320; + uos_version : cint32 = 2220425; {$IF DEFINED(bs2b)} BS2B_HIGH_CLEVEL = (CInt32(700)) or ((CInt32(30)) shl 16); diff --git a/log.txt b/log.txt index a69c295d..42176142 100644 --- a/log.txt +++ b/log.txt @@ -49,5 +49,7 @@ * 34 th changes: 2020-12-25 (Aarch64-Linux compatible, updated all examples) * * 35 th changes: 2020-12-30 (uos_AddIntoFile() can encode in ogg format) * * 36 th changes: 2021-20-16 (Synth waves sine, triangle, square and sawtooth) * +* 37 th changes: 2022-03-16 (Added missing Album and Track tag) * +* 38 th changes: 2022-03-20 (Methods inlined) * * * ***********************************************************************************} diff --git a/readme.md b/readme.md index 5bd9691d..63653986 100644 --- a/readme.md +++ b/readme.md @@ -30,7 +30,7 @@ Included in the package: . Examples fpGUI, MSEgui, LCL and console. -. Binaries of libraries included for Linux, arm-aarch64 Rapsberry Pi, Windows, Mac OSX, +. Binaries of libraries included for Linux, arm32-aarch64 Rapsberry Pi, Windows, Mac OSX, FreeBSD. See you at uos forum: http://uos-forum.108.s1.nabble.com diff --git a/src/uos.pas b/src/uos.pas index ef186218..c3527326 100644 --- a/src/uos.pas +++ b/src/uos.pas @@ -75,7 +75,7 @@ interface Classes, ctypes, Math, sysutils; const - uos_version : cint32 = 2220320; + uos_version : cint32 = 2220425; {$IF DEFINED(bs2b)} BS2B_HIGH_CLEVEL = (CInt32(700)) or ((CInt32(30)) shl 16);