CMM: minor fixes

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

programs/cmm/browser/WebView.c

@@ -25,14 +25,14 @@
 char homepage[] = FROM "html\\homepage.htm";
 
 #ifdef LANG_RUS
-	char version[]=" ’¥ªáâ®¢ë© ¡à ã§¥à 1.39";
+	char version[]=" ’¥ªáâ®¢ë© ¡à ã§¥à 1.40";
 	?define IMAGES_CACHE_CLEARED "Šíè ª à⨭®ª ®ç¨é¥­"
 	?define T_LAST_SLIDE "<EFBFBD>â® ¯®á«¥¤­¨© á« ©¤"
 	char loading[] = "‡ £à㧪  áâà ­¨æë...<br>";
 	char page_not_found[] = FROM "html\page_not_found_ru.htm";
 	char accept_language[]= "Accept-Language: ru\n";
 #else
-	char version[]=" Text-based Browser 1.39";
+	char version[]=" Text-based Browser 1.40";
 	?define IMAGES_CACHE_CLEARED "Images cache cleared"
 	?define T_LAST_SLIDE "This slide is the last"
 	char loading[] = "Loading...<br>";
@@ -161,8 +161,8 @@ void main()
 				DefineAndDrawWindow(GetScreenWidth()-800/2,GetScreenHeight()-600/2,800,600,0x73,col_bg,0,0);
 				GetProcessInfo(#Form, SelfInfo);
 				if (Form.status_window>2) { DrawTitle(#header); break; }
-				if (Form.height<120) MoveSize(OLD,OLD,OLD,120);
+				if (Form.height<120) { MoveSize(OLD,OLD,OLD,120); break; }
-				if (Form.width<280) MoveSize(OLD,OLD,280,OLD);
+				if (Form.width<280) { MoveSize(OLD,OLD,280,OLD); break; }
 				Draw_Window();
 				break;
 				

programs/cmm/browser/menu.h

@@ -21,7 +21,6 @@ llist menu;
 void menu_rmb()
 {
 	proc_info MenuForm;
-	int key;
 
 	menu.ClearList();
 	while (ITEMS_LIST[menu.count]) menu.count++;
@@ -32,25 +31,24 @@ void menu_rmb()
 	switch(WaitEvent())
 	{
 	case evMouse:
-				GetProcessInfo(#MenuForm, SelfInfo);
+		GetProcessInfo(#MenuForm, SelfInfo);
-				if (!CheckActiveProcess(MenuForm.ID)) ExitProcess();
+		if (!CheckActiveProcess(MenuForm.ID)) ExitProcess();
+		mouse.get();
+		if (menu.ProcessMouse(mouse.x, mouse.y)) DrawMenuList();
+		if (mouse.lkm)&&(mouse.up) ItemClick();
+		break;
 				
-				mouse.get();
+	case evKey:
-				if (menu.ProcessMouse(mouse.x, mouse.y)) DrawMenuList();
+		GetKeys();
-				if (mouse.lkm)&&(mouse.up) ItemClick();
+		if (key_scancode==SCAN_CODE_ESC) ExitProcess();
-				break;
+		if (key_scancode==SCAN_CODE_ENTER) ItemClick();
+		if (menu.ProcessKey(key_scancode)) DrawMenuList();
+		break;
 				
-		case evKey:
+	case evReDraw:
-				key = GetKey();
+		DefineAndDrawWindow(Form.left+mouse.x-6,Form.top+mouse.y+GetSkinHeight()+3,menu.w+2,menu.h+4,0x01, 0, 0, 0x01fffFFF);
-				if (key==27) ExitProcess();
+		DrawPopup(0,0,menu.w,menu.h+3,0, col_bg,border_color);
-				if (key==13) ItemClick();
+		DrawMenuList();				
-				if (menu.ProcessKey(key)) DrawMenuList();
-				break;
-				
-		case evReDraw:
-				DefineAndDrawWindow(Form.left+mouse.x-6,Form.top+mouse.y+GetSkinHeight()+3,menu.w+2,menu.h+4,0x01, 0, 0, 0x01fffFFF);
-				DrawPopup(0,0,menu.w,menu.h+3,0, col_bg,border_color);
-				DrawMenuList();				
 	}
 	goto _BEGIN_APPLICATION_MENU;
 }

programs/cmm/eolite/Eolite.c

@@ -531,8 +531,8 @@ void draw_window()
 	DefineAndDrawWindow(WinX+rand_n,WinY+rand_n,WinW,WinH,0x73,system.color.work,TITLE,0);
 	GetProcessInfo(#Form, SelfInfo);
 	if (Form.status_window>2) return;
-	if (Form.height < 350) MoveSize(OLD,OLD,OLD,350);
+	if (Form.height < 350) { MoveSize(OLD,OLD,OLD,350); return; }
-	if (Form.width  < 480) MoveSize(OLD,OLD,480,OLD);
+	if (Form.width  < 480) { MoveSize(OLD,OLD,480,OLD); return; }
 	GetProcessInfo(#Form, SelfInfo); //if win_size changed
 	PutPaletteImage(#toolbar,246,34,0,0,8,#toolbar_pal);
 	DrawBar(127, 8, 1, 25, system.color.work_graph);

programs/cmm/eolite/include/menu.h

@@ -79,8 +79,8 @@ void FileMenu()
 				
 		case evKey:
 				GetKeys();
-				if (key_scancode==SCAN_CODE_ESC){cmd_free=1;ExitProcess();}
+				if (key_scancode == SCAN_CODE_ESC) {cmd_free=1;ExitProcess();}
-				else if (key_scancode == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
+				if (key_scancode == SCAN_CODE_ENTER) {action_buf = cur_action_buf; cmd_free=1; ExitProcess(); }
 				if (menu.ProcessKey(key_scancode)) MenuListRedraw();
 				break;
 				

programs/cmm/eolite/include/translations.h

@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.2"
+#define TITLE "Eolite File Manager v3.21"
-#define ABOUT_TITLE "Eolite 3.2"
+#define ABOUT_TITLE "Eolite 3.21"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"

programs/cmm/lib/obj/iconv.h

@@ -58,7 +58,7 @@ dword ChangeCharset(dword from_chs, to_chs, conv_buf)
 
 
 :int cur_charset;
-:char *charsets[] = { " ", "UTF-8", "KOI8-RU", "CP1251",  "CP1252", "ISO8859-5",   "CP866"  };
+:char *charsets[] = { "UTF-8", "KOI8-RU", "CP1251", "CP1252", "ISO8859-5", "CP866", 0 };
-enum { CH_NULL, CH_UTF8, CH_KOI8, CH_CP1251, CH_CP1252, CH_ISO8859_5, CH_CP866 };
+enum { CH_UTF8, CH_KOI8, CH_CP1251, CH_CP1252, CH_ISO8859_5, CH_CP866, CH_NULL };
 
 #endif