KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

menu.dat: updated for ENG and RUS

Browse Source 
ICONS16.PNG: new icons 
Other small fixes

git-svn-id: svn://kolibrios.org@9436 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2021-12-18 00:41:36 +00:00
parent 227a838083
commit 5304ccbd3b
7 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/common/File Managers/icons.ini
View File

@@ -15,6 +15,7 @@ inf=3
odt=3
ob07=3
inc=4
c=14
h=4
img=5
ima=5
@@ -86,8 +87,8 @@ iw4=6
wav=7
mp3=7
xm=7
mid=7
midi=7
mid=22
midi=22
aif=7
aifc=7
aiff=7
@@ -135,7 +136,6 @@ html=12
mht=12
eml=12
url=12
css=13
js=14
lif=15
3ds=15
@@ -170,14 +170,14 @@ java=27
pas=27
pp=27
xml=27
cpp=28
c=28
cpp=14
fb2=29
ob7=29
grf=47
mgb=47
ch8=48
dtp=52
css=52
pal=52
ttf=59
ttc=59

BIN
data/common/icons16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

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

@@ -35,21 +35,22 @@
15 3D-waved area |3d/3dwav
#3 **** GRAPHICS
06 Kolibri Image Viewer |media/kiv
06 zSea* Image Viewer |/kolibrios/media/zsea/zsea
06 zSea Image Viewer * |/kolibrios/media/zsea/zsea
38 Animage |media/animage
38 IconEdit |media/iconedit
40 Image Filtering |media/imgf/imgf
52 Palitra |media/palitra
39 Pipet |develop/pipet
#4 **** MULTIMEDIA
53 Pixie AudioPlayer |media/pixie
53 AC97SND Audioplayer |media/ac97snd
11 Fplay* Video player |/kolibrios/media/fplay
07 MidAMP |media/midamp
22 Toy piano |media/piano
11 Fplay Video player * |/kolibrios/media/fplay
#5 **** DEV
09 KPack Archiver |kpack
54 Flat Assembler |develop/fasm
20 Diff Tool |develop/diff
16 Debug Board |develop/board
13 Debug Board |develop/board
16 Debugger |develop/mtdbg
34 Base Converter |develop/h2d2b
59 Character table |develop/ASCIIVju
@@ -97,7 +98,7 @@
25 Network devices |network/netcfg
25 Network status |network/netstat
#12 **** CLIENTS
16 IRC |network/ircc
13 IRC |network/ircc
16 FTP |network/ftpc
50 TFTP |network/tftpc
24 Ping |network/ping
@@ -113,7 +114,9 @@
00 Emulators* > |@6
16 Analog clock |aclock
16 Binary clock |demos/bcdclk
29 FB2 Reader |fb2read
16 Timer |timer
45 Screenshooter |scrshoot
45 Easyshot |easyshot
03 RTF reader |rtfread
##

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

