Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 8950 → Rev 8951

/programs/cmm/eolite/Eolite.c
3,9 → 3,9
 
// 70.5 - get volume info and label
 
#define ABOUT_TITLE "EOLITE 5 Beta9"
#define TITLE_EOLITE "Eolite File Manager 5 Beta9"
#define TITLE_KFM "Kolibri File Manager 2 Beta9";
#define ABOUT_TITLE "EOLITE 5 Beta10"
#define TITLE_EOLITE "Eolite File Manager 5 Beta10"
#define TITLE_KFM "Kolibri File Manager 2 Beta10";
 
#define MEMSIZE 1024 * 250
#include "../lib/clipboard.h"
110,9 → 110,8
248,#new_element_name,0,ed_focus+ed_always_focus,6,0};
PathShow_data FileShow = {0, 56,215, 8, 100, 1, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
 
 
#include "include\settings.h"
#include "include\gui.h"
#include "include\settings.h"
#include "include\progress_dialog.h"
#include "include\copy_and_delete.h"
#include "include\sorting.h"
121,7 → 120,6
#include "include\menu.h"
#include "include\about.h"
#include "include\properties.h"
#include "include\breadcrumbs.h"
 
void handle_param()
{
648,7 → 646,7
int h2 = Form.cheight-files_y-2 - status_bar_h;
if (!efm)
{
DrawDeviceAndActionsLeftPanel();
SystemDiscs.Draw();
files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 59 - status_bar_h, files.item_h);
DrawButtonsAroundList();
List_ReDraw();
655,36 → 653,29
}
else
{
llist_copy(#files_active, #files);
llist_copy(#files, #files_inactive);
if (!active_panel) {
files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
} else {
files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
}
 
files_inactive.x = files.x;
DrawButtonsAroundList();
path = location[active_panel^1];
Open_Dir(location[active_panel^1],WITH_REDRAW);
llist_copy(#files_inactive, #files);
 
if (active_panel==0)
{
if (!active_panel) {
files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
} else {
files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
DrawButtonsAroundList();
Open_Dir(path,WITH_REDRAW);
files_inactive.count = files.count;
llist_copy(#files, #files_active);
path = location[active_panel];
files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
DrawButtonsAroundList();
Open_Dir(path,WITH_REDRAW);
}
if (active_panel==1)
{
files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
 
DrawButtonsAroundList();
Open_Dir(path,WITH_REDRAW);
files_inactive.count = files.count;
llist_copy(#files, #files_active);
path = location[active_panel];
files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h);
DrawButtonsAroundList();
Open_Dir(path,WITH_REDRAW);
Open_Dir(location[active_panel],WITH_REDRAW);
}
}
}
 
void List_ReDraw()
{
1208,7 → 1199,7
} else {
if (GetRealFileCountInFolder("/")+dir_exists("/kolibrios") != SystemDiscs.dev_num) {
SystemDiscs.Get();
DrawDeviceAndActionsLeftPanel();
SystemDiscs.Draw();
}
}
if(GetRealFileCountInFolder(path) != files.count) Open_Dir(path,WITH_REDRAW);
1218,8 → 1209,7
{
Tip(56, T_DEVICES, 55, "-");
pause(10);
EventRefreshDisksAndFolders();
DrawDeviceAndActionsLeftPanel();
DrawFilePanels();
}
 
void EventSort(dword id)
/programs/cmm/eolite/include/breadcrumbs.h
File deleted
\ No newline at end of file
/programs/cmm/eolite/include/const.h
1,9 → 1,9
#ifdef LANG_RUS
//===================================================//
// //
// CYRILLIC //
// //
//===================================================//
#ifdef LANG_RUS
#define T_FILE "” ©«"
#define T_TYPE "’¨¯"
#define T_SIZE " §¬¥à"
62,12 → 62,12
#define T_USB "USB ¤¨áª "
#define T_RAM "RAM ¤¨áª "
#define T_UNC "¥¨§¢¥áâ­® "
#else
//===================================================//
// //
// ENGLISH //
// //
//===================================================//
#else
#define T_FILE "File"
#define T_TYPE "Type"
#define T_SIZE "Size"
135,19 → 135,6
// //
//===================================================//
 
char *devinfo = {
"r", 0, T_SYS,
"k", 1, T_PROG,
"f", 2, T_FD,
"c", 3, T_CD,
"h", 4, T_HD,
"b", 4, T_HD,
"s", 4, T_SATA,
"t", 5, T_RAM,
"u", 6, T_USB,
0
};
 
//Button IDs
enum {
PATH_BTN = 10,
177,4 → 164,21
enum {
WITH_REDRAW,
ONLY_OPEN
};
};
 
char *devinfo = {
"r", 0, T_SYS,
"k", 1, T_PROG,
"f", 2, T_FD,
"c", 3, T_CD,
"h", 4, T_HD,
"b", 4, T_HD,
"s", 4, T_SATA,
"t", 5, T_RAM,
"u", 6, T_USB,
0
};
 
#define DEV_H 17
#define DDW 120
#define KFM2_DEVH 20
/programs/cmm/eolite/include/gui.h
1,4 → 1,10
 
//===================================================//
// //
// SCROLL //
// //
//===================================================//
 
void DrawScroll(bool _scroll_used) {
dword i;
 
32,13 → 38,12
 
sc_center = sc_slider_h / 2 + sc_slider_y;
 
DrawBar(sc_x+3, sc_center, 10, 1, sc.work_graph);
DrawBar(sc_x+4, sc_center-3, 8, 1, sc.work_graph);
DrawBar(sc_x+4+1, sc_center-2, 8, 1, sc.work_light);
DrawBar(sc_x+4, sc_center+3, 8, 1, sc.work_graph);
 
DrawBar(sc_x+3, sc_center, 10, 1, sc.work_graph);
DrawBar(sc_x+3+1, sc_center+1, 10, 1, sc.work_light);
 
DrawBar(sc_x+4, sc_center+3, 8, 1, sc.work_graph);
DrawBar(sc_x+4+1, sc_center-2, 8, 1, sc.work_light);
DrawBar(sc_x+4+1, sc_center+4, 8, 1, sc.work_light);
 
//area before slider
57,6 → 62,12
}
}
 
//===================================================//
// //
// FLAT BUTTONS //
// //
//===================================================//
 
void DrawFlatButtonSmall(dword x,y,width,height,id,text)
{
DrawRectangle(x,y,width,height,sc.work_graph);
67,6 → 78,9
WriteText(-strlen(text)*6+width/2+x+1,height/2+y-3,0x80,sc.work_text,text);
}
 
void DrawFilledBar(dword x, y, w, h)
{ int i; for (i=0; i<h; i++) DrawBar(x, y+h-i-1, w, 1, col.work_gradient[i]); }
 
void DrawFuncButton(dword x,y,width,id,number,text)
{
#define FW 12
92,9 → 106,195
$int 64
}
 
void DrawFilledBar(dword x, y, w, h)
{ int i; for (i=0; i<h; i++) DrawBar(x, y+h-i-1, w, 1, col.work_gradient[i]); }
//===================================================//
// //
// LEFT PANEL //
// //
//===================================================//
 
void Tip(int y, dword caption, id, arrow)
{
DrawBar(17,y,160,1,col.list_bg);
DrawBar(17,y+1,1,16,sc.work_light);
DrawFilledBar(18, y+1, 160-1, 16);
DrawBar(17,y+17,160,1,sc.work_graph);
WriteText(25,y+5,0x80,col.list_gb_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,col.list_gb_text,arrow); //arrow
}
 
 
void ActionsDraw(int actions_y)
{
int i;
Tip(actions_y-18, T_ACTIONS, 77, "");
for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H)
{
DrawBar(17,actions_y,160,DEV_H,0xFFFFFF); //áåëîå
DefineButton(17,actions_y,159,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1);
WriteText(45,actions_y+4,0x80,0,actions[i*3+1]);
WriteText(-strlen(actions[i*3+2])*6+170,actions_y+4,0x80,0x999999,actions[i*3+2]);
_PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
}
}
 
void DrawLeftPanelBg(int actions_y)
{
int start_y = actions_y+159;
int area_h;
DrawBar(2,41,190,15,waves_pal[0]); //above devices block
DrawBar(17,actions_y+75,160,15,EDX); //below devices block
DrawBar(2,56,15,actions_y+103,EDX); //on the left
DrawBar(177,56,15,actions_y+103,EDX); //on the right
area_h = Form.cheight-start_y-2 - status_bar_h;
if (area_h < 268){
PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #waves_pal);
} else {
DrawBar(2,start_y,190, area_h-268, waves_pal[0]);
PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #waves_pal);
}
PutShadow(17,actions_y+75,160,1,1,3);
PutShadow(18,actions_y+75+1,158,1,1,1);
PutShadow(17,start_y,160,1,1,3);
PutShadow(18,start_y+1,158,1,1,1);
}
 
//===================================================//
// //
// PATHBAR //
// //
//===================================================//
 
char work_area_pointer[1024];
PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x000000, 0xFFFFCC, NULL, #work_area_pointer, 0};
void DrawPathBar()
{
if (efm) {
DrawPathBarKfm();
return;
}
 
if (show_breadcrumb.checked) {
DrawBreadCrumbs();
return;
}
 
PathShow.text_pointer = location[0];
PathShow.start_x = 250;
PathShow.start_y = 17;
PathShow.area_size_x = Form.cwidth-300;
DrawBar(PathShow.start_x-3, PathShow.start_y-6, PathShow.area_size_x+3, 19, col.odd_line);
DrawRectangle(PathShow.start_x-4,PathShow.start_y-7,PathShow.area_size_x+4,20,sc.work_graph);
DefineHiddenButton(PathShow.start_x-4+1,PathShow.start_y-7+1,PathShow.area_size_x+4-2,20-2,PATH_BTN);
DrawBar(PathShow.start_x-4, PathShow.start_y+14, PathShow.area_size_x+5+18, 1, sc.work_light);
 
DrawFlatButtonSmall(PathShow.start_x+PathShow.area_size_x,PathShow.start_y-7,18,20, 61, "\26");
 
PathShow.font_color = col.list_gb_text;
PathShow_prepare stdcall(#PathShow);
PathShow_draw stdcall(#PathShow);
}
 
void DrawPathBarKfm()
{
dword bgc;
int i=0;
if (!Form.cwidth) return;
 
if (skin_is_dark()) {
bgc = col.odd_line;
PathShow.font_color = col.list_gb_text;
} else {
bgc = 0xFFFFCC;
PathShow.font_color = 0x222222;
}
PathShow.start_y = Form.cheight - status_bar_h+2;
 
PathShow.start_x = 4;
PathShow.area_size_x = Form.cwidth/2-8;
do {
DrawBar(PathShow.start_x-2,PathShow.start_y-3,PathShow.area_size_x+5,14,bgc);
DrawRectangle(PathShow.start_x-3,PathShow.start_y-4,PathShow.area_size_x+6,15,sc.work_graph);
PathShow.text_pointer = location[i];
PathShow_prepare stdcall(#PathShow);
PathShow_draw stdcall(#PathShow);
PathShow.start_x = Form.cwidth/2 + 2;
PathShow.area_size_x = Form.cwidth - PathShow.start_x - 5;
i++;
} while (i<2);
 
DrawBar(0,PathShow.start_y-2,1,15,sc.work);
DrawBar(Form.cwidth-1,PathShow.start_y-2,1,15,sc.work);
DrawBar(1,PathShow.start_y+12,Form.cwidth-2,1,sc.work_light);
}
 
//===================================================//
// //
// BREADCRUMBS //
// //
//===================================================//
 
void DrawBreadCrumbs()
collection_int breadCrumb=0;
char PathShow_path[4096];
block btn;
int i;
unsigned text_line;
{
strcat(#PathShow_path, path);
for (i=0; i<50; i++) DeleteButton(i+BREADCRUMB_ID);
breadCrumb.drop();
for (i=0; (PathShow_path[i]) && (i<sizeof(PathShow_path)-1); i++)
{
if (PathShow_path[i]=='/') {
PathShow_path[i] = NULL;
breadCrumb.add(i+1);
}
}
breadCrumb.add(i+1);
btn.set_size(246,10,NULL,20);
//area_w = Form.cwidth - btn.x - 20;
for (i=0; i<breadCrumb.count-1; i++)
{
text_line = breadCrumb.get(i) + #PathShow_path;
btn.w = strlen(text_line)*8+10;
DrawBreadcrumbButton(btn.x, btn.y, btn.w, btn.h, i+BREADCRUMB_ID, text_line);
btn.x += btn.w;
}
//DrawFavButton(btn.x);
//btn.x+=20;
btn.x++;
DrawBar(btn.x,btn.y-1,Form.cwidth-btn.x-25,btn.h+3,sc.work);
}
 
void ClickOnBreadCrumb(unsigned clickid)
{
int i, slashpos = path;
for (i=0; i!=clickid+2; i++) {
slashpos=strchr(slashpos,'/')+1;
}
ESBYTE[slashpos-1] = NULL;
Open_Dir(path,WITH_REDRAW);
}
 
void DrawBreadcrumbButton(dword x,y,w,h,id,text)
{
int i;
DrawRectangle(x,y,w,h,sc.work_graph);
for (i=0; (i<h-1) & (i<20); i++) DrawBar(x+1, y+i+1, w-1, 1, col.work_gradient[20-i]);
DrawRectangle3D(x+1,y+1,w-2,h-2,sc.work_light, sc.work_dark);
DefineHiddenButton(x+1,y+1,w-2,h-2,id);
WriteText(-strlen(text)*8+w/2+x,h/2+y-7,0x90,sc.work_text,text);
DrawBar(x, y+h+1, w+1, 1, sc.work_light);
}
 
//===================================================//
// //
// MISC //
// //
//===================================================//
 
void DrawEolitePopup(dword b1_text, b2_text)
{
#define POPIN_W 260
/programs/cmm/eolite/include/left_panel.h
57,10 → 57,6
strcpy(disc_name, T_UNC);
}
 
#define DEV_H 17
#define DDW 120
#define KFM2_DEVH 20
 
void _SystemDiscs::Draw()
{
char dev_name[15], disc_name[100], i, dev_icon;
67,13 → 63,14
bool is_active=0;
int draw_y, draw_x;
for (i=0; i<30; i++) DeleteButton(100+i);
 
if (efm) {
DrawSelect(Form.cwidth/2-DDW, KFM_DEV_DROPDOWN_1, location[0]);
DrawSelect(Form.cwidth-DDW-2, KFM_DEV_DROPDOWN_2, location[sizeof(dword)]);
files.y = 40 + 17;
} else {
Tip(56, T_DEVICES, 55, "=");
for (i=0; i<30; i++) DeleteButton(100+i);
 
draw_y = 74;
draw_x = 17;
for (i=0;i<list.count;i++) {
100,6 → 97,8
draw_y += DEV_H;
}
DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
ActionsDraw(SystemDiscs.list.count*DEV_H+108);
DrawLeftPanelBg(SystemDiscs.list.count*DEV_H);
}
}
 
158,75 → 157,3
Open_Dir(path,WITH_REDRAW);
}
 
 
 
void DrawDeviceAndActionsLeftPanel()
{
Tip(56, T_DEVICES, 55, "=");
SystemDiscs.Draw();
ActionsDraw();
DrawLeftPanelBg();
}
 
dword col_palette_inner[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
0xDFDCDD,0xE1DDDE,0xE2DEE0,0xE4DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1};
void DrawFilledBarInner(dword x, y, w, h)
{
int i, fill_h;
if (h <= 14) fill_h = h; else fill_h = 14;
for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette_inner[14-i]);
DrawBar(x, y+i, w, h-fill_h, col_palette_inner[14-i]);
}
 
void Tip(int y, dword caption, id, arrow)
{
if (col.def) {
DrawBar(17,y,160,1,0xEFEDEE);
DrawFilledBarInner(17, y+1, 160, 16);
DrawBar(17,y+17,160,1,0x7E87A3);
} else {
DrawBar(17,y,160,1,sc.work_graph);
DrawBar(17,y+1,160,16,col.list_bg);
DrawBar(17,y+17,160,1,sc.work_graph);
}
WriteText(25,y+5,0x80,col.list_gb_text,caption);
if (id) DefineButton(159,y+1,16,16,id+BT_HIDE+BT_NOFRAME,0); //arrow button
WriteText(165,y+5,0x80,col.list_gb_text,arrow); //arrow
}
 
void ActionsDraw()
{
int i;
int actions_y= SystemDiscs.list.count*DEV_H+108;
Tip(actions_y-18, T_ACTIONS, 77, "");
for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H)
{
DrawBar(17,actions_y,160,DEV_H,0xFFFFFF); //áåëîå
DefineButton(17,actions_y,159,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1);
WriteText(45,actions_y+4,0x80,0,actions[i*3+1]);
WriteText(-strlen(actions[i*3+2])*6+170,actions_y+4,0x80,0x999999,actions[i*3+2]);
_PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
}
}
 
void DrawLeftPanelBg()
{
int actions_y = SystemDiscs.list.count*DEV_H;
int start_y = actions_y+159;
int area_h;
DrawBar(2,41,190,15,waves_pal[0]); //above devices block
DrawBar(17,actions_y+75,160,15,EDX); //below devices block
DrawBar(2,56,15,actions_y+103,EDX); //on the left
DrawBar(177,56,15,actions_y+103,EDX); //on the right
area_h = Form.cheight-start_y-2 - status_bar_h;
if (area_h < 268){
PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #waves_pal);
} else {
DrawBar(2,start_y,190, area_h-268, waves_pal[0]);
PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #waves_pal);
}
PutShadow(17,actions_y+75,160,1,1,3);
PutShadow(18,actions_y+75+1,158,1,1,1);
PutShadow(17,start_y,160,1,1,3);
PutShadow(18,start_y+1,158,1,1,1);
}