Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 3847 → Rev 3848

/programs/cmm/eolite/Eolite.c
19,11 → 19,45
#include "imgs\toolbar.txt"
#include "imgs\left_p.txt"
 
#ifndef AUTOBUILD
#include "lang.h--"
#endif
 
#ifdef LANG_RUS
?define T_FILE "” ©«"
?define T_TYPE "’¨¯"
?define T_SIZE " §¬¥à"
?define T_NEW_FOLDER "®¢ ï ¯ ¯ª "
?define T_NEW_FILE "®¢ë© ä ©«"
?define T_DELETE_FILE "‚ë ¤¥©á⢨⥫쭮 å®â¨â¥ 㤠«¨âì"
?define T_YES "„ "
?define T_NO "¥â"
?define T_DEL_ERROR_1 "Žè¨¡ª .  ¯ª  ­¥ ¯ãáâ ï."
?define T_DEL_ERROR_2 "Žè¨¡ª . ” ©«®¢ ï á¨á⥬  ⮫쪮 ¤«ï ç⥭¨ï."
?define NOT_CREATE_FOLDER "¥ 㤠«®áì ᮧ¤ âì ¯ ¯ªã."
?define NOT_CREATE_FILE "¥ 㤠«®áì ᮧ¤ âì ä ©«."
?define ERROR_1 "Žè¨¡ª  ¯à¨ § £à㧪¥ ¡¨¡«¨®â¥ª¨ /rd/1/lib/box_lib.obj"
#else
?define T_FILE "File"
?define T_TYPE "Type"
?define T_SIZE "Size"
?define T_NEW_FOLDER "New folder"
?define T_NEW_FILE "New file"
?define T_DELETE_FILE "Do you really want to delete"
?define T_YES "Yes"
?define T_NO "No"
?define T_DEL_ERROR_1 "Error. Folder isn't empty."
?define T_DEL_ERROR_2 "Error. Filesystem read-only."
?define NOT_CREATE_FOLDER "Folder can not be created."
?define NOT_CREATE_FILE "File can not be created."
?define ERROR_1 "Error while loading library /rd/1/lib/box_lib.obj"
#endif
 
enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
#define TITLE "Eolite File Manager v1.91"
#define ABOUT_TITLE "Eolite v1.91"
#define TITLE "Eolite File Manager v1.92"
#define ABOUT_TITLE "Eolite v1.92"
dword col_work = 0xE4DFE1;
dword col_border = 0x9098B0; //A0A0B8; //0x819FC5;
dword col_padding = 0xC8C9C9;
75,7 → 109,7
 
files.line_h=18;
mem_Init();
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify("Error while loading library /rd/1/lib/box_lib.obj");
if (load_dll2(boxlib, #box_lib_init,0)!=0) notify(ERROR_1);
SystemDiscsGet();
GetIni(1);
if (param)
377,9 → 411,9
for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);
DrawLeftPanel();
//ListBox
DrawFlatButton(files.x,40,onLeft(files.x,168),16,31,col_work,"File");
DrawFlatButton(onLeft(168,0),40,73,16,32,col_work,"Type");
DrawFlatButton(onLeft(95,0),40,68,16,33,col_work,"Size");
DrawFlatButton(files.x,40,onLeft(files.x,168),16,31,col_work,T_FILE);
DrawFlatButton(onLeft(168,0),40,73,16,32,col_work,T_TYPE);
DrawFlatButton(onLeft(95,0),40,68,16,33,col_work,T_SIZE);
DrawBar(onLeft(27,0),57,1,onTop(22,57),col_border); //line to the left from the scroll
DrawFlatButton(onLeft(27,0),40,16,16,0,col_work,"\x18");
DrawFlatButton(onLeft(27,0),onTop(22,0),16,16,0,col_work,"\x19");
592,8 → 626,12
int dform_x = files.w - 200 / 2 + files.x;
//oeia ieii
if (!files.count) return;
#ifdef LANG_RUS
DrawFlatButton(dform_x,160,215,80,0,col_work, ""); //oi?ia
#else
DrawFlatButton(dform_x,160,200,80,0,col_work, ""); //oi?ia
WriteText(dform_x+19,175,0x80,0,"Do you really want to delete");
#endif
WriteText(dform_x+19,175,0x80,0,T_DELETE_FILE);
IF (strlen(#file_name)<28)
{
WriteText(strlen(#file_name)*6+dform_x+20,190,0x80,0,"?");
605,8 → 643,8
ESI = 24;
WriteText(dform_x+20,190,0,0,#file_name); //ieoai eiy
}
DrawFlatButton(dform_x+20,208,70,20,301,0xFFB6B5,"Yes");
DrawFlatButton(dform_x+111,208,70,20,302,0xC6DFC6,"No");
DrawFlatButton(dform_x+20,208,70,20,301,0xFFB6B5,T_YES);
DrawFlatButton(dform_x+111,208,70,20,302,0xC6DFC6,T_NO);
del_active=1;
}
 
620,8 → 658,8
IF (del_rezult)
{
Write_Error(del_rezult);
IF ( itdir) ShowMessage("Error. Folder isn't empty.");
IF (!itdir) ShowMessage("Error. Filesystem read-only.");
IF ( itdir) ShowMessage(T_DEL_ERROR_1);
IF (!itdir) ShowMessage(T_DEL_ERROR_2);
}
}
del_active=0;
648,7 → 686,7
if (del_rezult!=0)
{
Write_Error(del_rezult);
ShowMessage("Error. Folder isn't empty.");
ShowMessage(T_DEL_ERROR_1);
return;
}
ELSE CreateDir(#temp);
750,30 → 788,30
break;
case 6:
strcpy(#temp, #path);
strcat(#temp, "New folder");
strcat(#temp, T_NEW_FOLDER);
CreateDir(#temp);
if (!EAX){
SelectFile("New folder");
SelectFile(T_NEW_FOLDER);
FnProcess(2);
}
else
{
Write_Error(EAX);
ShowMessage("Folder can not be created.");
ShowMessage(NOT_CREATE_FOLDER);
}
break;
case 7:
strcpy(#temp, #path);
strcat(#temp, "New file");
strcat(#temp, T_NEW_FILE);
WriteFile(0, 0, #temp);
if (!EAX){
SelectFile("New file");
SelectFile(T_NEW_FILE);
FnProcess(2);
}
else
{
Write_Error(EAX);
ShowMessage("File can not be created.");
ShowMessage(NOT_CREATE_FILE);
}
break;
case 10: //F10
/programs/cmm/eolite/include/about_dialog.h
4,7 → 4,19
#define BROWSER_PATH "/sys/htmlv"
#define BROWSER_LINK "http://kolibri-n.org/index.php"
 
#ifdef LANG_RUS
?define INTRO_TEXT_1 "Ž Eolite"
?define INTRO_TEXT_2 " §à ¡®â稪¨:"
?define INTRO_TEXT_3 "®á¥â¨â¥"
?define INTRO_TEXT_4 "‡ ªàëâì"
 
#else
?define INTRO_TEXT_1 "About Eolite"
?define INTRO_TEXT_2 "Developers:"
?define INTRO_TEXT_3 "Visit"
?define INTRO_TEXT_4 "Close"
#endif
 
void about_dialog()
{
byte id;
21,17 → 33,25
break;
case evReDraw:
DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"About Eolite");
DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,INTRO_TEXT_1);
DrawBar(0,0,172,50,0x8494C4);
PutPaletteImage(#logo,85,85,43,7,8,#logo_pal);
WriteTextB(46,100,0x90,0xBF40BF,ABOUT_TITLE);
WriteText(55,120,0x80,0,"Developers:");
#ifdef LANG_RUS
WriteText(50,120,0x80,0,INTRO_TEXT_2);
#else
WriteText(55,120,0x80,0,INTRO_TEXT_2);
#endif
WriteText(39,130,0x80,0,"Leency & Veliant");
WriteText(45,140,0x80,0,"KolibriOS Team");
WriteText(61,150,0x80,0,"2008-2013");
WriteText(29,170,0x80,0,"Visit");
DrawLink(66,170,0x80,23, "kolibri-n.org");
DrawFlatButton(85,190,70,22,10,0xE4DFE1, "Close");
#ifdef LANG_RUS
WriteText(19,170,0x80,0,INTRO_TEXT_3);
#else
WriteText(29,170,0x80,0,INTRO_TEXT_3);
#endif
DrawLink(71,170,0x80,23, "kolibri-n.org");
DrawFlatButton(85,190,70,22,10,0xE4DFE1, INTRO_TEXT_4);
DrawFilledBar(0, 216, 172, 12);
}
}
/programs/cmm/eolite/include/file_menu.h
1,6 → 1,22
//Leency 2008-2013
 
#ifdef LANG_RUS
char *captions[] = {
"Žâªàëâì", "Enter",
"Žâªàëâì á ¯®¬®éìî...", "CrlEnt",
"Žâªàëâì ª ª ⥪áâ", "F3",
"Žâªàëâì ¢ HEX", "F4",
//
"Š®¯¨à®¢ âì", "Crl+C",
"‚ë१ âì", "Crl+X",
"‚áâ ¢¨âì", "Crl+V",
"¥à¥¨¬¥­®¢ âì", "F2",
"“¤ «¨âì", "Del",
"Ž¡­®¢¨âì", "F5",
0, 0};
 
#else
char *captions[] = {
"Open", "Enter",
"Open with...", "CrlEnt",
"View as text", "F3",
11,8 → 27,9
"Paste", "Crl+V",
"Rename", "F2",
"Delete", "Del",
//"Refresh", "F5",
"Refresh", "F5",
0, 0};
#endif
 
proc_info MenuForm;
 
/programs/cmm/eolite/include/left_panel.h
1,5 → 1,28
//Leency 2008-2013
 
#ifdef LANG_RUS
char *actions[] = {
57, "®¢ë© ä ©«", "F7",
56, "®¢ ï ¯ ¯ª ", "F6",
60, " áâனª¨", "F10",
0,0,0
};
?define T_DEVICES "“áâனá⢠"
?define T_ACTIONS "„¥©á⢨ï"
 
#else
char *actions[] = {
57, "New file", "F7",
56, "New folder", "F6",
60, "Options", "F10",
0,0,0
};
 
?define T_DEVICES "Devices"
?define T_ACTIONS "Actions"
#endif
 
 
void Tip(int y, dword caption, id, arrow)
{
int i;
51,7 → 74,7
char dev_name[10], disc_name[100];
int i, dev_icon;
Tip(56, "Devices", 55, "=");
Tip(56, T_DEVICES, 55, "=");
for (i=0; i<20; i++) DeleteButton(100+i);
for (i=0;i<disc_num;i++)
{
104,17 → 127,10
}
}
 
 
char *actions[] = {
57, "New file", "F7",
56, "New folder", "F6",
60, "Options", "F10",
0,0,0
};
void ActionsDraw()
{
int actions_y=disc_num*16+108, lineh=16;
Tip(actions_y-18, "Actions", 77, ""); //çàãîëîâîê
Tip(actions_y-18, T_ACTIONS, 77, ""); //çàãîëîâîê
for (i=0; actions[i*3]!=0; i++, actions_y+=lineh)
{
DrawBar(17,actions_y,160,lineh,0xFFFFFF); //áåëîå
/programs/cmm/eolite/include/some_code.h
7,7 → 7,7
 
void ShowMessage(dword message)
{
DrawFlatButton(Form.width/2-13,160,200,80,0,0xFFB6B5, message);
DrawFlatButton(Form.width/2-13,160,220,80,0,0xFFB6B5, message);
pause(150);
List_ReDraw();
}
/programs/cmm/eolite/txt/History.txt
1,4 → 1,19
04.05.13 -- v1.88
04.08.13 -- 1.92
- ïîÿâèëàñü ðóññèôèöèðîâàííâ=àÿ âåðñèÿ
- ðàñêîìåíòèðîâàí ïóíêò "Îáíîâèòü" â êîíòåêñòíîì ìåíþ
02.08.13 -- 1.91
- èñïðàâëåí áàã ñ êíîïêàìè êîïèðîâàòü è âûðåçàòü
 
22.06.16 -- v1.90
- èñïðàâëåí áàã ñ ïàäåíèåì Ýîëàéòà ïîñëå îòêðûòèÿ ìåíþ (ñïàñèáî dunkaist çà òî, ÷òî íàø¸ë ïðîáëåìíîå ìåñòî â êîäå)
- òåïåðü ñïèñîê ôàéëîâ ñíîâà íîðìàëüíî îáíîâëÿåòñÿ ïîñëå âñòàâêè îäíîãî ôàéëà
- ìû óæå òàê ïðèâûêëè ê Êîëèáðè, ÷òî íåêîòîðûå î÷åâèäíûå äëÿ íàñ âåùè íå î÷åâèäíû äëÿ ëþäåé,
êîòîðûå âèäÿò Êîëèáðè âïåðâûå, ïîòîìó â ìåíþ äîáàâëåíû ïóíêòû copy, cut, paste
- äîáàâëåíà òåíü ê íàäïèñÿì â ìåíþ - èäåþ ïîçàèìñòâîâàë ó Akylist'a, òàê êóäà êðàñèâåå)
 
05.04.13 -- v1.89
 
04.04.13 -- v1.88
- êîïèðîâàíèå ÷åðåç ïîòîê;
- êîïèðîâàíèå ïàïîê;
- íåáîëüøèå èçìåíåíèÿ â GUI.