diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 13aab732bf..2bf79381c9 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -75,7 +75,6 @@ img_files = { -- For russian build, add russian-only files. if build_type == "rus" then tup.append_table(img_files, { {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, - {"PIPETKA", build_type .. "/pipetka"}, {"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"}, {"GAMES/PADENIE", build_type .. "/games/padenie"}, {"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"}, @@ -613,6 +612,7 @@ tup.append_table(img_files, { {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"}, {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"}, + {"DEVELOP/PIPET", PROGS .. "/cmm/pipet/pipet.com"}, {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, {"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"}, diff --git a/data/common/icons16.png b/data/common/icons16.png index a384efd65c..1279f29d9d 100644 Binary files a/data/common/icons16.png and b/data/common/icons16.png differ diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 18c3d0fcc8..449c917ebb 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -3,12 +3,11 @@ Game Center /sys/allgames Demos > /@1 Graphics > /@3 Multimedia > /@4 -Emulators* > /@18 Development > /@5 System > /@7 -Data processing > /@11 -Network > /@12 -Other > /@15 +Data processing > /@10 +Network > /@11 +Other > /@14 Help /sys/docpack Run /sys/run Shutdown /sys/end @@ -41,13 +40,13 @@ zSea* Image Viewer /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra +Pipet /sys/develop/pipet #4 **** MULTIMEDIA **** Pixie AudioPlayer /sys/media/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay* Video player /kolibrios/media/fplay MidAMP /sys/media/midamp #5 **** DEVELOPMENT **** -Examples > /@6 KPack Archiver /sys/kpack Flat Assembler /sys/develop/fasm Diff Tool /sys/develop/diff @@ -57,36 +56,24 @@ Base Converter /sys/develop/h2d2b Character table /sys/ASCIIVju Key ASCII-codes /sys/develop/keyascii Key SCAN-codes /sys/develop/scancode -#6 **** EXAMPLES **** -Threaded example /sys/develop/thread -Color slider /sys/demos/cslide -Console example 1 /sys/develop/testcon2 -Console example 2 /sys/develop/test_gets -Message Boxes example /sys/demos/use_mb +#6 **** EMULATORS **** +DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox +e80* (ZX Spectrum) /kolibrios/emul/e80/e80 +FCE Ultra* (NES) /kolibrios/emul/fceu/fceu +Gameboy Color* /kolibrios/emul/gameboy +ScummVM* (adventure) /kolibrios/emul/scummvm +ZSNES* (super Nintendo) /kolibrios/emul/zsnes #7 **** SYSTEM **** -Settings > /@8 -System monitors > /@9 -File Management > /@10 -Testing > /@16 -Accessibility > /@17 +File Management > /@8 +Accessibility > /@9 +Hotkeys /sys/mykey Debug board /sys/develop/board Clipboard viewer /sys/develop/clipview Calendar /sys/calendar Terminal /sys/terminal -#8 **** SETTINGS **** -System /sys/setup -Background generator /sys/media/palitra -Colors & Skin /sys/skincfg -Hotkeys /sys/mykey -ATI video mode /sys/vmode -#9 **** SYSTEM MONITORS **** Task manager /sys/cpu -PCI devices /sys/pcidev -CPUID /sys/cpuid -Ghost Monitor /sys/gmon -Bus disconnect test /sys/kbd -HDD informer /sys/hdd_info -#10 **** FILE MANAGEMENT **** +System panel /sys/syspenel +#8 **** FILE MANAGEMENT **** KFAR /sys/File Managers/kfar fNav /sys/File Managers/fNav/fNav KFM /sys/File Managers/kfm @@ -94,7 +81,10 @@ Eolite /sys/File Managers/Eolite Virtual disks /sys/tmpdisk Shell /sys/shell Save ramdisk /sys/rdsave -#11 **** DATA PROCESSING **** +#9 **** ACCESSIBILITY **** +Screen magnifier /sys/magnify +Screen keyboard /sys/zkey +#10 **** DATA PROCESSING **** Calculator /sys/calc Tinypad /sys/tinypad TextEdit /sys/develop/t_edit @@ -102,12 +92,12 @@ Table processor /sys/table Graph builder /sys/graph Hex editor /sys/develop/heed Unarchiver Unz /sys/unz -#12 **** NETWORK **** -Clients > /@13 -Servers > /@14 +#11 **** NETWORK **** +Clients > /@12 +Servers > /@13 Network devices /sys/network/netcfg Network status /sys/network/netstat -#13 **** CLIENTS **** +#12 **** CLIENTS **** IRC /sys/network/ircc FTP /sys/network/ftpc TFTP /sys/network/tftpc @@ -118,27 +108,13 @@ DNS lookup /sys/network/nslookup VNC Viewer /sys/network/vncc Downloader /sys/network/downloader Text-based browser /sys/network/webview -#14 **** SERVERS **** +#13 **** SERVERS **** FTP /sys/network/ftpd -#15 **** OTHER **** +#14 **** OTHER **** +Emulators* > /@6 Analog clock /sys/demos/aclock Binary clock /sys/demos/bcdclk Timer /sys/demos/timer Screenshooter /sys/scrshoot RTF reader /sys/rtfread -#16 **** SYSTEM TESTS **** -Protection test /sys/test -Monitor test /sys/disptest -Graphics benchmark /sys/mgb -File system benchmark /sys/fspeed -#17 **** ACCESSIBILITY **** -Screen magnifier /sys/magnify -Screen keyboard /sys/zkey -#18 **** EMULATORS **** -DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox -e80* (ZX Spectrum) /kolibrios/emul/e80/e80 -FCE Ultra* (NES) /kolibrios/emul/fceu/fceu -Gameboy Color* /kolibrios/emul/gameboy -ScummVM* (adventure) /kolibrios/emul/scummvm -ZSNES* (super Nintendo) /kolibrios/emul/zsnes ## diff --git a/data/rus/pipetka b/data/rus/pipetka deleted file mode 100644 index bd1a424b50..0000000000 Binary files a/data/rus/pipetka and /dev/null differ diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 60a3c4fc80..8ee2402b7f 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -41,7 +41,7 @@ FlatWave /sys/3d/flatwav Редактор Animage /sys/media/animage Наложение фильтров /sys/media/imgf/imgf Палитра /sys/media/palitra -Пипетка /sys/pipetka +Пипетка /sys/develop/pipet #4 **** Звук и видео **** Аудиоплеер Pixie /sys/media/pixie Аудиоплеер AC97SND /sys/media/ac97snd diff --git a/programs/cmm/TWB/TWB.c b/programs/cmm/TWB/TWB.c index 07178da326..07af54b5f4 100644 --- a/programs/cmm/TWB/TWB.c +++ b/programs/cmm/TWB/TWB.c @@ -97,8 +97,8 @@ void TWebBrowser::Paint() text_color__ = text_colors[text_color_index]; if (link) && (text_colors[text_color_index]==text_colors[0]) text_color__ = link_color_default; - DrawBuf.WriteText(start_x, draw_y, list.font_type, text_color__, #line); - if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_color__, #line); + DrawBuf.WriteText(start_x, draw_y, list.font_type, text_color__, #line, NULL); + if (style.b) DrawBuf.WriteText(start_x+1, draw_y, list.font_type, text_color__, #line, NULL); if (style.s) DrawBuf.DrawBar(start_x, list.item_h / 2 - zoom + draw_y, line_length, zoom, text_color__); if (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_color__); if (link) { diff --git a/programs/cmm/lib/draw_buf.h b/programs/cmm/lib/draw_buf.h index b623dc4d58..3ac25e4dac 100644 --- a/programs/cmm/lib/draw_buf.h +++ b/programs/cmm/lib/draw_buf.h @@ -64,7 +64,7 @@ void DrawBufer::DrawBar(dword x, y, w, h, color) } } -void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset) +void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset, strlen) { #define BUGFIX_32000 32000 dword ydiv=0; @@ -72,6 +72,7 @@ void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset) dword new_buf_offset; if (y + 30 >= bufh) IncreaseBufSize(); if (y < BUGFIX_32000) { + ESI = strlen; WriteBufText(x, y, fontType, color, str_offset, buf_data); } else { @@ -84,6 +85,7 @@ void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset) ESDWORD[new_buf_offset] = bufw; ESDWORD[new_buf_offset+4] = bufh - y; + ESI = strlen; WriteBufText(x, y, fontType, color, str_offset, new_buf_offset); ESDWORD[new_buf_offset] = reserve_data_1; diff --git a/programs/cmm/lib/io.h b/programs/cmm/lib/io.h index 2d99721bb4..6a61d9d25c 100644 --- a/programs/cmm/lib/io.h +++ b/programs/cmm/lib/io.h @@ -154,15 +154,15 @@ $mov ebx,#__file_F70.func $int 0x40 } -:int __FILE::write(dword write_file_size, write_buffer, write_file_path) +:int __FILE::write(dword write_offset, write_len, write_buffer, wfile_path) { __file_F70.func = 2; - __file_F70.param1 = 0; + __file_F70.param1 = write_offset; __file_F70.param2 = 0; - __file_F70.param3 = write_file_size; + __file_F70.param3 = write_len; __file_F70.param4 = write_buffer; __file_F70.rezerv = 0; - __file_F70.name = io.path.path(write_file_path); + __file_F70.name = io.path.path(wfile_path); $mov eax,70 $mov ebx,#__file_F70.func $int 0x40 @@ -326,7 +326,7 @@ } :int IO::write(dword PATH,data) { - file.write(0,strlen(data),data,PATH); + return file.write(0,strlen(data),data,PATH); } :char BYTE_HEAD_FILE_KPCK[4]; :dword IO::read(dword PATH) @@ -355,6 +355,7 @@ $mov eax,70 $mov ebx,#__file_F70.func $int 0x40 + return EAX; } :signed IO::count(dword PATH) { diff --git a/programs/cmm/txtread/ini.h b/programs/cmm/txtread/ini.h index b5c61f9076..02c3d97bc3 100644 --- a/programs/cmm/txtread/ini.h +++ b/programs/cmm/txtread/ini.h @@ -2,7 +2,7 @@ _ini ini = { "/sys/settings/app.ini", "Txtread" }; void LoadIniSettings() { - kfont.size.pt = ini.GetInt("FontSize", 14); + kfont.size.pt = ini.GetInt("FontSize", 13); encoding = ini.GetInt("Encoding", CH_AUTO); curcol_scheme = ini.GetInt("ColorScheme", 2); Form.left = ini.GetInt("WinX", 150); diff --git a/programs/network/ircc/gui.inc b/programs/network/ircc/gui.inc index 37bee8fdd3..e952cfe902 100644 --- a/programs/network/ircc/gui.inc +++ b/programs/network/ircc/gui.inc @@ -272,11 +272,12 @@ draw_window_tabs: mov edx, WINDOW_BTN_START mov edi, windows .more_btn: - mov esi, [colors.work_button] + mov esi, [colors.work] cmp [window_active], edi jne @f - not esi - and esi, 0x00ffffff + ;not esi + ;and esi, 0x00ffffff + mov esi, [colors.work_light] @@: mcall inc edx @@ -298,7 +299,18 @@ draw_window_tabs: mov ecx, TOP_SPACE shl 16 + TAB_HEIGHT - 1 mov edx, WINDOW_BTN_CLOSE mov esi, 0x00aa0000 ; red ! - mcall + mcall + + pusha + ; write closing cross + mov ebx, [xsize] + sub ebx, 9 + shl ebx, 16 + add ebx, TOP_SPACE+3 + mov ecx, 0x80FFFfff + mov edx, closing_cross + mcall 4 + popa @@: ; Draw the windownames onto the buttons @@ -308,7 +320,7 @@ draw_window_tabs: mov esi, MAX_WINDOWS mov edi, windows .more: - mov ecx, [colors.work_button_text] + mov ecx, [colors.work_text] test [edi + window.flags], FLAG_UPDATED jz @f mov ecx, 0x00aa0000 ; RED! diff --git a/programs/network/ircc/ircc.asm b/programs/network/ircc/ircc.asm index fba2277eb6..24c4843a24 100644 --- a/programs/network/ircc/ircc.asm +++ b/programs/network/ircc/ircc.asm @@ -559,6 +559,8 @@ default_nick db 'kolibri_user', 0 default_real db 'Kolibri User', 0 default_quit db 'KolibriOS forever', 0 +closing_cross db 'x',0 + irc_colors dd 0xffffff ; 0 white dd 0x000000 ; 1 black dd 0x00007f ; 2 blue (navy)