diff --git a/data/common/icons32.png b/data/common/icons32.png index 6de375ecaa..9cbfa5b2e8 100644 Binary files a/data/common/icons32.png and b/data/common/icons32.png differ diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 793786fed1..71a1aa1df4 100644 --- a/data/common/settings/assoc.ini +++ b/data/common/settings/assoc.ini @@ -78,6 +78,10 @@ icon=75 exec=/sys/fb2read icon=44 +[Unz] +exec=/sys/unz +icon=89 + [Assoc] /=/sys/file managers/eolite @@ -171,5 +175,5 @@ gb=/kolibrios/emul/gameboy gbc=/kolibrios/emul/gameboy min=/kolibrios/emul/pokemini -zip=/sys/unz -7z=/sys/unz \ No newline at end of file +zip=$Unz +7z=$Unz \ No newline at end of file diff --git a/data/common/settings/docky.ini b/data/common/settings/docky.ini index 1066af6469..68fdc875b0 100644 --- a/data/common/settings/docky.ini +++ b/data/common/settings/docky.ini @@ -9,6 +9,11 @@ path=network/ircc param= icon=29 +[Unz] +path=unz +param= +icon=89 + [TextEdit] path=develop/t_edit param= diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index 17f8bcfb4d..8c50cdb6a4 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -1,4 +1,4 @@ -#0 **** MAIN **** +#0 **** MAIN **** Game Center /sys/game_center Demos > /@1 Graphics > /@3 @@ -12,7 +12,7 @@ Other > /@15 Help /sys/docpack Run /sys/run Shutdown /sys/end -#1 **** DEMOS **** +#1 **** DEMOS **** 3D > /@2 Circle /sys/demos/circle Fractal /sys/demos/tinyfrac @@ -33,18 +33,18 @@ Heart* /kolibrios/3d/3dsheart View3DS /sys/3d/view3ds Gears /sys/3d/gears 3D-waved area /sys/3d/3dwav -#3 **** GRAPHICS **** +#3 **** GRAPHICS **** Kolibri Image Viewer /sys/media/kiv zSea* Image Viewer /kolibrios/media/zsea/zsea Animage /sys/media/animage Image Filtering /sys/media/imgf/imgf Palitra /sys/media/palitra -#4 **** MULTIMEDIA **** +#4 **** MULTIMEDIA **** Pixie (MP3 player) /sys/media/pixie/pixie AC97SND Audioplayer /sys/media/ac97snd Fplay* Video player /kolibrios/media/fplay MidAMP /sys/media/midamp -#5 **** PROGRAMMING **** +#5 **** PROGRAMMING **** Examples > /@6 KPack Archiver /sys/kpack Flat Assembler /sys/develop/fasm @@ -54,13 +54,13 @@ Debugger /sys/develop/mtdbg Base Converter /sys/develop/h2d2b Key ASCII-codes /sys/develop/keyascii Key SCAN-codes /sys/develop/scancode -#6 **** EXAMPLES **** +#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 -#7 **** SYSTEM **** +#7 **** SYSTEM **** Settings > /@8 System monitors > /@9 File Management > /@10 @@ -68,6 +68,7 @@ Testing > /@16 Accessibility > /@17 Debug board /sys/develop/board Clipboard viewer /sys/develop/clipview +Calendar /sys/calendar Terminal /sys/terminal #8 **** SETTINGS **** System /sys/setup @@ -75,14 +76,14 @@ Background generator /sys/media/palitra Colors & Skin /sys/skincfg Hotkeys /sys/mykey ATI video mode /sys/vmode -#9 **** SYSTEM MONITORS **** +#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 **** +#10 **** FILE MANAGEMENT **** KFAR /sys/File Managers/kfar fNav /sys/File Managers/fNav/fNav KFM /sys/File Managers/kfm @@ -97,12 +98,13 @@ TextEdit /sys/develop/t_edit Table processor /sys/table Graph builder /sys/graph Hex editor /sys/develop/heed -#12 **** NETWORK **** +Unarchiver Unz /sys/unz +#12 **** NETWORK **** Clients > /@13 Servers > /@14 Network devices /sys/network/netcfg Network status /sys/network/netstat -#13 **** CLIENTS **** +#13 **** CLIENTS **** IRC /sys/network/ircc FTP /sys/network/ftpc TFTP /sys/network/tftpc @@ -113,25 +115,24 @@ DNS lookup /sys/network/nslookup VNC Viewer /sys/network/vncc Downloader /sys/network/downloader Text-based browser /sys/network/webview -#14 **** SERVERS **** +#14 **** SERVERS **** FTP /sys/network/ftpd -#15 **** OTHER **** +#15 **** OTHER **** Analog clock /sys/demos/aclock Binary clock /sys/demos/bcdclk Timer /sys/demos/timer Screenshooter /sys/scrshoot -Calendar /sys/calendar RTF reader /sys/rtfread -#16 **** SYSTEM TESTS **** +#16 **** SYSTEM TESTS **** Protection test /sys/test Monitor test /sys/disptest Graphics benchmark /sys/mgb File system benchmark /sys/fspeed -#17 **** ACCESSIBILITY **** +#17 **** ACCESSIBILITY **** Screen magnifier /sys/magnify Screen keyboard /sys/zkey Character table /sys/ASCIIVju -#18 **** EMULATORS **** +#18 **** EMULATORS **** DOSBox* (DOS PC) /kolibrios/emul/DosBox/dosbox e80* (ZX Spectrum) /kolibrios/emul/e80/e80 FCE Ultra* (NES) /kolibrios/emul/fceu/fce diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index e9016dc0cd..4284e4f0b4 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -68,9 +68,10 @@ Color Slider /sys/demos/cslide Работа с файлами > /@10 Тестирование > /@11 Спец. возможности > /@12 +Календарь /sys/calendar Доска отладки /sys/develop/board Буфер обмена /sys/develop/clipview -Terminal /sys/terminal +Терминал /sys/terminal #8 **** Система -> Настройки **** Устройства /sys/setup Установить фон /sys/media/palitra @@ -108,10 +109,11 @@ FSPEED ско Табличный процессор /sys/table Построение графиков /sys/graph HEX-редактор /sys/develop/heed +Разархиватор Unz /sys/unz #14 **** Сеть **** Серверы > /@15 Клиенты > /@16 -Настройки сети /sys/network/netcfg +Настройки сети /sys/network/netcfg Статус подключения /sys/network/netstat #15 **** Сеть -> Серверы **** FTP daemon /sys/network/ftpd @@ -128,7 +130,6 @@ VNC Текстовый браузер /sys/network/webview #17 **** Разное **** Создание скриншотов /sys/scrshoot -Календарь /sys/calendar Аналоговые часы /sys/demos/aclock Просмотр RTF /sys/rtfread Таблица Менделеева /sys/period diff --git a/programs/fs/unz/unz.asm b/programs/fs/unz/unz.asm index 01e7ad35eb..39278fc1b6 100644 --- a/programs/fs/unz/unz.asm +++ b/programs/fs/unz/unz.asm @@ -726,11 +726,11 @@ endp sc system_colors -title db 'uNZ v0.11 - Unarchiver of Zip and 7z',0 bWinChild db 0 ;1 - дочернее окно есть, главное окно не должно реагировать redInput db 0 ;1 - подсветить красным надпись if lang eq ru + title db 'uNZ v0.11 - Распаковщик Zip и 7z',0 strGo db 'Распаковать',0 strInp db ' Архив',0 strPath db 'Извлечь в',0 @@ -744,6 +744,7 @@ if lang eq ru strNotSupport db "'Неподдерживаемый формат архива' -E",0 strNotFound db "'Файл не найден' -E",0 else + title db 'uNZ v0.11 - Unarchiver of Zip and 7z',0 strGo db 'Unpack',0 strInp db 'Archive',0 strPath db 'Extract to',0