From 2152629f854df123aaa30484ed971c9e3785ae6f Mon Sep 17 00:00:00 2001 From: fredvs Date: Thu, 21 Nov 2019 02:20:22 +0100 Subject: [PATCH] Fixed play song in list if 2x click. --- src/filelistform.mfm | 4 +- src/filelistform.pas | 7 ++- src/filelistform_mfm.pas | 4 +- src/strumpract.prj | 96 ++++++++++++++++++++++------------------ 4 files changed, 62 insertions(+), 49 deletions(-) diff --git a/src/filelistform.mfm b/src/filelistform.mfm index 13acdbe..2e9bcb8 100644 --- a/src/filelistform.mfm +++ b/src/filelistform.mfm @@ -547,8 +547,8 @@ object filelistfo: tfilelistfo face.template = mainfo.tfaceorange taborder = 7 visible = False - bounds_x = 54 - bounds_y = 32 + bounds_x = -1 + bounds_y = 93 bounds_cx = 431 bounds_cy = 32 anchors = [an_left, an_bottom] diff --git a/src/filelistform.pas b/src/filelistform.pas index 00c10ae..4bafcf6 100644 --- a/src/filelistform.pas +++ b/src/filelistform.pas @@ -443,7 +443,12 @@ procedure tfilelistfo.oncellev(const Sender: TObject; var info: celleventinfoty) // { if (ss_double in info.mouseeventinfopo^.shiftstate) then - begin + begin + + if filelistfo.tbutton1.face.template = mainfo.tfaceorange then + onsent(tbutton1) else + if filelistfo.tbutton2.face.template = mainfo.tfaceorange then onsent(tbutton2) ; + // writeln('button 2x click'); if commanderfo.tbutton2.face.template = mainfo.tfaceorange then diff --git a/src/filelistform_mfm.pas b/src/filelistform_mfm.pas index 6ff9b33..678d211 100644 --- a/src/filelistform_mfm.pas +++ b/src/filelistform_mfm.pas @@ -731,8 +731,8 @@ implementation 101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46, 116,101,109,112,108,97,116,101,7,18,109,97,105,110,102,111,46,116,102,97, 99,101,111,114,97,110,103,101,8,116,97,98,111,114,100,101,114,2,7,7, - 118,105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,2,54,8, - 98,111,117,110,100,115,95,121,2,32,9,98,111,117,110,100,115,95,99,120, + 118,105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,2,255,8, + 98,111,117,110,100,115,95,121,2,93,9,98,111,117,110,100,115,95,99,120, 3,175,1,9,98,111,117,110,100,115,95,99,121,2,32,7,97,110,99,104, 111,114,115,11,7,97,110,95,108,101,102,116,9,97,110,95,98,111,116,116, 111,109,0,9,102,111,110,116,46,110,97,109,101,6,11,115,116,102,95,100, diff --git a/src/strumpract.prj b/src/strumpract.prj index 4e489b0..d99be2d 100644 --- a/src/strumpract.prj +++ b/src/strumpract.prj @@ -1533,7 +1533,7 @@ findhistory=20 oswav2.y paintsliderimage findoptions=1 -editpos=63 +editpos=64 0,-1073741823 0,-1073741823 0,-1073741823 @@ -1578,16 +1578,16 @@ editpos=63 0,-1073741823 0,-1073741823 0,-1073741823 + 0,0 0,-1073741823 0,-1073741823 0,-1073741823 0,-1073741823 - 0,441 - 0,-1073741823 0,-1073741823 0,-1073741823 0,-1073741823 0,-1073741823 + 0,449 0,-1073741823 0,-1073741823 0,-1073741823 @@ -1597,6 +1597,7 @@ editpos=63 0,-1073741823 0,-1073741823 0,-1073741823 + 0,0 bookmarks0=0 bookmarks1=0 bookmarks2=0 @@ -1660,7 +1661,8 @@ bookmarks59=0 bookmarks60=0 bookmarks61=0 bookmarks62=0 -sourcefiles=63 +bookmarks63=0 +sourcefiles=64 ${PROJECTDIR}/filelistform.pas ${PROJECTDIR}/filelistform.pas /home/fred/msegui/lib/common/kernel/linux/mseguiintf.pas @@ -1724,7 +1726,8 @@ sourcefiles=63 ${PROJECTDIR}/filelistform.pas ${PROJECTDIR}/uos_flat.pas ${PROJECTDIR}/strumpract.pas -relpaths=63 + ${PROJECTDIR}/songplayer.pas +relpaths=64 filelistform.pas filelistform.pas msegui/lib/common/kernel/linux/mseguiintf.pas @@ -1788,7 +1791,9 @@ relpaths=63 filelistform.pas uos_flat.pas strumpract.pas -ismoduletexts=63 + songplayer.pas +ismoduletexts=64 + 0 0 0 0 @@ -1885,7 +1890,9 @@ nomenumodules=7 0 0 [sourcefo.files_tab] -order=63 +order=64 + 53 + 63 0 1 2 @@ -1896,6 +1903,9 @@ order=63 7 8 9 + 44 + 46 + 56 48 59 61 @@ -1932,27 +1942,23 @@ order=63 39 40 41 - 42 - 43 - 44 - 45 + 58 52 + 54 + 45 50 - 58 - 49 - 51 55 - 57 47 - 54 - 53 + 43 + 51 + 49 60 - 46 - 56 -firsttab=9 -index=10 + 42 + 57 +firsttab=0 +index=1 [layout] -windowlayout=727 +windowlayout=729 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -2097,7 +2103,7 @@ windowlayout=727 sortdescend1=0 sorted=0 col=0 - row=4 + row=7 rowheight=17 [stackfo] splitdir=0 @@ -2178,7 +2184,7 @@ windowlayout=727 [objectinspectorfo] splitdir=0 useroptions=268451947 - stackedunder=targetconsolefo + stackedunder=_mse_filelistfo_mse_ parent= mdistate=0 nx=0 @@ -2419,8 +2425,9 @@ windowlayout=727 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/strumpract/src/filelistform.pas - history=3 + value=/home/fred/strumpract/src/songplayer.pas + history=4 + /home/fred/strumpract/src/uos.pas /home/fred/strumpract/src/filelistform.pas /home/fred/strumpract/src/main.pas ${PROJECTDIR}/main.pas @@ -2445,7 +2452,9 @@ windowlayout=727 rcx=0 rcy=0 [sourcefo.files_tab] - order=63 + order=64 + 53 + 63 0 1 2 @@ -2456,6 +2465,9 @@ windowlayout=727 7 8 9 + 44 + 46 + 56 48 59 61 @@ -2492,25 +2504,21 @@ windowlayout=727 39 40 41 - 42 - 43 - 44 - 45 + 58 52 + 54 + 45 50 - 58 - 49 - 51 55 - 57 47 - 54 - 53 + 43 + 51 + 49 60 - 46 - 56 - firsttab=9 - index=10 + 42 + 57 + firsttab=0 + index=1 [cpuc86_64fo] irqoff=0 splitdir=0 @@ -2626,7 +2634,7 @@ windowlayout=727 [_mse_filelistfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=objectinspectorfo + stackedunder=_mse_songplayerfo_mse_ parent= mdistate=3 nx=0 @@ -2645,7 +2653,7 @@ windowlayout=727 [_mse_guitarsfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_songplayerfo_mse_ + stackedunder=targetconsolefo parent= mdistate=3 nx=0 @@ -2664,7 +2672,7 @@ windowlayout=727 [_mse_songplayerfo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_filelistfo_mse_ + stackedunder=mainfo parent= mdistate=3 nx=0