From b38cab60541ccdf040fbba576dc3821d1e34809c Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 7 May 2020 15:43:50 +0000 Subject: [PATCH] icons16.png: small colors tweak to bring them into the common gamma eng/settings/menu.dat: general update, sunc with rus /data/rus/pipetka: remove as it is closed-source and replace by pipet: add to IMG/develop/pipet (open-source, copy to clipboard function) cmm/lib/io.h: fix library function ircc: add 'x' to the close button, update tab colors to fix low contrast on some skins git-svn-id: svn://kolibrios.org@7889 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/icons16.png | Bin 7494 -> 7414 bytes data/eng/settings/menu.dat | 78 ++++++++++++--------------------- data/rus/pipetka | Bin 1373 -> 0 bytes data/rus/settings/menu.dat | 2 +- programs/cmm/TWB/TWB.c | 4 +- programs/cmm/lib/draw_buf.h | 4 +- programs/cmm/lib/io.h | 11 ++--- programs/cmm/txtread/ini.h | 2 +- programs/network/ircc/gui.inc | 22 +++++++--- programs/network/ircc/ircc.asm | 2 + 11 files changed, 60 insertions(+), 67 deletions(-) delete mode 100644 data/rus/pipetka 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 a384efd65c62352b8db7bf795463dd3cc757deb8..1279f29d9dfaa96fb95dff19009cbc3d7d2240a8 100644 GIT binary patch delta 7231 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 N002ovPDHLkV1i2xqO|}3 delta 7329 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 /@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 bd1a424b50fdc955cbf3b0fb9507fafdc5b273a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1373 zcmV-j1)};(P(w?*6#xK%00001Mv*2LLXK;4&&M{gp_U$4RJS&mpbge}QcI3X1Lgh` zYXoM@|Bl4D$6fF>RXoTnu1BrP!aIvQvJcl{GklD1!0ZZ<-;xGxP{K#MVZFJfK-xJ+ zUrkJ5|4c%U@(3``k@{DTL}4T)FOFytrsMtUchz+H#FH0bZkE?$_R7q{ynlI<)YQ_$ z1zH`(fx3urZ!%|( z$^q*MU(k`=#4M+lioe-o|C5L9sd!@B5&2#1ws+khOWV(^yzn+P5p-hzCnGOqTMHYv zs_?6LkG>r7;JSIV!kH;A{I^*8K*Uv63^}4Y7NEC(ThgVKNKI6`)W!=A$J_UWs=wAy z%V7*iDbMJ^v-5z)5JBRUIf0*ETVjQlVWa>5OsJ>O*2iB+5G_Y>kI!NN$DDi%OkKpj z4D%)k3HYs_hB68^lY28G6tidC4|FrZt4;KSnI6U}Kt^m}sBt-+@#q{YtOWuYzCNt{ zNvb>1v5Lap)lzftYW2X9PjujSuQ>FU#RMm2V5I>$C3!SNaX$0Xe;bD)h^<@A$}1tz zit(Y&Ch@Q<$^n>V+6XcqT6Vzh!AwO4DJaA~%nJerwhKOn0PcXg7uwk*lKYSvX{i9X zZ)>nE2{?NgPA6K3n10ukAE5EH|34B;+f}4>BsI@_{{k{-LyredIGtMF|M4y#>=e#h zA|a^Ee+~amWDwOrV04J{<@po(RA24hm=Z1}I7SWU^Xt%(cAwy}jEUa=zTJ9YyPL6Uw z6y@BG@dJ*^Clk`jB zU6sLBSVs}9O^J5f2b=B#^AxX^a;vxsG>{JQP}#Muj{Zu=Rzd-THDfwPC~>1K4UkNA z1@JlmG7Jff$ZU=pHVg&p!|FWJ1!t-I5cbdzh2aG(WC&pY(VdWlH6k>ukcl06zK0 zQhwTXtmRg)uAsUTJnzaEi_IF&!23T`$*3`Mr%!h4i#oz)cOl?LD?VW5C8-pP25{?U zuhs~DMjKwlQ0_Y62XPYbR{qY4?g|;DG&i+j(O~ICKb;iDFRw3=`L;TXbj?K^6#%H+ z1_-|d2oRx%PkzkBGr^0c4V7v}jW|@m)sQZ|E<;i`%yK+;|1&{C*B*n9I2v15!72_|tx1 f(uj$NJn2(eD}Q-~@T;F=hEqc~iyjaU00002p= 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)