diff --git a/data/Tupfile.lua b/data/Tupfile.lua index d4e69779f0..b633acee64 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -366,7 +366,6 @@ tup.append_table(img_files, { {"@VOLUME", PROGS .. "/media/volume/volume"}, {"HACONFIG", PROGS .. "/other/ha/HACONFIG"}, {"APM", PROGS .. "/system/apm/apm"}, - {"ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"}, {"CALC", PROGS .. "/other/calc/trunk/calc"}, {"CALENDAR", PROGS .. "/system/calendar/trunk/calendar"}, {"COLRDIAL", PROGS .. "/system/colrdial/color_dialog"}, @@ -422,10 +421,10 @@ tup.append_table(img_files, { {"DEMOS/TRANTEST", PROGS .. "/demos/trantest/trunk/trantest"}, {"DEMOS/TUBE", PROGS .. "/demos/tube/trunk/tube"}, {"DEMOS/UNVWATER", PROGS .. "/demos/unvwater/trunk/unvwater"}, - {"DEMOS/USE_MB", PROGS .. "/demos/use_mb/use_mb"}, {"DEMOS/WEB", PROGS .. "/demos/web/trunk/web"}, + {"DEVELOP/ASCIIVJU", PROGS .. "/develop/asciivju/trunk/asciivju"}, {"DEVELOP/BOARD", PROGS .. "/system/board/trunk/board"}, - {"DEVELOP/cObj", PROGS .. "/develop/cObj/trunk/cObj"}, + {"DEVELOP/COBJ", PROGS .. "/develop/cObj/trunk/cObj"}, {"DEVELOP/FASM", PROGS .. "/develop/fasm/1.73/fasm"}, {"DEVELOP/H2D2B", PROGS .. "/develop/h2d2b/trunk/h2d2b"}, {"DEVELOP/HEED", PROGS .. "/develop/heed/trunk/heed"}, @@ -433,8 +432,9 @@ tup.append_table(img_files, { {"DEVELOP/MTDBG", PROGS .. "/develop/mtdbg/mtdbg"}, {"DEVELOP/SCANCODE", PROGS .. "/develop/scancode/trunk/scancode"}, {"DEVELOP/T_EDIT", PROGS .. "/other/t_edit/t_edit"}, - {"DEVELOP/test_gets", PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, - {"DEVELOP/THREAD", PROGS .. "/develop/examples/thread/trunk/thread"}, + {"DEVELOP/EXAMPLES/CONGET", PROGS .. "/develop/libraries/console_coff/examples/test_gets"}, + {"DEVELOP/EXAMPLES/THREAD", PROGS .. "/develop/examples/thread/trunk/thread"}, + {"DEVELOP/EXAMPLES/USE_MB", PROGS .. "/demos/use_mb/use_mb"}, {"DEVELOP/INFO/ASM.SYN", PROGS .. "/other/t_edit/info/asm.syn"}, {"DEVELOP/INFO/CPP_CLA.SYN", PROGS .. "/other/t_edit/info/cpp_kol_cla.syn"}, {"DEVELOP/INFO/CPP_DAR.SYN", PROGS .. "/other/t_edit/info/cpp_kol_dar.syn"}, @@ -583,7 +583,7 @@ tup.append_table(extra_files, { if build_type == "rus" then tup.append_table(img_files, { {"PERIOD", PROGS .. "/other/period/trunk/period"}, {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"}, - {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, + {"DEVELOP/EXAMPLES/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, }) else tup.append_table(img_files, { {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, }) end @@ -597,10 +597,10 @@ end -- tup.getconfig('NO_FASM') ~= 'full' -- Programs that require NASM to compile. if tup.getconfig('NO_NASM') ~= 'full' then tup.append_table(img_files, { + {"ACLOCK", PROGS .. "/demos/aclock/trunk/aclock"}, {"LOD", PROGS .. "/fs/lod/lod"}, + {"TIMER", PROGS .. "/other/Timer/timer"}, {"TINFO", PROGS .. "/system/tinfo/tinfo"}, - {"DEMOS/ACLOCK", PROGS .. "/demos/aclock/trunk/aclock"}, - {"DEMOS/TIMER", PROGS .. "/other/Timer/timer"}, {"DEVELOP/MSTATE", PROGS .. "/develop/mstate/mstate"}, {"GAMES/C4", PROGS .. "/games/c4/trunk/c4"}, {"MEDIA/FILLSCR", PROGS .. "/media/FillScr/fillscr"}, diff --git a/data/ca/settings/menu.dat b/data/ca/settings/menu.dat index 90f39edb8a..e4ac5b8199 100644 --- a/data/ca/settings/menu.dat +++ b/data/ca/settings/menu.dat @@ -52,6 +52,7 @@ Assemblador Flat /sys/develop/fasm Panell de depuraciє /sys/develop/board Depurador /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b +Taula de carрcters /sys/develop/ASCIIVju Codis ASCII /sys/develop/keyascii Codis SCAN /sys/develop/scancode #6 **** EXEMPLES **** @@ -114,9 +115,9 @@ Resoluci Client de baixades /sys/network/downloader Navegador (mode text) /sys/network/webview #15 **** ALTRES **** -Rellotge analЄgic /sys/demos/aclock +Rellotge analЄgic /sys/aclock Rellotge binari /sys/demos/bcdclk -Contador /sys/demos/timer +Contador /sys/timer Capturador de pantalla /sys/scrshoot Calendari /sys/calendar Lector de RTF /sys/rtfread @@ -124,7 +125,6 @@ Lector de RTF /sys/rtfread #17 **** ACCESIBILITAT **** Ampliaciє de pantalla /sys/magnify Teclat en pantalla /sys/zkey -Taula de carрcters /sys/ASCIIVju #18 **** EMULADORS **** DOSBox DOS Emulador /KolibriOS/emul/DosBox/dosbox e80 (ZX Spectrum) /KolibriOS/emul/e80/e80 diff --git a/data/common/icons32.png b/data/common/icons32.png index 38b5ee721a..31347b18f7 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index ea47cca7db..3ebc442174 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -52,7 +52,7 @@ Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Base Converter /sys/develop/h2d2b -Character table /sys/ASCIIVju +Character table /sys/develop/ASCIIVju Key ASCII-codes /sys/develop/keyascii Key SCAN-codes /sys/develop/scancode #6 **** EMULATORS **** @@ -111,9 +111,9 @@ Text-based browser /sys/network/webview FTP /sys/network/ftpd #14 **** OTHER **** Emulators* > /@6 -Analog clock /sys/demos/aclock +Analog clock /sys/aclock Binary clock /sys/demos/bcdclk -Timer /sys/demos/timer +Timer /sys/timer Screenshooter /sys/scrshoot RTF reader /sys/rtfread ## diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index d31e39ff1e..65a68f1098 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -53,6 +53,7 @@ Diff Tool /sys/develop/diff Silumisaken /sys/develop/board Silur /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b +Mфrgistiku tabel /sys/develop/ASCIIVju ASCII-koodid /sys/develop/keyascii SCAN-koodid /sys/develop/scancode #6 **** EXAMPLES **** @@ -115,9 +116,9 @@ VNC Viewer /sys/network/vncc Interneti allalaadija /sys/network/downloader Tekstipїhine brauser /sys/network/webview #15 **** OTHER **** -Analoogkell /sys/demos/aclock +Analoogkell /sys/aclock Digitaalne kell /sys/demos/bcdclk -Taimer /sys/demos/timer +Taimer /sys/timer Ekraani tїmmis /sys/scrshoot Kalender /sys/calendar RTF faili lugeja /sys/rtfread @@ -129,7 +130,6 @@ FSPEED speed of FS /sys/fspeed #17 **** SYSTEM SPECIAL **** Ekraani suurendusklaas /sys/magnify Ekraani klaviatuur /sys/zkey -Mфrgistiku tabel /sys/ASCIIVju #18 **** EMULATORS **** DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) /kolibrios/emul/e80/e80 diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index d335754834..4c94c5d9fa 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -52,7 +52,7 @@ Diff Tool /sys/develop/diff Debug Board /sys/develop/board Debugger /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b -Tavola caratteri /sys/ASCIIVju +Tavola caratteri /sys/develop/ASCIIVju Codici ASCII /sys/develop/keyascii SCAN-codes /sys/develop/scancode #6 **** EXAMPLES **** @@ -117,9 +117,9 @@ DNS lookup /sys/network/nslookup Internet downloader /sys/network/downloader Text-based browser /sys/network/webview #15 **** OTHER **** -Orologio analogico /sys/demos/aclock +Orologio analogico /sys/aclock Orologio binario /sys/demos/bcdclk -Timer /sys/demos/timer +Timer /sys/timer ScreenShoter /sys/scrshoot Calendario /sys/calendar Lettore RTF /sys/rtfread diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 702a3491ca..1e5f3a84b3 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -54,14 +54,13 @@ HEX-ред Diff tool /sys/develop/diff Отладчик /sys/develop/mtdbg Hex2Dec2Bin /sys/develop/h2d2b -Таблица символов /sys/ASCIIVju +Таблица символов /sys/develop/ASCIIVju ASCII-коды /sys/develop/keyascii SCAN-коды /sys/develop/scancode #6 **** Эмуляторы **** DOSBox DOS Emulator /kolibrios/emul/DosBox/dosbox e80 (ZX Spectrum) /kolibrios/emul/e80/e80 FCE Ultra - NES /kolibrios/emul/fceu/fceu -PokeMini /kolibrios/emul/pokemini ScummVM /kolibrios/emul/scummvm ZSNES Super Nintendo /kolibrios/emul/zsnes #7 **** Система **** @@ -109,10 +108,10 @@ VNC #14 **** Разное **** Эмуляторы > /@6 Создание скриншотов /sys/scrshoot -Аналоговые часы /sys/demos/aclock +Аналоговые часы /sys/aclock Таблица Менделеева /sys/period Тренажёр KJ|ABuIIIA /sys/games/klavisha Бинарные часы /sys/demos/bcdclk -Таймер /sys/demos/timer +Таймер /sys/timer Разархиватор Unz /sys/unz ## diff --git a/programs/cmm/browser/TWB/TWB.c b/programs/cmm/browser/TWB/TWB.c index 9359eb33db..b271d27b6f 100644 --- a/programs/cmm/browser/TWB/TWB.c +++ b/programs/cmm/browser/TWB/TWB.c @@ -455,6 +455,8 @@ void TWebBrowser::SetStyle() { if (!value) value = tag.get_value_of("data-src="); if (!value) goto NOIMG; + if (!strcmp(value + strrchr(value, '.'), "svg")) goto NOIMG; + strlcpy(#img_path, value, sizeof(img_path)-1); get_absolute_url(#img_path, history.current()); diff --git a/programs/cmm/browser/TWB/special.h b/programs/cmm/browser/TWB/special.h index 3bb8fcd321..027d651943 100644 --- a/programs/cmm/browser/TWB/special.h +++ b/programs/cmm/browser/TWB/special.h @@ -46,6 +46,8 @@ char *unicode_symbols[]={ "#9660", "v", "#65122", "+", +"#8594", "->", + "uarr", "\24", "darr", "\25", "rarr", "\26", diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 8443cd4a92..04ee038a6b 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -78,6 +78,7 @@ proc_info Form; dword cur_img_url; dword shared_url; dword http_get_type; +dword render_start_time; int menu_id=NULL; char default_dir[] = "/rd/1"; @@ -701,6 +702,7 @@ void LoadInternalPage(dword _bufdata, _in_bufsize){ strcat(#editURL, #anchors.current); DrawOmnibox(); } + render_start_time = GetStartTime(); WB1.ParseHtml(_bufdata, _in_bufsize); // REJECTED. Reason: infinite redirect at Google Results. /* @@ -949,6 +951,7 @@ dword GetImg(bool _new) DrawOmnibox(); WB1.ParseHtml(WB1.o_bufpointer, WB1.bufsize); WB1.DrawPage(); + debugln(sprintf(#param, "WebView: page rendered in %i sec", GetStartTime()-render_start_time/100)); } stop: \ No newline at end of file diff --git a/programs/cmm/lib/gui/sensor.h b/programs/cmm/lib/gui/sensor.h index 97b40f9d1b..11710b81a6 100644 --- a/programs/cmm/lib/gui/sensor.h +++ b/programs/cmm/lib/gui/sensor.h @@ -1,7 +1,7 @@ #define MIN_PB_BLOCK_W 19 #define LOAD_CPU 0x2460C8 -#define PROGRESS_ACTIVE 0x489FE4 +#define PROGRESS_ACTIVE 0x62B7E4 #define PROGRESS_BG 0xFFFfff #define PROGRESS_BG_TEXT 0x696969 diff --git a/programs/demos/aclock/trunk/aclock.asm b/programs/demos/aclock/trunk/aclock.asm index 96cf229102..298d48089d 100644 --- a/programs/demos/aclock/trunk/aclock.asm +++ b/programs/demos/aclock/trunk/aclock.asm @@ -25,14 +25,14 @@ ; configuration stuff ;******************************************************************** - %define APPNAME "AClock 1.1" + %define APPNAME "Clock" %define STACKSIZE 1024 ; default window position/dimensions (work area) %define DEFAULT_XPOS -20 %define DEFAULT_YPOS 20 - %define DEFAULT_WIDTH 100 - %define DEFAULT_HEIGHT 100 + %define DEFAULT_WIDTH 110 + %define DEFAULT_HEIGHT 110 ; minimal size (horizontal and vertical) of work area %define MIN_WIDTH 100 diff --git a/programs/develop/asciivju/trunk/asciivju.asm b/programs/develop/asciivju/trunk/asciivju.asm index fcd7950cdb..c66b232d62 100644 --- a/programs/develop/asciivju/trunk/asciivju.asm +++ b/programs/develop/asciivju/trunk/asciivju.asm @@ -16,6 +16,9 @@ PANEL_Y = BUTTON_SPACE*8+TABLE_BEGIN_Y+TABLE_BEGIN_Y FOCUS_SQUARE_COLOR = 0x000080FF SWITCHER_BLINK_COLOR = 0x00808080 +FONT_SMALL = 0x01000000 +FONT_BIG = 0x10000000 + start: still: @@ -33,6 +36,8 @@ button: je quit cmp ax, 0xFFAA ; page switcher je .switch_page ; any button with a character + cmp ax, 0xEEBB ; page switcher + je .switch_font .change_focus: mov bl, [symbol_focused] mov [symbol_unfocused], bl @@ -41,6 +46,13 @@ button: stdcall draw_table, 0 call draw_codes jmp still + .switch_font: + cmp [font_type], FONT_SMALL + jne @f + mov [font_type], FONT_BIG + jmp redraw + @@: mov [font_type], FONT_SMALL + jmp redraw .switch_page: movzx bx, [symbol_start] add bx, BUTTON_ID_SHIFT @@ -77,6 +89,7 @@ redraw: stdcall draw_table, 1 call draw_codes stdcall draw_page_switcher, 0 + stdcall draw_font_switcher @@: mcall 12, 2 @@ -234,7 +247,8 @@ proc draw_button shl ebx, 16 add ebx, [button_y] add ebx, 7 - mcall 4, , 0x01000000, symbol_current, 1 + mov ecx, [font_type] + mcall 4, , , symbol_current, 1 ret endp @@ -247,7 +261,7 @@ proc draw_page_switcher _blinking cmp [_blinking], 1 ; blinking? jne @f mov esi, SWITCHER_BLINK_COLOR - @@: mcall , <2,98>, , 0x2000FFAA + @@: mcall , <2,98>, , 0x0000FFAA mov ecx, 0x81000000 mov edx, string_000_127 @@ -255,7 +269,20 @@ proc draw_page_switcher _blinking je @f mov edx, string_128_255 ; ok, the second one @@: mcall 4, <10,PANEL_Y+6>, - mcall , <115,PANEL_Y+6>, 0x81000000, string_ASCII_CODE + mcall , <278,PANEL_Y+6>, 0x81000000, string_ASCII_CODE + + ret +endp + +proc draw_font_switcher + + mcall 8, <120,136>, , 0x0000EEBB + + mov edx, string_font_small + cmp [font_type], FONT_SMALL + je @f + mov edx, string_font_big + @@: mcall 4, <130,PANEL_Y+6>,,,10 ret endp @@ -264,8 +291,8 @@ endp proc draw_codes movzx ecx, [symbol_focused] - mcall 47, 0x00030000, , <250,PANEL_Y+6>, 0x41000000, 0xAAAaaa - mcall , 0x00020100, , <500,PANEL_Y+6>, + mcall 47, 0x00030000, , <339,PANEL_Y+6>, 0x41000000, 0xAAAaaa + mcall , 0x00020100, , <508,PANEL_Y+6>, ret endp @@ -275,14 +302,18 @@ quit: mcall -1 -szZ window_title ,'ASCIIVju' -szZ string_000_127 ,'000-127' -szZ string_128_255 ,'128-255' -szZ string_ASCII_CODE ,'ASCII Code: ASCII Hex-Code:' +szZ window_title ,'ASCIIVju' +szZ string_000_127 ,'000-127' +szZ string_128_255 ,'128-255' +szZ string_font_small ,'Font1 6x9 ' +szZ string_font_big ,'Font2 8x14' +szZ string_ASCII_CODE ,'Code: Hex-Code:' button_x dd 2 button_y dd 2 +font_type dd FONT_SMALL + symbol_current db 0 symbol_start db 0