Classic KFM: fix Properties window

git-svn-id: svn://kolibrios.org@9464 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-12-24 14:43:09 +00:00
parent c344589fa0
commit 1ba74228ea
5 changed files with 151 additions and 141 deletions

View File

@ -82,6 +82,7 @@
20 fNav |File Managers/fNav/fNav 20 fNav |File Managers/fNav/fNav
64 KFAR |File Managers/kfar 64 KFAR |File Managers/kfar
65 NDN * |/kolibrios/utils/ndn/ndn 65 NDN * |/kolibrios/utils/ndn/ndn
05 Classic KFM * |/kolibrios/utils/kfm/kfm
#9 **** ACCESSIBILITY #9 **** ACCESSIBILITY
49 Screen magnifier |magnify 49 Screen magnifier |magnify
59 Screen keyboard |zkey 59 Screen keyboard |zkey

View File

@ -1,122 +1,123 @@
#0 **** MAIN #0 **** MAIN
58 <20>ਢ¥âá⢨¥ |welcome.htm 58 <20>ਢ¥âá⢨¥ |welcome.htm
00 2D „¥¬ª¨ > |@1 00 2D „¥¬ª¨ > |@1
00 3D „¥¬ª¨ > |@2 00 3D „¥¬ª¨ > |@2
00 ƒà ä¨ª  > |@3 00 ƒà ä¨ª  > |@3
00 ‡¢ãª ¨ ¢¨¤¥® > |@4 00 ‡¢ãª ¨ ¢¨¤¥® > |@4
00 <20> §à ¡®âª  > |@5 00 <20> §à ¡®âª  > |@5
00 ‘¨á⥬  > |@7 00 ‘¨á⥬  > |@7
00 Žä¨á > |@10 00 Žä¨á > |@10
00 ‘¥âì > |@11 00 ‘¥âì > |@11
00 <20> §­®¥ > |@14 00 <20> §­®¥ > |@14
23 ˆ£à®¢®© 業âà |allgames 23 ˆ£à®¢®© 業âà |allgames
60 ‘¨á⥬­ ï ¯ ­¥«ì |syspanel 60 ‘¨á⥬­ ï ¯ ­¥«ì |syspanel
18 „®ªã¬¥­â æ¨ï |docpack 18 „®ªã¬¥­â æ¨ï |docpack
53 ‡ ¯ã᪠¯à®£à ¬¬ë |run 53 ‡ ¯ã᪠¯à®£à ¬¬ë |run
04 ‡ ¢¥à襭¨¥ à ¡®âë |end 04 ‡ ¢¥à襭¨¥ à ¡®âë |end
#1 **** 2D „¥¬ª¨ #1 **** 2D „¥¬ª¨
16 ”ࠪ⠫ Œ ­¤¥«ì¡à®â  |demos/tinyfrac 16 ”ࠪ⠫ Œ ­¤¥«ì¡à®â  |demos/tinyfrac
16 ƒ« §  |demos/eyes 16 ƒ« §  |demos/eyes
16 ’àã¡  |demos/tube 16 ’àã¡  |demos/tube
16 Plasma |demos/plasma 16 Plasma |demos/plasma
16 ‘¯¨à «ì |demos/spiral 16 ‘¯¨à «ì |demos/spiral
16 Moveback |demos/movback 16 Moveback |demos/movback
16 TranTest |demos/trantest 16 TranTest |demos/trantest
16 <20> ã⨭ª  |demos/web 16 <20> ã⨭ª  |demos/web
16 ”¥©¥à¢¥àª |demos/firework 16 ”¥©¥à¢¥àª |demos/firework
16 UnvWater |demos/unvwater 16 UnvWater |demos/unvwater
#2 **** 3D #2 **** 3D
15 ‘ªà¨­á¥©¢¥à |3d/crownscr 15 ‘ªà¨­á¥©¢¥à |3d/crownscr
15 3D-‹ ¡¨à¨­â |3d/free3d04 15 3D-‹ ¡¨à¨­â |3d/free3d04
15 3D-Šã¡ |3d/3dcube2 15 3D-Šã¡ |3d/3dcube2
15 ’à áá¨à®¢ª  «ã祩 |3d/ray 15 ’à áá¨à®¢ª  «ã祩 |3d/ray
15 <20>à®á¬®âà騪 3DS |3d/view3ds 15 <20>à®á¬®âà騪 3DS |3d/view3ds
15 ˜¥áâ¥àñ­ª¨ |3d/gears 15 ˜¥áâ¥àñ­ª¨ |3d/gears
15 3D-‚®«­ë |3d/3dwav 15 3D-‚®«­ë |3d/3dwav
#3 **** ƒà ä¨ª  #3 **** ƒà ä¨ª 
06 <20>à®á¬®âà ä®â® KIV |media/kiv 06 <20>à®á¬®âà ä®â® KIV |media/kiv
06 <20>à®á¬®âà ä®â® zSea |/kolibrios/media/zsea/zsea 06 <20>à®á¬®âà ä®â® zSea |/kolibrios/media/zsea/zsea
38 <20>¥¤ ªâ®à Animage |media/animage 38 <20>¥¤ ªâ®à Animage |media/animage
38 <20>¥¤ ªâ®à ¨ª®­®ª |media/iconedit 38 <20>¥¤ ªâ®à ¨ª®­®ª |media/iconedit
40 <20> «®¦¥­¨¥ 䨫ìâ஢ |media/imgf/imgf 40 <20> «®¦¥­¨¥ 䨫ìâ஢ |media/imgf/imgf
52 <20> «¨âà  |media/palitra 52 <20> «¨âà  |media/palitra
39 <20>¨¯¥âª  |develop/pipet 39 <20>¨¯¥âª  |develop/pipet
#4 **** ‡¢ãª ¨ ¢¨¤¥® #4 **** ‡¢ãª ¨ ¢¨¤¥®
53 €ã¤¨®¯«¥¥à Pixie |media/pixie 53 €ã¤¨®¯«¥¥à Pixie |media/pixie
07 Midi-¯«¥¥à |media/midamp 07 Midi-¯«¥¥à |media/midamp
22 „¥â᪮¥ ¯¨ ­¨­® |media/piano 22 „¥â᪮¥ ¯¨ ­¨­® |media/piano
11 ‚¨¤¥®¯«¥¥à Fplay * |/kolibrios/media/fplay 11 ‚¨¤¥®¯«¥¥à Fplay * |/kolibrios/media/fplay
#5 **** <20> §à ¡®âª  #5 **** <20> §à ¡®âª 
54 Flat Assembler |develop/fasm 54 Flat Assembler |develop/fasm
27 Example.asm |example.asm 27 Example.asm |example.asm
09 “¯ ª®¢é¨ª KPack |kpack 09 “¯ ª®¢é¨ª KPack |kpack
49 Žâ« ¤ç¨ª |develop/mtdbg 49 Žâ« ¤ç¨ª |develop/mtdbg
13 „®áª  ®â« ¤ª¨ |develop/board 13 „®áª  ®â« ¤ª¨ |develop/board
16 HEX-। ªâ®à |develop/heed 16 HEX-। ªâ®à |develop/heed
20 Diff tool |develop/diff 20 Diff tool |develop/diff
34 Hex2Dec2Bin |develop/h2d2b 34 Hex2Dec2Bin |develop/h2d2b
59 ’ ¡«¨æ  ᨬ¢®«®¢ |develop/ASCIIVju 59 ’ ¡«¨æ  ᨬ¢®«®¢ |develop/ASCIIVju
59 ASCII-ª®¤ë |develop/keyascii 59 ASCII-ª®¤ë |develop/keyascii
59 SCAN-ª®¤ë |develop/scancode 59 SCAN-ª®¤ë |develop/scancode
#6 **** <20>¬ã«ïâ®àë #6 **** <20>¬ã«ïâ®àë
24 DOSBox * |/kolibrios/emul/DosBox/dosbox 24 DOSBox * |/kolibrios/emul/DosBox/dosbox
16 e80 (ZX Spectrum) * |/kolibrios/emul/e80/e80 16 e80 (ZX Spectrum) * |/kolibrios/emul/e80/e80
23 Gameboy Color * |/kolibrios/emul/gameboy 23 Gameboy Color * |/kolibrios/emul/gameboy
23 FCE Ultra (NES) * |/kolibrios/emul/fceu/fceu 23 FCE Ultra (NES) * |/kolibrios/emul/fceu/fceu
23 ZSNES * |/kolibrios/emul/zsnes/zsnes 23 ZSNES * |/kolibrios/emul/zsnes/zsnes
16 ScummVM * |/kolibrios/emul/scummvm 16 ScummVM * |/kolibrios/emul/scummvm
#7 **** ‘¨á⥬  #7 **** ‘¨á⥬ 
00 ” ©«®¢ë¥ ¬¥­¥¤¦¥àë > |@8 00 ” ©«®¢ë¥ ¬¥­¥¤¦¥àë > |@8
00 ‘¯¥æ. ¢®§¬®¦­®á⨠> |@9 00 ‘¯¥æ. ¢®§¬®¦­®á⨠> |@9
62 Š «¥­¤ àì |calendar 62 Š «¥­¤ àì |calendar
51 ‚¨àâã «ì­ë¥ ¤¨áª¨ |tmpdisk 51 ‚¨àâã «ì­ë¥ ¤¨áª¨ |tmpdisk
24 ’¥à¬¨­ « |terminal 24 ’¥à¬¨­ « |terminal
24 Š®­á®«ì SHELL |shell 24 Š®­á®«ì SHELL |shell
05 ‘®åà ­¥­¨¥ ®¡à §  |rdsave 05 ‘®åà ­¥­¨¥ ®¡à §  |rdsave
33 Ž­« ©­ ®¡­®¢«¥­¨¥ * |/kolibrios/utils/osupdate 33 Ž­« ©­ ®¡­®¢«¥­¨¥ * |/kolibrios/utils/osupdate
#8 **** ‘¨á⥬  > ”Œ #8 **** ‘¨á⥬  > ”Œ
50 Eolite |File Managers/Eolite 50 Eolite |File Managers/Eolite
05 KFM2 |File Managers/kfm2 05 KFM2 |File Managers/kfm2
20 fNav |File Managers/fNav/fNav 20 fNav |File Managers/fNav/fNav
64 KFAR |File Managers/kfar 64 KFAR |File Managers/kfar
65 NDN * |/kolibrios/utils/ndn/ndn 65 NDN * |/kolibrios/utils/ndn/ndn
05 Classic KFM * |/kolibrios/utils/kfm/kfm
#9 **** ‘¨á⥬  > ‘¯¥æ.¢®§¬®¦­®á⨠#9 **** ‘¨á⥬  > ‘¯¥æ.¢®§¬®¦­®áâ¨
49 <20>ªà ­­ ï «ã¯  |magnify 49 <20>ªà ­­ ï «ã¯  |magnify
59 <20>ªà ­­ ï ª« ¢¨ âãà  |zkey 59 <20>ªà ­­ ï ª« ¢¨ âãà  |zkey
#10 **** Žä¨á #10 **** Žä¨á
16 Š «ìªã«ïâ®à |calc 16 Š «ìªã«ïâ®à |calc
03 <20>¥¤ ªâ®à Tinypad |tinypad 03 <20>¥¤ ªâ®à Tinypad |tinypad
28 <20>¥¤ ªâ®à CodeEdit |develop/cedit 28 <20>¥¤ ªâ®à CodeEdit |develop/cedit
21 ’ ¡«¨ç­ë© ¯à®æ¥áá®à |table 21 ’ ¡«¨ç­ë© ¯à®æ¥áá®à |table
47 <20>®áâ஥­¨¥ £à ä¨ª®¢ |graph 47 <20>®áâ஥­¨¥ £à ä¨ª®¢ |graph
03 <20>à®á¬®âà RTF |rtfread 03 <20>à®á¬®âà RTF |rtfread
#11 **** ‘¥âì #11 **** ‘¥âì
00 ‘¥à¢¥àë > |@12 00 ‘¥à¢¥àë > |@12
00 Š«¨¥­âë > |@13 00 Š«¨¥­âë > |@13
25 <20> áâனª¨ á¥â¨ |network/netcfg 25 <20> áâனª¨ á¥â¨ |network/netcfg
25 ‘â âãá ¯®¤ª«î祭¨ï |network/netstat 25 ‘â âãá ¯®¤ª«î祭¨ï |network/netstat
#12 **** ‘¥âì > ‘¥à¢¥àë #12 **** ‘¥âì > ‘¥à¢¥àë
24 FTP daemon |network/ftpd 24 FTP daemon |network/ftpd
#13 **** ‘¥âì > Š«¨¥­âë #13 **** ‘¥âì > Š«¨¥­âë
13 IRC ª«¨¥­â |network/ircc 13 IRC ª«¨¥­â |network/ircc
20 FTP ª«¨¥­â |network/ftpc 20 FTP ª«¨¥­â |network/ftpc
20 TFTP ª«¨¥­â |network/tftpc 20 TFTP ª«¨¥­â |network/tftpc
24 Ping |network/ping 24 Ping |network/ping
24 Telnet |network/telnet 24 Telnet |network/telnet
24 Synergy ª«¨¥­â |network/synergyc 24 Synergy ª«¨¥­â |network/synergyc
24 DNS lookup |network/nslookup 24 DNS lookup |network/nslookup
61 VNC Š«¨¥­â |network/vncc 61 VNC Š«¨¥­â |network/vncc
33 ˆ­â¥à­¥â § £àã§ç¨ª |network/downloader 33 ˆ­â¥à­¥â § £àã§ç¨ª |network/downloader
12 <20>à ã§¥à WebView |network/webview 12 <20>à ã§¥à WebView |network/webview
#14 **** <20> §­®¥ #14 **** <20> §­®¥
00 <20>¬ã«ïâ®àë* > |@6 00 <20>¬ã«ïâ®àë* > |@6
45 ‘®§¤ ­¨¥ áªà¨­è®â®¢ |scrshoot 45 ‘®§¤ ­¨¥ áªà¨­è®â®¢ |scrshoot
45 <20>à®á⮩ áªà¨­è®â¥à |easyshot 45 <20>à®á⮩ áªà¨­è®â¥à |easyshot
29 FB2 —¨â «ª  |fb2read 29 FB2 —¨â «ª  |fb2read
16 €­ «®£®¢ë¥ ç áë |aclock 16 €­ «®£®¢ë¥ ç áë |aclock
21 ’ ¡«¨æ  Œ¥­¤¥«¥¥¢  |period 21 ’ ¡«¨æ  Œ¥­¤¥«¥¥¢  |period
59 ’७ ¦ñà KJ|ABuIIIA |games/klavisha 59 ’७ ¦ñà KJ|ABuIIIA |games/klavisha
16 <20>¨­ à­ë¥ ç áë |demos/bcdclk 16 <20>¨­ à­ë¥ ç áë |demos/bcdclk
53 ’ ©¬¥à |timer 53 ’ ©¬¥à |timer
09 <20> § à娢 â®à Unz |unz 09 <20> § à娢 â®à Unz |unz
## ##

