Egor00f/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

icons16.png: small colors tweak to bring them into the common gamma

Browse Source 
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
This commit is contained in:
Kirill Lipatov (Leency) 2020-05-07 15:43:50 +00:00
parent a7d4a56bcc
commit b38cab6054
11 changed files with 60 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Tupfile.lua
View File

@ -75,7 +75,6 @@ img_files = {
-- For russian build, add russian-only files. -- For russian build, add russian-only files.
if build_type == "rus" then tup.append_table(img_files, { if build_type == "rus" then tup.append_table(img_files, {
{"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"}, {"EXAMPLE.ASM", PROGS .. "/develop/examples/example/trunk/rus/example.asm"},
{"PIPETKA", build_type .. "/pipetka"},
{"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"}, {"GAMES/BASEKURS.KLA", build_type .. "/games/basekurs.kla"},
{"GAMES/PADENIE", build_type .. "/games/padenie"}, {"GAMES/PADENIE", build_type .. "/games/padenie"},
{"File Managers/KFAR.INI", build_type .. "/File Managers/kfar.ini"}, {"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"}, {"TMPDISK", PROGS .. "/cmm/tmpdisk/tmpdisk.com"},
{"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"}, {"DEVELOP/CLIPVIEW", PROGS .. "/cmm/clipview/clipview.com"},
{"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"}, {"DEVELOP/MENU", PROGS .. "/cmm/menu/menu.com"},
{"DEVELOP/PIPET", PROGS .. "/cmm/pipet/pipet.com"},
{"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"}, {"File Managers/EOLITE", PROGS .. "/cmm/eolite/Eolite.com"},
{"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"}, {"KF_VIEW", PROGS .. "/cmm/kf_font_viewer/font_viewer.com"},
{"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"}, {"GAMES/CLICKS", PROGS .. "/games/clicks/trunk/clicks.com"},

BIN
data/common/icons16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

78
data/eng/settings/menu.dat
View File

@ -3,12 +3,11 @@ Game Center /sys/allgames
Demos > /@1 Demos > /@1
Graphics > /@3 Graphics > /@3
Multimedia > /@4 Multimedia > /@4
Emulators* > /@18
Development > /@5 Development > /@5
System > /@7 System > /@7
Data processing > /@11 Data processing > /@10
Network > /@12 Network > /@11
Other > /@15 Other > /@14
Help /sys/docpack Help /sys/docpack
Run /sys/run Run /sys/run
Shutdown /sys/end Shutdown /sys/end
@ -41,13 +40,13 @@ zSea* Image Viewer /kolibrios/media/zsea/zsea
Animage /sys/media/animage Animage /sys/media/animage
Image Filtering /sys/media/imgf/imgf Image Filtering /sys/media/imgf/imgf
Palitra /sys/media/palitra Palitra /sys/media/palitra
Pipet /sys/develop/pipet
#4 **** MULTIMEDIA **** #4 **** MULTIMEDIA ****
Pixie AudioPlayer /sys/media/pixie Pixie AudioPlayer /sys/media/pixie
AC97SND Audioplayer /sys/media/ac97snd AC97SND Audioplayer /sys/media/ac97snd
Fplay* Video player /kolibrios/media/fplay Fplay* Video player /kolibrios/media/fplay
MidAMP /sys/media/midamp MidAMP /sys/media/midamp
#5 **** DEVELOPMENT **** #5 **** DEVELOPMENT ****
Examples > /@6
KPack Archiver /sys/kpack KPack Archiver /sys/kpack
Flat Assembler /sys/develop/fasm Flat Assembler /sys/develop/fasm
Diff Tool /sys/develop/diff Diff Tool /sys/develop/diff
@ -57,36 +56,24 @@ Base Converter /sys/develop/h2d2b
Character table /sys/ASCIIVju Character table /sys/ASCIIVju
Key ASCII-codes /sys/develop/keyascii Key ASCII-codes /sys/develop/keyascii
Key SCAN-codes /sys/develop/scancode Key SCAN-codes /sys/develop/scancode
#6 **** EXAMPLES **** #6 **** EMULATORS ****
Threaded example /sys/develop/thread DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox
Color slider /sys/demos/cslide e80* (ZX Spectrum) /kolibrios/emul/e80/e80
Console example 1 /sys/develop/testcon2 FCE Ultra* (NES) /kolibrios/emul/fceu/fceu
Console example 2 /sys/develop/test_gets Gameboy Color* /kolibrios/emul/gameboy
Message Boxes example /sys/demos/use_mb ScummVM* (adventure) /kolibrios/emul/scummvm
ZSNES* (super Nintendo) /kolibrios/emul/zsnes
#7 **** SYSTEM **** #7 **** SYSTEM ****
Settings > /@8 File Management > /@8
System monitors > /@9 Accessibility > /@9
File Management > /@10 Hotkeys /sys/mykey
Testing > /@16
Accessibility > /@17
Debug board /sys/develop/board Debug board /sys/develop/board
Clipboard viewer /sys/develop/clipview Clipboard viewer /sys/develop/clipview
Calendar /sys/calendar Calendar /sys/calendar
Terminal /sys/terminal 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 Task manager /sys/cpu
PCI devices /sys/pcidev System panel /sys/syspenel
CPUID /sys/cpuid #8 **** FILE MANAGEMENT ****
Ghost Monitor /sys/gmon
Bus disconnect test /sys/kbd
HDD informer /sys/hdd_info
#10 **** FILE MANAGEMENT ****
KFAR /sys/File Managers/kfar KFAR /sys/File Managers/kfar
fNav /sys/File Managers/fNav/fNav fNav /sys/File Managers/fNav/fNav
KFM /sys/File Managers/kfm KFM /sys/File Managers/kfm
@ -94,7 +81,10 @@ Eolite /sys/File Managers/Eolite
Virtual disks /sys/tmpdisk Virtual disks /sys/tmpdisk
Shell /sys/shell Shell /sys/shell
Save ramdisk /sys/rdsave Save ramdisk /sys/rdsave
#11 **** DATA PROCESSING **** #9 **** ACCESSIBILITY ****
Screen magnifier /sys/magnify
Screen keyboard /sys/zkey
#10 **** DATA PROCESSING ****
Calculator /sys/calc Calculator /sys/calc
Tinypad /sys/tinypad Tinypad /sys/tinypad
TextEdit /sys/develop/t_edit TextEdit /sys/develop/t_edit
@ -102,12 +92,12 @@ Table processor /sys/table
Graph builder /sys/graph Graph builder /sys/graph
Hex editor /sys/develop/heed Hex editor /sys/develop/heed
Unarchiver Unz /sys/unz Unarchiver Unz /sys/unz
#12 **** NETWORK **** #11 **** NETWORK ****
Clients > /@13 Clients > /@12
Servers > /@14 Servers > /@13
Network devices /sys/network/netcfg Network devices /sys/network/netcfg
Network status /sys/network/netstat Network status /sys/network/netstat
#13 **** CLIENTS **** #12 **** CLIENTS ****
IRC /sys/network/ircc IRC /sys/network/ircc
FTP /sys/network/ftpc FTP /sys/network/ftpc
TFTP /sys/network/tftpc TFTP /sys/network/tftpc
@ -118,27 +108,13 @@ DNS lookup /sys/network/nslookup
VNC Viewer /sys/network/vncc VNC Viewer /sys/network/vncc
Downloader /sys/network/downloader Downloader /sys/network/downloader
Text-based browser /sys/network/webview Text-based browser /sys/network/webview
#14 **** SERVERS **** #13 **** SERVERS ****
FTP /sys/network/ftpd FTP /sys/network/ftpd
#15 **** OTHER **** #14 **** OTHER ****
Emulators* > /@6
Analog clock /sys/demos/aclock Analog clock /sys/demos/aclock
Binary clock /sys/demos/bcdclk Binary clock /sys/demos/bcdclk
Timer /sys/demos/timer Timer /sys/demos/timer
Screenshooter /sys/scrshoot Screenshooter /sys/scrshoot
RTF reader /sys/rtfread 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
## ##

BIN
data/rus/pipetka
View File

Binary file not shown.

2
data/rus/settings/menu.dat
View File

@ -41,7 +41,7 @@ FlatWave /sys/3d/flatwav
<EFBFBD>¥¤ ªâ®à Animage /sys/media/animage <EFBFBD>¥¤ ªâ®à Animage /sys/media/animage
<EFBFBD> «®¦¥­¨¥ 䨫ìâ஢ /sys/media/imgf/imgf <EFBFBD> «®¦¥­¨¥ 䨫ìâ஢ /sys/media/imgf/imgf
<EFBFBD> «¨âà  /sys/media/palitra <EFBFBD> «¨âà  /sys/media/palitra
<EFBFBD>¨¯¥âª  /sys/pipetka <EFBFBD>¨¯¥âª  /sys/develop/pipet
#4 **** ‡¢ãª ¨ ¢¨¤¥® **** #4 **** ‡¢ãª ¨ ¢¨¤¥® ****
€ã¤¨®¯«¥¥à Pixie /sys/media/pixie €ã¤¨®¯«¥¥à Pixie /sys/media/pixie
€ã¤¨®¯«¥¥à AC97SND /sys/media/ac97snd €ã¤¨®¯«¥¥à AC97SND /sys/media/ac97snd

4
programs/cmm/TWB/TWB.c
View File

@ -97,8 +97,8 @@ void TWebBrowser::Paint()
text_color__ = text_colors[text_color_index]; text_color__ = text_colors[text_color_index];
if (link) && (text_colors[text_color_index]==text_colors[0]) text_color__ = link_color_default; 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); 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); 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.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 (style.u) DrawBuf.DrawBar(start_x, list.item_h - zoom - zoom + draw_y, line_length, zoom, text_color__);
if (link) { if (link) {

4
programs/cmm/lib/draw_buf.h
View File

@ -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 #define BUGFIX_32000 32000
dword ydiv=0; dword ydiv=0;
@ -72,6 +72,7 @@ void DrawBufer::WriteText(dword x, y, byte fontType, dword color, str_offset)
dword new_buf_offset; dword new_buf_offset;
if (y + 30 >= bufh) IncreaseBufSize(); if (y + 30 >= bufh) IncreaseBufSize();
if (y < BUGFIX_32000) { if (y < BUGFIX_32000) {
ESI = strlen;
WriteBufText(x, y, fontType, color, str_offset, buf_data); WriteBufText(x, y, fontType, color, str_offset, buf_data);
} }
else { 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] = bufw;
ESDWORD[new_buf_offset+4] = bufh - y; ESDWORD[new_buf_offset+4] = bufh - y;
ESI = strlen;
WriteBufText(x, y, fontType, color, str_offset, new_buf_offset); WriteBufText(x, y, fontType, color, str_offset, new_buf_offset);
ESDWORD[new_buf_offset] = reserve_data_1; ESDWORD[new_buf_offset] = reserve_data_1;

11
programs/cmm/lib/io.h
View File

@ -154,15 +154,15 @@
$mov ebx,#__file_F70.func $mov ebx,#__file_F70.func
$int 0x40 $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.func = 2;
__file_F70.param1 = 0; __file_F70.param1 = write_offset;
__file_F70.param2 = 0; __file_F70.param2 = 0;
__file_F70.param3 = write_file_size; __file_F70.param3 = write_len;
__file_F70.param4 = write_buffer; __file_F70.param4 = write_buffer;
__file_F70.rezerv = 0; __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 eax,70
$mov ebx,#__file_F70.func $mov ebx,#__file_F70.func
$int 0x40 $int 0x40
@ -326,7 +326,7 @@
} }
:int IO::write(dword PATH,data) :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]; :char BYTE_HEAD_FILE_KPCK[4];
:dword IO::read(dword PATH) :dword IO::read(dword PATH)
@ -355,6 +355,7 @@
$mov eax,70 $mov eax,70
$mov ebx,#__file_F70.func $mov ebx,#__file_F70.func
$int 0x40 $int 0x40
return EAX;
} }
:signed IO::count(dword PATH) :signed IO::count(dword PATH)
{ {

2
programs/cmm/txtread/ini.h
View File

@ -2,7 +2,7 @@ _ini ini = { "/sys/settings/app.ini", "Txtread" };
void LoadIniSettings() void LoadIniSettings()
{ {
kfont.size.pt = ini.GetInt("FontSize", 14); kfont.size.pt = ini.GetInt("FontSize", 13);
encoding = ini.GetInt("Encoding", CH_AUTO); encoding = ini.GetInt("Encoding", CH_AUTO);
curcol_scheme = ini.GetInt("ColorScheme", 2); curcol_scheme = ini.GetInt("ColorScheme", 2);
Form.left = ini.GetInt("WinX", 150); Form.left = ini.GetInt("WinX", 150);

20
programs/network/ircc/gui.inc
View File

@ -272,11 +272,12 @@ draw_window_tabs:
mov edx, WINDOW_BTN_START mov edx, WINDOW_BTN_START
mov edi, windows mov edi, windows
.more_btn: .more_btn:
mov esi, [colors.work_button] mov esi, [colors.work]
cmp [window_active], edi cmp [window_active], edi
jne @f jne @f
not esi ;not esi
and esi, 0x00ffffff ;and esi, 0x00ffffff
mov esi, [colors.work_light]
@@: @@:
mcall mcall
inc edx inc edx
@ -299,6 +300,17 @@ draw_window_tabs:
mov edx, WINDOW_BTN_CLOSE mov edx, WINDOW_BTN_CLOSE
mov esi, 0x00aa0000 ; red ! 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 ; Draw the windownames onto the buttons
@ -308,7 +320,7 @@ draw_window_tabs:
mov esi, MAX_WINDOWS mov esi, MAX_WINDOWS
mov edi, windows mov edi, windows
.more: .more:
mov ecx, [colors.work_button_text] mov ecx, [colors.work_text]
test [edi + window.flags], FLAG_UPDATED test [edi + window.flags], FLAG_UPDATED
jz @f jz @f
mov ecx, 0x00aa0000 ; RED! mov ecx, 0x00aa0000 ; RED!

2
programs/network/ircc/ircc.asm
View File

@ -559,6 +559,8 @@ default_nick db 'kolibri_user', 0
default_real db 'Kolibri User', 0 default_real db 'Kolibri User', 0
default_quit db 'KolibriOS forever', 0 default_quit db 'KolibriOS forever', 0
closing_cross db 'x',0
irc_colors dd 0xffffff ; 0 white irc_colors dd 0xffffff ; 0 white
dd 0x000000 ; 1 black dd 0x000000 ; 1 black
dd 0x00007f ; 2 blue (navy) dd 0x00007f ; 2 blue (navy)