@@ -1,6 +1,7 @@
#0
#0 **** MAIN
23 <20><>஢<EFBFBD><E0AEA2> 業<><E6A5AD> |allgames
00 <20><><EFBFBD><EFBFBD><EFBFBD> > |@1
00 2D <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > |@1
00 3D <20><><EFBFBD><EFBFBD><EFBFBD> > |@2
00 <20><><EFBFBD>䨪<EFBFBD> > |@3
00 <20><><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> > |@4
00 <20><><EFBFBD>ࠡ<EFBFBD>⪠ > |@5
@@ -11,8 +12,7 @@
18 <20><><EFBFBD>㬥<EFBFBD><E3ACA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |docpack
53 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ணࠬ<E0AEA3><E0A0AC> |run
04 <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD><E8A5AD> ࠡ<><E0A0A1><EFBFBD> |end
#1 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
00 <20><><EFBFBD>嬥<EFBFBD><E5ACA5><EFBFBD><EFBFBD> > |@2
#1 **** 2D <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
16 <20><>㦮<EFBFBD> |demos/circle
16 <20>ࠪ⠫ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |demos/tinyfrac
16 <20><><EFBFBD><EFBFBD><EFBFBD> |demos/colorref
@@ -25,7 +25,7 @@
16 <20><><EFBFBD>⨭<EFBFBD><E2A8AD> |demos/web
16 <20><><EFBFBD><EFBFBD>ࢥ<EFBFBD><E0A2A5> |demos/firework
16 UnvWater |demos/unvwater
#2 ==3D
#2 **** 3D
15 <20><>ਭᥩ<E0A8AD><E1A5A9><EFBFBD> |3d/crownscr
15 3D-<2D><><EFBFBD><EFBFBD>ਭ<EFBFBD> |3d/free3d04
15 3D-<2D><><EFBFBD> |3d/3dcube2
@@ -33,23 +33,23 @@
15 <20><><EFBFBD>ᬮ<EFBFBD><E1ACAE>騪 3DS |3d/view3ds
15 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>񭪨 |3d/gears
15 3D-<2D><><EFBFBD><EFBFBD><EFBFBD> |3d/3dwav
#3 ==<EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD>
#3 **** <EFBFBD><EFBFBD><EFBFBD>䨪<EFBFBD>
06 <20><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD><EFBFBD> KIV |media/kiv
06 <20><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD><EFBFBD> zSea |/kolibrios/media/zsea/zsea
38 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Animage |media/animage
38 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |media/iconedit
40 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 䨫<><E4A8AB>஢ |media/imgf/imgf
52 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |media/palitra
39 <20><><EFBFBD><EFBFBD>⪠ |develop/pipet
#4 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
#4 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD>
53 <20>㤨<EFBFBD><E3A4A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Pixie |media/pixie
53 <20>㤨<EFBFBD><E3A4A8><EFBFBD><EFBFBD><EFBFBD><EFBFBD> AC97SND |media/ac97snd
11 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay |/kolibrios/media/fplay
07 Midi-<2D><><EFBFBD><EFBFBD><EFBFBD> |media/midamp
07 <20><><EFBFBD>᪮<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |media/piano
#5 ==<3D><><EFBFBD>ࠡ<EFBFBD>⪠
22 <20><><EFBFBD>᪮<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |media/piano
11 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Fplay * |/kolibrios/media/fplay
#5 **** <20><><EFBFBD>ࠡ<EFBFBD>⪠
09 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>騪 KPack |kpack
54 Flat Assembler |develop/fasm
16 <20><>᪠ <20>⫠<EFBFBD><E2ABA0><EFBFBD> |develop/board
13 <20><>᪠ <20>⫠<EFBFBD><E2ABA0><EFBFBD> |develop/board
59 HEX-।<><E0A5A4><EFBFBD><EFBFBD><EFBFBD> |develop/heed
20 Diff tool |develop/diff
16 <20>⫠<EFBFBD>稪 |develop/mtdbg
@@ -57,13 +57,13 @@
59 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᨬ<><E1A8AC><EFBFBD><EFBFBD><EFBFBD> |develop/ASCIIVju
59 ASCII-<2D><><EFBFBD><EFBFBD> |develop/keyascii
59 SCAN-<2D><><EFBFBD><EFBFBD> |develop/scancode
#6 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#6 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
24 DOSBox |/kolibrios/emul/DosBox/dosbox
16 e80 (ZX Spectrum) |/kolibrios/emul/e80/e80
16 FCE Ultra - NES |/kolibrios/emul/fceu/fceu
16 ZSNES Super Nintendo |/kolibrios/emul/zsnes/zsnes
16 ScummVM |/kolibrios/emul/scummvm
#7 ==<EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD>
#7 **** <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD>
00 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > |@8
00 <20><><EFBFBD><EFBFBD>. <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > |@9
16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |calendar
@@ -72,30 +72,30 @@
24 <20><><EFBFBD>᮫<EFBFBD> SHELL |shell
05 <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><>ࠧ<EFBFBD> |rdsave
25 <20><><EFBFBD>⥬<EFBFBD><E2A5AC><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |syspanel
#8 ==<EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD> > <20><>
#8 **** <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD> > <20><>
24 KFAR |File Managers/kfar
20 fNav |File Managers/fNav/fNav
50 KFM2 |File Managers/kfm2
50 Eolite |File Managers/Eolite
#9 ==<EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD> > <20><><EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#9 **** <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD> > <20><><EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
49 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20>㯠 |magnify
59 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |zkey
#10 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#10 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |calc
03 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Tinypad |tinypad
28 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> CodeEdit |develop/cedit
21 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |table
47 <20><><EFBFBD><EFBFBD>஥<EFBFBD><E0AEA5><EFBFBD> <20><><EFBFBD>䨪<EFBFBD><E4A8AA> |graph
03 <20><><EFBFBD>ᬮ<EFBFBD><E1ACAE> RTF |rtfread
#11 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#11 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
00 <20><>ࢥ<EFBFBD><E0A2A5> > |@12
00 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> > |@13
25 <20><><EFBFBD><EFBFBD>ன<EFBFBD><E0AEA9> <20><><EFBFBD><EFBFBD> |network/netcfg
25 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD> |network/netstat
#12 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><>ࢥ<EFBFBD><E0A2A5>
#12 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><>ࢥ<EFBFBD><E0A2A5>
16 FTP daemon |network/ftpd
#13 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
16 IRC <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |network/ircc
#13 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD> > <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
13 IRC <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |network/ircc
16 FTP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |network/ftpc
50 TFTP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |network/tftpc
24 Ping |network/ping
@@ -105,9 +105,11 @@
16 VNC <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |network/vncc
33 <20><><EFBFBD><EFBFBD>୥<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>稪 |network/downloader
12 <20><><EFBFBD>㧥<EFBFBD> WebView |network/webview
#14 ==<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#14 **** <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
00 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>* > |@6
45 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>ਭ<EFBFBD><E0A8AD>⮢ |scrshoot
45 <20><><EFBFBD><EFBFBD>⮩ <20><>ਭ<EFBFBD><E0A8AD><EFBFBD><EFBFBD><EFBFBD> |easyshot
29 FB2 <20><>⠫<EFBFBD><E2A0AB> |fb2read
16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> |aclock
16 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |period
16 <20>७<EFBFBD><E0A5AD><EFBFBD><EFBFBD> KJ|ABuIIIA |games/klavisha

