Eolite 3.71: fix crash while using Insert key, two tiny fixes

git-svn-id: svn://kolibrios.org@6646 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/cmm/Calypte/include/properties.h

@@ -50,10 +50,6 @@ void properties_dialog()
 {
 	byte id;
 	byte key;
-	dword file_name_off;
-	dword element_size;
-	dword selected_offset2;
-	char element_size_label[32];
 	proc_info settings_form;
 	
 	IF (active_properties) ExitProcess();

programs/cmm/eolite/Eolite.c

@@ -458,10 +458,8 @@ void main()
 								Del_Form();
 								break;
 						case SCAN_CODE_INS:
-								selected_offset = file_mas[files.cur_y]*304 + buf+32 + 7;
+								if (getElementSelectedFlag(files.cur_y) == true) setElementSelectedFlag(files.cur_y, false);
-								if (ESBYTE[selected_offset]) setElementSelectedFlag(files.cur_y, false);
 								else setElementSelectedFlag(files.cur_y, true);
-								_INSERT_END:
 								files.KeyDown();
 								List_ReDraw();
 								DrawStatusBar();

programs/cmm/eolite/include/copy.h

@@ -7,17 +7,21 @@ enum {NOCUT, CUT};
 
 Clipboard clipboard;
 
-void setElementSelectedFlag(dword n, bool state) {
+void setElementSelectedFlag(dword n, int state) {
 	dword selected_offset = file_mas[n]*304 + buf+32 + 7;
-	if (!n) if (!strncmp(selected_offset+33, "..", 2)) return; //do not selec ".." directory
 	ESBYTE[selected_offset] = state;
+	if (n==0) && (strncmp(file_mas[n]*304+buf+72,"..",2)==0) ESBYTE[selected_offset] = false; //do not selec ".." directory
 	if (state==true) selected_count++;
 	if (state==false) selected_count--;
 }
 
+int getElementSelectedFlag(dword n) {
+	dword selected_offset = file_mas[n]*304 + buf+32 + 7;
+	return ESBYTE[selected_offset];
+}
+
 void Copy(dword pcth, char cut)
 {
-	dword selected_offset2;
 	byte copy_t[4096];
 	dword buff_data;
 	dword path_len = 0;
@@ -29,8 +33,7 @@ void Copy(dword pcth, char cut)
 	size_buf = 4;
 	for (i=0; i<files.count; i++) 
 	{
-		selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+		if (getElementSelectedFlag(i) == true) {
-		if (ESBYTE[selected_offset2]) {
 			sprintf(#copy_t,"%s/%s",#path,file_mas[i]*304+buf+72);
 			path_len = strlen(#copy_t);
 			size_buf += path_len + 1;
@@ -44,8 +47,7 @@ void Copy(dword pcth, char cut)
 	copy_buf_offset = buff_data + 10;
 	for (i=0; i<files.count; i++) 
 	{
-		selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+		if (getElementSelectedFlag(i) == true) {
-		if (ESBYTE[selected_offset2]) {
 			sprintf(copy_buf_offset,"%s/%s",#path,file_mas[i]*304+buf+72);
 			copy_buf_offset += strlen(copy_buf_offset) + 1;
 		}

programs/cmm/eolite/include/delete.h

@@ -29,7 +29,6 @@ int Del_File2(dword way, sh_progr)
 void Del_File_Thread()
 {   
 	byte del_from[4096];
-	dword selected_offset2;
 	int tst, count, i;
 	
 	file_count_copy = 0;
@@ -40,8 +39,7 @@ void Del_File_Thread()
 	{
 	   for (i=0; i<files.count; i++) 
 		{
-			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+			if (getElementSelectedFlag(i) == true) {
-			if (ESBYTE[selected_offset2]) {
 				sprintf(#del_from,"%s/%s",#path,file_mas[i]*304+buf+72);
 				GetFileInfo(#del_from, #file_info_count);
 				if ( file_info_count.isfolder ) DirFileCount(#del_from);
@@ -63,8 +61,7 @@ void Del_File_Thread()
 	{
 		for (i=0; i<files.count; i++) 
 		{
-			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+			if (getElementSelectedFlag(i) == true) {
-			if (ESBYTE[selected_offset2]) {
 				sprintf(#del_from,"%s/%s",#path,file_mas[i]*304+buf+72);
 				Del_File2(#del_from, 1);
 			}

programs/cmm/eolite/include/properties.h

@@ -95,7 +95,6 @@ void SetPropertiesDir(dword way)
 void SetProperties(byte prop)
 {
 	dword cur_file;
-	dword selected_offset2;
 
 	if (prop==1) || (prop==2)
 	{
@@ -104,8 +103,7 @@ void SetProperties(byte prop)
 			cur_file = malloc(4096);
 			for (i=0; i<files.count; i++) 
 			{
-				selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+				if (getElementSelectedFlag(i) == true) 
-				if (ESBYTE[selected_offset2])
 				{
 					strcpy(cur_file, #path);
 					strcat(cur_file, file_mas[i]*304+buf+72);
@@ -147,9 +145,9 @@ void SetProperties(byte prop)
 	}
 	cmd_free=3;
 	_not_draw = true;
-    Open_Dir(#path,WITH_REDRAW);
+	Open_Dir(#path,WITH_REDRAW);
-    _not_draw = false;
+	_not_draw = false;
-    EventRedrawWindow(Form.left,Form.top);
+	EventRedrawWindow(Form.left,Form.top);
 	ExitProcess();
 }
 
@@ -197,12 +195,11 @@ void GetSizeDir(dword way)
 void GetSizeMoreFiles(dword way)
 {
 	char cur_file[4096];
-	dword selected_offset2;
 	
 	for (i=0; i<files.count; i++) 
-    {
+	{
-        selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+		if (getElementSelectedFlag(i) == true) 
-        if (ESBYTE[selected_offset2]) {
+		{
 			sprintf(#cur_file,"%s/%s",way,file_mas[i]*304+buf+72);
 			if (TestBit(ESDWORD[file_mas[i]*304+buf+32], 4) )
 			{
@@ -215,15 +212,13 @@ void GetSizeMoreFiles(dword way)
 				size_dir += file_info_dirsize.sizelo;
 				file_count++;
 			}
-        }
+		}
 	}  
 }
 
 void properties_dialog()
 {
 	byte id;
-	dword file_name_off;
-	dword selected_offset2;
 	
 	DSBYTE[#folder_info]=0;
 	file_count = 0;
@@ -386,7 +381,7 @@ void DrawPropertiesWindow()
 		
 		if (selected_count)
 		{
-			DrawIconByExtension(NULL, 18, 19, system.color.work);
+			DrawIconByExtension(NULL, 18, 49, system.color.work);
 			sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
 			WriteText(50, 49, 0x90, 0x000000, #folder_info);
 			sprintf(#element_size_label,"%s (%d %s)",ConvertSize(size_dir),size_dir,SET_BYTE_LANG);

programs/cmm/eolite/include/translations.h

@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.7"
+#define TITLE "Eolite File Manager v3.71"
-#define ABOUT_TITLE "EOLITE 3.7"
+#define ABOUT_TITLE "EOLITE 3.71"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"