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

do not show docky by default

Browse Source 
git-svn-id: svn://kolibrios.org@9444 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2021-12-19 11:48:59 +00:00
parent 6808335608
commit 7b0fc6a739
9 changed files with 43 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/common/settings/app_plus.ini
View File

@@ -36,4 +36,5 @@ THashView=/k/utils/thashview,124
Notes=/k/utils/notes,117 Notes=/k/utils/notes,117
Table=table,28 Table=table,28
FtpClient=network/ftpc,90 FtpClient=network/ftpc,90
Quark=/k/utils/quark,85

7
data/common/settings/docky.ini
View File

@@ -1,5 +1,5 @@
[@] [@]
location=2 location=0
fsize=0 fsize=0
$=1 $=1
@@ -14,11 +14,6 @@ path=unz
param= param=
icon=89 icon=89
[Quark]
path=quark
param=
icon=85
[Pixie] [Pixie]
path=media/pixie path=media/pixie
param= param=

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

@@ -78,10 +78,11 @@
24 Shell |shell 24 Shell |shell
51 Virtual disks |tmpdisk 51 Virtual disks |tmpdisk
#8 **** FM #8 **** FM
24 KFAR |File Managers/kfar
20 fNav |File Managers/fNav/fNav
05 KFM2 |File Managers/kfm2
50 Eolite |File Managers/Eolite 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 #9 **** ACCESSIBILITY
49 Screen magnifier |magnify 49 Screen magnifier |magnify
59 Screen keyboard |zkey 59 Screen keyboard |zkey

41
data/et/settings/menu.dat
View File

@@ -61,34 +61,23 @@
16 SCAN-koodid |develop/scancode 16 SCAN-koodid |develop/scancode
#6 **** EXAMPLES **** #6 **** EXAMPLES ****
#7 **** SYSTEM **** #7 **** SYSTEM ****
00 S<EFBFBD>tted > |@11 00 T<EFBFBD><EFBFBD> failidega > |@10
00 S<>steemi sensorid > |@12
00 T<><54> failidega > |@13
00 Testimine > |@16
00 H<>lbustus seaded > |@17 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 Virtual disks |tmpdisk
16 SHELL konsool |shell 16 SHELL konsool |shell
16 Salvesta RD t<>mmis |rdsave 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 **** #11 **** DATA PROCESSING ****
16 Kalkulaator |calc 16 Kalkulaator |calc
16 Teksti redaktor |tinypad 16 Teksti redaktor |tinypad
@@ -122,10 +111,6 @@
62 Kalender |calendar 62 Kalender |calendar
03 RTF faili lugeja |rtfread 03 RTF faili lugeja |rtfread
#16 **** SYSTEM TESTS **** #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 **** #17 **** SYSTEM SPECIAL ****
49 Ekraani suurendusklaas|magnify 49 Ekraani suurendusklaas|magnify
59 Ekraani klaviatuur |zkey 59 Ekraani klaviatuur |zkey

7
data/it/settings/menu.dat
View File

@@ -72,10 +72,11 @@
#8 **** SETTINGS #8 **** SETTINGS
#9 **** SYSTEM SENSORS #9 **** SYSTEM SENSORS
#10 **** FM #10 **** FM
16 KFAR |File Managers/kfar 50 Eolite |File Managers/Eolite
16 fNav |File Managers/fNav/fNav
05 KFM2 |File Managers/kfm2 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 #11 **** DATA PROCESSING
16 Calcolatrice |calc 16 Calcolatrice |calc
16 Tinypad |tinypad 16 Tinypad |tinypad

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

