From 5304ccbd3bc7ddc5bace910c3370b293d69cc6ce Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 18 Dec 2021 00:41:36 +0000 Subject: [PATCH] menu.dat: updated for ENG and RUS ICONS16.PNG: new icons Other small fixes git-svn-id: svn://kolibrios.org@9436 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/File Managers/icons.ini | 10 +++--- data/common/icons16.png | Bin 10297 -> 10746 bytes data/eng/settings/menu.dat | 13 +++++--- data/rus/settings/menu.dat | 46 +++++++++++++++------------- programs/cmm/browser/WebView.c | 2 +- programs/cmm/sysmon/sysmon.c | 5 ++- programs/system/menu/trunk/menu.asm | 5 +-- 7 files changed, 43 insertions(+), 38 deletions(-) diff --git a/data/common/File Managers/icons.ini b/data/common/File Managers/icons.ini index 77a5546524..82969b9c22 100644 --- a/data/common/File Managers/icons.ini +++ b/data/common/File Managers/icons.ini @@ -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 diff --git a/data/common/icons16.png b/data/common/icons16.png index 6549cf0830c099429b137b9d84465b89da31a4b8..b1d61445034534ece26f4ef78b38e28126c2b3cb 100644 GIT binary patch literal 10746 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 literal 10297 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 |@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 ## diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 951adef1ae..0e0ed9e4d9 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -1,6 +1,7 @@ -#0 +#0 **** MAIN 23 Игровой центр |allgames -00 Демки > |@1 +00 2D Демки > |@1 +00 3D Демки > |@2 00 Графика > |@3 00 Звук и видео > |@4 00 Разработка > |@5 @@ -11,8 +12,7 @@ 18 Документация |docpack 53 Запуск программы |run 04 Завершение работы |end -#1 ==Демки -00 Трёхмерные > |@2 +#1 **** 2D Демки 16 Кружок |demos/circle 16 Фрактал Мандельброта |demos/tinyfrac 16 Цвета |demos/colorref @@ -25,7 +25,7 @@ 16 Паутинка |demos/web 16 Фейерверк |demos/firework 16 UnvWater |demos/unvwater -#2 ==3D +#2 **** 3D 15 Скринсейвер |3d/crownscr 15 3D-Лабиринт |3d/free3d04 15 3D-Куб |3d/3dcube2 @@ -33,23 +33,23 @@ 15 Просмотрщик 3DS |3d/view3ds 15 Шестерёнки |3d/gears 15 3D-Волны |3d/3dwav -#3 ==Графика +#3 **** Графика 06 Просмотр фото KIV |media/kiv 06 Просмотр фото zSea |/kolibrios/media/zsea/zsea 38 Редактор Animage |media/animage +38 Редактор иконок |media/iconedit 40 Наложение фильтров |media/imgf/imgf 52 Палитра |media/palitra 39 Пипетка |develop/pipet -#4 ==Звук и видео +#4 **** Звук и видео 53 Аудиоплеер Pixie |media/pixie -53 Аудиоплеер AC97SND |media/ac97snd -11 Видеоплеер Fplay |/kolibrios/media/fplay 07 Midi-плеер |media/midamp -07 Детское пианино |media/piano -#5 ==Разработка +22 Детское пианино |media/piano +11 Видеоплеер Fplay * |/kolibrios/media/fplay +#5 **** Разработка 09 Упаковщик KPack |kpack 54 Flat Assembler |develop/fasm -16 Доска отладки |develop/board +13 Доска отладки |develop/board 59 HEX-редактор |develop/heed 20 Diff tool |develop/diff 16 Отладчик |develop/mtdbg @@ -57,13 +57,13 @@ 59 Таблица символов |develop/ASCIIVju 59 ASCII-коды |develop/keyascii 59 SCAN-коды |develop/scancode -#6 ==Эмуляторы +#6 **** Эмуляторы 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 ==Система +#7 **** Система 00 Файловые менеджеры > |@8 00 Спец. возможности > |@9 16 Календарь |calendar @@ -72,30 +72,30 @@ 24 Консоль SHELL |shell 05 Сохранение образа |rdsave 25 Системная панель |syspanel -#8 ==Система > ФМ +#8 **** Система > ФМ 24 KFAR |File Managers/kfar 20 fNav |File Managers/fNav/fNav 50 KFM2 |File Managers/kfm2 50 Eolite |File Managers/Eolite -#9 ==Система > Спец.возможности +#9 **** Система > Спец.возможности 49 Экранная лупа |magnify 59 Экранная клавиатура |zkey -#10 ==Офис +#10 **** Офис 16 Калькулятор |calc 03 Редактор Tinypad |tinypad 28 Редактор CodeEdit |develop/cedit 21 Табличный процессор |table 47 Построение графиков |graph 03 Просмотр RTF |rtfread -#11 ==Сеть +#11 **** Сеть 00 Серверы > |@12 00 Клиенты > |@13 25 Настройки сети |network/netcfg 25 Статус подключения |network/netstat -#12 ==Сеть > Серверы +#12 **** Сеть > Серверы 16 FTP daemon |network/ftpd -#13 ==Сеть > Клиенты -16 IRC клиент |network/ircc +#13 **** Сеть > Клиенты +13 IRC клиент |network/ircc 16 FTP клиент |network/ftpc 50 TFTP клиент |network/tftpc 24 Ping |network/ping @@ -105,9 +105,11 @@ 16 VNC Клиент |network/vncc 33 Интернет загрузчик |network/downloader 12 Браузер WebView |network/webview -#14 ==Разное +#14 **** Разное 00 Эмуляторы* > |@6 45 Создание скриншотов |scrshoot +45 Простой скриншотер |easyshot +29 FB2 Читалка |fb2read 16 Аналоговые часы |aclock 16 Таблица Менделеева |period 16 Тренажёр KJ|ABuIIIA |games/klavisha diff --git a/programs/cmm/browser/WebView.c b/programs/cmm/browser/WebView.c index 9974f3c7b1..7904c772a7 100644 --- a/programs/cmm/browser/WebView.c +++ b/programs/cmm/browser/WebView.c @@ -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; diff --git a/programs/cmm/sysmon/sysmon.c b/programs/cmm/sysmon/sysmon.c index 1318ad73f2..e98c1c947a 100644 --- a/programs/cmm/sysmon/sysmon.c +++ b/programs/cmm/sysmon/sysmon.c @@ -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 { diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index 558bc2375b..357e8e0d7f 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -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