View File

@ -37,12 +37,12 @@ start_error_window_thread:
mov eax,[ebx+46] mov eax,[ebx+46]
shr eax,1 shr eax,1
add eax,[ebx+38] add eax,[ebx+38]
sub eax,40 sub eax,ERR_WINH/2
mov [error_window_y+2],ax mov [error_window_y+2],ax
mov eax,[ebx+42] mov eax,[ebx+42]
shr eax,1 shr eax,1
add eax,[ebx+34] add eax,[ebx+34]
sub eax,125 sub eax,ERR_WINW/2
mov [error_window_x+2],ax mov [error_window_x+2],ax
mcall 51,1,thread_start,thread_stack mcall 51,1,thread_start,thread_stack
ret ret

View File

@ -14,20 +14,20 @@ start_files_information_thread:
mov eax,[ebx+46] mov eax,[ebx+46]
shr eax,1 shr eax,1
add eax,[ebx+38] add eax,[ebx+38]
sub eax,150 sub eax,INF_WINH/2
mov [files_information_window_y+2],ax mov [files_information_window_y+2],ax
mov eax,[ebx+42] mov eax,[ebx+42]
shr eax,1 shr eax,1
add eax,[ebx+34] add eax,[ebx+34]
sub eax,125 sub eax,INF_WINW/2
mov [files_information_window_x+2],ax mov [files_information_window_x+2],ax
mcall 51,1,thread_files_information_start,thread_stack mcall 51,1,thread_files_information_start,thread_stack
ret ret
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
draw_files_information_window: draw_files_information_window:
mcall 12,1 mcall 12,1
mcall 0,[files_information_window_x],[files_information_window_y],0x03ffffcc mcall 0,[files_information_window_x],[files_information_window_y],0x33ffffcc,,infowin_title
mov edx,100 shl 16+50 mov edx,INF_DATAX shl 16+INF_DATAY+INF_LINEH
mov ebx,0x800a0000 mov ebx,0x800a0000
mov esi,0x10000000 mov esi,0x10000000
cmp [inf_marked_yes],1 cmp [inf_marked_yes],1
@ -36,7 +36,7 @@ draw_files_information_window:
cmp [nesting_direction],1 cmp [nesting_direction],1
je @f je @f
add edx,15 add edx,INF_LINEH
;-------------------------------------- ;--------------------------------------
.continue_4: .continue_4:
; show files counter ; show files counter
@ -54,12 +54,12 @@ draw_files_information_window:
;-------------------------------------- ;--------------------------------------
.continue_2: .continue_2:
; show directories counter ; show directories counter
add edx,15 add edx,INF_LINEH
mcall ,,[directories_counter] mcall ,,[directories_counter]
;-------------------------------------- ;--------------------------------------
@@: @@:
; show file or directory size ; show file or directory size
add edx,15 add edx,INF_LINEH
mcall 47,0x80140001,files_size mcall 47,0x80140001,files_size
;-------------------------------------- ;--------------------------------------
mov ebp,date.create mov ebp,date.create
@ -81,21 +81,21 @@ draw_files_information_window:
mov edx,read_folder_1_name mov edx,read_folder_1_name
;-------------------------------------- ;--------------------------------------
@@: @@:
mcall 4,<75,35>,0x80000000, ;file_name mcall 4,<INF_DATAX,INF_DATAY>,0x90000000, ;file_name
mcall ,<10,35>,0x90000000,type_location mcall ,<10,INF_DATAY>,0x90000000,type_location
cmp [inf_marked_yes],1 cmp [inf_marked_yes],1
je .continue je .continue
mcall ,<90,50>,0x80000000,type_name mcall ,<INF_DATAX,INF_DATAY+INF_LINEH>,0x90000000,type_name
mov ecx,0x90000000 mov ecx,0x90000000
cmp [nesting_direction],1 cmp [nesting_direction],1
je @f je @f
mcall ,<10,50>,,type_dir_name mcall ,<10,INF_DATAY+INF_LINEH>,,type_dir_name
jmp .continue jmp .continue
;-------------------------------------- ;--------------------------------------
@@: @@:
mcall ,<10,50>,,type_file_name mcall ,<10,INF_DATAY+INF_LINEH>,,type_file_name
;-------------------------------------- ;--------------------------------------
.continue: .continue:
cmp [inf_marked_yes],1 cmp [inf_marked_yes],1
@ -105,7 +105,7 @@ draw_files_information_window:
je @f je @f
;-------------------------------------- ;--------------------------------------
.continue_3: .continue_3:
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_files mcall ,,,type_files
;-------------------------------------- ;--------------------------------------
@@: @@:
@ -119,24 +119,24 @@ draw_files_information_window:
je @f je @f
;-------------------------------------- ;--------------------------------------
.continue_1: .continue_1:
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_dir mcall ,,,type_dir
;-------------------------------------- ;--------------------------------------
@@: @@:
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_size mcall ,,,type_size
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_create mcall ,,,type_create
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_change mcall ,,,type_change
add ebx,15 add ebx,INF_LINEH
mcall ,,,type_access mcall ,,,type_access
sub ebx,30 sub ebx,INF_LINEH*2
add ebx,107 shl 16 add ebx,115 shl 16
mcall ,,0x80000000,type_limiters_data_time mcall ,,0x90000000,type_limiters_data_time
add ebx,15 add ebx,INF_LINEH
mcall mcall
add ebx,15 add ebx,INF_LINEH
mcall mcall
mcall 12,2 mcall 12,2
@ -144,11 +144,11 @@ draw_files_information_window:
;------------------------------------------------------------------------------ ;------------------------------------------------------------------------------
show_date_and_time_of_files_information: show_date_and_time_of_files_information:
; show date ; show date
add edx,15 add edx,INF_LINEH
push edx push edx
movzx ecx,byte [ebp+0] movzx ecx,byte [ebp+0]
mcall ,0x00020000 mcall ,0x00020000
add edx,24 shl 16 add edx,23 shl 16
movzx ecx,byte [ebp+1] movzx ecx,byte [ebp+1]
mcall mcall
add edx,23 shl 16 add edx,23 shl 16
@ -156,7 +156,7 @@ show_date_and_time_of_files_information:
mcall ,0x00040000 mcall ,0x00040000
sub ebp,12 sub ebp,12
; show time ; show time
add edx,37 shl 16 add edx,41 shl 16
movzx ecx,byte [ebp+2] movzx ecx,byte [ebp+2]
mcall ,0x00020000 mcall ,0x00020000
add edx,24 shl 16 add edx,24 shl 16

