Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 9575 → Rev 9576

/programs/cmm/eolite/Eolite.c
11,9 → 11,9
http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
*/
 
#define ABOUT_TITLE "EOLITE 5.19"
#define TITLE_EOLITE "Eolite File Manager 5.19"
#define TITLE_KFM "Kolibri File Manager 2.19";
#define ABOUT_TITLE "EOLITE 5.2"
#define TITLE_EOLITE "Eolite File Manager 5.2"
#define TITLE_KFM "Kolibri File Manager 2.2";
 
#define MEMSIZE 1024 * 250
#include "../lib/clipboard.h"
/programs/cmm/eolite/include/icons.h
1,26 → 1,47
_ini icons_ini = { "/sys/File managers/icons.ini", NULL };
 
struct ICONS_INI {
collection exts;
collection_int i18;
collection_int i32;
int get();
} ini_icons;
 
int ICONS_INI::get(dword _file_path, _ext, int size)
{
char file_4bytes[4], ext[7];
int ext_pos;
if (!_ext) {
ReadFile(0,4,#file_4bytes,_file_path);
IF(DSDWORD[#file_4bytes]=='KCPK')
||(DSDWORD[#file_4bytes]=='UNEM') {
_ext = "kex";
}
}
strlcpy(#ext, _ext, sizeof(ext));
strlwr(#ext);
ext_pos = exts.get_pos_by_name(#ext);
if (ext_pos != -1) {
if (size == 18) return i18.get(ext_pos);
else if (size == 32) return i32.get(ext_pos);
} else {
exts.add(#ext);
icons_ini.section = "icons16";
i18.set(exts.count-1, icons_ini.GetInt(#ext, 2));
 
icons_ini.section = "icons32";
i32.set(exts.count-1, icons_ini.GetInt(#ext, 95));
return get(#ext, size);
}
}
 
void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
{
char BYTE_HEAD_FILE[4];
char ext[512];
char ext[7];
int icon_n = 2;
dword selected_image;
dword default_image;
dword default_icon;
 
if (big_icons.checked) {
icons_ini.section = "icons32";
selected_image = icons32_selected.image;
default_image = icons32_default.image;
default_icon=95;
} else {
icons_ini.section = "icons16";
selected_image = icons16_selected.image;
default_image = icons16_default.image;
default_icon=2;
}
 
if (ESBYTE[file_path+1]!='k') && (ESBYTE[file_path+1]!='s') && (chrnum(file_path, '/')==2) {
if (ESBYTE[file_path+1]=='/') ext[0] = ESBYTE[file_path+2];
else ext[0] = ESBYTE[file_path+1];
32,16 → 53,18
icons_ini.section = "drives16";
icon_n = icons_ini.GetInt(#ext, 50);
}
} else if (extension) {
strcpy(#ext, extension);
strlwr(#ext);
icon_n = icons_ini.GetInt(#ext, default_icon);
} else if (file_path) {
ReadFile(0,4,#BYTE_HEAD_FILE,file_path);
IF(DSDWORD[#BYTE_HEAD_FILE]=='KCPK')||(DSDWORD[#BYTE_HEAD_FILE]=='UNEM')
icon_n = icons_ini.GetInt("kex", 2);
} else {
icon_n = ini_icons.get(file_path, extension, icon_size);
}
 
if (big_icons.checked) {
selected_image = icons32_selected.image;
default_image = icons32_default.image;
} else {
selected_image = icons16_selected.image;
default_image = icons16_default.image;
}
 
if (fairing_color==col.selec) {
img_draw stdcall(selected_image, xx, yy, icon_size, icon_size, 0, icon_n*icon_size);
} else {
/programs/cmm/eolite/include/properties.h
263,7 → 263,7
if (!itdir) {
element_size = file_info_general.sizelo;
} else {
sprintf(#folder_info,PR_T_CONTAINS,dir_size.files,dir_size.folders);
sprintf(#folder_info,T_FILES_FOLDERS,more_files_count.files,more_files_count.folders);
WriteText(10, 117, 0x90, sc.work_text, PR_T_CONTAINS);
WriteText(120, 117, 0x90, sc.work_text, #folder_info);
element_size = dir_size.bytes;
288,9 → 288,8
 
void PropertiesDrawIcon(dword file_path, extension)
{
#define ICON_PADDING 11
DrawBar(20-ICON_PADDING, 30-ICON_PADDING-1, ICON_PADDING*2+16, ICON_PADDING*2+16, 0xFFFfff);
DrawIconByExtension(file_path, extension, -icon_size/2+28, -icon_size/2+38, 0xFFFfff);
int icon_n = ini_icons.get(file_path, extension, 32);
draw_icon_32(12, 22, sc.work, icon_n);
}
 
void EventApplyProperties()