Eolite: fix tricky issue with double click, big fonts in progress dialog; tones of minor fixes;

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

programs/cmm/aelia/_compile.bat

@@ -1,4 +1,4 @@
-C-- "aelia.c"
+@C-- "aelia.c"
 @del "aelia"
 @rename "aelia.com" "aelia"
 @del warning.txt

programs/cmm/app_plus/compile_en.bat

@@ -3,7 +3,7 @@
 
 @del app_plus
 cls
-c-- app_plus.c
+@c-- app_plus.c
 @rename app_plus.com app_plus
 @del warning.txt
 @del lang.h--

programs/cmm/app_plus/compile_ru.bat

@@ -3,7 +3,7 @@
 
 @del app_plus
 cls
-c-- app_plus.c
+@c-- app_plus.c
 @rename app_plus.com app_plus
 @del warning.txt
 @del lang.h--

programs/cmm/appearance/compile_en.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_ENG 1 >lang.h--
 
-C-- appearance.c
+@C-- appearance.c
 @del appearance
 @rename appearance.com appearance
 @del warning.txt

programs/cmm/appearance/compile_ru.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_RUS 1 >lang.h--
 
-C-- appearance.c
+@C-- appearance.c
 @del appearance
 @rename appearance.com appearance
 @del warning.txt

programs/cmm/browser/WebView.c

@@ -237,7 +237,7 @@ void main()
 							GetAbsoluteURL(#URL);
 							history.back();
 							strcpy(#editURL, #URL);
-							DrawEditBox();
+							DrawEditBoxWebView();
 							OpenPage();
 						}
 						else
@@ -290,7 +290,7 @@ void Draw_Window()
 	img_draw stdcall(skin.image, Form.cwidth-22, address_box.top-3, 16, skin.h, 85, 0);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,STATUSBAR_H, col_bg);
 	DrawBar(0,Form.cheight - STATUSBAR_H, Form.cwidth,1, border_color);
-	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBox(); }
+	if (!header) OpenPage(); else { WB1.DrawPage(); DrawEditBoxWebView(); }
 	DrawRectangle(scroll_wv.start_x, scroll_wv.start_y, scroll_wv.size_x, scroll_wv.size_y-1, scroll_wv.bckg_col);
 	DrawProgress();
 
