Well, yeah.

1. Remove KFONT_VIEWER and Listplay from "Open with" (but keep associations)
2. Set zero delays in AUTORUN.DAT instead of 1
3. Upload wallpapers deink.png and in_the_wind.png and copyright.txt
3.1. Set deink.png as default in IMG distro (filesize is 1 sector, 507b)
3.2. Add in_the_wind.png to ISO
4. syspanel.ini: fix Appearance app path
5. Tupfile.lua: fix sorting to alphabet as was initially planned

git-svn-id: svn://kolibrios.org@6958 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2017-09-07 12:01:52 +00:00
parent 9499a3b7bf
commit 7175856f3d
8 changed files with 75 additions and 62 deletions

View File

@ -15,58 +15,59 @@ img_files = {
{"MACROS.INC", PROGS .. "/macros.inc"}, {"MACROS.INC", PROGS .. "/macros.inc"},
{"CONFIG.INC", PROGS .. "/config.inc"}, {"CONFIG.INC", PROGS .. "/config.inc"},
{"STRUCT.INC", PROGS .. "/struct.inc"}, {"STRUCT.INC", PROGS .. "/struct.inc"},
{"TOOLBAR.PNG", PROGS .. "/cmm/txtread/toolbar.png"}, {"DEINK.PNG", "common/wallpapers/deink.png"},
{"DEVELOP/T_EDIT.INI", PROGS .. "/other/t_edit/t_edit.ini"},
{"FB2READ", "common/fb2read"}, {"FB2READ", "common/fb2read"},
{"ICONS32.PNG", "common/icons32.png"},
{"INDEX.HTM", "common/index_htm"},
{"KERPACK", "common/kerpack"},
{"KUZKINA.MID", "common/kuzkina.mid"},
{"LANG.INC", build_type .. "/lang.inc"},
{"NOTIFY3.PNG", "common/notify3.png"},
{"TOOLBAR.PNG", PROGS .. "/cmm/txtread/toolbar.png"},
{"VMODE", "common/vmode"},
{"3D/HOUSE.3DS", "common/3d/house.3ds"},
{"DEVELOP/T_EDIT.INI", PROGS .. "/other/t_edit/t_edit.ini"},
{"File Managers/EOLITE.INI", "common/File Managers/eolite.ini"},
{"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
{"File Managers/KFM.INI", "common/File Managers/kfm.ini"},
{"File Managers/Z_ICONS.PNG", PROGS .. "/fs/opendial/z_icons.png"}, {"File Managers/Z_ICONS.PNG", PROGS .. "/fs/opendial/z_icons.png"},
{"File Managers/BUTTONS.BMP", PROGS .. "/fs/kfm/trunk/buttons.bmp"}, {"File Managers/BUTTONS.BMP", PROGS .. "/fs/kfm/trunk/buttons.bmp"},
{"File Managers/ICONS.BMP", PROGS .. "/fs/kfm/trunk/icons.bmp"}, {"File Managers/ICONS.BMP", PROGS .. "/fs/kfm/trunk/icons.bmp"},
{"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"}, {"FONTS/LITT.CHR", PROGS .. "/demos/bgitest/trunk/FONTS/LITT.CHR"},
{"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"}, {"FONTS/TAHOMA.KF", "common/fonts/tahoma.kf"},
{"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"}, {"GAMES/SNAKE.INI", PROGS .. "/games/snake/trunk/snake.ini"},
{"LIB/ARRAY.OBJ", "common/lib/array.obj"},
{"LIB/LIBRARY.OBJ", "common/lib/library.obj"},
{"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
{"LIB/KMENU.OBJ", "common/lib/kmenu.obj"},
{"LIB/NETCODE.OBJ", "common/lib/netcode.obj"},
{"LIB/PIXLIB.OBJ", "common/lib/pixlib.obj"},
{"MEDIA/IMGF/IMGF", "common/media/ImgF/ImgF"},
{"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"},
{"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"},
{"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"},
{"MEDIA/KIV.INI", PROGS .. "/media/kiv/trunk/kiv.ini"}, {"MEDIA/KIV.INI", PROGS .. "/media/kiv/trunk/kiv.ini"},
{"MEDIA/PIXIE/PIXIE.INI", PROGS .. "/cmm/pixie/pixie.ini"}, {"MEDIA/PIXIE/PIXIE.INI", PROGS .. "/cmm/pixie/pixie.ini"},
{"MEDIA/PIXIE/S_DARK.PNG", PROGS .. "/cmm/pixie/s_dark.png"}, {"MEDIA/PIXIE/S_DARK.PNG", PROGS .. "/cmm/pixie/s_dark.png"},
{"MEDIA/PIXIE/S_LIGHT.PNG", PROGS .. "/cmm/pixie/s_light.png"}, {"MEDIA/PIXIE/S_LIGHT.PNG", PROGS .. "/cmm/pixie/s_light.png"},
{"MEDIA/PIXIE/MINIMP3", PROGS .. "/cmm/pixie/minimp3"}, {"MEDIA/PIXIE/MINIMP3", PROGS .. "/cmm/pixie/minimp3"},
{"NETWORK/WV_SKIN.PNG", PROGS .. "/cmm/browser/wv_skin.png"}, {"NETWORK/WV_SKIN.PNG", PROGS .. "/cmm/browser/wv_skin.png"},
{"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"},
{"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"},
{"ICONS32.PNG", "common/icons32.png"},
{"INDEX.HTM", "common/index_htm"},
{"KERPACK", "common/kerpack"},
{"SETTINGS/KEYMAP.KEY", PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"},
{"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"},
{"KUZKINA.MID", "common/kuzkina.mid"},
{"LANG.INC", build_type .. "/lang.inc"},
{"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"},
{"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"},
{"SETTINGS/TASKBAR.INI", build_type .. "/settings/taskbar.ini"},
{"SETTINGS/ESKIN.INI", "common/settings/eskin.ini"},
{"SETTINGS/DOCKY.INI", "common/settings/docky.ini"},
{"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"},
{"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
{"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"},
{"NOTIFY3.PNG", "common/notify3.png"},
{"SETTINGS/SYSTEM.INI", "common/settings/system.ini"},
{"VMODE", "common/vmode"},
{"3D/HOUSE.3DS", "common/3d/house.3ds"},
{"File Managers/EOLITE.INI", "common/File Managers/eolite.ini"},
{"File Managers/ICONS.INI", "common/File Managers/icons.ini"},
{"File Managers/KFM.INI", "common/File Managers/kfm.ini"},
{"LIB/PIXLIB.OBJ", "common/lib/pixlib.obj"},
{"LIB/ARRAY.OBJ", "common/lib/array.obj"},
{"LIB/LIBRARY.OBJ", "common/lib/library.obj"},
{"LIB/ICONV.OBJ", "common/lib/iconv.obj"},
{"LIB/NETCODE.OBJ", "common/lib/netcode.obj"},
{"LIB/KMENU.OBJ", "common/lib/kmenu.obj"},
{"MEDIA/IMGF/IMGF", "common/media/ImgF/ImgF"},
{"MEDIA/IMGF/CEDG.OBJ", "common/media/ImgF/cEdg.obj"},
{"MEDIA/IMGF/DITHER.OBJ", "common/media/ImgF/dither.obj"},
{"MEDIA/IMGF/INVSOL.OBJ", "common/media/ImgF/invSol.obj"},
{"SETTINGS/NETWORK.INI", build_type .. "/settings/network.ini"},
{"NETWORK/FTPD.INI", "common/network/ftpd.ini"}, {"NETWORK/FTPD.INI", "common/network/ftpd.ini"},
{"NETWORK/USERS.INI", "common/network/users.ini"}, {"NETWORK/USERS.INI", "common/network/users.ini"},
{"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"},
{"SETTINGS/ASSOC.INI", "common/settings/assoc.ini"},
{"SETTINGS/DOCKY.INI", "common/settings/docky.ini"},
{"SETTINGS/ESKIN.INI", "common/settings/eskin.ini"},
{"SETTINGS/FB2READ.INI", "common/settings/fb2read.ini"},
{"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"},
{"SETTINGS/KEYMAP.KEY", PROGS .. "/system/taskbar/trunk/KEYMAP.KEY"},
{"SETTINGS/KOLIBRI.LBL", build_type .. "/settings/kolibri.lbl"},
{"SETTINGS/LANG.INI", build_type .. "/settings/lang.ini"},
{"SETTINGS/MENU.DAT", build_type .. "/settings/menu.dat"},
{"SETTINGS/NETWORK.INI", build_type .. "/settings/network.ini"},
{"SETTINGS/TASKBAR.INI", build_type .. "/settings/taskbar.ini"},
{"SETTINGS/SYSPANEL.INI", "common/settings/syspanel.ini"},
{"SETTINGS/SYSTEM.INI", "common/settings/system.ini"},
} }
-- For russian build, add russian-only files. -- For russian build, add russian-only files.
if build_type == "rus" then tup.append_table(img_files, { if build_type == "rus" then tup.append_table(img_files, {
@ -234,7 +235,8 @@ extra_files = {
{"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"}, {"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"},
{"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"}, {"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
{"kolibrios/utils/fNav/", "common/File Managers/fNav/*"}, {"kolibrios/utils/fNav/", "common/File Managers/fNav/*"},
} {"kolibrios/res/wallpappers/in_the_wind.png", "common/wallpappers/in_the_wind.png"},
}
if build_type == "rus" then tup.append_table(extra_files, { if build_type == "rus" then tup.append_table(extra_files, {
{"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"}, {"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},
{"Docs/cp866/gnu.txt", build_type .. "/docs/GNU.TXT"}, {"Docs/cp866/gnu.txt", build_type .. "/docs/GNU.TXT"},

View File

@ -5,18 +5,18 @@
# #
#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen #/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen
#/SYS/LOADDRV COMMOUSE 1 # serial mouse driver #/SYS/LOADDRV COMMOUSE 1 # serial mouse driver
#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board #/SYS/DEVELOP/BOARD "" 0 # Load DEBUG board
#/SYS/refrscrn "" 1 # Refresh screen #/SYS/refrscrn "" 0 # Refresh screen
/SYS/SETUP BOOT 1 # Load device settings /SYS/SETUP BOOT 0 # Load device settings
/SYS/LOADDRV RDC 1 # videodriver for RDC M2010/M2012 /SYS/LOADDRV RDC 0 # videodriver for RDC M2010/M2012
/SYS/@TASKBAR "" 1 # Start taskbar /SYS/@TASKBAR "" 0 # Start taskbar
/SYS/@ICON "" 1 # Multithread icon /SYS/@ICON "" 0 # Multithread icon
/SYS/ESKIN "" 1 # Set style /SYS/ESKIN "" 0 # Set style
/SYS/@DOCKY "" 1 # Start docky /SYS/@DOCKY "" 0 # Start docky
/SYS/NETWORK/NETCFG A 1 # /SYS/NETWORK/NETCFG A 0 #
/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration /SYS/NETWORK/@ZEROCONF "" 0 # Network configuration
/SYS/@VOLUME "" 1 # Start volume daemon /SYS/@VOLUME "" 0 # Start volume daemon
/SYS/@SS ASSM 1 # Screensaver /SYS/@SS ASSM 0 # Screensaver
/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 /SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1
/SYS/SEARCHAP "" -1 # Search and mount additional system directory /SYS/SEARCHAP "" -1 # Search and mount additional system directory
### Hello, ASM World! ### ### Hello, ASM World! ###

View File

@ -28,9 +28,6 @@ exec=/sys/media/kiv
icon=70 icon=70
next=$Animage next=$Animage
[FontViewer]
exec=/sys/FONT_VIEWER
[Animage] [Animage]
exec=/sys/media/animage exec=/sys/media/animage
icon=15 icon=15
@ -48,9 +45,6 @@ icon=40
exec=/sys/media/ac97snd exec=/sys/media/ac97snd
icon=64 icon=64
[ListPlay]
exec=/sys/media/listplay
[MidAMP] [MidAMP]
exec=/sys/media/midamp exec=/sys/media/midamp
icon=74 icon=74
@ -99,7 +93,7 @@ icon=1
[Assoc] [Assoc]
/=$Eolite /=$Eolite
kf=$FontViewer kf=/sys/FONT_VIEWER
txt=$TinyPad txt=$TinyPad
asm=$TinyPad asm=$TinyPad
@ -149,8 +143,8 @@ wav=$AC97snd
xm=$AC97snd xm=$AC97snd
m3u=$AC97snd m3u=$AC97snd
lap=$ListPlay lap=/sys/media/listplay
asf=$ListPlay asf=/sys/media/listplay
mid=$MidAMP mid=$MidAMP
midi=$MidAMP midi=$MidAMP

View File

@ -1,8 +1,12 @@
[main] [main]
bg=1 bg=1
program=/rd/1/media/palitra ;program=/rd/1/media/palitra
param=H 007DCEDF 003C427F ;param=H 007DCEDF 003C427F
program=/rd/1/media/kiv
param=\S__/rd/1/deink.png
;T=tiled, S=stretched, C=centered
wallpaper= wallpaper=

View File

@ -10,7 +10,7 @@ VideoMode=vmode,7
NetConfig=/sys/network/netcfg,33 NetConfig=/sys/network/netcfg,33
SysSetup=setup,5 SysSetup=setup,5
Date&Time=calendar,52 Date&Time=calendar,52
Appearance=/kolibrios/utils/appearance.kex,62 Appearance=/kolibrios/utils/appearance,62
Background=/sys/media/palitra,61 Background=/sys/media/palitra,61
SkinConfig=skincfg,80 SkinConfig=skincfg,80
Volume=@VOLUME,64 Volume=@VOLUME,64

View File

@ -0,0 +1,13 @@
==Wallpapers==
In the wind there is longing https://bo0xvn.deviantart.com
Deink https://greentoadmx.deviantart.com
=====Icons====
HEX-editor Sublyme http://www.pixeljoint.com/p/34532.htm
Browser Plutogeezer http://www.pixeljoint.com/p/12237.htm
Snake real Troll http://realtroll.npage.de
Flood-it iMoose http://benjamus.deviantart.com
Dicty Susumu Yoshida http://www.mcdodesign.com
Liza mail Asher Abbasi http://kyo-tux.deviantart.com http://www.iconfinder.com/

Binary file not shown.

After

Width:  |  Height:  |  Size: 507 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB