diff --git a/data/Tupfile.lua b/data/Tupfile.lua index 8d3e35033a..91bd3d694e 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -32,13 +32,13 @@ img_files = { {"MEDIA/PIXIE/S_LIGHT.PNG", PROGS .. "/cmm/pixie/s_light.png"}, {"MEDIA/PIXIE/MINIMP3", PROGS .. "/cmm/pixie/minimp3"}, {"NETWORK/WV_SKIN.PNG", PROGS .. "/cmm/browser/wv_skin.png"}, - {"SETTINGS/AUTORUN.DAT", build_type .. "/settings/autorun.dat"}, + {"SETTINGS/AUTORUN.DAT", "common/settings/AUTORUN.DAT"}, {"DEFAULT.SKN", "common/default.skn"}, {"SETTINGS/ICON.INI", build_type .. "/settings/icon.ini"}, {"ICONS32.PNG", "common/icons32.png"}, {"INDEX.HTM", "common/index_htm"}, {"KERPACK", "common/kerpack"}, - {"SETTINGS/KEYMAP.KEY", build_type .. "/settings/keymap.key"}, + {"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"}, diff --git a/data/common/settings/AUTORUN.DAT b/data/common/settings/AUTORUN.DAT new file mode 100644 index 0000000000..a155eb0a1d --- /dev/null +++ b/data/common/settings/AUTORUN.DAT @@ -0,0 +1,23 @@ +# Syntaxis is: +# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. +# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. +# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait +# +#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen +#/SYS/LOADDRV COMMOUSE 1 # serial mouse driver +#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board +#/SYS/refrscrn "" 1 # Refresh screen +/SYS/SETUP BOOT 1 # Load device settings +/SYS/LOADDRV RDC 1 # videodriver for RDC M2010/M2012 +/SYS/NETWORK/NETCFG A 1 # +/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration +/SYS/ESKIN "" 1 # Set style +/SYS/@VOLUME "" 1 # Start volume daemon +/SYS/@TASKBAR "" 1 # Start taskbar +/SYS/@DOCKY "" 1 # Start docky +/SYS/@ICON "" 1 # Multithread icon +#/SYS/@RB "" 1 # Desktop right-click menu +/SYS/@SS ASSM 1 # Screensaver +/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 +/SYS/SEARCHAP "" -1 # Search and mount additional system directory +### Hello, ASM World! ### diff --git a/data/eng/settings/SYSTEM.INI b/data/eng/settings/SYSTEM.INI index 34cdf7ba25..a52222440a 100644 --- a/data/eng/settings/SYSTEM.INI +++ b/data/eng/settings/SYSTEM.INI @@ -1,7 +1,7 @@ [system] language=en -keyboard=en font smoothing=sbp +font height=9 speaker mute=on [mouse] speed=1 diff --git a/data/eng/settings/autorun.dat b/data/eng/settings/autorun.dat deleted file mode 100644 index 26d3531feb..0000000000 --- a/data/eng/settings/autorun.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Syntaxis is: -# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. -# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. -# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait -# -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/LOADDRV "COMMOUSE" 1 # serial mouse driver -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen -/SYS/LOADDRV "RDC" 1 # videodriver for RDC M2010/M2012 -/SYS/NETWORK/NETCFG A 1 # -/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration -/SYS/ESKIN "" 1 # Set style -/SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@TASKBAR "" 1 # Start taskbar -/SYS/@DOCKY "" 1 # Start docky -/SYS/SETUP BOOT 1 # Load device settings -/SYS/@ICON "" 1 # Multithread icon -#/SYS/@RB "" 1 # Desktop right-click menu -/SYS/@SS ASSM 1 # Screensaver -/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 -/SYS/SEARCHAP "" -1 # Search and mount additional system directory -### Hello, ASM World! ### diff --git a/data/eng/settings/keymap.key b/data/eng/settings/keymap.key deleted file mode 100644 index f6f2a5d8a7..0000000000 Binary files a/data/eng/settings/keymap.key and /dev/null differ diff --git a/data/eng/settings/lang.ini b/data/eng/settings/lang.ini index c03a291d7d..bfcb052a51 100644 --- a/data/eng/settings/lang.ini +++ b/data/eng/settings/lang.ini @@ -4,7 +4,7 @@ startlng = 1 [comkey] ccomkey1 = 1 ccomkey2 = 4 -ccomkey3 = 7 +ccomkey3 = 0 [altkey] altkey1 = 1 @@ -14,8 +14,8 @@ altkey4 = 3 altkey5 = 5 altkey6 = 6 altkey7 = 2 -altkey8 = 0 -altkey9 = 0 +altkey8 = 8 +altkey9 = 9 altkey0 = 0 [langs] @@ -25,4 +25,6 @@ altkey0 = 0 4 = Ru 5 = Fr 6 = Et -7 = Ua \ No newline at end of file +7 = Ua +8 = It +9 = Be \ No newline at end of file diff --git a/data/et/settings/SYSTEM.INI b/data/et/settings/SYSTEM.INI index dbab7c4422..970eb2aff7 100644 --- a/data/et/settings/SYSTEM.INI +++ b/data/et/settings/SYSTEM.INI @@ -1,7 +1,7 @@ [system] language=et -keyboard=et font smoothing=sbp +font height=9 speaker mute=on [mouse] speed=1 diff --git a/data/et/settings/autorun.dat b/data/et/settings/autorun.dat deleted file mode 100644 index 999f48d842..0000000000 --- a/data/et/settings/autorun.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Syntaxis is: -# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. -# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. -# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait -# -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/LOADDRV "COMMOUSE" 1 # serial mouse driver -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen -/SYS/LOADDRV "RDC" 1 # videodriver for RDC M2010/M2012 -/SYS/NETWORK/NETCFG A 1 # -/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration -/SYS/ESKIN "" 1 # Set style -/SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@TASKBAR "" 1 # Start taskbar -/SYS/@DOCKY "" 1 # Start docky -/SYS/SETUP BOOT 1 # Load device settings -/SYS/@ICON "" 1 # Multithread icon -#/SYS/@RB "" 1 # Desktop right-click menu -/SYS/@SS ASSM 1 # Screensaver -/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 -/SYS/SEARCHAP "" -1 # Search and mount additional system directory -### Hello, ASM World! ### diff --git a/data/et/settings/keymap.key b/data/et/settings/keymap.key deleted file mode 100644 index f6f2a5d8a7..0000000000 Binary files a/data/et/settings/keymap.key and /dev/null differ diff --git a/data/et/settings/lang.ini b/data/et/settings/lang.ini index 0e814ab2dc..5b41dbcaeb 100644 --- a/data/et/settings/lang.ini +++ b/data/et/settings/lang.ini @@ -2,9 +2,9 @@ startlng = 6 [comkey] -ccomkey1 = 1 -ccomkey2 = 4 -ccomkey3 = 7 +ccomkey1 = 6 +ccomkey2 = 1 +ccomkey3 = 4 [altkey] altkey1 = 1 @@ -14,8 +14,8 @@ altkey4 = 3 altkey5 = 5 altkey6 = 6 altkey7 = 2 -altkey8 = 0 -altkey9 = 0 +altkey8 = 8 +altkey9 = 9 altkey0 = 0 [langs] @@ -25,4 +25,6 @@ altkey0 = 0 4 = Ru 5 = Fr 6 = Et -7 = Ua \ No newline at end of file +7 = Ua +8 = It +9 = Be \ No newline at end of file diff --git a/data/it/settings/SYSTEM.INI b/data/it/settings/SYSTEM.INI index 65615f0379..34d22b004f 100644 --- a/data/it/settings/SYSTEM.INI +++ b/data/it/settings/SYSTEM.INI @@ -1,7 +1,7 @@ [system] language=it -keyboard=it font smoothing=sbp +font height=9 speaker mute=on [mouse] speed=1 diff --git a/data/it/settings/autorun.dat b/data/it/settings/autorun.dat deleted file mode 100644 index cba9e23986..0000000000 --- a/data/it/settings/autorun.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Syntaxis is: -# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. -# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. -# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait -# -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/LOADDRV "COMMOUSE" 1 # serial mouse driver -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen -/SYS/LOADDRV "RDC" 1 # videodriver for RDC M2010/M2012 -/SYS/NETWORK/NETCFG A 1 # -/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration -/SYS/ESKIN "" 1 # Set style -/SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@TASKBAR "" 1 # Start taskbar -/SYS/@DOCKY "" 1 # Start docky -/SYS/SETUP BOOT 1 # Load device settings -/SYS/@ICON "" 1 # Multithread icon -#/SYS/@RB "" 1 # Desktop right-click menu -/SYS/@SS ASSM 1 # Screensaver -/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 -/SYS/SEARCHAP "" -1 # Search and mount additional system directory -### Hello, ASM World! ### diff --git a/data/it/settings/keymap.key b/data/it/settings/keymap.key deleted file mode 100644 index f6f2a5d8a7..0000000000 Binary files a/data/it/settings/keymap.key and /dev/null differ diff --git a/data/it/settings/lang.ini b/data/it/settings/lang.ini index c03a291d7d..3ac79e2f92 100644 --- a/data/it/settings/lang.ini +++ b/data/it/settings/lang.ini @@ -1,10 +1,10 @@ [start] -startlng = 1 +startlng = 8 [comkey] -ccomkey1 = 1 -ccomkey2 = 4 -ccomkey3 = 7 +ccomkey1 = 8 +ccomkey2 = 1 +ccomkey3 = 4 [altkey] altkey1 = 1 @@ -14,8 +14,8 @@ altkey4 = 3 altkey5 = 5 altkey6 = 6 altkey7 = 2 -altkey8 = 0 -altkey9 = 0 +altkey8 = 8 +altkey9 = 9 altkey0 = 0 [langs] @@ -25,4 +25,6 @@ altkey0 = 0 4 = Ru 5 = Fr 6 = Et -7 = Ua \ No newline at end of file +7 = Ua +8 = It +9 = Be \ No newline at end of file diff --git a/data/rus/settings/SYSTEM.INI b/data/rus/settings/SYSTEM.INI index fcbfb92321..f4742aea50 100644 --- a/data/rus/settings/SYSTEM.INI +++ b/data/rus/settings/SYSTEM.INI @@ -1,7 +1,7 @@ [system] language=ru -keyboard=ru font smoothing=sbp +font height=9 speaker mute=on [mouse] speed=1 diff --git a/data/rus/settings/autorun.dat b/data/rus/settings/autorun.dat deleted file mode 100644 index cba9e23986..0000000000 --- a/data/rus/settings/autorun.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Syntaxis is: -# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. -# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. -# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait -# -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/LOADDRV "COMMOUSE" 1 # serial mouse driver -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen -/SYS/LOADDRV "RDC" 1 # videodriver for RDC M2010/M2012 -/SYS/NETWORK/NETCFG A 1 # -/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration -/SYS/ESKIN "" 1 # Set style -/SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@TASKBAR "" 1 # Start taskbar -/SYS/@DOCKY "" 1 # Start docky -/SYS/SETUP BOOT 1 # Load device settings -/SYS/@ICON "" 1 # Multithread icon -#/SYS/@RB "" 1 # Desktop right-click menu -/SYS/@SS ASSM 1 # Screensaver -/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 -/SYS/SEARCHAP "" -1 # Search and mount additional system directory -### Hello, ASM World! ### diff --git a/data/rus/settings/keymap.key b/data/rus/settings/keymap.key deleted file mode 100644 index f6f2a5d8a7..0000000000 Binary files a/data/rus/settings/keymap.key and /dev/null differ diff --git a/data/rus/settings/lang.ini b/data/rus/settings/lang.ini index c03a291d7d..1e2c8e5a09 100644 --- a/data/rus/settings/lang.ini +++ b/data/rus/settings/lang.ini @@ -1,10 +1,10 @@ [start] -startlng = 1 +startlng = 4 [comkey] -ccomkey1 = 1 -ccomkey2 = 4 -ccomkey3 = 7 +ccomkey1 = 4 +ccomkey2 = 7 +ccomkey3 = 1 [altkey] altkey1 = 1 @@ -14,8 +14,8 @@ altkey4 = 3 altkey5 = 5 altkey6 = 6 altkey7 = 2 -altkey8 = 0 -altkey9 = 0 +altkey8 = 8 +altkey9 = 9 altkey0 = 0 [langs] @@ -25,4 +25,6 @@ altkey0 = 0 4 = Ru 5 = Fr 6 = Et -7 = Ua \ No newline at end of file +7 = Ua +8 = It +9 = Be \ No newline at end of file diff --git a/data/sp/settings/SYSTEM.INI b/data/sp/settings/SYSTEM.INI index 947ef432f5..eb8b02e926 100644 --- a/data/sp/settings/SYSTEM.INI +++ b/data/sp/settings/SYSTEM.INI @@ -1,7 +1,7 @@ [system] language=sp -keyboard=sp font smoothing=sbp +font height=9 speaker mute=on [mouse] speed=1 diff --git a/data/sp/settings/autorun.dat b/data/sp/settings/autorun.dat deleted file mode 100644 index cba9e23986..0000000000 --- a/data/sp/settings/autorun.dat +++ /dev/null @@ -1,23 +0,0 @@ -# Syntaxis is: -# Use "parameter value" for parameters with spaces. Use "" if no parameter is required. -# Delay time means how much the system should wait, before running the next line. It is measured in 1/100 seconds. -# If delay is negative, wait for termination of the spawned process. Otherwise, simply wait -# -#/SYS/CROPFLAT "XS800 YS480" 1 # set limits of screen -#/SYS/LOADDRV "COMMOUSE" 1 # serial mouse driver -#/SYS/DEVELOP/BOARD "" 1 # Load DEBUG board -#/SYS/refrscrn "" 1 # Refresh screen -/SYS/LOADDRV "RDC" 1 # videodriver for RDC M2010/M2012 -/SYS/NETWORK/NETCFG A 1 # -/SYS/NETWORK/@ZEROCONF "" 1 # Network configuration -/SYS/ESKIN "" 1 # Set style -/SYS/@VOLUME "" 1 # Start volume daemon -/SYS/@TASKBAR "" 1 # Start taskbar -/SYS/@DOCKY "" 1 # Start docky -/SYS/SETUP BOOT 1 # Load device settings -/SYS/@ICON "" 1 # Multithread icon -#/SYS/@RB "" 1 # Desktop right-click menu -/SYS/@SS ASSM 1 # Screensaver -/SYS/TMPDISK A0 -1 # Add virtual RAM disk /tmp0/1 -/SYS/SEARCHAP "" -1 # Search and mount additional system directory -### Hello, ASM World! ### diff --git a/data/sp/settings/keymap.key b/data/sp/settings/keymap.key deleted file mode 100644 index f6f2a5d8a7..0000000000 Binary files a/data/sp/settings/keymap.key and /dev/null differ diff --git a/data/sp/settings/lang.ini b/data/sp/settings/lang.ini index e7fe62f210..10feb623d6 100644 --- a/data/sp/settings/lang.ini +++ b/data/sp/settings/lang.ini @@ -4,7 +4,7 @@ startlng = 1 [comkey] ccomkey1 = 1 ccomkey2 = 4 -ccomkey3 = 7 +ccomkey3 = 0 [altkey] altkey1 = 1 @@ -14,8 +14,8 @@ altkey4 = 3 altkey5 = 5 altkey6 = 6 altkey7 = 2 -altkey8 = 0 -altkey9 = 0 +altkey8 = 8 +altkey9 = 9 altkey0 = 0 [langs] @@ -26,3 +26,5 @@ altkey0 = 0 5 = Fr 6 = Et 7 = Ua +8 = It +9 = Be