From ae095b7f07c4a59e69f4be7456babbf20b778321 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 25 Oct 2013 22:06:19 +0000 Subject: [PATCH] MENU - using of SETTINGS directory for MENU.DAT git-svn-id: svn://kolibrios.org@4096 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 3 ++- data/eng/{ => settings}/menu.dat | 0 data/et/Makefile | 3 ++- data/et/{ => settings}/menu.dat | 0 data/it/Makefile | 3 ++- data/it/{ => settings}/menu.dat | 0 data/rus/Makefile | 3 ++- data/rus/{ => settings}/menu.dat | 0 data/sp/Makefile | 3 ++- data/sp/{ => settings}/menu.dat | 0 programs/system/menu/trunk/menu.asm | 2 +- 11 files changed, 11 insertions(+), 6 deletions(-) rename data/eng/{ => settings}/menu.dat (100%) rename data/et/{ => settings}/menu.dat (100%) rename data/it/{ => settings}/menu.dat (100%) rename data/rus/{ => settings}/menu.dat (100%) rename data/sp/{ => settings}/menu.dat (100%) diff --git a/data/eng/Makefile b/data/eng/Makefile index 16b63c48f9..9b75b57dc3 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -294,7 +294,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ settings/keymap.key:SETTINGS/KEYMAP.KEY \ settings/lang.ini:SETTINGS/LANG.INI \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \ - menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ + settings/menu.dat:SETTINGS/MENU.DAT \ + settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ diff --git a/data/eng/menu.dat b/data/eng/settings/menu.dat similarity index 100% rename from data/eng/menu.dat rename to data/eng/settings/menu.dat diff --git a/data/et/Makefile b/data/et/Makefile index 16b63c48f9..9b75b57dc3 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -294,7 +294,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ settings/keymap.key:SETTINGS/KEYMAP.KEY \ settings/lang.ini:SETTINGS/LANG.INI \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \ - menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ + settings/menu.dat:SETTINGS/MENU.DAT \ + settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ diff --git a/data/et/menu.dat b/data/et/settings/menu.dat similarity index 100% rename from data/et/menu.dat rename to data/et/settings/menu.dat diff --git a/data/it/Makefile b/data/it/Makefile index 59307b59bc..8cdf3aa812 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -293,7 +293,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ settings/keymap.key:SETTINGS/KEYMAP.KEY \ settings/lang.ini:SETTINGS/LANG.INI \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \ - menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ + settings/menu.dat:SETTINGS/MENU.DAT \ + settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ diff --git a/data/it/menu.dat b/data/it/settings/menu.dat similarity index 100% rename from data/it/menu.dat rename to data/it/settings/menu.dat diff --git a/data/rus/Makefile b/data/rus/Makefile index a1fccdd9c2..b647f0ebd6 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -288,7 +288,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ settings/keymap.key:SETTINGS/KEYMAP.KEY \ settings/lang.ini:SETTINGS/LANG.INI \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \ - menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ + settings/menu.dat:SETTINGS/MENU.DAT \ + settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ settings/panel.ini:SETTINGS/PANEL.INI pipetka:PIPETKA setup.dat:SETUP.DAT \ shell:SHELL table:TABLE vmode:VMODE \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ diff --git a/data/rus/menu.dat b/data/rus/settings/menu.dat similarity index 100% rename from data/rus/menu.dat rename to data/rus/settings/menu.dat diff --git a/data/sp/Makefile b/data/sp/Makefile index 415ce3ab20..8588ff9ff6 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -293,7 +293,8 @@ OTHER_FILES:=settings/autorun.dat:SETTINGS/AUTORUN.DAT \ settings/keymap.key:SETTINGS/KEYMAP.KEY \ settings/lang.ini:SETTINGS/LANG.INI \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC \ - menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ + settings/menu.dat:SETTINGS/MENU.DAT \ + settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ diff --git a/data/sp/menu.dat b/data/sp/settings/menu.dat similarity index 100% rename from data/sp/menu.dat rename to data/sp/settings/menu.dat diff --git a/programs/system/menu/trunk/menu.asm b/programs/system/menu/trunk/menu.asm index a9c8332192..0f329b90fd 100644 --- a/programs/system/menu/trunk/menu.asm +++ b/programs/system/menu/trunk/menu.asm @@ -881,7 +881,7 @@ fileinfo: .size dd 0 ; bytes to read .return dd procinfo ; return data pointer .name: - db '/sys/MENU.DAT',0 ; ASCIIZ dir & filename + db '/SYS/SETTINGS/MENU.DAT',0 ; ASCIIZ dir & filename ;-------------------------------------- align 4 fileinfo_start: