From 1f2ca38560646d42848499aa1c1c4d27265da007 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 27 Sep 2017 02:01:45 +0000 Subject: [PATCH] vncc: use big fonts, hide password, add to menu.dat git-svn-id: svn://kolibrios.org@7017 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/settings/menu.dat | 1 + data/et/settings/menu.dat | 1 + data/it/settings/menu.dat | 1 + data/rus/settings/menu.dat | 1 + data/sp/settings/menu.dat | 1 + programs/network/vncc/build.bat | 2 ++ programs/network/vncc/gui.inc | 45 +++++++++++++++++++-------------- programs/network/vncc/vncc.asm | 6 ++--- 8 files changed, 36 insertions(+), 22 deletions(-) create mode 100644 programs/network/vncc/build.bat diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 5da4555ffe..b337c20b33 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -109,6 +109,7 @@ Ping /sys/network/ping Telnet /sys/network/telnet Synergy /sys/network/synergyc DNS lookup /sys/network/nslookup +VNC Viewer /sys/network/vncc Downloader /sys/network/downloader Text-based browser /sys/network/webview #14 **** SERVERS **** diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index b6f0ffd127..634cc4d1fa 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -111,6 +111,7 @@ Ping /sys/network/ping Telnet klient /sys/network/telnet Synergy klient /sys/network/synergyc DNS otsing /sys/network/nslookup +VNC Viewer /sys/network/vncc Interneti allalaadija /sys/network/downloader Tekstipїhine brauser /sys/network/webview #15 **** OTHER **** diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 6494d6e313..20b51e2034 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -109,6 +109,7 @@ Client TFTP /sys/network/tftpc Ping /sys/network/ping Client Telnet /sys/network/telnet Client Synergy /sys/network/synergyc +VNC Viewer /sys/network/vncc DNS lookup /sys/network/nslookup Internet downloader /sys/network/downloader Text-based browser /sys/network/webview diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 018d0d88fb..fb9e1e3da2 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -122,6 +122,7 @@ Ping /sys/network/ping Telnet /sys/network/telnet Synergy клиент /sys/network/synergyc DNS lookup /sys/network/nslookup +VNC Клиент /sys/network/vncc Интернет загрузчик /sys/network/downloader Текстовый браузер /sys/network/webview #17 **** Разное **** diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 4050bfd5e0..354def5325 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -111,6 +111,7 @@ Ping /sys/network/ping Cliente Telnet /sys/network/telnet Cliente Synergy /sys/network/synergyc Resoluciвn de nombres /sys/network/nslookup +VNC Viewer /sys/network/vncc Cliente de descarga /sys/network/downloader Navegador (modo texto) /sys/network/webview #15 **** OTROS **** diff --git a/programs/network/vncc/build.bat b/programs/network/vncc/build.bat new file mode 100644 index 0000000000..d9efe64166 --- /dev/null +++ b/programs/network/vncc/build.bat @@ -0,0 +1,2 @@ +@fasm vncc.asm vncc +@pause \ No newline at end of file diff --git a/programs/network/vncc/gui.inc b/programs/network/vncc/gui.inc index 5dcc430ad8..6edede96ec 100644 --- a/programs/network/vncc/gui.inc +++ b/programs/network/vncc/gui.inc @@ -12,6 +12,9 @@ ;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +BTN_H equ 22 +TEXT_ECX equ 00010000b shl 24 + 0 + draw_gui: mcall 67, 160, 160, 330, 100 ; resize and move the window mcall 66, 1, 0 ; switch keyboard to ascii mode @@ -23,7 +26,7 @@ draw_gui: ; DRAW WINDOW xor eax, eax ; function 0 _logon: define and draw window mov ebx, 160 shl 16 + 330 ; [x start]:[x size] - mov ecx, 160 shl 16 + 100 ; [y start]:[y size] + mov ecx, 160 shl 16 + 130 ; [y start]:[y size] mov edx, 0x34DDDDDD ; color of work area RRGGBB mov edi, name ; WINDOW LABEL mcall @@ -31,8 +34,8 @@ draw_gui: cmp [status], STATUS_CONNECTING ja .login? - mov ebx, 25 shl 16 + 24 - xor ecx, ecx + mov ebx, 10 shl 16 + 22 + mov ecx, TEXT_ECX mov edx, serverstr mov esi, userstr-serverstr mcall 4 ; "server" text @@ -43,12 +46,13 @@ draw_gui: jne @f mov ebx, 220 shl 16 + 85 - mov ecx, 47 shl 16 + 16 + mov ecx, 57 shl 16 + BTN_H mov edx, 4 mov esi, 0xCCCCCC mcall 8 ; Cancel button - mov ebx, 240 shl 16 + 52 + mov ebx, 240 shl 16 + 62 + mov ecx, TEXT_ECX mov edx, cancelstr mov esi, okstr-cancelstr mcall 4 ; Cancel button text @@ -60,12 +64,13 @@ draw_gui: jne .redraw_done mov ebx, 220 shl 16 + 85 - mov ecx, 47 shl 16 + 16 + mov ecx, 57 shl 16 + BTN_H mov edx, 2 mov esi, 0xCCCCCC mcall 8 ; Connect button - mov ebx, 240 shl 16 + 52 + mov ebx, 236 shl 16 + 62 + mov ecx, TEXT_ECX mov edx, connectstr mov esi, loginstr-connectstr mcall 4 ; Connect button text @@ -76,13 +81,13 @@ draw_gui: cmp [status], STATUS_LOGIN ja @f - mov ebx, 25 shl 16 + 14 - xor ecx, ecx + mov ebx, 10 shl 16 + 12 + mov ecx, TEXT_ECX mov edx, userstr mov esi, passstr-userstr mcall 4 ; "user" text - add bl, 20 + add bl, 25 mov edx, passstr mov esi, connectstr-passstr ; "password" text mcall @@ -94,23 +99,24 @@ draw_gui: jne .redraw_done mov ebx, 220 shl 16 + 85 - mov ecx, 47 shl 16 + 16 + mov ecx, 67 shl 16 + BTN_H mov edx, 3 mov esi, 0xCCCCCC mcall 8 ; Login button - mov ebx, 240 shl 16 + 52 - mov edx, loginstr - mov esi, cancelstr-loginstr - mcall 4 ; Login button text - mov ebx, 120 shl 16 + 85 - mov ecx, 47 shl 16 + 16 + mov ecx, 67 shl 16 + BTN_H mov edx, 4 mov esi, 0xCCCCCC mcall 8 ; Cancel button - mov ebx, 140 shl 16 + 52 + mov ebx, 240 shl 16 + 71 + mov ecx, TEXT_ECX + mov edx, loginstr + mov esi, cancelstr-loginstr + mcall 4 ; Login button text + + mov ebx, 140 shl 16 + 71 mov edx, cancelstr mov esi, okstr-cancelstr mcall 4 ; Cancel button text @@ -145,12 +151,13 @@ draw_gui: mcall 4 ; print error message to window mov ebx, 220 shl 16 + 85 - mov ecx, 47 shl 16 + 16 + mov ecx, 47 shl 16 + BTN_H mov edx, 5 mov esi, 0xCCCCCC mcall 8 ; OK button mov ebx, 256 shl 16 + 52 + mov ecx, TEXT_ECX mov edx, okstr mov esi, okstr_e-okstr mcall 4 ; OK button text diff --git a/programs/network/vncc/vncc.asm b/programs/network/vncc/vncc.asm index 68dfbf2aab..847df5aa7d 100644 --- a/programs/network/vncc/vncc.asm +++ b/programs/network/vncc/vncc.asm @@ -490,9 +490,9 @@ deflate_buffer dd 0 deflate_length dd ? deflate_str dd ? -URLbox edit_box 235, 70, 20, 0xffffff, 0x6f9480, 0, 0, 0, SERVERADDRLEN, serveraddr, mouse_dd, ed_focus, 0, 0 -USERbox edit_box 215, 90, 10, 0xffffff, 0x6f9480, 0, 0, 0, 127, username, mouse_dd, ed_focus, 0, 0 -PASSbox edit_box 215, 90, 30, 0xffffff, 0x6f9480, 0, 0, 0, 127, password, mouse_dd, ed_pass, 0, 0 +URLbox edit_box 235, 70, 20, 0xffffff, 0x6f9480, 0, 0, 0x90000000, SERVERADDRLEN, serveraddr, mouse_dd, ed_focus, 0, 0 +USERbox edit_box 215, 90, 10, 0xffffff, 0x6f9480, 0, 0, 0x90000000, 127, username, mouse_dd, ed_focus, 0, 0 +PASSbox edit_box 215, 90, 35, 0xffffff, 0x6f9480, 0, 0, 0x10000000, 127, password, mouse_dd, ed_pass, 0, 0 serverstr db "server:" userstr db "username:"