Eolite 3.5: Breadcrumbs (option settings)

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

programs/cmm/eolite/Eolite.c

@@ -28,7 +28,8 @@
 //Button IDs
 enum {
 	POPUP_BTN1 = 201,
-	POPUP_BTN2 = 202
+	POPUP_BTN2 = 202,
+	BREADCRUMB_ID = 300
 };
 
 //NewElement options
@@ -98,11 +99,11 @@ int sort_num=2,
 	real_files_names_case=false,
 	info_after_copy=false,
 	two_panels=false,
+	show_breadcrumb=false,
 	active_panel=1;
 //} settings;
 
 edit_box new_file_ed = {171,213,180,0xFFFFFF,0x94AECE,0xFFFFFF,0xFFFFFF,0,248,#new_element_name,#mouse_dd,100000000000010b,6,0};
-PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0};
 PathShow_data FileShow = {0, 56,215, 6, 100, 0, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
 byte cmd_free=0;
 #include "include\translations.h"
@@ -122,10 +123,11 @@ char *fd_path_eolite_ini_path;
 #include "include\delete.h"
 #include "include\about.h"
 #include "include\properties.h"
+#include "include\breadcrumbs.h"
 
 void main() 
 {
-	word id;
+	dword id;
 	byte count_sl = 0;
 	signed x_old, y_old, dif_x, dif_y, adif_x, adif_y;
 	char can_show, can_select, stats;
@@ -343,6 +345,9 @@ void main()
 						DeleteButton(POPUP_BTN1);
 						DeleteButton(POPUP_BTN2);
 						break;
+					case BREADCRUMB_ID...400:
+						ClickOnBreadCrumb(id-BREADCRUMB_ID);
+						break;
 				}
 				break;
 	//Key pressed-----------------------------------------------------------------------------
@@ -539,11 +544,12 @@ void draw_window()
 	DrawBar(127, 8, 1, 25, col_graph);
 	for (j=0; j<3; j++) DefineButton(toolbar_buttons_x[j]+2,5+2,31-5,29-5,21+j+BT_HIDE,NULL);
 	for (j=3; j<6; j++) DefineButton(toolbar_buttons_x[j],5,31,29,21+j+BT_HIDE,NULL);
-	DrawBar(246,0, Form.cwidth - 297,12, col_work); //upper editbox
+	DrawBar(246,0, Form.cwidth - 246, 34, col_work);
-	DrawBar(246,29,Form.cwidth - 297,5,  col_work); //lower editbox
+	if (!show_breadcrumb) {
-	DrawRectangle(246,12,Form.cwidth - 303,16,col_graph);
+		DrawRectangle(246,12,Form.cwidth - 303,16,col_graph);
-	DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about
+		DefineButton(Form.cwidth - 32,6,27,28,51+BT_HIDE+BT_NOFRAME,0); //about
-	PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal);
+		PutPaletteImage(#goto_about,56,34,Form.width-65,0,8,#goto_about_pal);
+	}
 	//main rectangles
 	DrawRectangle(1,40,Form.cwidth-3,Form.cheight - 42,col_graph);
 	DrawRectangle(0,39,Form.cwidth-1,Form.cheight - 40,col_palette[4]); //bg
@@ -753,13 +759,7 @@ void Open_Dir(dword dir_path, redraw){
 	}
 	if (files.count!=-1)
 	{
-		if(!_not_draw)
+		if(!_not_draw) if (show_breadcrumb) DrawBreadCrumbs(); else DrawPathBar();
-		{
-			PathShow.area_size_x = Form.cwidth-306;
-			DrawBar(PathShow.start_x-3, PathShow.start_y-4, PathShow.area_size_x+2, 15, 0xFFFfff);
-			PathShow_prepare stdcall(#PathShow);
-			PathShow_draw stdcall(#PathShow);
-		}
 		history.add(#path);
 		SystemDiscs.Draw();
 		files.visible = files.h / files.item_h;

programs/cmm/eolite/include/breadcrumbs.h

@@ -0,0 +1,64 @@
+
+PathShow_data PathShow = {0, 17,250, 6, 250, 0, 0, 0x0, 0xFFFfff, #path, #temp, 0};
+void DrawPathBar()
+{
+	PathShow.area_size_x = Form.cwidth-306;
+	DrawBar(PathShow.start_x-3, PathShow.start_y-4, PathShow.area_size_x+2, 15, 0xFFFfff);
+	PathShow_prepare stdcall(#PathShow);
+	PathShow_draw stdcall(#PathShow);
+}
+
+void DrawBreadCrumbs()
+ collection_int breadCrumb;
+ char PathShow_path[4096];
+ obj btn;
+ int i;
+ unsigned text_line, area_w;
+ {
+	strcat(#PathShow_path, #path);
+	for (i=0; i<50; i++) DeleteButton(i+BREADCRUMB_ID);
+	breadCrumb.drop();
+	for (i=0; PathShow_path[i]; i++) 
+	{
+		if (PathShow_path[i]=='/') {
+			PathShow_path[i] = NULL;
+			breadCrumb.add(i+1);
+		}
+	}
+	btn.size(246,10,NULL,20);
+	area_w = Form.cwidth - btn.x - 20;
+	for (i=0; i<breadCrumb.count-1; i++)
+	{
+		text_line = breadCrumb.get(i) + #PathShow_path;
+		btn.w = strlen(text_line)*8+10;
+		DrawBreadcrumbButton(btn.x, btn.y, btn.w, btn.h, i+BREADCRUMB_ID, text_line);
+		btn.x += btn.w;
+	}
+	DrawBar(btn.x+1,btn.y-1,Form.cwidth-btn.x-5,btn.h+3,col_work);
+}
+
+
+void ClickOnBreadCrumb(unsigned clickid)
+{
+	int i, slashpos = #path;
+	for (i=0; i!=clickid+2; i++) {
+		slashpos=strchr(slashpos,'/')+1;
+	}
+	ESBYTE[slashpos] = NULL;
+	Open_Dir(#path,WITH_REDRAW);
+}
+
+
+dword col_palette_br[14] = {0xFFFfff,0xF3EDF0,0xF3EDF0,0xF3EDF0,0xF3EDF0,
+	0xF2EBEF,0xF2EBEF,
+	0xF0EAEC,0xEFE9EB,0xEDE6E9,0xEAE6E8,0xE9E4E6,0xE5E0E3,0xE3DDDE,0xE0DBDB,
+	0xDFDADA,0xDBD9DA,0xD2D0D2,0xC2C6C6};
+void DrawBreadcrumbButton(dword x,y,w,h,id,text)
+{
+	int i;
+	DrawRectangle(x,y,w,h,col_graph);
+	for (i=0; i<h-1; i++) DrawBar(x+1, y+i+1, w-1, 1, col_palette_br[i]);
+	DefineButton(x+1,y+1,w-2,h-2,id+BT_HIDE,0xEFEBEF);
+	WriteText(-strlen(text)*8+w/2+x,h/2+y-7,0x90,0x444444,text);
+	DrawBar(x, y+h+1, w+1, 1, MixColors(col_work,0xFFFfff,120));
+}

programs/cmm/eolite/include/gui.h

@@ -1,6 +1,5 @@
 
-dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,
+dword col_palette[14] = {0xD2D3D3,0xD4D4D4,0xD6D5D6,0xD8D7D8,0xDAD8D9,0xDCDADB,0xDFDCDD,0xE1DDDE,0xE2DEE0,0xE4DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1};
-0xDFDCDD,0xE1DDDE,0xE2DEE0,0xE4DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1,0xE3DFE1};
 
 void Scroll() {
 	dword i;
@@ -59,11 +58,12 @@ void DrawFlatButton(dword x,y,width,height,id,text)
 	}
 }
 
+
 void DrawFilledBar(dword x, y, w, h)
 {
 	int i, fill_h;
 	if (h <= 14) fill_h = h; else fill_h = 14;
-	for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette[14-i]);	
+	for (i=0; i<fill_h; i++) DrawBar(x, y+i, w, 1, col_palette[14-i]);
 	DrawBar(x, y+i, w, h-fill_h, col_palette[14-i]);
 }
 

programs/cmm/eolite/include/settings.h

@@ -50,12 +50,13 @@ void settings_dialog()
 				else if (id==21) { action_buf=109; real_files_names_case ^= 1; }
 				else if (id==22) info_after_copy ^= 1;
 				else if (id==24) two_panels ^= true;
+				else if (id==32) show_breadcrumb ^= true;
 				else if (id==25) { files.item_h++; files_active.item_h = files_inactive.item_h = files.item_h; }
 				else if (id==26) && (files.item_h>18) files.item_h--;
 				else if (id==30) { label.size.pt++; IF(!label.changeSIZE()) label.size.pt--; BigFontsChange(); }
 				else if (id==31) { label.size.pt--; IF(!label.changeSIZE()) label.size.pt++; BigFontsChange(); }
 				EventRedrawWindow(Form.left,Form.top);
-				DrawSettingsCheckBoxes();
+				//DrawSettingsCheckBoxes();
 			break;
 					
 			case evKey:
@@ -64,10 +65,8 @@ void settings_dialog()
 				break;
 				
 			case evReDraw:
-				DefineAndDrawWindow(Form.left + Form.width/2-10, Form.top + Form.height/2 - 75, 370, 258+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
+				DefineAndDrawWindow(Form.left + Form.width/2-10, Form.top + Form.height/2 - 75, 370, 282+GetSkinHeight(),0x34,system.color.work,TITLE_SETT);
 				DrawSettingsCheckBoxes();
-				DrawFlatButton(9, 180, strlen(SAVE_PATH_AS_DEFAULT)+3*8, 24, 6, SAVE_PATH_AS_DEFAULT);
-				DrawFlatButton(9, 216, strlen(EDIT_FILE_ASSOCIATIONS)+3*8, 24, 5, EDIT_FILE_ASSOCIATIONS);
 		}
 	}
 }
@@ -82,12 +81,17 @@ void ExitSettings()
 
 void DrawSettingsCheckBoxes()
 {
-	CheckBox(10, 13, 20, SHOW_DEVICE_CLASS,  show_dev_name);
+	incn y;
-	CheckBox(10, 37, 21, SHOW_REAL_NAMES,  real_files_names_case);
+	y.n = 0;
-	CheckBox(10, 61, 22, NOTIFY_COPY_END,  info_after_copy);
+	CheckBox(10, y.inc(13), 20, SHOW_DEVICE_CLASS,  show_dev_name);
-	CheckBox(10, 85, 24, USE_TWO_PANELS,  two_panels);
+	CheckBox(10, y.inc(24), 21, SHOW_REAL_NAMES,  real_files_names_case);
-	MoreLessBox(10, 115, 25, 26, files.item_h, LIST_LINE_HEIGHT);
+	CheckBox(10, y.inc(24), 22, NOTIFY_COPY_END,  info_after_copy);
-	if (label.font) MoreLessBox(10, 144, 30, 31, label.size.pt, FONT_SIZE_LABEL);
+	CheckBox(10, y.inc(24), 24, USE_TWO_PANELS,  two_panels);
+	CheckBox(10, y.inc(24), 32, "Show breadcrumbs",  show_breadcrumb);
+	MoreLessBox(10, y.inc(30), 25, 26, files.item_h, LIST_LINE_HEIGHT);
+	if (label.font) MoreLessBox(10, y.inc(30), 30, 31, label.size.pt, FONT_SIZE_LABEL);
+	DrawFlatButton(9, y.inc(35), strlen(SAVE_PATH_AS_DEFAULT)+3*8, 24, 6, SAVE_PATH_AS_DEFAULT);
+	DrawFlatButton(9, y.inc(35), strlen(EDIT_FILE_ASSOCIATIONS)+3*8, 24, 5, EDIT_FILE_ASSOCIATIONS);
 }
 
 

programs/cmm/eolite/include/translations.h

@@ -1,5 +1,5 @@
-#define TITLE "Eolite File Manager v3.45"
+#define TITLE "Eolite File Manager v3.5"
-#define ABOUT_TITLE "EOLITE 3.45"
+#define ABOUT_TITLE "EOLITE 3.5"
 
 #ifdef LANG_RUS
 	?define T_FILE "” ©«"