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

 //Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2021
 //GNU GPL license.
+/*
+TODO:
+- fix a kfm2 bug with selected files on window deactivation
+- click on a path bar opens edit
+- click to show breadcrumbs
+- 70.5 - get volume info and label
-// 70.5 - get volume info and label
+*/
-#define ABOUT_TITLE "EOLITE 5 Beta10"
+#define ABOUT_TITLE "EOLITE 5 Beta11"
-#define TITLE_EOLITE "Eolite File Manager 5 Beta10"
+#define TITLE_EOLITE "Eolite File Manager 5 Beta11"
-#define TITLE_KFM "Kolibri File Manager 2 Beta10";
+#define TITLE_KFM "Kolibri File Manager 2 Beta11";
 #define MEMSIZE 1024 * 250
 #include "../lib/clipboard.h"
 #include "../lib/obj/libini.h"
 #include "../lib/obj/box_lib.h"
 #include "../lib/obj/libimg.h"
-#include "../lib/patterns/history.h"
-#include "../lib/patterns/toolbar_button.h"
+#include "../lib/patterns/history.h"
 #include "imgs/images.h"
 #include "imgs/images.h"
 #include "include/const.h"
 bool efm = false;
-int toolbar_buttons_x[7]={9,46,85,134,167,203};
-bool dir_at_fat16 = NULL;
-dword about_thread_id;
-dword settings_window;
 bool active_about = false;
-bool active_settings = false;
+int toolbar_buttons_x[7]={9,46,85,134,167,203};
 	dword buf;
 	collection_int items=0;
 	int selected_count;
 	int folder_count;
 	dword path;
+	bool dir_at_fat16 = NULL;
 //Sselected element data
 	byte file_path[4096];
 	byte file_name[256];
 	char sort_type=2;
 	bool sort_desc=false;
 	int status_bar_h;
 	int icon_size = 18;
+//Threads data
+	dword about_thread_id;
+	dword settings_window;
+	bool active_about = false;
+	bool active_settings = false;
+	dword about_stak=0,properties_stak=0,settings_stak=0;
+	byte cmd_free=0;
 //Multipanes
-int active_panel=0;
+	int active_panel=0;
-int disk_popin_active_on_panel=0;
+	int disk_popin_active_on_panel=0;
-#define PANES_COUNT 2
+	#define PANES_COUNT 2
-dword location[PANES_COUNT];
-dword about_stak=0,properties_stak=0,settings_stak=0;
-byte cmd_free=0;
+	dword location[PANES_COUNT];
 libimg_image icons16_default;
 libimg_image icons16_selected;
 				case KFM_DEV_DROPDOWN_2:
 				case KFM_DEV_DROPDOWN_2+1:
 						EventOpenDiskPopin(active_panel);
 						break;
 				case BACK_BTN...PASTE_BTN:
-						SetActivePanel(0);
 						EventToolbarButtonClick(id);
 						break;
-				case BACK_BTN+100...PASTE_BTN+100:
-						SetActivePanel(1);
-						EventToolbarButtonClick(id-100);
-						break;
 				case 31...33:
 						EventSort(id-30);
 						break;
 				case 51:
 						EventShowBurgerMenu();
 	dword title;
 	static int rand_n;
 	if (rand_n) rand_n = random(80);
 	if (show_status_bar.checked) {
-		#define STBAR_EOLITE_H 16;
+		#define STBAR_EOLITE_H 16
-		#define STBAR_KFM_H 21+16;
+		#define STBAR_KFM_H 21
 		if (efm) status_bar_h = STBAR_KFM_H;
 		else status_bar_h = STBAR_EOLITE_H;
 	} else {
 		status_bar_h = 0;
 	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; }
