KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Eolite 1.64: fixed cut/paste and rename bag (founded by 0CodErr)

Browse Source 
git-svn-id: svn://kolibrios.org@3404 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kiril Lipatov
2013-03-23 00:00:11 +00:00
parent c3a49bafc1
commit 16919a6ad9
3 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
programs/cmm/eolite/Eolite.c
View File

@@ -25,7 +25,7 @@ int BUTTON_HEIGHT=18;
#define ONLY_OPEN 2
//<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
#define title "Eolite File Manager v1.63"
#define title "Eolite File Manager v1.64"
dword col_work = 0xE4DFE1;
dword col_border = 0x819FC5;
dword col_padding = 0xC8C9C9;
@@ -50,7 +50,7 @@ unsigned char
path[4096],
edit_path[4096],
file_path[4096],
file_name[4096],
file_name[256],
copy_file[4096],
temp[4096];
int scroll_size;
@@ -695,13 +695,13 @@ void Del_Form()
void Del_File(byte dodel)
{
int del_file_rez;
int del_rezult;
IF (dodel==true)
{
del_file_rez = DeleteFile(#file_path);
IF (del_file_rez<>0)
del_rezult = DeleteFile(#file_path);
IF (del_rezult<>0)
{
Write_Error(del_file_rez);
Write_Error(del_rezult);
IF ( isdir) ShowMessage("Error. Folder isn't empty.");
IF (!isdir) ShowMessage("Error. Filesystem read-only.");
}
@@ -726,11 +726,10 @@ void Paste()
strcat(#new_copy_path, #copy_file+strrchr(#copy_file,'/'));
}
copy_rezult = CopyFile(#copy_file,#new_copy_path);
IF (copy_rezult<>0) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
IF (copy_rezult!=0) //<2F><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{
Write_Error(copy_rezult);
DrawFlatButton(Form.width/2-13,160,200,80,0,0xFFB6B5, "Error. You can't paste here.");
pause(150);
return;
}
IF (cut_active) //<2F><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
{
@@ -745,7 +744,7 @@ void Paste()
void ReName(byte rename)
{
int del_file_rez;
int del_rezult, copy_rezult;
char edit_name[256];
rename_active=0;
edit2.flags=64;
@@ -758,10 +757,10 @@ void ReName(byte rename)
if (strcmp(#file_path,#temp)<>0) && (file_name)
IF (isdir)
{
del_file_rez = DeleteFile(#file_path);
IF (del_file_rez<>0)
del_rezult = DeleteFile(#file_path);
IF (del_rezult!=0)
{
Write_Error(del_file_rez);
Write_Error(del_rezult);
ShowMessage("Error. Folder isn't empty.");
return;
}
@@ -770,8 +769,8 @@ void ReName(byte rename)
}
ELSE
{
CopyFile(#file_path,#temp);
Del_File(true);
copy_rezult = CopyFile(#file_path,#temp);
if (copy_rezult!=0) Write_Error(copy_rezult); else Del_File(true);
}
SelectFile(#edit_name);
}

2
programs/cmm/eolite/include/about_dialog.h
View File

@@ -25,7 +25,7 @@ void about_dialog()
DefineAndDrawWindow(600,150,181,232+GetSkinHeight(),0x34,col_work,"About Eolite");
DrawBar(0,0,172,50,0x8494C4);
PutPaletteImage(#logo,85,85,43,7,8,#logo_pal);
WriteTextB(46,100,0x90,0xBF40BF,"Eolite v1.63");
WriteTextB(46,100,0x90,0xBF40BF,"Eolite v1.64");
WriteText(55,120,0x80,0,"Developers:");
WriteText(39,130,0x80,0,"Leency & Veliant");
WriteText(45,140,0x80,0,"KolibriOS Team");

9
programs/cmm/eolite/txt/History.txt
View File

@@ -1,9 +1,12 @@
03.03.13 -- v1.62
03.03.13 -- v1.64
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> s1n). <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
<20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>;
- <20><><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> PathShow;
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> USB flash <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>;
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> USB flash <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> SATA <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Serge'a;
- <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0CodErr <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>);
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>;
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>.
28.02.13 -- v1.56
- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>;