move eskin.ini settings into system.ini

git-svn-id: svn://kolibrios.org@7870 a494cfbc-eb01-0410-851d-a64ba20cac60

data/common/settings/eskin.ini

@@ -1,12 +0,0 @@
-[bg]
-active=1
-;program=/sys/media/fillscr
-;param=105,145,200, 105,145,200, 105,145,200, 60,60,128, 82,102,164, 60,60,128, 60,60,128, 60,60,128, 60,60,128
-
-program=/rd/1/media/kiv
-param=\T__/rd/1/home.png 
-;T=tiled, S=stretched
-
-[skin]
-3d=1
-file=/rd1/1/default.skn

data/common/settings/system.ini

@@ -16,4 +16,10 @@ PCI=on
 
 [screensaver]
 timeout=10 ;in minutes
-program=/sys/demos/spiral
+program=/sys/demos/spiral
+
+[style]
+buttons_gradient=1
+skin=/rd1/1/default.skn
+bg_program=/rd/1/media/kiv
+bg_param=\T__/rd/1/home.png

data/rus/settings/lang.ini

@@ -4,7 +4,6 @@ startlng   = 1
 [comkey]
 ccomkey1   = 1
 ccomkey2   = 4
-ccomkey3   = 7
 
 [altkey]
 altkey1    = 1

programs/cmm/appearance/appearance.c

@@ -398,7 +398,7 @@ void EventOpenFile()
 	if (tabs.active_tab==WALLPAPERS) RunProgram("/sys/media/kiv", #cur_file_path);
 }
 
-_ini ini = { "/sys/settings/eskin.ini", "main" };
+_ini ini = { "/sys/settings/system.ini", "style" };
 void EventExit()
 {
 	if (cur_skin_path) ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path));

programs/media/kiv/trunk/kiv.asm

@@ -2396,10 +2396,10 @@ aPrev       db  'Prev',0
 aSlide      db  'SlideShow',0
 aTglbar     db  'ToggleBar',0
 
-inifileeskin db '/sys/settings/eskin.ini',0
-amain       db 'bg',0
-aprogram    db 'program',0
-aparam      db 'param',0
+inifileeskin db '/sys/settings/system.ini',0
+amain       db 'style',0
+aprogram    db 'bg_program',0
+aparam      db 'bg_param',0
 
 align 4
 check_modifier_table:

programs/media/palitra/trunk/palitra.asm

@@ -1252,10 +1252,10 @@ circle:
     runmode	dd 1			  ; ०¨¬ § ¯ã᪠ (1-normal, 2-hidden, 3-colordialog)
     color2	dd 00FFFFFFh		  ; åà ­¨â §­ ç¥­¨¥ ¢â®à®£® ¢ë¡à ­­®£® 梥â 
 
-    inifileeskin db '/sys/settings/eskin.ini',0
-    amain       db 'main',0
-    aprogram    db 'program',0
-    aparam      db 'param',0
+    inifileeskin db '/sys/settings/system.ini',0
+    amain       db 'style',0
+    aprogram    db 'bg_program',0
+    aparam      db 'bg_param',0
 
 align 16
 @IMPORT:

programs/system/eskin/trunk/eskin.asm

@@ -1 +1 @@
- use32          
+ use32          

programs/system/skincfg/trunk/idata.inc

@@ -115,9 +115,9 @@ library                                                 \
 import  libini, \        
         ini_set_int  ,'ini_set_int' 
 
-aIni          db  '/sys/settings/eskin.ini',0 
-aSectionSkn   db  'skin',0
-aButtonStyle  db  '3d',0
+aIni          db  '/sys/settings/system.ini',0 
+aSectionSkn   db  'style',0
+aButtonStyle  db  'buttons_gradient',0
 ;---------------------------------------------------------------------
 l_libs_start: