From 41c5451c55eb8f459ba8c3e1eb2769bb380ac426 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Thu, 2 Dec 2021 19:28:12 +0000 Subject: [PATCH] Eolite 5.14: better drives list git-svn-id: svn://kolibrios.org@9356 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/eolite/Eolite.c | 15 +++++++++------ programs/cmm/eolite/include/left_panel.h | 6 +++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/programs/cmm/eolite/Eolite.c b/programs/cmm/eolite/Eolite.c index d1b964a73c..158bcdb76e 100644 --- a/programs/cmm/eolite/Eolite.c +++ b/programs/cmm/eolite/Eolite.c @@ -9,9 +9,9 @@ TODO: http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334 */ -#define ABOUT_TITLE "EOLITE 5.12" -#define TITLE_EOLITE "Eolite File Manager 5.12" -#define TITLE_KFM "Kolibri File Manager 2.12"; +#define ABOUT_TITLE "EOLITE 5.14" +#define TITLE_EOLITE "Eolite File Manager 5.14" +#define TITLE_KFM "Kolibri File Manager 2.14"; #define MEMSIZE 1024 * 250 #include "../lib/clipboard.h" @@ -429,9 +429,12 @@ void main() case SCAN_CODE_KEY_V: EventPaste(path); break; - case SCAN_CODE_KEY_D: //set image as bg - strlcpy(#temp, "\\S__",4); - strcat(#temp, #file_path); + case SCAN_CODE_KEY_S: //set image as bg tile + sprintf(#temp, "\\S__%s",#file_path); + RunProgram("/sys/media/kiv", #temp); + break; + case SCAN_CODE_KEY_T: //set image as bg stretch + sprintf(#temp, "\\T__%s",#file_path); RunProgram("/sys/media/kiv", #temp); break; case SCAN_CODE_KEY_N: diff --git a/programs/cmm/eolite/include/left_panel.h b/programs/cmm/eolite/include/left_panel.h index ce27defa05..ab5fe733b1 100644 --- a/programs/cmm/eolite/include/left_panel.h +++ b/programs/cmm/eolite/include/left_panel.h @@ -56,10 +56,10 @@ void GetDiskIconAndName(dword dev_name, icon, disc_name) for (i=0; devinfo[i]!=0; i+=3) { if (!strncmp(dev_name+1, devinfo[i], 2)) { ESBYTE[icon] = devinfo[i+1]; - if (volume_label = GetVolumeLabel(dev_name)) + if (ESBYTE[icon]==4) { //show label only for hard disk drives - if (ESBYTE[icon]==4) { + if (volume_label = GetVolumeLabel(dev_name)) { strncpy(disc_name, volume_label, 15); chrcat(disc_name, ' '); return; @@ -102,7 +102,7 @@ void _SystemDiscs::Draw() if (dev_name[1]=='t') { chrcat(#disc_name, dev_name[4]); } else if (dev_name[1]=='f') { - // + if (dev_name[3]!='/') chrcat(#disc_name, dev_name[3]); } else { strcat(#disc_name, #dev_name); }