-		DrawBar(0, 0, Form.cwidth, 34, sc.work);
+		DrawBar(0, 4, Form.cwidth, SELECTY-5, sc.work);
+		DrawBar(0, SELECTY+KFM2_DEVH+1, Form.cwidth, 3, sc.work);
+		DrawBar(0, SELECTY-1, 1, KFM2_DEVH+2, sc.work);
+		DrawBar(Form.cwidth-1, SELECTY-1, 1, KFM2_DEVH+2, sc.work);
+		DrawBar(Form.cwidth/2-16, SELECTY-1, 16, KFM2_DEVH+2, sc.work);
+		/*
 		#define PAD 7
 		#define GAP_S 26+5
 		#define GAP_B 26+14
 		x.set(Form.cwidth/2-DDW-203/2-GAP_S);
 		while (i<200) {
 			DrawTopPanelButton(i+PASTE_BTN,x.inc(GAP_S), PAD, 56, false);
 			x.set(Form.cwidth/2-DDW-203/2-GAP_S+calc(Form.cwidth/2));
 			i+=100;
+		}
 		//DrawTopPanelButton(51, Form.cwidth-GAP_S-PAD, PAD, -1, false); //burger menu
+		*/
 	} else {
 		if (Form.width < 480) { MoveSize(OLD,OLD,480,OLD); return; }
 		ESDWORD[#toolbar_pal] = sc.work;
 		ESDWORD[#toolbar_pal+4] = MixColors(0, sc.work, 35);
 		PutPaletteImage(#toolbar, 246, 34, 0, 0, 8, #toolbar_pal);
 	DrawRectangle(0,39,Form.cwidth-1,-show_status_bar.checked*status_bar_h + Form.cheight - 40,col.work_gradient[4]); //bg
 	for (i=0; i<6; i++) DrawBar(0, 34+i, Form.cwidth, 1, MixColors(sc.work_dark, sc.work, i*10));
 	for (i=0; i<6; i++) DrawBar(0, 5-i, Form.cwidth, 1, MixColors(sc.work_light, sc.work, i*10));
 	llist_copy(#files_active, #files);
 	DrawStatusBar();
+	if (!selected_count) {
-	if (!selected_count) Open_Dir(path,ONLY_OPEN); //if there are no selected files -> refresh folder [L001]
+		Open_Dir(path,ONLY_OPEN); //if there are no selected files -> refresh folder [L001]
+	}
 	DrawFilePanels();
 	disk_popin_active_on_panel = 0;
+}
+{
 	char status_bar_str[80];
 	int go_up_folder_exists=0;
 	if (efm) {
-		DrawBar(0, Form.cheight - status_bar_h+15, Form.cwidth,  3, sc.work);
+		DrawBar(0, Form.cheight - status_bar_h, Form.cwidth, 2, sc.work);
 		DrawBar(0, Form.cheight - 2, Form.cwidth,  2, sc.work);
 		DrawBar(Form.cwidth-1, Form.cheight - 19, 1,  17, sc.work);
-		DrawFuncButtonsInKfm();
-		DrawPathBar();
+		DrawFuncButtonsInKfm();
-		return;
-	}
 	} else {
-	if (!show_status_bar.checked) return;
+		if (!show_status_bar.checked) return;
-	if (files.count>0) && (streq(items.get(0)*304+buf+72,"..")) go_up_folder_exists=1;
+		if (files.count>0) && (streq(items.get(0)*304+buf+72,"..")) go_up_folder_exists=1;
-	DrawBar(0, Form.cheight - status_bar_h, Form.cwidth,  status_bar_h, sc.work);
+		DrawBar(0, Form.cheight - status_bar_h, Form.cwidth,  status_bar_h, sc.work);
-	sprintf(#status_bar_str, T_STATUS_EVEMENTS, folder_count-go_up_folder_exists, files.count-folder_count);
+		sprintf(#status_bar_str, T_STATUS_EVEMENTS, folder_count-go_up_folder_exists, files.count-folder_count);
-		sprintf(#status_bar_str, T_STATUS_SELECTED, selected_count);
+			sprintf(#status_bar_str, T_STATUS_SELECTED, selected_count);
-		WriteText(Form.cwidth - calc(strlen(#status_bar_str)*6)-6,Form.cheight - 13,
+			WriteText(Form.cwidth - calc(strlen(#status_bar_str)*6)-6,Form.cheight - 13,
 x80,sc.work_text,#status_bar_str);
+		}
+	}
+}
 void DrawFilePanels()
+{
 	int files_y = files.y;
+	{
 		SystemDiscs.Draw();
 		files.SetSizes(192, 57, Form.cwidth - 210, Form.cheight - 59 - status_bar_h, files.item_h);
 		DrawButtonsAroundList();
 		List_ReDraw();
+		DrawPathBar();
+	}
 	else
+	{
+		llist_copy(#files_active, #files);
+		llist_copy(#files, #files_inactive);
 		if (!active_panel) {
 			files.SetSizes(Form.cwidth/2, files_y, w2-17, h2, files.item_h);
 		} else {
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
+		}
 		files_inactive.x = files.x;
 		DrawButtonsAroundList();
 		path = location[active_panel^1];
+		Open_Dir(path,WITH_REDRAW);
-		Open_Dir(location[active_panel^1],WITH_REDRAW);
+		if (!selected_count) files_inactive.count = files.count;
-		llist_copy(#files_inactive, #files);
+		llist_copy(#files, #files_active);
 		if (!active_panel) {
 			files.SetSizes(2, files_y, Form.cwidth/2-2-17, h2, files.item_h);
 		} else {
 			files.SetSizes(Form.cwidth/2, files_y, w2 -17, h2, files.item_h);
+		}
 		DrawButtonsAroundList();
 		path = location[active_panel];
-		Open_Dir(location[active_panel],WITH_REDRAW);
+		Open_Dir(path,WITH_REDRAW);
+	}
 void Open_Dir(dword dir_path, redraw){
 	int errornum;
 	selected_count = 0;
 	if (buf) free(buf);
-	errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT);
-	if (errornum)
+	if (errornum = GetDir(#buf, #files.count, dir_path, DIRS_NOROOT))
+	{
 		history.add(path);
 		EventHistoryGoBack();
 		Write_Error(errornum);
 	if (!strncmp(dir_path, "/rd/1",5)) || (!strncmp(dir_path, "/sys/",4))
 		dir_at_fat16 = true; else dir_at_fat16 = false;
 	Sorting();
 	list_full_redraw = true;
 	SetCurDir(dir_path);
-	DrawPathBar();
 	if (redraw!=ONLY_OPEN) {
 		history.add(path);
 		List_ReDraw();
 		DrawStatusBar();
+		DrawPathBar();
+	}
+}
 inline Sorting()
 	if (iii==0) return;
 	iii = strrchr(path, '/');
 	strcpy(#old_folder_name, path+iii);
 	if (iii>1) ESBYTE[path+iii-1]=NULL; else ESBYTE[path+iii]=NULL;
 	SelectFileByName(#old_folder_name);
+	if(efm)DrawPathBarKfm();
+}
 void EventOpenSelected()
+{
 void EventOpenDiskPopin(int panel_n)
+{
 	DefineHiddenButton(0,0,5000,3000,9999+BT_NOFRAME);
 	if (panel_n==0) {
 		disk_popin_active_on_panel = 1;
-		SystemDiscs.DrawOptions(Form.cwidth/2-DDW);
+		SystemDiscs.DrawOptions(1);
 	} else {
 		disk_popin_active_on_panel = 2;
-		SystemDiscs.DrawOptions(Form.cwidth-DDW-2);
+		SystemDiscs.DrawOptions(Form.cwidth/2-1);
+	}
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/Eolite.c @ 9269 – Rev 8951 → 8952