rename "desktop" app to "skincfg"

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

data/Tupfile.lua

@@ -270,7 +270,7 @@ tup.append_table(img_files, {
  {"LOADDRV", PROGS .. "/system/loaddrv/loaddrv"},
  {"CPU", PROGS .. "/system/cpu/trunk/cpu"},
  {"CPUID", PROGS .. "/system/cpuid/trunk/CPUID"},
- {"DESKTOP", PROGS .. "/system/desktop/trunk/desktop"},
+ {"SKINCFG", PROGS .. "/system/skincfg/trunk/skincfg"},
  {"DISPTEST", PROGS .. "/system/disptest/trunk/disptest"},
  {"DOCPACK", PROGS .. "/system/docpack/trunk/docpack"},
  {"END", PROGS .. "/system/end/light/end"},

data/common/File Managers/kfar.ini

@@ -23,7 +23,7 @@ rtf=/sys/RtfRead
 3ds=/sys/3d/view3ds
 asc=/sys/3d/view3ds
 lif=/sys/demos/life2
-skn=/sys/desktop
+skn=/sys/skincfg
 lap=/sys/media/listplay
 asf=/sys/media/listplay
 m3u=/sys/media/AC97SND

data/common/File Managers/kfm.ini

@@ -180,7 +180,7 @@ rtf /sys/rtfread
 3ds /sys/3d/view3ds
 asc /sys/3d/view3ds
 lif /sys/demos/life2
-skn /sys/desktop
+skn /sys/skincfg
 avi /KolibriOS/media/fplay-full
 mpg /KolibriOS/media/fplay-full
 mov /KolibriOS/media/fplay-full

data/common/settings/assoc.ini

@@ -171,7 +171,7 @@ cmd=$Shell
 3ds=$View3DS
 asc=$View3DS
 
-skn=/sys/desktop
+skn=/sys/skincfg
 lif=/sys/demos/life2
 kla=/sys/games/klavisha
 

data/common/settings/eskin.ini

@@ -1 +1,10 @@
-[main]
bg=1

program=/rd/1/media/palitra
param=H 007DCEDF 003C427F

wallpaper=

3d=0
skin=/rd1/1/default.skn
+[main]
+bg=1
+
+program=/rd/1/media/palitra
+param=H 007DCEDF 003C427F
+
+wallpaper=
+
+3d=0
+skin=/rd1/1/default.skn

data/common/settings/syspanel.ini

@@ -12,7 +12,7 @@ SysSetup=setup,5
 Date&Time=calendar,52
 Appearance=/kolibrios/utils/appearance,62
 Background=/sys/media/palitra,61
-WinColors=desktop,59
+ThemeSettings=skincfg,59
 Volume=@VOLUME,64
 Panels=panels_cfg,63
 Mouse=/sys/mouse_cfg,54

data/eng/settings/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 Processes=cpu
-Themes=desktop
+Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
 Shell=shell

data/et/settings/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 Protsessid=cpu
-Teemad=desktop
+Theme settings=skincfg
 Fondo=/sys/media/palitra
 System panel=syspanel
 [00]

data/it/settings/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 Processes=cpu
-Themes=desktop
+Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
 Shell=shell

data/rus/settings/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 „¨á¯¥âç¥à ¯à®æ¥áᮢ=cpu
-“¯à ¢«¥­¨¥ ⥬®©=desktop
+“¯à ¢«¥­¨¥ ⥬®©=skincfg
 <EFBFBD> áâனª  ä®­ =/sys/media/palitra
 ‘¨á⥬­ ï ¯ ­¥«ì=syspanel
 Š®­á®«ì=/rd/1/shell

data/sp/settings/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 Processes=cpu
-Themes=desktop
+Theme settings=skincfg
 Background=/sys/media/palitra
 System panel=syspanel
 Shell=shell

programs/build_all.bat

@@ -61,7 +61,7 @@ fasm system\board\trunk\board.asm %BIN%\develop\board
 fasm system\commouse\trunk\commouse.asm %BIN%\commouse
 fasm system\cpu\trunk\cpu.asm %BIN%\cpu 
 fasm system\cpuid\trunk\cpuid.asm %BIN%\cpuid
-fasm system\desktop\trunk\desktop.asm %BIN%\desktop
+fasm system\skincfg\trunk\skincfg.asm %BIN%\skincfg
 fasm system\docpack\trunk\docpack.asm %BIN%\docpack
 fasm system\end\trunk\end.asm %BIN%\end
 fasm system\gmon\gmon.asm %BIN%\gmon
@@ -237,7 +237,7 @@ fasm media\animage\trunk\animage.asm %BIN%\nightbuild\animage
 fasm media\midamp\trunk\midamp.asm %BIN%\nightbuild\midamp
 fasm develop\heed\trunk\heed.asm %BIN%\nightbuild\heed
 fasm develop\tinypad\trunk\tinypad.asm %BIN%\nightbuild\tinypad
-fasm system\desktop\trunk\desktop.asm %BIN%\nightbuild\desktop
+fasm system\skincfg\trunk\skincfg.asm %BIN%\nightbuild\skincfg
 fasm system\hdd_info\trunk\hdd_info.asm %BIN%\nightbuild\hdd_info
 fasm system\mgb\trunk\mgb.asm %BIN%\nightbuild\mgb
 fasm system\rdsave\trunk\rdsave.asm %BIN%\nightbuild\rdsave
@@ -275,7 +275,7 @@ kpack %BIN%\calendar
 kpack %BIN%\develop\board
 kpack %BIN%\cpu 
 kpack %BIN%\cpuid
-kpack %BIN%\desktop
+kpack %BIN%\skincfg
 kpack %BIN%\docpack
 kpack %BIN%\end
 kpack %BIN%\gmon
@@ -441,7 +441,7 @@ kpack %BIN%\nightbuild\animage
 kpack %BIN%\nightbuild\midamp
 kpack %BIN%\nightbuild\heed
 kpack %BIN%\nightbuild\tinypad
-kpack %BIN%\nightbuild\desktop
+kpack %BIN%\nightbuild\skincfg
 kpack %BIN%\nightbuild\hdd_info
 kpack %BIN%\nightbuild\mgb
 kpack %BIN%\nightbuild\rdsave

programs/cmm/appearance/appearance.c

@@ -138,7 +138,7 @@ void Apply()
 
 OpenFile()
 {
-	if (list[SKINS].active) RunProgram("/sys/desktop", #cur_file_path);
+	if (list[SKINS].active) RunProgram("/sys/skincfg", #cur_file_path);
 	if (list[WALLPAPERS].active) RunProgram("/sys/media/kiv", #cur_file_path);
 }
 

programs/develop/kol_f_edit/kol_f_edit.asm

@@ -14,8 +14,8 @@ include '../../proc32.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
 include '../../dll.inc'
-include '../../system/desktop/trunk/kglobals.inc'
+include '../../system/skincfg/trunk/kglobals.inc'
-include '../../system/desktop/trunk/unpacker.inc'
+include '../../system/skincfg/trunk/unpacker.inc'
 include 'strlen.inc'
 include 'obj_codes.inc'
 

programs/develop/libraries/TinyGL/asm_fork/examples/build.bat

@@ -1,41 +1,3 @@
-if not exist bin mkdir bin
+@fasm.exe test_glu2.asm test_glu2
-if not exist bin\text_1.png @copy text_1.png bin\text_1.png
+@FASM.exe textures0.asm textures0
-if not exist bin\text_2.png @copy text_2.png bin\text_2.png
-if not exist bin\toolb_1.png @copy toolb_1.png bin\toolb_1.png
-if not exist bin\font8x9.bmp @copy ..\..\..\..\..\fs\kfar\trunk\font8x9.bmp bin\font8x9.bmp
-if not exist bin\tinygl.obj @fasm.exe -m 16384 ..\tinygl.asm bin\tinygl.obj
-
-@fasm.exe -m 16384 test0.asm bin\test0.kex
-@fasm.exe -m 16384 test1.asm bin\test1.kex
-@fasm.exe -m 16384 test2.asm bin\test2.kex
-@fasm.exe -m 16384 test3.asm bin\test3.kex
-
-@fasm.exe -m 16384 test_array0.asm bin\test_array0.kex
-@fasm.exe -m 16384 test_array1.asm bin\test_array1.kex
-
-@fasm.exe -m 16384 test_glu0.asm bin\test_glu0.kex
-@fasm.exe -m 16384 test_glu1.asm bin\test_glu1.kex
-@fasm.exe -m 16384 test_glu2.asm bin\test_glu2.kex
-
-@fasm.exe -m 16384 gears.asm bin\gears.kex
-@fasm.exe -m 16384 textures0.asm bin\textures0.kex
-@fasm.exe -m 16384 textures1.asm bin\textures1.kex
-
-
-@kpack bin\test0.kex
-@kpack bin\test1.kex
-@kpack bin\test2.kex
-@kpack bin\test3.kex
-
-@kpack bin\test_array0.kex
-@kpack bin\test_array1.kex
-
-@kpack bin\test_glu0.kex
-@kpack bin\test_glu1.kex
-@kpack bin\test_glu2.kex
-
-@kpack bin\gears.kex
-@kpack bin\textures0.kex
-@kpack bin\textures1.kex
-
 pause

programs/fs/kfar/trunk/kfar.ini

@@ -22,7 +22,7 @@ xcf=/sys/media/kiv
 rtf=/sys/RtfRead
 3ds=/sys/3d/view3ds
 lif=/sys/demos/life2
-skn=/sys/desktop
+skn=/sys/skincfg
 lap=/sys/media/listplay
 asf=/sys/media/listplay
 m3u=/sys/media/AC97SND

programs/fs/kfm/trunk/kfm.ini

@@ -178,7 +178,7 @@ mid /sys/media/midamp
 rtf /sys/rtfread
 3ds /sys/3d/view3ds
 lif /sys/demos/life2
-skn /sys/desktop
+skn /sys/skincfg
 avi /hd0/1/fplay.kex
 mpg /hd0/1/fplay.kex
 mov /hd0/1/fplay.kex

programs/other/t_edit/t_edit.asm

@@ -20,8 +20,8 @@ include '../../dll.inc'
 include '../../KOSfuncs.inc'
 include '../../develop/libraries/box_lib/load_lib.mac'
 include '../../develop/libraries/box_lib/trunk/box_lib.mac'
-include '../../system/desktop/trunk/kglobals.inc'
+include '../../system/skincfg/trunk/kglobals.inc'
-include '../../system/desktop/trunk/unpacker.inc'
+include '../../system/skincfg/trunk/unpacker.inc'
 include 'lang.inc'
 
 include 't_data.inc'

programs/system/icon_new/icon.ini

@@ -1,6 +1,6 @@
 [rbmenu]
 „¨á¯¥âç¥à ¯à®æ¥áᮢ=cpu
-“¯à ¢«¥­¨¥ ⥬®©=desktop
+“¯à ¢«¥­¨¥ ⥬®©=skincfg
 <EFBFBD> áâனª  ä®­ =/sys/media/palitra
 <EFBFBD> áâனª  ãáâனáâ¢=setup
 Š®­á®«ì=/rd/1/shell

programs/system/skincfg/trunk/Tupfile.lua

@@ -1,3 +1,3 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 tup.rule("echo lang fix " .. ((tup.getconfig("LANG") == "") and "en" or tup.getconfig("LANG")) .. " > lang.inc", {"lang.inc"})
-tup.rule({"desktop.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "desktop")
+tup.rule({"skincfg.asm", extra_inputs = {"lang.inc"}}, "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "skincfg")

programs/system/skincfg/trunk/build_en.bat

@@ -1,6 +1,6 @@
 @erase lang.inc
 @echo lang fix en >lang.inc
-@fasm desktop.asm desktop
+@fasm skincfg.asm skincfg
-@kpack desktop
+@kpack skincfg
 @erase lang.inc
 @pause

programs/system/skincfg/trunk/build_en.sh

@@ -4,7 +4,7 @@
 
 	echo "lang fix en"
 	echo "lang fix en" > lang.inc
-	fasm -m 16384 desktop.asm desktop
+	fasm -m 16384 skincfg.asm skincfg
 	rm -f lang.inc
 	exit 0
 

programs/system/skincfg/trunk/build_et.bat

@@ -1,6 +1,6 @@
 @erase lang.inc
 @echo lang fix et >lang.inc
-@fasm desktop.asm desktop
+@fasm skincfg.asm skincfg
-@kpack desktop
+@kpack skincfg
 @erase lang.inc
 @pause

programs/system/skincfg/trunk/build_et.sh

@@ -4,7 +4,7 @@
 
 	echo "lang fix et"
 	echo "lang fix et" > lang.inc
-	fasm -m 16384 desktop.asm desktop
+	fasm -m 16384 skincfg.asm skincfg
 	rm -f lang.inc
 	exit 0
 

programs/system/skincfg/trunk/build_it.bat

@@ -1,6 +1,6 @@
 @erase lang.inc
 @echo lang fix it >lang.inc
-@fasm desktop.asm desktop
+@fasm skincfg.asm skincfg
-@kpack desktop
+@kpack skincfg
 @erase lang.inc
 @pause

programs/system/skincfg/trunk/build_ru.bat

@@ -1,6 +1,6 @@
 @erase lang.inc
 @echo lang fix ru >lang.inc
-@fasm desktop.asm desktop
+@fasm skincfg.asm skincfg
-@kpack desktop
+@kpack skincfg
 @erase lang.inc
 @pause

programs/system/skincfg/trunk/build_ru.sh

@@ -4,7 +4,7 @@
 
 	echo "lang fix ru"
 	echo "lang fix ru" > lang.inc
-	fasm -m 16384 desktop.asm desktop
+	fasm -m 16384 skincfg.asm skincfg
 	rm -f lang.inc
 	exit 0
 

programs/system/skincfg/trunk/build_sp.bat

@@ -1,6 +1,6 @@
 @erase lang.inc
 @echo lang fix sp >lang.inc
-@fasm desktop.asm desktop
+@fasm skincfg.asm skincfg
-@kpack desktop
+@kpack skincfg
 @erase lang.inc
 @pause

programs/system/skincfg/trunk/build_sp.sh

@@ -4,7 +4,7 @@
 
 	echo "lang fix sp"
 	echo "lang fix sp" > lang.inc
-	fasm -m 16384 desktop.asm desktop
+	fasm -m 16384 skincfg.asm skincfg
 	rm -f lang.inc
 	exit 0
 

programs/system/skincfg/trunk/makefile

@@ -4,7 +4,7 @@
 FASM=/opt/bin/fasm
 KPACK=/opt/bin/kpack
 LANG=lang.inc
-FILE=desktop
+FILE=skincfg
 SOURCE=${FILE}.asm
 OUT=${FILE}.bin