WebSVN – Kolibri OS – Diff – /programs/cmm/eolite/Eolite.c

 //Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2021
 //GNU GPL license.
 // 70.5 - get volume info and label
-#define ABOUT_TITLE "EOLITE 5 RC4"
+#define ABOUT_TITLE "EOLITE 5 RC5"
-#define TITLE_EOLITE "Eolite File Manager 5 RC4"
+#define TITLE_EOLITE "Eolite File Manager 5 RC5"
-#define TITLE_KFM "Kolibri File Manager 2 RC4";
+#define TITLE_KFM "Kolibri File Manager 2 RC5";
 #define MEMSIZE 1024 * 250
 int action_buf;
 int rand_n;
 char sort_type=2;
 bool sort_desc=false;
-int active_panel=1;
+int active_panel=0;
 libimg_image icons16_default;
 	llist_copy(#files_inactive, #files);
 	SetEventMask(EVM_REDRAW+EVM_KEY+EVM_BUTTON+EVM_MOUSE+EVM_MOUSE_FILTER);
 	loop() switch(@WaitEventTimeout(80))
+	{
 		case evMouse:
-			if (del_active) || (disk_popin_active_on_panel) || (Form.status_window>2) break;
+			if (del_active) || (disk_popin_active_on_panel) || (Form.status_window&ROLLED_UP) break;
 			if (new_element_active)
+			{
 				edit_box_mouse stdcall(#new_file_ed);
 				break;
+			}
 				break;
+			}
 			if (efm) && (mouse.y < files.y + files.h) && (mouse.down) {
 				if (mouse.x
-					if (active_panel!=1) ChangeActivePanel();
+					SetActivePanel(0);
 				} else {
-					if (active_panel!=2) ChangeActivePanel();
+					SetActivePanel(1);
+				}
+			}
 			break;
 //Button pressed-----------------------------------------------------------------------------
 						notify(COPY_PATH_STR);
 						Clipboard__CopyText(#path);
 						break;
 				case KFM_DEV_DROPDOWN_1:
 				case KFM_DEV_DROPDOWN_1+1:
-						EventOpenDiskPopin(1);
-						break;
 				case KFM_DEV_DROPDOWN_2:
 				case KFM_DEV_DROPDOWN_2+1:
-						EventOpenDiskPopin(2);
+						EventOpenDiskPopin(active_panel);
 						break;
 				case BACK_BTN...PASTE_BTN:
-						if (active_panel==2) ChangeActivePanel();
+						SetActivePanel(0);
 						EventToolbarButtonClick(id);
 						break;
 				case BACK_BTN+100...PASTE_BTN+100:
-						if (active_panel==1) ChangeActivePanel();
+						SetActivePanel(1);
 						EventToolbarButtonClick(id-100);
 						break;
 				case 31...33:
 						EventSort(id-30);
 						break;
 //Key pressed-----------------------------------------------------------------------------
 		case evKey:
 			GetKeys();
-			if (Form.status_window>2) break;
+			if (Form.status_window&ROLLED_UP) break;
 					case SCAN_CODE_ENTER:
 							EventOpen(0);
 							break;
 					case SCAN_CODE_TAB:
 							if (!efm) break;
-							ChangeActivePanel();
+							SetActivePanel(active_panel^1);
 							break;
 					case SCAN_CODE_MENU:
 							mouse.x = files.x+15;
 							mouse.y = files.cur_y - files.first * files.item_h + files.y + 5;
 							EventShowListMenu();
 		status_bar_h = 0;
+	}
 	if (efm) title = TITLE_KFM; else title = TITLE_EOLITE;
 	DefineAndDrawWindow(Form.left+rand_n,Form.top+rand_n,Form.width,Form.height,0x73,NULL,title,0);
 	GetProcessInfo(#Form, SelfInfo);
-	if (Form.status_window>2) return;
+	if (Form.status_window&ROLLED_UP) return;
 	if (Form.height < 356) { MoveSize(OLD,OLD,OLD,356); return; }
 	GetProcessInfo(#Form, SelfInfo);
 	SetAppColors();
 	if (efm) {
 		if (screen.width > 693) && (Form.width < 693) { MoveSize(OLD,OLD,693,OLD); return; }
 		strcpy(#path, #inactive_path);
 		files_y = files.y;
 		h2 = Form.cheight-files_y-2 - status_bar_h;
 		col.selec = col.selec_inactive;  //this is a bad code: need to use some var to set inactive panel for DrawButtonsAroundList();
-		if (active_panel==1)
+		if (active_panel==0)
+		{
 			files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
 			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
 			col.selec = col.selec_active;
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
 			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
+		}
-		if (active_panel==2)
+		if (active_panel==1)
+		{
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
 			DrawButtonsAroundList();
 			Open_Dir(#path,WITH_REDRAW);
 			files_inactive.count = files.count;
 	if (del_active) Del_Form();
 	if (new_element_active) && (col.selec != 0xCCCccc) NewElement_Form(new_element_active, #new_element_name);
-}
-bool file_name_is_8_3(dword name)
-{
-	int name_len = strlen(name);
-	int dot_pos = strrchr(name, '.');
-	if (name_len<=12)
-	{
-		if (dot_pos) {
-			if (name_len - dot_pos > 3) return false;
-		}
-		else {
-			if (name_len>8) return false;
-		}
-		return true;
-	}
-	return false;
+}
 void Line_ReDraw(dword bgcol, filenum){
 	dword text_col=col.list_gb_text,
 		  ext1, attr,
 		pause(10);
 		DrawDeviceAndActionsLeftPanel();
+	}
+}
-void ChangeActivePanel()
+void SetActivePanel(int _active)
 {
+	if (active_panel != _active) {
-	if (active_panel==1) active_panel=2; else active_panel=1;
+		active_panel = _active;
-	llist_copy(#files_active, #files_inactive);
+		llist_copy(#files_active, #files_inactive);
-	llist_copy(#files_inactive, #files);
+		llist_copy(#files_inactive, #files);
-	strcpy(#active_path, #inactive_path);
+		strcpy(#active_path, #inactive_path);
-	strcpy(#inactive_path, #path);
+		strcpy(#inactive_path, #path);
-	DrawFilePanels();
+		DrawFilePanels();
+	}
+}
 void EventSelectFileByKeyPress()
+{
+	}
+}
 void EventDriveClick(int __id)
-{
-	if (disk_popin_active_on_panel != active_panel) {
-		ChangeActivePanel();
-	}
+{
 	SystemDiscs.Click(__id-100);
 	if (efm) {
 		draw_window();
+	}
+}
 void EventOpenDiskPopin(int panel_n)
 {
 	DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
-	disk_popin_active_on_panel = panel_n;
+	if (panel_n==0) {
-	if (disk_popin_active_on_panel==1) {
+		disk_popin_active_on_panel = 1;
+		SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3);
-		SystemDiscs.DrawOptions(Form.cwidth/2-DDW, 8+DEV_H_HOR+3);
+	} else {
-	} else {
+		disk_popin_active_on_panel = 2;
 		SystemDiscs.DrawOptions(Form.cwidth-DDW-2, 8+DEV_H_HOR+3);
+	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c – Rev 8944 → 8946