diff --git a/data/common/settings/app_plus.ini b/data/common/settings/app_plus.ini index 5b49736b13..b14d8d7afd 100644 --- a/data/common/settings/app_plus.ini +++ b/data/common/settings/app_plus.ini @@ -36,4 +36,5 @@ THashView=/k/utils/thashview,124 Notes=/k/utils/notes,117 Table=table,28 FtpClient=network/ftpc,90 +Quark=/k/utils/quark,85 diff --git a/data/common/settings/docky.ini b/data/common/settings/docky.ini index 96a33c779f..9f44ee8773 100644 --- a/data/common/settings/docky.ini +++ b/data/common/settings/docky.ini @@ -1,5 +1,5 @@ [@] -location=2 +location=0 fsize=0 $=1 @@ -14,11 +14,6 @@ path=unz param= icon=89 -[Quark] -path=quark -param= -icon=85 - [Pixie] path=media/pixie param= diff --git a/data/eng/settings/menu.dat b/data/eng/settings/menu.dat index a659cde391..129c123994 100644 --- a/data/eng/settings/menu.dat +++ b/data/eng/settings/menu.dat @@ -78,10 +78,11 @@ 24 Shell |shell 51 Virtual disks |tmpdisk #8 **** FM -24 KFAR |File Managers/kfar -20 fNav |File Managers/fNav/fNav -05 KFM2 |File Managers/kfm2 50 Eolite |File Managers/Eolite +05 KFM2 |File Managers/kfm2 +20 fNav |File Managers/fNav/fNav +24 KFAR |File Managers/kfar +24 NDN * |/kolibrios/utils/ndn/ndn #9 **** ACCESSIBILITY 49 Screen magnifier |magnify 59 Screen keyboard |zkey diff --git a/data/et/settings/menu.dat b/data/et/settings/menu.dat index aff220e3f8..95c38a80a7 100644 --- a/data/et/settings/menu.dat +++ b/data/et/settings/menu.dat @@ -61,34 +61,23 @@ 16 SCAN-koodid |develop/scancode #6 **** EXAMPLES **** #7 **** SYSTEM **** -00 Sätted > |@11 -00 Süsteemi sensorid > |@12 -00 Töö failidega > |@13 -00 Testimine > |@16 +00 Töö failidega > |@10 00 Hõlbustus seaded > |@17 -16 Silumisaken |develop/board -16 Clipboard viewer |develop/clipview -16 Terminal |terminal -#8 **** SETTINGS **** -16 Seadmed |setup -16 Tausta genereerija |media/palitra -16 Värvid & Teemad |skincfg -16 MyKey |mykey -#9 **** SYSTEM SENSORS **** -16 Protsesside haldur |cpu -16 PCI seadmed |pcidev -16 CPUID |cpuid -16 Ghost Monitor |gmon -16 K. Bus disconnected |kbd -16 HDD info |hdd_info -#10 **** WORK WITH FILES **** -16 KFAR |File Managers/kfar -16 KFM2 |File Managers/kfm2 -16 fNav |File Managers/fNav/fNav -16 Eolite |File Managers/Eolite 16 Virtual disks |tmpdisk 16 SHELL konsool |shell 16 Salvesta RD tõmmis |rdsave +16 Silumisaken |develop/board +16 Clipboard viewer |develop/clipview +16 Terminal |terminal +16 Protsesside haldur |cpu +#8 **** SETTINGS **** +#9 **** SYSTEM SENSORS **** +#10 **** WORK WITH FILES **** +50 Eolite |File Managers/Eolite +05 KFM2 |File Managers/kfm2 +20 fNav |File Managers/fNav/fNav +24 KFAR |File Managers/kfar +24 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING **** 16 Kalkulaator |calc 16 Teksti redaktor |tinypad @@ -122,10 +111,6 @@ 62 Kalender |calendar 03 RTF faili lugeja |rtfread #16 **** SYSTEM TESTS **** -16 Protection test |test -16 Monitor test |disptest -16 Testi graafika kiirust|mgb -16 FSPEED speed of FS |fspeed #17 **** SYSTEM SPECIAL **** 49 Ekraani suurendusklaas|magnify 59 Ekraani klaviatuur |zkey diff --git a/data/it/settings/menu.dat b/data/it/settings/menu.dat index 32c7c456a6..404eacdf77 100644 --- a/data/it/settings/menu.dat +++ b/data/it/settings/menu.dat @@ -72,10 +72,11 @@ #8 **** SETTINGS #9 **** SYSTEM SENSORS #10 **** FM -16 KFAR |File Managers/kfar -16 fNav |File Managers/fNav/fNav +50 Eolite |File Managers/Eolite 05 KFM2 |File Managers/kfm2 -16 Eolite |File Managers/Eolite +20 fNav |File Managers/fNav/fNav +24 KFAR |File Managers/kfar +24 NDN * |/kolibrios/utils/ndn/ndn #11 **** DATA PROCESSING 16 Calcolatrice |calc 16 Tinypad |tinypad diff --git a/data/rus/settings/menu.dat b/data/rus/settings/menu.dat index 8c5f117086..fdee153991 100644 --- a/data/rus/settings/menu.dat +++ b/data/rus/settings/menu.dat @@ -75,10 +75,11 @@ 24 Š®­á®«ì SHELL |shell 05 ‘®åà ­¥­š¥ ®¡à §  |rdsave #8 **** ‘šá⥬  > ”Œ -24 KFAR |File Managers/kfar -20 fNav |File Managers/fNav/fNav -05 KFM2 |File Managers/kfm2 50 Eolite |File Managers/Eolite +05 KFM2 |File Managers/kfm2 +20 fNav |File Managers/fNav/fNav +24 KFAR |File Managers/kfar +24 NDN * |/kolibrios/utils/ndn/ndn #9 **** ‘šá⥬  > ‘¯¥æ.¢®§¬®Š­®áâš 49 ªà ­­ ï «ã¯  |magnify 59 ªà ­­ ï ª« ¢š âãà  |zkey diff --git a/data/sp/settings/menu.dat b/data/sp/settings/menu.dat index 6f97f3e366..b55c72c5de 100644 --- a/data/sp/settings/menu.dat +++ b/data/sp/settings/menu.dat @@ -65,11 +65,11 @@ 16 Ejemplo de consola 2 |develop/test_gets 16 Ejemplo de Messages |demos/use_mb #7 **** SISTEMA -00 Configuraci¢n > |@8 -00 Sensores > |@9 00 Archivos > |@10 -00 Pruebas > |@16 00 Accesibilidad > |@17 +16 Virtual disks |tmpdisk +16 SHELL |shell +16 Guardar im gen RD |rdsave 16 Debug board |develop/board 16 Clipboard viewer |develop/clipview 16 Terminal |terminal @@ -86,13 +86,11 @@ 16 K. Bus desconectado |kbd 16 Informaci¢n de HDD |hdd_info #10 **** ARCHIVOS -16 KFAR |File Managers/kfar -16 fNav |File Managers/fNav/fNav -16 KFM2 |File Managers/kfm2 -16 Eolite |File Managers/Eolite -16 Virtual disks |tmpdisk -16 SHELL |shell -16 Guardar im gen RD |rdsave +50 Eolite |File Managers/Eolite +05 KFM2 |File Managers/kfm2 +20 fNav |File Managers/fNav/fNav +24 KFAR |File Managers/kfar +24 NDN * |/kolibrios/utils/ndn/ndn #11 **** PROCESO DE DATOS 16 Calculadora |calc 16 Tinypad |tinypad diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c index ebbebd4d38..086a2fb166 100644 --- a/programs/cmm/barscfg/barscfg.c +++ b/programs/cmm/barscfg/barscfg.c @@ -240,7 +240,11 @@ void SaveSettingsAndRestartProcess(byte panel_type) taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset.value); } if (panel_type==DOCKY) { - docky_ini.SetInt("location", dkLocation); + if (!docky_on.checked) { + docky_ini.SetInt("location", 0); + } else { + docky_ini.SetInt("location", dkLocation); + } docky_ini.SetInt("fsize", dkFsize.checked); docky_ini.SetInt("ashow", dkAshow.checked); } diff --git a/programs/system/docky/trunk/docky.asm b/programs/system/docky/trunk/docky.asm index e7a2a13929..d8955a3935 100644 --- a/programs/system/docky/trunk/docky.asm +++ b/programs/system/docky/trunk/docky.asm @@ -31,7 +31,9 @@ main: load_libraries load_lib_start, load_lib_end ; ==== Config LibINI ==== - invoke ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.location_name, 1 + invoke ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.location_name, 2 + test eax,eax + jz exit mov [dock_items.location], eax invoke ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.fsize_name, 0 mov [dock_items.fsize], eax