WebSVN – Kolibri OS – Diff – /programs/cmm/eolite/include/properties.h

 	?define PR_T_CONTAINS "®¤¥à¦¨â: "
 	?define FLAGS " ââà¨¡ãâë "
 	?define PR_T_HIDDEN "ªàëâë©"
 	?define PR_T_SYSTEM "¨áâ¥¬ë©"
 	?define PR_T_ONLY_READ "®«ìª® çâ¥¨¥"
+	?define SET_BYTE_LANG "¡ ©â"
 #else
 	?define WINDOW_TITLE_PROPERTIES "Properties"
 	?define BTN_CLOSE "Close"
 	?define PR_T_NAME "Name:"
 	?define PR_T_DEST "Destination:"
 	?define PR_T_CONTAINS "Contains: "
 	?define FLAGS " Attributes "
 	?define PR_T_HIDDEN "Hidden"
 	?define PR_T_SYSTEM "System"
 	?define PR_T_ONLY_READ "Read-only"
+	?define SET_BYTE_LANG "byte"
 #endif
 dword mouse_ddd2;
 char path_to_file[4096]="\0";
 void SetProperties(byte id)
+{
 	if (selected_count) return;
 	else
+	{
-		if (id==20) file_info_general.readonly ^= 1;
+		if (id==20) file_info_general.readonly ^= true;
-		if (id==21) file_info_general.hidden ^= 1;
+		if (id==21) file_info_general.hidden ^= true;
-		if (id==22) file_info_general.system ^= 1;
+		if (id==22) file_info_general.system ^= true;
 		SetFileInfo(#file_path, #file_info_general);
+	}
+}
 void GetSizeDir(dword way)
+{
 	dword dirbuf, fcount, i, filename;
-	char cur_file[4096];
+	dword cur_file;
 	if (isdir(way))
+	{
+		cur_file = malloc(4096);
 		// In the process of recursive descent, memory must be allocated dynamically, because the static memory -> was a bug !!! But unfortunately pass away to sacrifice speed.
 		GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL);
 		for (i=0; i
+		{
 			filename = i*304+dirbuf+72;
+			sprintf(cur_file,"%s/%s",way,filename);
 			sprintf(#cur_file,"%s/%s",way,filename);
-			if ( TestBit(ESDWORD[filename-40], 4) )
+			if (TestBit(ESDWORD[filename-40], 4) )
+			{
 				dir_count++;
-				GetSizeDir(#cur_file);
+				GetSizeDir(cur_file);
+			}
 			else
 			{
-				GetFileInfo(#cur_file, #file_info_dirsize);
+				GetFileInfo(cur_file, #file_info_dirsize);
-				size_dir = size_dir + file_info_dirsize.sizelo;
+				size_dir += file_info_dirsize.sizelo;
 				file_count++;
+			}
+		}
 		free(cur_file);
+	}
+}
 	for (i=0; i
+    {
         selected_offset2 = file_mas[i]*304 + buf+32 + 7;
         if (ESBYTE[selected_offset2]) {
-			sprintf(#cur_file,way,file_mas[i]*304+buf+72);
+			sprintf(#cur_file,"%s/%s",way,file_mas[i]*304+buf+72);
 			GetFileInfo(#cur_file, #file_info_general);
 			if ( file_info_general.isfolder )
 	SetEventMask(0x27);
 	loop() switch(WaitEvent())
+	{
 		case evButton:
 				id=GetButtonID();
-				IF (id==1) || (id==10){cmd_free=3;ExitProcess();}
+				if (id==1) || (id==10)
+				{
+					cmd_free=3;
+					ExitProcess();
+				}
 				if (id==20) SetProperties(id);
 				if (id==21) SetProperties(id);
 				if (id==22) SetProperties(id);
 				DrawPropertiesCheckBoxes();
 				break;
 				edit_box_mouse stdcall (#path_to_file_ed);
 				break;
 		case evKey:
+				key = GetKey();
+				if (key==27)
+				{
-				key = GetKey();
+					cmd_free=3;
+					ExitProcess();
 				IF (key==27){cmd_free=3;ExitProcess();}
 				EAX=key<<8;
 				edit_box_key stdcall(#file_name_ed);
 				edit_box_key stdcall(#path_to_file_ed);
 				if (selected_count)
+				{
 					Put_icon('', 18, 19, 0xFFFfff, 0);
 					sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
 					WriteText(50, 23, 0x80, 0x000000, #folder_info);
-					EAX = ConvertSize(size_dir);
-					strcpy(#element_size_label, EAX);
-					strcat(#element_size_label, " (");
-					strcat(#element_size_label, itoa(size_dir));
+					sprintf(#element_size_label,"%s (%d %s)",ConvertSize(size_dir),size_dir,SET_BYTE_LANG);
-					strcat(#element_size_label, " b)");
-					//tmp = ConvertSize(size_dir);
-					//sprintf(#element_size_label," ( byte)");
 					WriteText(100, 65, 0x80, 0x000000, #element_size_label);
+				}
 				else
+				{
 					if ( file_info_general.isfolder )
-						Put_icon(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff, 0);
+							Put_icon(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff, 0);
 					WriteText(50, 13, 0x80, 0x000000, PR_T_NAME);
-					edit_box_draw stdcall (#file_name_ed);
-					if (!itdir)
+					edit_box_draw stdcall (#file_name_ed);
-					{
 						element_size = file_info_general.sizelo;
 					if (!itdir) element_size = file_info_general.sizelo;
 					else
+					{
 						WriteText(10, 80, 0x80, 0x000000, PR_T_CONTAINS);
 						sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
 						WriteText(100, 80, 0x80, 0x000000, #folder_info);
-						element_size = size_dir;
 						element_size = size_dir;
+					}
 					WriteText(10,  95, 0x80, 0x000000, SET_3);
-					WriteText(10, 110, 0x80, 0x000000, SET_4);
+                    WriteText(10, 110, 0x80, 0x000000, SET_4);
-					WriteText(10, 125, 0x80, 0x000000, SET_5);
+                    WriteText(10, 125, 0x80, 0x000000, SET_5);
 					DrawDate(100,  95, 0, #file_info_general.datecreate);
-					DrawDate(100, 110, 0, #file_info_general.datelastaccess);
-					DrawDate(100, 125, 0, #file_info_general.datelastedit);
-					EAX = ConvertSize(element_size);
-					strcpy(#element_size_label, EAX);
-					strcat(#element_size_label, " (");
-					strcat(#element_size_label, itoa(element_size));
-					strcat(#element_size_label, " b)");
+                    DrawDate(100, 110, 0, #file_info_general.datelastaccess);
-					//sprintf(#element_size_label,"%s (%d byte)","",element_size);
+                    DrawDate(100, 125, 0, #file_info_general.datelastedit);
 					//tmp = ConvertSize(element_size);
-					//sprintf(#element_size_label,"%s (%d byte)",tmp,element_size);
+					sprintf(#element_size_label,"%s (%d %s)",ConvertSize(element_size),element_size,SET_BYTE_LANG);
 					WriteText(100, 65, 0x80, 0x000000, #element_size_label);

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/include/properties.h – Rev 5576 → 5591