From 74c3100ca78e86827b1e9efbcf782b22e121e82a Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 30 Sep 2013 20:44:45 +0000 Subject: [PATCH] Eolite 1.96: Additional /kolibrios/ system directory support git-svn-id: svn://kolibrios.org@3956 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 4 ++-- programs/cmm/eolite/include/left_panel.h | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index 60e844a621..0db47662d3 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -73,8 +73,8 @@ enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir -#define TITLE "Eolite File Manager v1.95" -#define ABOUT_TITLE "Eolite v1.95" +#define TITLE "Eolite File Manager v1.96" +#define ABOUT_TITLE "Eolite v1.96" dword col_work = 0xE4DFE1; dword col_border = 0x9098B0; //A0A0B8; //0x819FC5; dword col_padding = 0xC8C9C9; diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index 5a991a3593..39c6222901 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -50,11 +50,12 @@ path_string disk_list[30]; int disc_num; dword devbuf; + void SystemDiscsGet() { unsigned char dev_name[10], sys_discs[10]; unsigned int i1, j1, dev_num, dev_disc_num; - + unsigned int nullbuf; disc_num=0; if (devbuf) free(devbuf); devbuf = malloc(10000); //буфер где-то на 10 девайсов в левой панели @@ -76,13 +77,18 @@ void SystemDiscsGet() strcpy(#disk_list[disc_num].Item, #sys_discs); disc_num++; } + if (strcmp(#disk_list[disc_num-1].Item, "/rd/1/")==0) if (GetDir(nullbuf, nullbuf, "/kolibrios/", DIRS_ALL)==0) + { + strcpy(#disk_list[disc_num].Item, "/kolibrios/"); + disc_num++; + } } } void SystemDiscsDraw() { - char dev_name[10], disc_name[100]; + char dev_name[15], disc_name[100]; int i, dev_icon; Tip(56, T_DEVICES, 55, "="); @@ -95,9 +101,13 @@ void SystemDiscsDraw() dev_name[strlen(#dev_name)-1]=NULL; switch(dev_name[1]) { + case 'k': + dev_icon=0; + strcpy(#disc_name, "Programs "); + break; case 'r': dev_icon=0; - strcpy(#disc_name, "SYS disk "); + strcpy(#disc_name, "System "); break; case 'c': dev_icon=1;