@@ -75,10 +75,11 @@
24 <20><><EFBFBD>᮫<EFBFBD> SHELL |shell 24 <20><><EFBFBD>᮫<EFBFBD> SHELL |shell
05 <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><>ࠧ<EFBFBD> |rdsave 05 <20><><EFBFBD>࠭<EFBFBD><E0A0AD><EFBFBD><EFBFBD> <20><>ࠧ<EFBFBD> |rdsave
#8 **** <20><><EFBFBD>⥬<EFBFBD> > <20><> #8 **** <20><><EFBFBD>⥬<EFBFBD> > <20><>
24 KFAR |File Managers/kfar
20 fNav |File Managers/fNav/fNav
05 KFM2 |File Managers/kfm2
50 Eolite |File Managers/Eolite 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 **** <20><><EFBFBD>⥬<EFBFBD> > <20><><EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> #9 **** <20><><EFBFBD>⥬<EFBFBD> > <20><><EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
49 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20>㯠 |magnify 49 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20>㯠 |magnify
59 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |zkey 59 <20><>࠭<EFBFBD><E0A0AD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> |zkey

18
data/sp/settings/menu.dat
View File

@@ -65,11 +65,11 @@
16 Ejemplo de consola 2 |develop/test_gets 16 Ejemplo de consola 2 |develop/test_gets
16 Ejemplo de Messages |demos/use_mb 16 Ejemplo de Messages |demos/use_mb
#7 **** SISTEMA #7 **** SISTEMA
00 Configuraci<63>n > |@8
00 Sensores > |@9
00 Archivos > |@10 00 Archivos > |@10
00 Pruebas > |@16
00 Accesibilidad > |@17 00 Accesibilidad > |@17
16 Virtual disks |tmpdisk
16 SHELL |shell
16 Guardar im<69>gen RD |rdsave
16 Debug board |develop/board 16 Debug board |develop/board
16 Clipboard viewer |develop/clipview 16 Clipboard viewer |develop/clipview
16 Terminal |terminal 16 Terminal |terminal
@@ -86,13 +86,11 @@
16 K. Bus desconectado |kbd 16 K. Bus desconectado |kbd
16 Informaci<63>n de HDD |hdd_info 16 Informaci<63>n de HDD |hdd_info
#10 **** ARCHIVOS #10 **** ARCHIVOS
16 KFAR |File Managers/kfar 50 Eolite |File Managers/Eolite
16 fNav |File Managers/fNav/fNav 05 KFM2 |File Managers/kfm2
16 KFM2 |File Managers/kfm2 20 fNav |File Managers/fNav/fNav
16 Eolite |File Managers/Eolite 24 KFAR |File Managers/kfar
16 Virtual disks |tmpdisk 24 NDN * |/kolibrios/utils/ndn/ndn
16 SHELL |shell
16 Guardar im<69>gen RD |rdsave
#11 **** PROCESO DE DATOS #11 **** PROCESO DE DATOS
16 Calculadora |calc 16 Calculadora |calc
16 Tinypad |tinypad 16 Tinypad |tinypad

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

@@ -240,7 +240,11 @@ void SaveSettingsAndRestartProcess(byte panel_type)
taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset.value); taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset.value);
} }
if (panel_type==DOCKY) { if (panel_type==DOCKY) {
if (!docky_on.checked) {
docky_ini.SetInt("location", 0);
} else {
docky_ini.SetInt("location", dkLocation); docky_ini.SetInt("location", dkLocation);
}
docky_ini.SetInt("fsize", dkFsize.checked); docky_ini.SetInt("fsize", dkFsize.checked);
docky_ini.SetInt("ashow", dkAshow.checked); docky_ini.SetInt("ashow", dkAshow.checked);
} }

4
programs/system/docky/trunk/docky.asm
View File

@@ -31,7 +31,9 @@ main:
load_libraries load_lib_start, load_lib_end load_libraries load_lib_start, load_lib_end
; ==== Config LibINI ==== ; ==== 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 mov [dock_items.location], eax
invoke ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.fsize_name, 0 invoke ini.get_int, ini_data.file_name, ini_data.settings_name, ini_data.fsize_name, 0
mov [dock_items.fsize], eax mov [dock_items.fsize], eax