From f25840cccacee4c9e311df4f9f01907ebf77e940 Mon Sep 17 00:00:00 2001 From: "Marat Zakiyanov (Mario79)" Date: Fri, 25 Oct 2013 19:57:48 +0000 Subject: [PATCH] PANEL - using of SETTINGS directory for INI. git-svn-id: svn://kolibrios.org@4089 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/eng/Makefile | 2 +- data/et/Makefile | 2 +- data/it/Makefile | 2 +- data/rus/Makefile | 2 +- data/sp/Makefile | 2 +- programs/system/panel/trunk/i_data.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/eng/Makefile b/data/eng/Makefile index 43ab321fed..7fff95a023 100644 --- a/data/eng/Makefile +++ b/data/eng/Makefile @@ -292,7 +292,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ - panel.ini:PANEL.INI setup.dat:SETUP.DAT \ + settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ diff --git a/data/et/Makefile b/data/et/Makefile index 43ab321fed..7fff95a023 100644 --- a/data/et/Makefile +++ b/data/et/Makefile @@ -292,7 +292,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ - panel.ini:PANEL.INI setup.dat:SETUP.DAT \ + settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ diff --git a/data/it/Makefile b/data/it/Makefile index 5d79aec180..0bb1ae6b3c 100644 --- a/data/it/Makefile +++ b/data/it/Makefile @@ -291,7 +291,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ - panel.ini:PANEL.INI setup.dat:SETUP.DAT \ + settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ diff --git a/data/rus/Makefile b/data/rus/Makefile index e79711f27d..d5a0c90bb7 100644 --- a/data/rus/Makefile +++ b/data/rus/Makefile @@ -286,7 +286,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ - panel.ini:PANEL.INI pipetka:PIPETKA setup.dat:SETUP.DAT \ + 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 \ demos/ak47.lif:DEMOS/AK47.LIF demos/life2:DEMOS/LIFE2 \ diff --git a/data/sp/Makefile b/data/sp/Makefile index 38a8de66f0..f3d91764ac 100644 --- a/data/sp/Makefile +++ b/data/sp/Makefile @@ -291,7 +291,7 @@ OTHER_FILES:=autorun.dat:AUTORUN.DAT \ kernel.mnt:KERNEL.MNT kerpack:KERPACK keymap.key:KEYMAP.KEY \ kuzkina.mid:KUZKINA.MID lang.inc:LANG.INC lang.ini:LANG.INI \ menu.dat:MENU.DAT settings/kolibri.lbl:SETTINGS/KOLIBRI.LBL \ - panel.ini:PANEL.INI setup.dat:SETUP.DAT \ + settings/panel.ini:SETTINGS/PANEL.INI setup.dat:SETUP.DAT \ shell:SHELL table:TABLE \ vmode:VMODE 3d/3dsheart:3D/3DSHEART \ 3d/cubeline:3D/CUBELINE 3d/gears:3D/GEARS 3d/house.3ds:3D/HOUSE.3DS \ diff --git a/programs/system/panel/trunk/i_data.inc b/programs/system/panel/trunk/i_data.inc index 76bc3079aa..0cf416680c 100644 --- a/programs/system/panel/trunk/i_data.inc +++ b/programs/system/panel/trunk/i_data.inc @@ -190,7 +190,7 @@ aMouseEmul db 'MouseEmul',0 ;------------------------------------------------------------------------------ plugins_directory db 0 -ini_file_name db 'panel.ini',0 +ini_file_name db 'settings/panel.ini',0 system_dir_Libini db '/sys/lib/libini.obj',0