View File

@ -1,4 +1,4 @@
header_text db 'Kolibri File Manager v0.48d',0 header_text db 'Kolibri File Manager v0.48e',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
fbutton_name: fbutton_name:
.f1 db '1 Help',0 .f1 db '1 Help',0
@ -9,7 +9,7 @@ fbutton_name:
.f6 db '6 Move',0 .f6 db '6 Move',0
.f7 db '7 Dir',0 .f7 db '7 Dir',0
.f8 db '8 Del',0 .f8 db '8 Del',0
.f9 db '9 file',0 .f9 db '9 File',0
.f10 db '10',0 .f10 db '10',0
.f11 db '11',0 .f11 db '11',0
.f12 db '12 Exit',0 .f12 db '12 Exit',0
@ -149,7 +149,7 @@ type_access:
db 'Access date:',0 db 'Access date:',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
type_limiters_data_time: type_limiters_data_time:
db '/ / : :',0 db '/ / : :',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
mouse_left_panel: mouse_left_panel:
db 'Left ',0 db 'Left ',0
@ -182,11 +182,19 @@ background_tile:
background_stretch: background_stretch:
db '\S ' db '\S '
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
files_information_window_x: dd 100 shl 16 + 300 INF_WINW = 400
files_information_window_y: dd 100 shl 16 + 200 INF_WINH = 200
INF_DATAX = 110
INF_DATAY = 10
INF_LINEH = 18
files_information_window_x: dd 100 shl 16 + INF_WINW
files_information_window_y: dd 100 shl 16 + INF_WINH
infowin_title db 'Properties',0
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
error_window_x: dd 100 shl 16 + 250 ERR_WINW = 300
error_window_y: dd 100 shl 16 + 80 ERR_WINH = 80
error_window_x: dd 100 shl 16 + ERR_WINW
error_window_y: dd 100 shl 16 + ERR_WINH
;--------------------------------------------------------------------- ;---------------------------------------------------------------------
mouse_key_delay dd 100 mouse_key_delay dd 100
;--------------------------------------------------------------------- ;---------------------------------------------------------------------