From 7fac0c11be2e93f7a74bd77d61fde4535fb26d5a Mon Sep 17 00:00:00 2001 From: pavelyakov Date: Tue, 3 Nov 2015 09:32:10 +0000 Subject: [PATCH] system.ini: new param. font file eolite: load system.ini param. font file git-svn-id: svn://kolibrios.org@5876 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/settings/SYSTEM.INI | 1 + data/et/settings/SYSTEM.INI | 1 + data/it/settings/SYSTEM.INI | 1 + data/rus/settings/SYSTEM.INI | 1 + data/sp/settings/SYSTEM.INI | 1 + programs/cmm/eolite/Eolite.c | 5 +++-- 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/data/eng/settings/SYSTEM.INI b/data/eng/settings/SYSTEM.INI index a52222440a..18b6a67b03 100644 --- a/data/eng/settings/SYSTEM.INI +++ b/data/eng/settings/SYSTEM.INI @@ -1,5 +1,6 @@ [system] language=en +font file=/sys/Fonts/Tahoma.kf font smoothing=sbp font height=9 speaker mute=on diff --git a/data/et/settings/SYSTEM.INI b/data/et/settings/SYSTEM.INI index 970eb2aff7..3e67e15afa 100644 --- a/data/et/settings/SYSTEM.INI +++ b/data/et/settings/SYSTEM.INI @@ -1,5 +1,6 @@ [system] language=et +font file=/sys/Fonts/Tahoma.kf font smoothing=sbp font height=9 speaker mute=on diff --git a/data/it/settings/SYSTEM.INI b/data/it/settings/SYSTEM.INI index 34d22b004f..bd009f2acb 100644 --- a/data/it/settings/SYSTEM.INI +++ b/data/it/settings/SYSTEM.INI @@ -1,5 +1,6 @@ [system] language=it +font file=/sys/Fonts/Tahoma.kf font smoothing=sbp font height=9 speaker mute=on diff --git a/data/rus/settings/SYSTEM.INI b/data/rus/settings/SYSTEM.INI index f4742aea50..1d8aba7cc0 100644 --- a/data/rus/settings/SYSTEM.INI +++ b/data/rus/settings/SYSTEM.INI @@ -1,5 +1,6 @@ [system] language=ru +font file=/sys/Fonts/Tahoma.kf font smoothing=sbp font height=9 speaker mute=on diff --git a/data/sp/settings/SYSTEM.INI b/data/sp/settings/SYSTEM.INI index eb8b02e926..ac01a8c75c 100644 --- a/data/sp/settings/SYSTEM.INI +++ b/data/sp/settings/SYSTEM.INI @@ -1,5 +1,6 @@ [system] language=sp +font file=/sys/Fonts/Tahoma.kf font smoothing=sbp font height=9 speaker mute=on diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 86371ff2bc..99b0f0509f 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -109,7 +109,7 @@ char *fd_path_eolite_ini_path; #include "include\about.h" #include "include\properties.h" - +char TMPS[4096]; //char *TMP_PARS,*TMP_PARS2; void main() { @@ -159,7 +159,8 @@ void main() strcpy(#inactive_path, #path); llist_copy(#files_inactive, #files); font.no_bg_copy = true; - font.load("/sys/fonts/tahoma.kf"); + ini_get_str stdcall ("/sys/SETTINGS/SYSTEM.INI", "system", "font file",#TMPS,4096,"/sys/FONTS/Tahoma.kf"); + font.load(#TMPS); SetEventMask(1100111b); loop(){ switch(WaitEvent())