@@ -426,7 +426,7 @@ void OpenPage()
 		SetPageDefaults();
 		if (!strcmp(#URL, URL_SERVICE_HOME)) WB1.LoadInternalPage(#homepage, sizeof(homepage));
 		else if (!strcmp(#URL, URL_SERVICE_HISTORY)) ShowHistory();
-		DrawEditBox();
+		DrawEditBoxWebView();
 		return;
 	}
 	if (!strncmp(#URL,"http:",5))
@@ -458,7 +458,7 @@ void OpenPage()
 	}
 }
 
-DrawEditBox()
+DrawEditBoxWebView()
 {
 	DrawWideRectangle(address_box.left-2, address_box.top-2, address_box.width+3, 19, 2, address_box.color);
 	address_box.size = address_box.pos = address_box.shift = address_box.shift_old = strlen(#editURL);
@@ -471,7 +471,7 @@ DrawEditBox()
 
 void ShowPage()
 {
-	DrawEditBox();
+	DrawEditBoxWebView();
 	if (!bufsize)
 	{
 		if (http_transfer) WB1.LoadInternalPage(#loading, sizeof(loading));

programs/cmm/browser/compile_en.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_ENG 1 >lang.h--
 
-c-- WebView.c
+@c-- WebView.c
 @del WebView
 @rename WebView.com WebView
 @del warning.txt

programs/cmm/browser/compile_ru.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_RUS 1 >lang.h--
 
-c-- WebView.c
+@c-- WebView.c
 @del WebView
 @rename WebView.com WebView
 @del warning.txt

programs/cmm/browser/download_manager.h

@@ -128,9 +128,10 @@ void DL_Draw_Window()
 	ed.left = strlen("URL:")*6 + 10 + cleft;
 	ed.width = DL_Form.cwidth - ed.left - cleft - 3;
 	ed.offset=0;
-	edit_box_draw stdcall(#ed);
+	//edit_box_draw stdcall(#ed);
-	DrawRectangle(ed.left-1, ed.top-1, ed.width+2, 16, ed.blur_border_color);
+	DrawEditBox(#ed);
-	DrawRectangle(ed.left-2, ed.top-2, ed.width+4, 18, border_color);
+	//DrawRectangle(ed.left-1, ed.top-1, ed.width+2, 16, ed.blur_border_color);
+	//DrawRectangle(ed.left-2, ed.top-2, ed.width+4, 18, border_color);
 }
 
 void StartDownloading()

programs/cmm/dicty/compile_en.bat

@@ -6,5 +6,4 @@ C-- dicty.c
 @rename dicty.com dicty
 @del warning.txt
 @del lang.h--
-@pause
+@pause
-kpack dicty

programs/cmm/dicty/compile_ru.bat

@@ -1,10 +1,9 @@
 @del lang.h--
 @echo #define LANG_RUS 1 >lang.h--
 
-C-- dicty.c
+@C-- dicty.c
 @del dicty
 @rename dicty.com dicty
 @del warning.txt
 @del lang.h--
-@pause
+@pause
-kpack dicty

programs/cmm/end/compile_en.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_ENG 1 >lang.h--
 
-c-- end.c
+@c-- end.c
 @del end
 @rename end.com end
 @del warning.txt

programs/cmm/end/compile_ru.bat

@@ -1,10 +1,9 @@
 @del lang.h--
 @echo #define LANG_RUS 1 >lang.h--
 
-c-- end.c
+@c-- end.c
 @del end
 @rename end.com end
 @del warning.txt
 @del lang.h--
-@pause
+@pause
-kpack end

programs/cmm/eolite/Eolite.c

@@ -1,4 +1,4 @@
-//Leency, Veliant, Punk_Joker & KolibriOS Team 2008-2015
+//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2016
 //GNU GPL licence.
 
 #ifndef AUTOBUILD
@@ -16,10 +16,8 @@
 #include "..\lib\random.h"
 #include "..\lib\font.h"
 #include "..\lib\collection.h"
-//obj
 #include "..\lib\obj\libini.h"
 #include "..\lib\obj\box_lib.h"
-//patterns
 #include "..\lib\patterns\history.h"
 
 //images
@@ -27,8 +25,25 @@
 #include "imgs\left_p.txt"
 #include "imgs\icons.txt"
 
-enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
+//Button IDs
-enum {CREATE_FILE=1, CREATE_FOLDER, RENAME_ITEM }; //NewElement
+enum {
+	POPUP_BTN1 = 201,
+	POPUP_BTN2 = 202
+};
+
+//NewElement options
+enum {
+	CREATE_FILE=1, 
+	CREATE_FOLDER, 
+	RENAME_ITEM
+}; 
+
+//OpenDir options
+enum {
+	ONLY_SHOW, 
+	WITH_REDRAW, 
+	ONLY_OPEN
+};
 
 dword col_padding, col_selec, col_lpanel, col_work, col_graph;
 
@@ -104,6 +119,7 @@ char *fd_path_eolite_ini_path;
 #include "include\icons.h"
 #include "include\left_panel.h"
 #include "include\menu.h"
+#include "include\delete.h"
 #include "include\about.h"
 #include "include\properties.h"
 
@@ -193,33 +209,19 @@ void main()
 				}	
 				if (files.MouseOver(mouse.x, mouse.y))
 				{
-					//open
-					if (mouse.key&MOUSE_LEFT)&&(mouse.dblclick) 
-					{
-						if (mouse.y - files.y / files.item_h + files.first < files.count) 
-						{
-							files.ProcessMouse(mouse.x, mouse.y);
-							List_ReDraw();
-							Open(0);					
-						}
-					}
 					//select file
-					else if (mouse.key&MOUSE_LEFT)&&((mouse.down)
+					if (mouse.key&MOUSE_LEFT) && (mouse.up)
 					{
 						if (files.ProcessMouse(mouse.x, mouse.y)) List_ReDraw();
+						else if (mouse.dblclick)) Open(0);
 					}
 					//file menu
-					else if (mouse.key&MOUSE_RIGHT)&&(mouse.up)
+					if (mouse.key&MOUSE_RIGHT)
 					{
 						menu_call_mouse = 1;
-						
+						if (files.ProcessMouse(mouse.x, mouse.y)) List_ReDraw();
-						if (files.MouseOver(mouse.x, mouse.y))
+						menu_stak = malloc(4096);
-						{
+						CreateThread(#FileMenu,menu_stak+4092);
-							files.cur_y = mouse.y - files.y / files.item_h + files.first;
-							List_ReDraw();
-							menu_stak = malloc(4096);
-							CreateThread(#FileMenu,menu_stak+4092);	
-						}
 						break;
 					}
 				}
@@ -293,26 +295,13 @@ void main()
 				break;  
 	//Button pressed-----------------------------------------------------------------------------
 			case evButton:
-				id=GetButtonID();
+				id=GetButtonID();				
-				if (id==1)
-				{
-					KillProcess(about_window);
-					SaveIniSettings();
-					ExitProcess();
-				}
-				if (del_active)
-				{
-					if (id==301) || (id==302) Del_File(302-id);
-					break;
-				}
-				if (new_element_active)
-				{
-					if (id==301) || (id==302) NewElement(302-id);
-					break;
-				}
-				
 				switch(id) 
 				{
+					case 01:
+							KillProcess(about_window);
+							SaveIniSettings();
+							ExitProcess();
 					case 21: //Back
 							GoBack();
 							break;
@@ -347,6 +336,13 @@ void main()
 					case 100...120:
 						SystemDiscs.Click(id-100);
 						break;
+					case POPUP_BTN1:
+					case POPUP_BTN2:
+						if (del_active) Del_File(id-POPUP_BTN2);
+						if (new_element_active) NewElement(id-POPUP_BTN2);
+						DeleteButton(POPUP_BTN1);
+						DeleteButton(POPUP_BTN2);
+						break;
 				}
 				break;
 	//Key pressed-----------------------------------------------------------------------------
@@ -411,7 +407,7 @@ void main()
 						case 050: //Ctrl+M
 								Open_Dir(#inactive_path,WITH_REDRAW);
 								break; 
-						case 028: //Ctrl+Enter
+						case SCAN_CODE_ENTER: //Ctrl+Enter
 								if (!itdir) ShowOpenWithDialog();
 								else Open(1);
 								break;
@@ -683,15 +679,18 @@ void Line_ReDraw(dword bgcol, filenum){
 	if (! TestBit(attr, 4) ) //file or folder?
 	{	
 		ext1 = strrchr(file_name_off,'.') + file_name_off;
-		if (ext1==file_name_off) ext1 = " \0"; //if no extension then show nothing 
+		if (ext1==file_name_off) ext1 = NULL; //if no extension then show nothing 
-		Put_icon(ext1, files.x+3, files.item_h/2-7+y, bgcol, 0);
+		WriteText(7-strlen(ConvertSize(file.sizelo))*6+files.x+files.w - 58, files.text_y+y+1, files.font_type, 0, ConvertSize(file.sizelo));
-		WriteText(7-strlen(ConvertSize(file.sizelo))*6+files.x+files.w - 58, files.text_y + y +1,files.font_type,0,ConvertSize(file.sizelo));
+		if (ext1) && (strlen(ext1)<9) WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1);
 	}
 	else
 	{
-		if (!strncmp(file_name_off,"..",3)) ext1=".."; else ext1="<DIR>";
+		if (!strncmp(file_name_off,"..",3))	ext1=".."; else {
-		Put_icon(ext1, files.x+3, files.item_h/2-7+y, bgcol, 0);		
+			ext1="<DIR>";
+			WriteTextCenter(files.x+files.w-140, files.text_y+y+1, 72, 0, ext1);
+		}
 	}
+	DrawIconByExtension(ext1, files.x+3, files.item_h/2-7+y, bgcol);
 
 	if (TestBit(attr, 1)) || (TestBit(attr, 2)) text_col=0xA6A6B7; //system or hiden?
 	if (bgcol!=0xFFFfff)
@@ -814,7 +813,7 @@ inline Sorting()
 void Del_Form()
 {
 	dword selected_offset2;
-	int cont = 0;
+	int selected_count = 0;
 	byte f_count[128];
 	int dform_x = files.w - 220 / 2 + files.x;
 	if (!strncmp(#file_name,".",2)) || (!strncmp(#file_name,"..",2)) return;
@@ -826,11 +825,11 @@ void Del_Form()
 		for (i=0; i<files.count; i++) 
 		{
 			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
-			if (ESBYTE[selected_offset2]) cont++;
+			if (ESBYTE[selected_offset2]) selected_count++;
 		}
-		if (cont)
+		if (selected_count)
 		{
-			sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,cont,DEL_MORE_FILES_2);
+			sprintf(#f_count,"%s%d%s",DEL_MORE_FILES_1,selected_count,DEL_MORE_FILES_2);
 			WriteText(-strlen(#f_count)*3+110+dform_x,190,0x80,system.color.work_text,#f_count);
 		}
 		else
@@ -851,97 +850,6 @@ void Del_Form()
 	}
 }
 
-int del_error;
-int Del_File2(dword way, sh_progr)
-{    
-	dword dirbuf, fcount, i, filename;
-	int error;
-	char del_from[4096];
-	if (dir_exists(way))
-	{
-		if (error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL)) del_error = error;
-		for (i=0; i<fcount; i++)
-		{
-			if (CheckEvent()==evReDraw) draw_window();
-			filename = i*304+dirbuf+72;
-			sprintf(#del_from,"%s/%s",way,filename);
-			if ( TestBit(ESDWORD[filename-40], 4) )
-			{
-				Del_File2(#del_from, 1);
-			}
-			else
-			{
-				if (sh_progr) Operation_Draw_Progress(#del_from);
-				if (error = DeleteFile(#del_from)) del_error = error;
-			}
-		}
-	}
-	if (error = DeleteFile(way)) del_error = error;
-}
-
-void Del_File_Thread()
-{   
-	byte del_from[4096];
-	dword selected_offset2;
-	int tst, count, i;
-	
-	file_count_copy = 0;
-	copy_bar.value = 0; 
-	operation_flag = DELETE_FLAG;
-	
-	if (selected_count)
-	{
-	   for (i=0; i<files.count; i++) 
-		  {
-			   selected_offset2 = file_mas[i]*304 + buf+32 + 7;
-				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);
-					else file_count_copy++;
-				}
-		   }
-	}
-	else
-	{
-		if (itdir) DirFileCount(#file_path);
-		else file_count_copy++;
-	}
-	
-	copy_bar.max = file_count_copy;
-	
-	del_error = 0;
-	DisplayOperationForm();
-	if (selected_count)
-	{
-		for (i=0; i<files.count; i++) 
-		{
-			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
-			if (ESBYTE[selected_offset2]) {
-				sprintf(#del_from,"%s%s",#path,file_mas[i]*304+buf+72);
-				Del_File2(#del_from, 1);
-			}
-		}
-	}
-	else
-	{
-		Del_File2(#file_path, 1);			
-	}
-	if (del_error) Write_Error(del_error);
-	cmd_free = 6;
-	DialogExit();
-}
-
-void Del_File(byte dodel) {
-	del_active=0;
-	if (dodel)
-	{
-		delete_stak = malloc(40000);
-		CreateThread(#Del_File_Thread,delete_stak+40000-4);
-	}
-	else draw_window();
-}
-
 void SelectFileByName(dword that_file)
 {
 	int ind;
@@ -1105,9 +1013,7 @@ void NewElement_Form(byte crt, dword strng)
 	if (new_element_active==3) DrawEolitePopup(T_RENAME, T_CANCEL);
 	else DrawEolitePopup(T_CREATE, T_CANCEL);
 	new_file_ed.left = dform_x+24;
-	edit_box_draw  stdcall (#new_file_ed);
+	DrawEditBox(#new_file_ed);
-	DrawRectangle(new_file_ed.left-1, new_file_ed.top-1, new_file_ed.width+2, 16, 0xFFFfff);
-	DrawRectangle(new_file_ed.left-2, new_file_ed.top-2, new_file_ed.width+4, 18, col_graph);
 }
 
 void FnProcess(byte N)

programs/cmm/eolite/compile_en.bat

@@ -3,7 +3,7 @@
 
 @del Eolite
 cls
-c-- Eolite.c
+@c-- Eolite.c
 rem @kpack Eolite.com
 @rename Eolite.com Eolite
 @del warning.txt

programs/cmm/eolite/compile_ru.bat

@@ -3,7 +3,7 @@
 
 @del Eolite
 cls
-c-- Eolite.c
+@c-- Eolite.c
 rem @kpack Eolite.com
 @rename Eolite.com Eolite
 

programs/cmm/eolite/include/about.h

@@ -42,7 +42,7 @@ void about_dialog()
 				about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
 				WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
 				WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE);
-				DrawRectangle3D(0,154,about_form.cwidth/5*3,1,system.color.work_dark,system.color.work_light);
+				DrawRectangle3D(0,154,about_form.cwidth,1,system.color.work_dark,system.color.work_light);
 				WriteTextLines(7,163,0x90,system.color.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunkJoker, Pavelyakov\n(c) 2008 - 2016",20);
 				#ifdef LANG_RUS
 				DrawFlatButton(about_form.cwidth-180/2,about_form.cheight-38,180,26,11,"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ࠧࠡ<E0A0A7>⪨");

programs/cmm/eolite/include/delete.h

@@ -0,0 +1,90 @@
+int del_error;
+int Del_File2(dword way, sh_progr)
+{    
+	dword dirbuf, fcount, i, filename;
+	int error;
+	char del_from[4096];
+	if (dir_exists(way))
+	{
+		if (error = GetDir(#dirbuf, #fcount, way, DIRS_ONLYREAL)) del_error = error;
+		for (i=0; i<fcount; i++)
+		{
+			if (CheckEvent()==evReDraw) draw_window();
+			filename = i*304+dirbuf+72;
+			sprintf(#del_from,"%s/%s",way,filename);
+			if ( TestBit(ESDWORD[filename-40], 4) )
+			{
+				Del_File2(#del_from, 1);
+			}
+			else
+			{
+				if (sh_progr) Operation_Draw_Progress(filename);
+				if (error = DeleteFile(#del_from)) del_error = error;
+			}
+		}
+	}
+	if (error = DeleteFile(way)) del_error = error;
+}
+
+void Del_File_Thread()
+{   
+	byte del_from[4096];
+	dword selected_offset2;
+	int tst, count, i;
+	
+	file_count_copy = 0;
+	copy_bar.value = 0; 
+	operation_flag = DELETE_FLAG;
+	
+	if (selected_count)
+	{
+	   for (i=0; i<files.count; i++) 
+		{
+			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+			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);
+				else file_count_copy++;
+			}
+		}
+	}
+	else
+	{
+		if (itdir) DirFileCount(#file_path);
+		else file_count_copy++;
+	}
+	
+	copy_bar.max = file_count_copy;
+	
+	del_error = 0;
+	DisplayOperationForm();
+	if (selected_count)
+	{
+		for (i=0; i<files.count; i++) 
+		{
+			selected_offset2 = file_mas[i]*304 + buf+32 + 7;
+			if (ESBYTE[selected_offset2]) {
+				sprintf(#del_from,"%s%s",#path,file_mas[i]*304+buf+72);
+				Del_File2(#del_from, 1);
+			}
+		}
+	}
+	else
+	{
+		Del_File2(#file_path, 1);			
+	}
+	if (del_error) Write_Error(del_error);
+	cmd_free = 6;
+	DialogExit();
+}
+
+void Del_File(byte dodel) {
+	del_active=0;
+	if (dodel)
+	{
+		delete_stak = malloc(40000);
+		CreateThread(#Del_File_Thread,delete_stak+40000-4);
+	}
+	else draw_window();
+}

programs/cmm/eolite/include/gui.h

@@ -67,16 +67,17 @@ void DrawFilledBar(dword x, y, w, h)
 	DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]);
 }
 
+int popin_w=250;
 void DrawEolitePopup(dword b1_text, b2_text)
 {
-	int form_w=250, button_padding=30;
+	int button_padding=30;
 	int b1_len = strlen(b1_text) * 8 + button_padding;
 	int b2_len = strlen(b2_text) * 8 + button_padding;
-	int dform_x = files.w - form_w / 2 + files.x ;
+	int popin_x = files.w - popin_w / 2 + files.x ;
-	int button_margin = form_w - b1_len - b2_len / 3;
+	int button_margin = popin_w - b1_len - b2_len / 3;
-	int b1_x = dform_x + button_margin;
+	int b1_x = popin_x + button_margin;
-	int b2_x = dform_x + button_margin + b1_len + button_margin;
+	int b2_x = popin_x + button_margin + b1_len + button_margin;
-	DrawPopup(dform_x, 160, form_w, 90, 1, system.color.work, col_graph);
+	DrawPopup(popin_x, 160, popin_w, 90, 1, system.color.work, col_graph);
-	DrawFlatButton(b1_x, 210, b1_len, 24, 301, b1_text);
+	DrawFlatButton(b1_x, 210, b1_len, 24, POPUP_BTN1, b1_text);
-	DrawFlatButton(b2_x, 210, b2_len, 24, 302, b2_text);
+	DrawFlatButton(b2_x, 210, b2_len, 24, POPUP_BTN2, b2_text);
 }

programs/cmm/eolite/include/icons.h

@@ -27,10 +27,10 @@ char *ext[]={
 "grf", 25,
 0,0};
 
-void Put_icon(dword extension, xx, yy, fairing_color, icon_n)
+void DrawIconByExtension(dword extension, xx, yy, fairing_color)
 {
 	int i;
-
+	dword icon_n=0;
 	if (extension) for (i=0; ext[i]!=0; i+=2;)
 	{
 		if (strcmpi(extension, ext[i])==0)
@@ -39,11 +39,9 @@ void Put_icon(dword extension, xx, yy, fairing_color, icon_n)
 			break;
 		}
 	}
-
 	ficons_pal[0] = fairing_color;
 	PutPaletteImage(icon_n*16*15+#ficons,16,15,xx,yy,8,#ficons_pal);
 	if (fairing_color!=0xFFFfff) IconFairing(icon_n, xx, yy, fairing_color);
-	if (icon_n!=17) && (strlen(extension)<9) WriteText(-FileShow.font_size_x/2*strlen(extension)+files.x+files.w-103,yy+3,files.font_type,0,extension);
 }
 
 

programs/cmm/eolite/include/progress_dialog.h

@@ -1,36 +1,45 @@
-#define WIN_DIALOG_W 345
+#define WIN_DIALOG_W 420
-#define WIN_DIALOG_H 110
+#define WIN_DIALOG_H 100
 proc_info Dialog_Form;
 
-progress_bar copy_bar = {0,16,49,50,20,0,0,1,0xFFFFFF,0x00FF00,0x000000};
+progress_bar copy_bar = {0,16,60,50,23,0,0,1,0xFFFFFF,0x00FF00,0x555555};
 
-enum {COPY_FLAG, MOVE_FLAG, DELETE_FLAG, OPERATION_END};
 int operation_flag;
+enum {
+	COPY_FLAG, 
+	MOVE_FLAG, 
+	DELETE_FLAG, 
+	OPERATION_END
+};
 
 void DisplayOperationForm()
 {
-	  switch(CheckEvent())
+	dword title, message;
-	  {
+	switch(CheckEvent())
+	{
 		 case evButton:
 			notify(T_CANCEL_PASTE);
 			DialogExit();
 			break;
-		 
+			
 		case evReDraw:
-			if (operation_flag==COPY_FLAG) DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W,GetSkinHeight()+WIN_DIALOG_H,0x34,0xFFFFFF,T_COPY_WINDOW_TITLE);
+			if (operation_flag==COPY_FLAG) {
-			else if (operation_flag==MOVE_FLAG) DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W,GetSkinHeight()+WIN_DIALOG_H,0x34,0xFFFFFF,T_MOVE_WINDOW_TITLE);
+				title = T_COPY_WINDOW_TITLE;
-			else DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W,GetSkinHeight()+WIN_DIALOG_H,0x34,0xFFFFFF,T_DELETE_WINDOW_TITLE);
+				message = T_COPY_WINDOW_TEXT;
-			
+			}
+			else if (operation_flag==MOVE_FLAG) {
+				title = T_MOVE_WINDOW_TITLE;
+				message = T_MOVE_WINDOW_TEXT;
+			}
+			else if (operation_flag==DELETE_FLAG) {
+				title = T_DELETE_WINDOW_TITLE;
+				message = T_DELETE_WINDOW_TEXT;
+			}
+			DefineAndDrawWindow(Form.left+Form.width-200,Form.top+90,WIN_DIALOG_W,skin_height+WIN_DIALOG_H,0x34,system.color.work,title);
 			GetProcessInfo(#Dialog_Form, SelfInfo);
-			
+			WriteText(45, 11, 0x90, system.color.work_text, message);
-			if (operation_flag==COPY_FLAG) WriteText(45, 11, 0x80, system.color.work_text, T_COPY_WINDOW_TEXT);
+			DrawFlatButton(Dialog_Form.cwidth - 96, /*Dialog_Form.cheight - 32*/ copy_bar.top , 80, 22, T_CANCEL_PASTE, T_ABORT_WINDOW_BUTTON);
-			else if (operation_flag==MOVE_FLAG) WriteText(45, 11, 0x80, system.color.work_text, T_MOVE_WINDOW_TEXT);
+	}
-			else WriteText(45, 11, 0x80, system.color.work_text, T_DELETE_WINDOW_TEXT);
-			
-			DrawFlatButton(Dialog_Form.cwidth - 96, Dialog_Form.cheight - 32, 80, 22, 10, T_ABORT_WINDOW_BUTTON);
-			DrawBar(8, 10, 32, 32, 0xFFFfff);
-			break;
-	  }
 }
 
 void DialogExit() {
@@ -40,19 +49,19 @@ void DialogExit() {
 }
 
 
-void Operation_Draw_Progress(dword copying_filename) {
+void Operation_Draw_Progress(dword filename) {
 	if (Dialog_Form.cwidth==0)
 	{
 		copy_bar.value++;
 		return;
 	}
-	copy_bar.width = Dialog_Form.cwidth-32;
+	copy_bar.width = Dialog_Form.cwidth-32 - 100;
 	DisplayOperationForm();
-	Put_icon(copying_filename+strrchr(copying_filename,'.'), 16, 19, 0xFFFfff, 0);
+	DrawIconByExtension(filename+strrchr(filename,'.'), 16, 19, system.color.work);
-	DrawBar(45, 29, Dialog_Form.cwidth-45, 10, 0xFFFFFF);
+	DrawBar(45, 32, Dialog_Form.cwidth-45, 15, system.color.work);
-	WriteText(45, 29, 0x80, 0x000000, copying_filename);
+	WriteText(45, 32, 0x90, 0x000000, filename);
 	progressbar_draw stdcall (#copy_bar);
 	progressbar_progress stdcall (#copy_bar);
 	//copy_bar.value++;
-	//pause(50);
+	//pause(20);
 }

programs/cmm/eolite/include/properties.h

@@ -3,7 +3,7 @@
 	?define BTN_CLOSE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 	?define BTN_APPLY "<EFBFBD>ਬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
 	?define QUEST_1 "<EFBFBD>ਬ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>ᥬ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-	?define QUEST_2 "䠩<EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+	?define QUEST_2 "䠩<EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?"
 	?define PR_T_NAME "<EFBFBD><EFBFBD><EFBFBD>:"
 	?define PR_T_DEST "<EFBFBD><EFBFBD>ᯮ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"
 	?define PR_T_SIZE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:"
@@ -21,7 +21,7 @@
 	?define BTN_CLOSE "Close"
 	?define BTN_APPLY "Apply"
 	?define QUEST_1 "Apply to all subfolders"
-	?define QUEST_2 "files and Folders"
+	?define QUEST_2 "files and Folders?"
 	?define PR_T_NAME "Name:"
 	?define PR_T_DEST "Destination:"
 	?define PR_T_SIZE "Size:"
@@ -41,7 +41,7 @@ char path_to_file[4096]="\0";
 char file_name2[4096]="\0";
 edit_box file_name_ed = {195,50,25,0xffffff,0x94AECE,0xFFFfff,0xffffff,2,4098,#file_name2,#mouse_ddd2, 1000000000000000b,2,2};
 edit_box path_to_file_ed = {145,100,46,0xffffff,0x94AECE,0xFFFfff,0xffffff,2,4098,#path_to_file,#mouse_ddd2, 1000000000000000b,2,2};
-frame flags_frame = { 0, 280, 10, 83, 151, 0x000111, 0xFFFfff, 1, FLAGS, 0, 0, 6, 0x000111, 0xFFFFFF };
+frame flags_frame = { 0, 280, 10, 83, 151, 0x000111, 0xFFFfff, 1, FLAGS, 0, 1, 12, 0x000111, 0xFFFFFF };
 
 int file_count, dir_count, size_dir;
 char folder_info[200];
@@ -51,7 +51,7 @@ BDVK file_info_general;
 BDVK file_info_dirsize;
 
 proc_info settings_form;
-byte quest_active, atr_readonly, atr_hidden, atr_system;
+bool quest_active, atr_readonly, atr_hidden, atr_system;
 
 void SetPropertiesDir(dword way)
 {
@@ -142,8 +142,9 @@ void SetProperties(byte prop)
 	ExitProcess();
 }
 
-void Quest()
+void ShowConfirmQuestionPopin()
 {
+	quest_active = 1;
 	DrawPopup(30,80,200,90,1,system.color.work, system.color.work_graph);
 	WriteText(50, 100, 0x80, 0x000000, QUEST_1);
 	WriteText(80, 115, 0x80, 0x000000, QUEST_2);
@@ -249,6 +250,7 @@ void properties_dialog()
 				{
 					IF (id==301) SetProperties(2);
 					IF (id==302) SetProperties(1);
+					quest_active=false;
 					break;
 				}
 				if (id==1) || (id==10)
@@ -260,8 +262,7 @@ void properties_dialog()
 				{
 					if (selected_count) || (itdir)
 					{
-						quest_active = 1;
+						ShowConfirmQuestionPopin();
-						Quest();
 					}
 					else 
 					{
@@ -287,6 +288,7 @@ void properties_dialog()
 				{
 					IF (key_scancode==SCAN_CODE_ENTER) SetProperties(2);
 					IF (key_scancode==SCAN_CODE_ESC) SetProperties(1);
+					quest_active=false;
 					break;
 				}
 				if (key_scancode==SCAN_CODE_ESC)
@@ -298,8 +300,7 @@ void properties_dialog()
 				{
 					if (selected_count) || (itdir)
 					{
-						quest_active = 1;
+						ShowConfirmQuestionPopin();
-						Quest();
 					}
 					else 
 					{
@@ -332,7 +333,7 @@ void DrawPropertiesWindow()
 	
 	if (selected_count)
 	{
-		Put_icon('', 18, 19, 0xFFFfff, 0);
+		DrawIconByExtension('', 18, 19, 0xFFFfff);
 		sprintf(#folder_info,"%s%d%s%d",SET_6,file_count,SET_7,dir_count);
 		WriteText(50, 23, 0x80, 0x000000, #folder_info);
 		sprintf(#element_size_label,"%s (%d %s)",ConvertSize(size_dir),size_dir,SET_BYTE_LANG);
@@ -341,9 +342,9 @@ void DrawPropertiesWindow()
 	else
 	{
 		if ( file_info_general.isfolder )
-				Put_icon("<DIR>", 18, 19, 0xFFFfff, 0);
+				DrawIconByExtension("<DIR>", 18, 19, 0xFFFfff);
 		else
-				Put_icon(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff, 0);
+				DrawIconByExtension(#file_name2+strrchr(#file_name2,'.'), 18, 19, 0xFFFfff);
 
 		WriteText(50, 13, 0x80, 0x000000, PR_T_NAME);                          
 		edit_box_draw stdcall (#file_name_ed);
@@ -367,6 +368,7 @@ void DrawPropertiesWindow()
 	flags_frame.size_x = - flags_frame.start_x * 2 + settings_form.cwidth - 2;
 	flags_frame.font_color = system.color.work_text;
 	flags_frame.ext_col = system.color.work_graph;
+	flags_frame.font_backgr_color = system.color.work;
 	frame_draw stdcall (#flags_frame);
 	DrawPropertiesCheckBoxes();
 }

programs/cmm/eolite/include/settings.h

@@ -14,7 +14,7 @@
 	?define EDIT_FILE_ASSOCIATIONS "Edit file associations"
 	?define TITLE_SETT "Settings"
 	?define SHOW_DEVICE_CLASS "Show device class name"
-	?define SHOW_REAL_NAMES "Show real file names without changing case"
+	?define SHOW_REAL_NAMES "Show file names in original case"
 	?define FONT_SIZE_LABEL "Font size"
 	?define USE_TWO_PANELS "Two panels"
 	?define smooth_FONT "Use smooth font"

programs/cmm/eolite/include/translations.h

@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.4"
+#define TITLE "Eolite File Manager v3.43"
-#define ABOUT_TITLE "EOLITE 3.4"
+#define ABOUT_TITLE "EOLITE 3.43"
 
 #ifdef LANG_RUS
 	?define T_FILE "<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"

programs/cmm/kf_font_viewer/compile_en.bat

@@ -1,4 +1,4 @@
-C-- "font_viewer.c"
+@C-- "font_viewer.c"
 @del "font_viewer"
 @rename "font_viewer.com" "font_viewer"
 @del warning.txt

programs/cmm/lib/copyf.h

@@ -92,7 +92,7 @@
 		}
 		else
 		{
-			Operation_Draw_Progress(filename);
+			Operation_Draw_Progress(filename+strchr(filename, '/'));
 			if (error=CopyFile(#copy_from2, #copy_in2)) 
 			{
 				if (fabs(error)==8) { debugln("Stop copying."); break;} //TODO: may be need grobal var like stop_all

programs/cmm/lib/debug.h

@@ -51,6 +51,13 @@ inline void debugi(dword d_int)
 	debugln(#tmpch);
 }
 
+:void debugval(dword text,number)
+{
+	debug(text);
+	debug(": ");
+	debugi(number);
+}
+
 :void assert(dword _type, _actual, _expected)
 {
 	char r[4096];

programs/cmm/lib/gui.h

@@ -107,7 +107,8 @@
 {
 	byte w=14, h=14;
 	DefineButton(x-1, y-1, strlen(text)*8 + w + 17, h+2, bt_id+BT_HIDE+BT_NOFRAME, 0);
-	WriteText(x+w+8, h / 2 + y -7, 0x90, system.color.work_text, text);
+	EDI = system.color.work;
+	WriteText(x+w+8, h / 2 + y -7, 0xD0, system.color.work_text, text);
 	DrawRectangle(x, y, w, h, system.color.work_graph);
 	if (is_checked == 0)
 	{
@@ -136,26 +137,29 @@
 	DrawRectangle(x, y, VALUE_FIELD_W, SIZE, system.color.work_graph);
 	DrawRectangle3D(x+1, y+1, VALUE_FIELD_W-2, SIZE-2, 0xDDDddd, 0xffffff);
 	DrawBar(x+2, y+2, VALUE_FIELD_W-3, SIZE-3, 0xffffff);
-	WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, 0x000000, value_text);
+	WriteText( -strlen(value_text)+3*8 + x+6, SIZE / 2 + y -6, 0x90, system.color.work_text, value_text);
 
 	DrawCaptButton(VALUE_FIELD_W + x,     y, SIZE, SIZE, bt_id_more, system.color.work_button, system.color.work_button_text, "+");
 	DrawCaptButton(VALUE_FIELD_W + x + SIZE, y, SIZE, SIZE, bt_id_less, system.color.work_button, system.color.work_button_text, "-");
-	WriteText(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -7, 0x90, system.color.work_text, text);
+	EDI = system.color.work;
+	WriteText(x+VALUE_FIELD_W+SIZE+SIZE+10, SIZE / 2 + y -7, 0xD0, system.color.work_text, text);
 	DrawRectangle3D(x-1,y-1,VALUE_FIELD_W+SIZE+SIZE+2,SIZE+2,system.color.work_dark,system.color.work_light);
 }
 
-:void EditBox(dword edit_box_pointer)
+:void DrawEditBox(dword edit_box_pointer)
 {
-	dword x,y,w,h;
+	dword x,y,w,h,bg;
 	ESI = edit_box_pointer;
 	x = ESI.edit_box.left;
 	y = ESI.edit_box.top;
 	w = ESI.edit_box.width+1;
+	if (ESI.edit_box.flags & 100000000000b) bg = 0xCACACA; else bg = 0xFFFfff;
 	h = 15;
-	DrawRectangle(x-1, y-1, w+2, h+2, 0xFFFfff);
+	DrawRectangle(x-1, y-1, w+2, h+2, bg);
-	DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, 0xffffff);
+	DrawRectangle3D(x-2, y-2, w+2, h+2, 0xDDDddd, bg);
 	DrawRectangle(x-3, y-3, w+6, h+6, system.color.work_graph);
 	DrawRectangle3D(x-4, y-4, w+8, h+8, system.color.work_dark, system.color.work_light);
+	edit_box_draw  stdcall (edit_box_pointer);
 }
 
 :void DrawProgressBar(dword st_x, st_y, st_w, st_h, col_fon, col_border, col_fill, col_text, progress_percent)

programs/cmm/liza/compile_en.bat

@@ -1,6 +1,5 @@
-C-- liza.c
+@C-- liza.c
 @del liza
 @rename liza.com liza
-@kpack liza
 @del warning.txt
 @pause

programs/cmm/liza/login.c

@@ -183,14 +183,12 @@ void DrawLoginScreen()
 	WriteText(panel_x,panel_y,0x80,system.color.work_text,"Your Email:");
 	login_box.left = panel_x+3;
 	login_box.top = panel_y+15;
-	edit_box_draw stdcall(#login_box);
+	DrawEditBox(#login_box);
-	EditBox(#login_box);
 	
 	WriteText(panel_x,panel_y+40,0x80,system.color.work_text,"Password:");
 	pass_box.left = panel_x+3;
 	pass_box.top = panel_y+55;
-	edit_box_draw stdcall(#pass_box);
+	DrawEditBox(#pass_box);
-	EditBox(#pass_box);
 	
 	if (!aim)
 	{

programs/cmm/liza/settings.c

@@ -11,10 +11,10 @@ unsigned char POP_server1[128]="pop.server.com";
 unsigned char POP_server_port1[5]="110";
 unsigned char SMTP_server1[128]="smtp.server.com";
 unsigned char SMTP_server_port1[5]="25";
-edit_box POP_server_box        = {210,190,90 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b};
+edit_box POP_server_box        = {210,230,125 ,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(POP_server1),#POP_server1,#mouse_opt,100000000000b};
-edit_box POP_server_port_box   = {210,190,115,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#POP_server_port1,#mouse_opt,100000000000b};
+edit_box POP_server_port_box   = {210,230,160,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#POP_server_port1,#mouse_opt,100000000000b};
-edit_box SMTP_server_box       = {210,190,140,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b};
+edit_box SMTP_server_box       = {210,230,195,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,sizeof(SMTP_server1),#SMTP_server1,#mouse_opt,100000000000b};
-edit_box SMTP_server_port_box  = {210,190,165,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#SMTP_server_port1,#mouse_opt,100000000000b};
+edit_box SMTP_server_port_box  = {210,230,230,0xffffff,0x94AECE,0xffc90E,0xCACACA,0,5,#SMTP_server_port1,#mouse_opt,100000000000b};
 
 
 void SettingsDialog()
@@ -97,20 +97,19 @@ void OptionsWindow()
 {
 	#define ELEM_X 25
 	int i;
+	incn y;
+	y.n=0;
 	DrawBar(0, Form.cheight - 40, Form.cwidth, 1, system.color.work_graph);
 	DrawBar(0, Form.cheight - 40+1, Form.cwidth, 1, LBUMP);
 	DrawCaptButton(Form.cwidth-79, Form.cheight-32, 70, 25, 19, system.color.work_button, system.color.work_button_text,"Apply");
 
-	WriteTextB(ELEM_X, 20, 0x90, system.color.work_text, "Network settings");
+	WriteText(ELEM_X, y.inc(20), 0x81, system.color.work_text, "Network settings");
-	CheckBox(ELEM_X, 45, 17, "Use custom settings", checked[0]);
+	CheckBox(ELEM_X, y.inc(35), 17, "Use custom settings", checked[0]);
-	CheckBox(ELEM_X, 65, 18, "Manual configuration", checked[1]);
+	CheckBox(ELEM_X, y.inc(30), 18, "Manual configuration", checked[1]);
-	for (i=0; i<4; i++)
+	EDI = system.color.work;
-	{
+	for (i=0; i<4; i++)	WriteText(ELEM_X+40, i*35+POP_server_box.top, 0xD0, system.color.work_text, text1[i]);
-		WriteText(ELEM_X+40, i*25+4+POP_server_box.top, 0x80, system.color.work_text, text1[i]);
+	DrawEditBox(#POP_server_box);
-		DrawRectangle(POP_server_box.left-1, i*25+POP_server_box.top-1, POP_server_box.width+2, 16, system.color.work_graph);
+	DrawEditBox(#POP_server_port_box);
-	}
+	DrawEditBox(#SMTP_server_box);
-	edit_box_draw stdcall(#POP_server_box);
+	DrawEditBox(#SMTP_server_port_box);
-	edit_box_draw stdcall(#POP_server_port_box);
-	edit_box_draw stdcall(#SMTP_server_box);
-	edit_box_draw stdcall(#SMTP_server_port_box);
 }

programs/cmm/mouse_cfg/compile_en.bat

@@ -3,7 +3,7 @@
 
 @del mouse_cfg
 cls
-c-- mouse_cfg.c
+@c-- mouse_cfg.c
 @rename mouse_cfg.com mouse_cfg
 @kpack mouse_cfg
 @del warning.txt

programs/cmm/mouse_cfg/compile_ru.bat

@@ -3,7 +3,7 @@
 
 @del mouse_cfg
 cls
-c-- mouse_cfg.c
+@c-- mouse_cfg.c
 @rename mouse_cfg.com mouse_cfg
 @kpack mouse_cfg
 @del warning.txt

programs/cmm/mouse_cfg/mouse_cfg.c

@@ -162,7 +162,6 @@ void DrawMouseImage() {
 }
 
 void DrawControls() {
-	DrawBar(pos_x, mouse_frame.start_y + 142, Form.cwidth - pos_x, 285-142, system.color.work);
 	MoreLessBox(pos_x, mouse_frame.start_y + 142, 120, 121, mouse_cfg.pointer_speed, POINTER_SPEED);
 	MoreLessBox(pos_x, mouse_frame.start_y + 172, 122, 123, mouse_cfg.acceleration, ACCELERATION_TEXT);
 	MoreLessBox(pos_x, mouse_frame.start_y + 202, 124, 125, mouse_cfg.double_click_delay, DOUBLE_CLICK_TEXT);

programs/cmm/panels_cfg/compile_en.bat

@@ -3,7 +3,7 @@
 
 @del panels_cfg
 cls
-c-- panels_cfg.c
+@c-- panels_cfg.c
 @pause
 @echo off
 @rename panels_cfg.com panels_cfg

programs/cmm/panels_cfg/compile_ru.bat

@@ -3,7 +3,7 @@
 
 @del panels_cfg
 cls
-c-- panels_cfg.c
+@c-- panels_cfg.c
 @pause
 @rename panels_cfg.com panels_cfg
 @kpack panels_cfg

programs/cmm/pixie/compile_en.bat

@@ -1,7 +1,7 @@
 @del lang.h--
 @echo #define LANG_ENG 1 >lang.h--
 
-C-- pixie.c
+@C-- pixie.c
 @del pixie
 @kpack pixie.com
 @rename pixie.com pixie

programs/cmm/textreader/compile.bat

@@ -1,4 +1,4 @@
-C-- "textreader.c"
+@C-- "textreader.c"
 @del "textreader"
 @rename "textreader.com" "textreader"
 @del warning.txt

programs/cmm/tmpdisk/compile_en.bat

@@ -1,6 +1,6 @@
 @echo #define LANG_ENG 1 >lang.h--
 
-C-- tmpdisk.c
+@C-- tmpdisk.c
 @del tmpdisk
 @rename tmpdisk.com tmpdisk
 @del warning.txt

programs/cmm/tmpdisk/compile_ru.bat

@@ -1,6 +1,6 @@
 @echo #define LANG_RUS 1 >lang.h--
 
-C-- tmpdisk.c
+@C-- tmpdisk.c
 @del tmpdisk
 @rename tmpdisk.com tmpdisk
 @del warning.txt

programs/cmm/tmpdisk/t_console.c

@@ -5,7 +5,7 @@
 #ifdef LANG_RUS
 	?define ADD_DISK_TEXT "<EFBFBD>஡<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㠫<EFBFBD><E3A0AB><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
 	?define DELETE_DISK_TEXT "<EFBFBD>஡<EFBFBD><EFBFBD> 㤠<><E3A4A0><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>㠫<EFBFBD><E3A0AB><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>"
-	?define DONT_KNOW_DISK_SIZE_TEXT "<EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD> <20><> 㪠<><E3AAA0><EFBFBD>, 10% ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20>㤥<EFBFBD> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD>"
+	?define DONT_KNOW_DISK_SIZE_TEXT "<EFBFBD><EFBFBD><EFBFBD> ࠧ<><E0A0A7><EFBFBD> <20><> 㪠<><E3AAA0><EFBFBD>, 20% ᢮<><E1A2AE><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20>㤥<EFBFBD> <20>ᯮ<EFBFBD>짮<EFBFBD><ECA7AE><EFBFBD><EFBFBD>"
 	?define NEW_DISK_TEXT "ࠧ<EFBFBD><EFBFBD><EFBFBD> <20><>᪠ <20>㤥<EFBFBD>: "
 	char *rezult_text[]={
 	"<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>ᯥ譮 <20><><EFBFBD><EFBFBD><EFBFBD>襭<EFBFBD>",
@@ -19,7 +19,7 @@
 #else
 	?define ADD_DISK_TEXT "trying to add disk"
 	?define DELETE_DISK_TEXT "trying to delete virtual disk"
-	?define DONT_KNOW_DISK_SIZE_TEXT "its size is not specified, 10% from free RAM will be used"
+	?define DONT_KNOW_DISK_SIZE_TEXT "its size is not specified, 20% from free RAM will be used"
 	?define NEW_DISK_TEXT "new DiskSize: "
 	char *rezult_text[]={
 	"operation completed successfully",
@@ -64,7 +64,7 @@ char Console_Work()
 			disk_size= strchr(#param, 's');
 			if (!disk_size)
 			{
-				add_disk.DiskSize = GetFreeRAM() / 5;
+				add_disk.DiskSize = GetFreeRAM() / 5 * 2;
 				debugln(DONT_KNOW_DISK_SIZE_TEXT);
 			}				
 			else

programs/cmm/tmpdisk/t_gui.c

@@ -137,8 +137,7 @@ void Main_Window()
 			DrawBar(0,TOPPANELH, Form.cwidth,1,  system.color.work_graph);
 			WriteText(6, 6, 0x90, system.color.work_text, SIZE_TEXT);
 			WriteText(edit_disk_size.left + edit_disk_size.width + 12, 6, 0x90, system.color.work_text, "MB.");
-			edit_box_draw stdcall (#edit_disk_size);
+			DrawEditBox(#edit_disk_size);
-			EditBox(#edit_disk_size);
 			for (i=0, x=6; i<2; i++, x+=strlen(but_text[i])*6+37)
 			{
 				DefineButton(x,29, strlen(but_text[i])*6+28,19, 10+i, system.color.work_button);
@@ -155,7 +154,7 @@ void Main_Window()
 void GetSizeDisk()
 {
 	int fr;
-	fr = GetFreeRAM() / 5;
+	fr = GetFreeRAM() / 5 * 2;
 	fr = itoa(fr / 2048);
 	strcpy(#new_disk_size, fr);
 	edit_disk_size.size = edit_disk_size.pos = strlen(#new_disk_size);