Sweetbread/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

rename "desktop" app to "skincfg"

Browse Source 
git-svn-id: svn://kolibrios.org@6169 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-02-08 12:52:20 +00:00
parent 7e4562ffe1
commit c8de4cb0ee
36 changed files with 50 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Tupfile.lua
View File

@ -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"},

2
data/common/File Managers/kfar.ini
View File

@ -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

2
data/common/File Managers/kfm.ini
View File

@ -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

2
data/common/settings/assoc.ini
View File

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

11
data/common/settings/eskin.ini
View File

@ -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

2
data/common/settings/syspanel.ini
View File

@ -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

2
data/eng/settings/icon.ini
View File

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

2
data/et/settings/icon.ini
View File

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

2
data/it/settings/icon.ini
View File

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

2
data/rus/settings/icon.ini
View File

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

2
data/sp/settings/icon.ini
View File

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

8
programs/build_all.bat
View File

@ -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

2
programs/cmm/appearance/appearance.c
View File

@ -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);
}

4
programs/develop/kol_f_edit/kol_f_edit.asm
View File

@ -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'

42
programs/develop/libraries/TinyGL/asm_fork/examples/build.bat
View File

@ -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

2
programs/fs/kfar/trunk/kfar.ini
View File

@ -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

2
programs/fs/kfm/trunk/kfm.ini
View File

@ -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

4
programs/other/t_edit/t_edit.asm
View File

@ -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'

2
programs/system/icon_new/icon.ini
View File

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

2
programs/system/desktop/trunk/Tupfile.lua → programs/system/skincfg/trunk/Tupfile.lua
View File

@ -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")

4
programs/system/desktop/trunk/build_en.bat → programs/system/skincfg/trunk/build_en.bat
View File

@ -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

2
programs/system/desktop/trunk/build_en.sh → programs/system/skincfg/trunk/build_en.sh
View File

@ -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

4
programs/system/desktop/trunk/build_et.bat → programs/system/skincfg/trunk/build_et.bat
View File

@ -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

2
programs/system/desktop/trunk/build_et.sh → programs/system/skincfg/trunk/build_et.sh
View File

@ -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

4
programs/system/desktop/trunk/build_it.bat → programs/system/skincfg/trunk/build_it.bat
View File

@ -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

4
programs/system/desktop/trunk/build_ru.bat → programs/system/skincfg/trunk/build_ru.bat
View File

@ -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

2
programs/system/desktop/trunk/build_ru.sh → programs/system/skincfg/trunk/build_ru.sh
View File

@ -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

4
programs/system/desktop/trunk/build_sp.bat → programs/system/skincfg/trunk/build_sp.bat
View File

@ -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

2
programs/system/desktop/trunk/build_sp.sh → programs/system/skincfg/trunk/build_sp.sh
View File

@ -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

0
programs/system/desktop/trunk/drawskin.inc → programs/system/skincfg/trunk/drawskin.inc
View File

0
programs/system/desktop/trunk/idata.inc → programs/system/skincfg/trunk/idata.inc
View File

0
programs/system/desktop/trunk/kglobals.inc → programs/system/skincfg/trunk/kglobals.inc
View File

2
programs/system/desktop/trunk/makefile → programs/system/skincfg/trunk/makefile
View File

@ -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

0
programs/system/desktop/trunk/desktop.asm → programs/system/skincfg/trunk/skincfg.asm
View File

0
programs/system/desktop/trunk/udata.inc → programs/system/skincfg/trunk/udata.inc
View File

0
programs/system/desktop/trunk/unpacker.inc → programs/system/skincfg/trunk/unpacker.inc
View File