From c8de4cb0ee12a7b8e48ae6807d42725b05c52835 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 8 Feb 2016 12:52:20 +0000 Subject: [PATCH] rename "desktop" app to "skincfg" git-svn-id: svn://kolibrios.org@6169 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/File Managers/kfar.ini | 2 +- data/common/File Managers/kfm.ini | 2 +- data/common/settings/assoc.ini | 2 +- data/common/settings/eskin.ini | 11 ++++- data/common/settings/syspanel.ini | 2 +- data/eng/settings/icon.ini | 2 +- data/et/settings/icon.ini | 2 +- data/it/settings/icon.ini | 2 +- data/rus/settings/icon.ini | 2 +- data/sp/settings/icon.ini | 2 +- programs/build_all.bat | 8 ++-- programs/cmm/appearance/appearance.c | 2 +- programs/develop/kol_f_edit/kol_f_edit.asm | 4 +- .../TinyGL/asm_fork/examples/build.bat | 42 +------------------ programs/fs/kfar/trunk/kfar.ini | 2 +- programs/fs/kfm/trunk/kfm.ini | 2 +- programs/other/t_edit/t_edit.asm | 4 +- programs/system/icon_new/icon.ini | 2 +- .../{desktop => skincfg}/trunk/Tupfile.lua | 2 +- .../{desktop => skincfg}/trunk/build_en.bat | 4 +- .../{desktop => skincfg}/trunk/build_en.sh | 2 +- .../{desktop => skincfg}/trunk/build_et.bat | 4 +- .../{desktop => skincfg}/trunk/build_et.sh | 2 +- .../{desktop => skincfg}/trunk/build_it.bat | 4 +- .../{desktop => skincfg}/trunk/build_ru.bat | 4 +- .../{desktop => skincfg}/trunk/build_ru.sh | 2 +- .../{desktop => skincfg}/trunk/build_sp.bat | 4 +- .../{desktop => skincfg}/trunk/build_sp.sh | 2 +- .../{desktop => skincfg}/trunk/drawskin.inc | 0 .../{desktop => skincfg}/trunk/idata.inc | 0 .../{desktop => skincfg}/trunk/kglobals.inc | 0 .../{desktop => skincfg}/trunk/makefile | 2 +- .../desktop.asm => skincfg/trunk/skincfg.asm} | 0 .../{desktop => skincfg}/trunk/udata.inc | 0 .../{desktop => skincfg}/trunk/unpacker.inc | 0 36 files changed, 50 insertions(+), 79 deletions(-) rename programs/system/{desktop => skincfg}/trunk/Tupfile.lua (61%) rename programs/system/{desktop => skincfg}/trunk/build_en.bat (53%) rename programs/system/{desktop => skincfg}/trunk/build_en.sh (84%) rename programs/system/{desktop => skincfg}/trunk/build_et.bat (53%) rename programs/system/{desktop => skincfg}/trunk/build_et.sh (84%) rename programs/system/{desktop => skincfg}/trunk/build_it.bat (53%) rename programs/system/{desktop => skincfg}/trunk/build_ru.bat (53%) rename programs/system/{desktop => skincfg}/trunk/build_ru.sh (84%) rename programs/system/{desktop => skincfg}/trunk/build_sp.bat (53%) rename programs/system/{desktop => skincfg}/trunk/build_sp.sh (84%) rename programs/system/{desktop => skincfg}/trunk/drawskin.inc (100%) rename programs/system/{desktop => skincfg}/trunk/idata.inc (100%) rename programs/system/{desktop => skincfg}/trunk/kglobals.inc (100%) rename programs/system/{desktop => skincfg}/trunk/makefile (97%) rename programs/system/{desktop/trunk/desktop.asm => skincfg/trunk/skincfg.asm} (100%) rename programs/system/{desktop => skincfg}/trunk/udata.inc (100%) rename programs/system/{desktop => skincfg}/trunk/unpacker.inc (100%) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 8fd87de123..d7d332528c 100644 --- a/data/Tupfile.lua +++ b/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"}, diff --git a/data/common/File Managers/kfar.ini b/data/common/File Managers/kfar.ini index 8711042e69..f11567e1fd 100644 --- a/data/common/File Managers/kfar.ini +++ b/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 diff --git a/data/common/File Managers/kfm.ini b/data/common/File Managers/kfm.ini index 9d6cdb0e74..2395534e2f 100644 --- a/data/common/File Managers/kfm.ini +++ b/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 diff --git a/data/common/settings/assoc.ini b/data/common/settings/assoc.ini index 9c917a67e6..e524ae0293 100644 --- a/data/common/settings/assoc.ini +++ b/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 diff --git a/data/common/settings/eskin.ini b/data/common/settings/eskin.ini index 3eafa3a3d6..8ed9153049 100644 --- a/data/common/settings/eskin.ini +++ b/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 \ No newline at end of file +[main] +bg=1 + +program=/rd/1/media/palitra +param=H 007DCEDF 003C427F + +wallpaper= + +3d=0 +skin=/rd1/1/default.skn diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 1a9810f241..964ac18671 100644 --- a/data/common/settings/syspanel.ini +++ b/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 diff --git a/data/eng/settings/icon.ini b/data/eng/settings/icon.ini index ceee63e5a0..a8f1a8fbd8 100644 --- a/data/eng/settings/icon.ini +++ b/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 diff --git a/data/et/settings/icon.ini b/data/et/settings/icon.ini index 5946f1ce5e..e6efc4f1ad 100644 --- a/data/et/settings/icon.ini +++ b/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] diff --git a/data/it/settings/icon.ini b/data/it/settings/icon.ini index ceee63e5a0..a8f1a8fbd8 100644 --- a/data/it/settings/icon.ini +++ b/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 diff --git a/data/rus/settings/icon.ini b/data/rus/settings/icon.ini index 525d3f0ab9..266129dad6 100644 --- a/data/rus/settings/icon.ini +++ b/data/rus/settings/icon.ini @@ -1,6 +1,6 @@ [rbmenu] Диспетчер процессов=cpu -Управление темой=desktop +Управление темой=skincfg Настройка фона=/sys/media/palitra Системная панель=syspanel Консоль=/rd/1/shell diff --git a/data/sp/settings/icon.ini b/data/sp/settings/icon.ini index ceee63e5a0..a8f1a8fbd8 100644 --- a/data/sp/settings/icon.ini +++ b/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 diff --git a/programs/build_all.bat b/programs/build_all.bat index 39bfb91ae3..760f1c115c 100644 --- a/programs/build_all.bat +++ b/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 diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index d98bb34dd4..f0c3611783 100644 --- a/programs/cmm/appearance/appearance.c +++ b/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); } diff --git a/programs/develop/kol_f_edit/kol_f_edit.asm b/programs/develop/kol_f_edit/kol_f_edit.asm index ddc2fb6615..52e73e8c64 100644 --- a/programs/develop/kol_f_edit/kol_f_edit.asm +++ b/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/desktop/trunk/unpacker.inc' +include '../../system/skincfg/trunk/kglobals.inc' +include '../../system/skincfg/trunk/unpacker.inc' include 'strlen.inc' include 'obj_codes.inc' diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/build.bat b/programs/develop/libraries/TinyGL/asm_fork/examples/build.bat index e1207e6f28..17ac9abd2e 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/examples/build.bat +++ b/programs/develop/libraries/TinyGL/asm_fork/examples/build.bat @@ -1,41 +1,3 @@ -if not exist bin mkdir bin -if not exist bin\text_1.png @copy text_1.png bin\text_1.png -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 - +@fasm.exe test_glu2.asm test_glu2 +@FASM.exe textures0.asm textures0 pause \ No newline at end of file diff --git a/programs/fs/kfar/trunk/kfar.ini b/programs/fs/kfar/trunk/kfar.ini index 1988712e0f..b218b58820 100644 --- a/programs/fs/kfar/trunk/kfar.ini +++ b/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 diff --git a/programs/fs/kfm/trunk/kfm.ini b/programs/fs/kfm/trunk/kfm.ini index f989286bee..e686841a0b 100644 --- a/programs/fs/kfm/trunk/kfm.ini +++ b/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 diff --git a/programs/other/t_edit/t_edit.asm b/programs/other/t_edit/t_edit.asm index 04e7d94465..cd4067cea8 100644 --- a/programs/other/t_edit/t_edit.asm +++ b/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/desktop/trunk/unpacker.inc' +include '../../system/skincfg/trunk/kglobals.inc' +include '../../system/skincfg/trunk/unpacker.inc' include 'lang.inc' include 't_data.inc' diff --git a/programs/system/icon_new/icon.ini b/programs/system/icon_new/icon.ini index 27723723f9..5ef318656a 100644 --- a/programs/system/icon_new/icon.ini +++ b/programs/system/icon_new/icon.ini @@ -1,6 +1,6 @@ [rbmenu] Диспетчер процессов=cpu -Управление темой=desktop +Управление темой=skincfg Настройка фона=/sys/media/palitra Настройка устройств=setup Консоль=/rd/1/shell diff --git a/programs/system/desktop/trunk/Tupfile.lua b/programs/system/skincfg/trunk/Tupfile.lua similarity index 61% rename from programs/system/desktop/trunk/Tupfile.lua rename to programs/system/skincfg/trunk/Tupfile.lua index 4f82077286..c19417b512 100644 --- a/programs/system/desktop/trunk/Tupfile.lua +++ b/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") diff --git a/programs/system/desktop/trunk/build_en.bat b/programs/system/skincfg/trunk/build_en.bat similarity index 53% rename from programs/system/desktop/trunk/build_en.bat rename to programs/system/skincfg/trunk/build_en.bat index 33c918c5ac..ad83f4c716 100644 --- a/programs/system/desktop/trunk/build_en.bat +++ b/programs/system/skincfg/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix en >lang.inc -@fasm desktop.asm desktop -@kpack desktop +@fasm skincfg.asm skincfg +@kpack skincfg @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/desktop/trunk/build_en.sh b/programs/system/skincfg/trunk/build_en.sh similarity index 84% rename from programs/system/desktop/trunk/build_en.sh rename to programs/system/skincfg/trunk/build_en.sh index d871ad62d5..6def4f7542 100755 --- a/programs/system/desktop/trunk/build_en.sh +++ b/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 diff --git a/programs/system/desktop/trunk/build_et.bat b/programs/system/skincfg/trunk/build_et.bat similarity index 53% rename from programs/system/desktop/trunk/build_et.bat rename to programs/system/skincfg/trunk/build_et.bat index 8d307a0ecc..0fde358647 100644 --- a/programs/system/desktop/trunk/build_et.bat +++ b/programs/system/skincfg/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix et >lang.inc -@fasm desktop.asm desktop -@kpack desktop +@fasm skincfg.asm skincfg +@kpack skincfg @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/desktop/trunk/build_et.sh b/programs/system/skincfg/trunk/build_et.sh similarity index 84% rename from programs/system/desktop/trunk/build_et.sh rename to programs/system/skincfg/trunk/build_et.sh index 9c56948187..6fe84eb544 100755 --- a/programs/system/desktop/trunk/build_et.sh +++ b/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 diff --git a/programs/system/desktop/trunk/build_it.bat b/programs/system/skincfg/trunk/build_it.bat similarity index 53% rename from programs/system/desktop/trunk/build_it.bat rename to programs/system/skincfg/trunk/build_it.bat index 5f2ee04b21..b9eab68c53 100644 --- a/programs/system/desktop/trunk/build_it.bat +++ b/programs/system/skincfg/trunk/build_it.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix it >lang.inc -@fasm desktop.asm desktop -@kpack desktop +@fasm skincfg.asm skincfg +@kpack skincfg @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/desktop/trunk/build_ru.bat b/programs/system/skincfg/trunk/build_ru.bat similarity index 53% rename from programs/system/desktop/trunk/build_ru.bat rename to programs/system/skincfg/trunk/build_ru.bat index de8fa6df98..27d43f28ca 100644 --- a/programs/system/desktop/trunk/build_ru.bat +++ b/programs/system/skincfg/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc -@fasm desktop.asm desktop -@kpack desktop +@fasm skincfg.asm skincfg +@kpack skincfg @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/desktop/trunk/build_ru.sh b/programs/system/skincfg/trunk/build_ru.sh similarity index 84% rename from programs/system/desktop/trunk/build_ru.sh rename to programs/system/skincfg/trunk/build_ru.sh index 329b6d4316..cc6704e385 100755 --- a/programs/system/desktop/trunk/build_ru.sh +++ b/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 diff --git a/programs/system/desktop/trunk/build_sp.bat b/programs/system/skincfg/trunk/build_sp.bat similarity index 53% rename from programs/system/desktop/trunk/build_sp.bat rename to programs/system/skincfg/trunk/build_sp.bat index 35250bee8d..202a803eaa 100644 --- a/programs/system/desktop/trunk/build_sp.bat +++ b/programs/system/skincfg/trunk/build_sp.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix sp >lang.inc -@fasm desktop.asm desktop -@kpack desktop +@fasm skincfg.asm skincfg +@kpack skincfg @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/desktop/trunk/build_sp.sh b/programs/system/skincfg/trunk/build_sp.sh similarity index 84% rename from programs/system/desktop/trunk/build_sp.sh rename to programs/system/skincfg/trunk/build_sp.sh index 7e37090f85..b14649b515 100755 --- a/programs/system/desktop/trunk/build_sp.sh +++ b/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 diff --git a/programs/system/desktop/trunk/drawskin.inc b/programs/system/skincfg/trunk/drawskin.inc similarity index 100% rename from programs/system/desktop/trunk/drawskin.inc rename to programs/system/skincfg/trunk/drawskin.inc diff --git a/programs/system/desktop/trunk/idata.inc b/programs/system/skincfg/trunk/idata.inc similarity index 100% rename from programs/system/desktop/trunk/idata.inc rename to programs/system/skincfg/trunk/idata.inc diff --git a/programs/system/desktop/trunk/kglobals.inc b/programs/system/skincfg/trunk/kglobals.inc similarity index 100% rename from programs/system/desktop/trunk/kglobals.inc rename to programs/system/skincfg/trunk/kglobals.inc diff --git a/programs/system/desktop/trunk/makefile b/programs/system/skincfg/trunk/makefile similarity index 97% rename from programs/system/desktop/trunk/makefile rename to programs/system/skincfg/trunk/makefile index 47c63a2b44..b2acb67d30 100644 --- a/programs/system/desktop/trunk/makefile +++ b/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 diff --git a/programs/system/desktop/trunk/desktop.asm b/programs/system/skincfg/trunk/skincfg.asm similarity index 100% rename from programs/system/desktop/trunk/desktop.asm rename to programs/system/skincfg/trunk/skincfg.asm diff --git a/programs/system/desktop/trunk/udata.inc b/programs/system/skincfg/trunk/udata.inc similarity index 100% rename from programs/system/desktop/trunk/udata.inc rename to programs/system/skincfg/trunk/udata.inc diff --git a/programs/system/desktop/trunk/unpacker.inc b/programs/system/skincfg/trunk/unpacker.inc similarity index 100% rename from programs/system/desktop/trunk/unpacker.inc rename to programs/system/skincfg/trunk/unpacker.inc