2
programs/cmm/browser/WebView.c
View File

@@ -985,7 +985,7 @@ dword GetImg(bool _new)
for (i = 0; i < WB1.img_url.count; i++)
{
cur_img_url = WB1.img_url.get(i);
//if (debug_mode)
if (debug_mode)
{debug("get img: ");debugln(cur_img_url);}
if (cache.has(cur_img_url)==false) {
prbar.max = WB1.img_url.count;

5
programs/cmm/sysmon/sysmon.c
View File

@@ -78,8 +78,6 @@ int proc_list[256];
checkbox show_system = { T_SHOW_SYSTEM, false };
char* shared_icons_16;
sensor cpu;
sensor ram;
sensor rd;
@@ -104,7 +102,6 @@ void main()
{
int btn;
load_lib();
shared_icons_16 = memopen("ICONS18W", NULL, SHM_READ);
@SetEventMask(EVM_REDRAW + EVM_KEY + EVM_BUTTON + EVM_MOUSE + EVM_MOUSE_FILTER);
loop() switch(@WaitEventTimeout(50))
{
@@ -297,6 +294,8 @@ void MonitorTmp()
void DrawIconWithText(dword _x, _y, _icon, _title)
{
static dword shared_icons_16;
if (!shared_icons_16) shared_icons_16 = memopen("ICONS18W", NULL, SHM_READ);
if (shared_icons_16) {
PutPaletteImage(18*18*4*_icon + shared_icons_16, 18, 18,_x, _y, 32, 0);
} else {

5
programs/system/menu/trunk/menu.asm
View File

@@ -21,7 +21,7 @@
; Compile with FASM for Kolibri
;******************************************************************************
BTN_HEIGHT = 26
BTN_WIDTH = 198 ; was 178
BTN_WIDTH = 198 ; 178 for a small font
TXT_Y = (BTN_HEIGHT)/2-7
FONT_TYPE = 0x90000000
@@ -1000,6 +1000,7 @@ align 4
sub ebx, 2
shl eax, 16
add eax, ebx
add eax, 1 shl 16
mov [tmp], eax
mov ebx, [icon_number]
imul ebx, 18*18*4
@@ -1011,7 +1012,7 @@ align 4
mov ecx, [shared_icons_active_ptr]
.not_active_icon:
add ebx, ecx
mcall 65, ebx, (18 shl 16) + 18, [tmp], 32, 0, 0
mcall 65, ebx, <18,18>, [tmp], 32, 0, 0
@@:
pop ebp edi esi ecx