Appearance 2.3: always use a real path

git-svn-id: svn://kolibrios.org@7594 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2019-03-10 19:46:52 +00:00
parent dfa7b43372
commit f98a16dcad
2 changed files with 17 additions and 18 deletions

View File

@ -1,5 +1,5 @@
//11.03.12 - start! //11.03.12 - start!
//ver 2.21 //ver 2.3
#ifndef AUTOBUILD #ifndef AUTOBUILD
?include "lang.h--" ?include "lang.h--"
@ -14,12 +14,11 @@
#include "..\lib\obj\box_lib.h" #include "..\lib\obj\box_lib.h"
#include "..\lib\obj\proc_lib.h" #include "..\lib\obj\proc_lib.h"
#include "..\lib\obj\libini.h"
#include "..\lib\patterns\select_list.h" #include "..\lib\patterns\select_list.h"
#include "..\lib\patterns\simple_open_dialog.h" #include "..\lib\patterns\simple_open_dialog.h"
#include "ini.h"
//===================================================// //===================================================//
// // // //
// DATA // // DATA //
@ -42,8 +41,8 @@
#define PANEL_H 40 #define PANEL_H 40
#define LP 10 //LIST_PADDING #define LP 10 //LIST_PADDING
char skins_folder_path[4096] = "/kolibrios/res/skins"; char skins_folder_path[4096];
char wallp_folder_path[4096] = "/kolibrios/res/wallpapers"; char wallp_folder_path[4096];
signed int active_skin=-1, active_wallpaper=-1; signed int active_skin=-1, active_wallpaper=-1;
enum { enum {
@ -82,10 +81,21 @@ od_filter filter2 = { 8, "TXT\0\0" };
// // // //
//===================================================// //===================================================//
void GetRealFolderPathes()
{
char real_skin_path[4096];
SetCurDir("/kolibrios");
GetCurDir(#real_skin_path, sizeof(real_skin_path));
sprintf(#skins_folder_path, "%s/res/skins", #real_skin_path);
sprintf(#wallp_folder_path, "%s/res/wallpapers", #real_skin_path);
}
void main() void main()
{ {
int id, mouse_clicked; int id, mouse_clicked;
GetRealFolderPathes();
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
load_dll(libini, #lib_init,1); load_dll(libini, #lib_init,1);
load_dll(Proc_lib, #OpenDialog_init,0); load_dll(Proc_lib, #OpenDialog_init,0);
@ -377,10 +387,11 @@ void EventOpenFile()
if (tabs.active_tab==WALLPAPERS) RunProgram("/sys/media/kiv", #cur_file_path); if (tabs.active_tab==WALLPAPERS) RunProgram("/sys/media/kiv", #cur_file_path);
} }
_ini ini = { "/sys/settings/eskin.ini", "main" };
void EventExit() void EventExit()
{ {
ini.SetString("skin", #cur_skin_path, strlen(#cur_skin_path));
ExitProcess(); ExitProcess();
SaveSkinSettings(#cur_skin_path);
} }
stop: stop:

View File

@ -1,12 +0,0 @@
#include "../lib/obj/libini.h"
_ini ini = { "/sys/settings/eskin.ini", "main" };
void SaveSkinSettings(dword skin_path)
{
char real_skin_path[4096];
SetCurDir("/kolibrios");
GetCurDir(#real_skin_path, sizeof(real_skin_path));
strcat(#real_skin_path, skin_path+10);
ini.SetString("skin", #real_skin_path, strlen(#real_skin_path));
}