Eolite 2.52: better settings code, fix list sorting buttons

C-- BoxLib library include: add frame structure, clean source

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

programs/cmm/eolite/Eolite.c

@@ -83,8 +83,8 @@
 
 enum {ONLY_SHOW, WITH_REDRAW, ONLY_OPEN}; //OpenDir
 
-#define TITLE "Eolite File Manager v2.51"
+#define TITLE "Eolite File Manager v2.5"
-#define ABOUT_TITLE "Eolite v2.51"
+#define ABOUT_TITLE "Eolite v2.52"
 dword col_padding, col_selec, col_lpanel;
 
 int toolbar_buttons_x[7]={9,46,85,134,167,203};
@@ -502,9 +502,9 @@ void draw_window()
 	for (i=0; i<5; i++) DrawBar(0, 34+i, Form.cwidth, 1, col_palette[8-i]);	
 	DrawLeftPanel();
 	//ListBox
-	DrawFlatButton(files.x,40,Form.cwidth + files.x - 159,16,31,sc.work,T_FILE);
+	DrawFlatButton(files.x,40,Form.cwidth - files.x - 159,16,31,sc.work,T_FILE);
-	DrawFlatButton(Form.cwidth + 159,40,73,16,32,sc.work,T_TYPE);
+	DrawFlatButton(Form.cwidth - 159,40,73,16,32,sc.work,T_TYPE);
-	DrawFlatButton(Form.cwidth + 96,40,68,16,33,sc.work,T_SIZE);
+	DrawFlatButton(Form.cwidth - 86,40,68,16,33,sc.work,T_SIZE);
 	DrawBar(files.x+files.w,files.y,1,onTop(22,files.y),sc.work_graph); //line to the left from the scroll
 	DrawFlatButton(files.x+files.w,40,16,16,0,sc.work,"\x18");
 	DrawFlatButton(files.x+files.w,onTop(22,0),16,16,0,sc.work,"\x19");
@@ -889,7 +889,7 @@ void Dir_Up()
 	SelectFile(#cur_folder);
 }
 
-void Open(int rez)
+void Open(byte rez)
 {
 	byte temp[4096];
 	if (rez)

programs/cmm/eolite/include/settings.h

@@ -83,11 +83,8 @@ void settings_dialog()
 				DefineAndDrawWindow(Form.left + 100, 150, 300, 200+GetSkinHeight(),0x34,sc.work,TITLE_SETT);
 				GetProcessInfo(#settings_form, SelfInfo);
 
-				if (show_dev_name) ShowDeviceName_chb.flags = 110b;
+				ShowDeviceName_chb.flags |= 1 << show_dev_name;
-				ELSE  ShowDeviceName_chb.flags = 100b;
+				RealFileNamesCase_chb.flags |= 1 << real_files_names_case;
-				
-				if (real_files_names_case) RealFileNamesCase_chb.flags = 110b;
-				ELSE RealFileNamesCase_chb.flags = 100b;
 
 				key = itoa(files.line_h);
 				strcpy(#lineh_s, key);
@@ -119,8 +116,8 @@ void LoadIniSettings()
 
 void SaveIniSettings()
 {
-	if (ShowDeviceName_chb.flags==6) show_dev_name=1; else show_dev_name=0;
+	show_dev_name = TestBit(ShowDeviceName_chb.flags, 1);
-	if (RealFileNamesCase_chb.flags==6) real_files_names_case=1; else real_files_names_case=0;
+	real_files_names_case = TestBit(RealFileNamesCase_chb.flags, 1);
 	ini_set_int stdcall (eolite_ini_path, "Config", "ShowDeviceName", show_dev_name);
 	ini_set_int stdcall (eolite_ini_path, "Config", "RealFileNamesCase", real_files_names_case);
 	ini_set_int stdcall (eolite_ini_path, "Config", "LineHeight", atoi(#lineh_s));

programs/cmm/lib/lib.obj/box_lib.h

@@ -1,6 +1,6 @@
 //BOX_LIB - Asper
 dword boxlib = #aEdit_box_lib;
-char aEdit_box_lib[22]="/sys/lib/box_lib.obj\0";
+char aEdit_box_lib[]="/sys/lib/box_lib.obj";
 
 dword box_lib_init   = #aboxlib_init;
 
@@ -25,49 +25,53 @@ dword check_box_draw = #aCheck_box_draw;
 dword check_box_mouse = #aCheck_box_mouse;
 dword version_ch = #aVersion_ch;
 
+dword frame_draw = #aFrame_draw;
+
 $DD 2 dup 0
 
-char aEdit_box_draw [9]     = "edit_box\0";
+char aEdit_box_draw []     = "edit_box";
-char aEdit_box_key  [13]    = "edit_box_key\0";
+char aEdit_box_key  []    = "edit_box_key";
-char aEdit_box_mouse[15]    = "edit_box_mouse\0";
+char aEdit_box_mouse[]    = "edit_box_mouse";
-char aVersion_ed    [11]    = "version_ed\0";
+char aVersion_ed    []    = "version_ed";
 
-char aboxlib_init[9]        = "lib_init\0";
+char aboxlib_init[]        = "lib_init";
-char aScrollbar_v_draw [17] = "scrollbar_v_draw\0";
+char aScrollbar_v_draw [] = "scrollbar_v_draw";
-char aScrollbar_v_mouse[18] = "scrollbar_v_mouse\0";
+char aScrollbar_v_mouse[] = "scrollbar_v_mouse";
-char aScrollbar_h_draw [17] = "scrollbar_h_draw\0";
+char aScrollbar_h_draw [] = "scrollbar_h_draw";
-char aScrollbar_h_mouse[18] = "scrollbar_h_mouse\0";
+char aScrollbar_h_mouse[] = "scrollbar_h_mouse";
-char aVersion_scrollbar[18] = "version_scrollbar\0";
+char aVersion_scrollbar[] = "version_scrollbar";
 
-char aCheck_box_draw   [15] = "check_box_draw2\0";
+char aCheck_box_draw   [] = "check_box_draw2";
-char aCheck_box_mouse  [16] = "check_box_mouse2\0";
+char aCheck_box_mouse  [] = "check_box_mouse2";
-char aVersion_ch       [11] = "version_ch2\0";
+char aVersion_ch       [] = "version_ch2";
 
-char aOption_box_draw  [16] = "option_box_draw\0";
+char aOption_box_draw  [] = "option_box_draw";
-char aOption_box_mouse [17] = "option_box_mouse\0";
+char aOption_box_mouse [] = "option_box_mouse";
-char aVersion_op       [11] = "version_op\0" ;
+char aVersion_op       [] = "version_op" ;
 
-char aPathShow_prepare [17] = "PathShow_prepare\0";
+char aPathShow_prepare [] = "PathShow_prepare";
-char aPathShow_draw    [14] = "PathShow_draw\0";
+char aPathShow_draw    [] = "PathShow_draw";
 
-char aProgressbar_draw  [17] = "progressbar_draw\0";
+char aProgressbar_draw  [] = "progressbar_draw";
-char aProgressbar_progress[21] = "progressbar_progress\0";
+char aProgressbar_progress[] = "progressbar_progress";
+
+char aFrame_draw[] = "frame_draw";
 
 
 struct PathShow_data
 {
-dword type;//			dd 0	;+0
+dword type;
-word start_y,//		dw 28	;+4
+word start_y,
-	start_x,//		dw 172	;+6
+	start_x,
-	font_size_x,//		dw 6	;+8	; 6 - for font 0, 8 - for font 1
+	font_size_x,    // 6 - for font 0, 8 - for font 1
-	area_size_x;//		dw 200	;+10
+	area_size_x;
-dword font_number,//		dd 0	;+12	; 0 - monospace, 1 - variable
+dword font_number,  // 0 - monospace, 1 - variable
-	background_flag,//	dd 0	;+16
+	background_flag,
-	font_color,//		dd 0x0	;+20
+	font_color,
-	background_color,//	dd 0x0	;+24
+	background_color,
-	text_pointer,//		dd openfile_pach	;+28
+	text_pointer,
-	work_area_pointer,//	dd text_work_area	;+32
+	work_area_pointer,
-	temp_text_length;//	dd 0	;+36
+	temp_text_length;
 };
 /*
 char temp[128];
@@ -82,8 +86,18 @@ dword width, left, top, color, shift_color, focus_border_color, blur_border_colo
 text_color, max, text, mouse_variable, flags, size, pos, offset, cl_curs_x, cl_curs_y, shift, shift_old;
 };
 
-struct checkbox2{
+struct checkbox2
-dword left_s, top_s, ch_text_margin, color, border_color, text_color, text, flags, size_of_str;
+{
+  dword
+	left_s,
+	top_s,
+	ch_text_margin,
+	color,
+	border_color,
+	text_color,
+	text,
+	flags,
+	size_of_str;
 };
 
 //flags for checkbox2
@@ -94,46 +108,65 @@ dword left_s, top_s, ch_text_margin, color, border_color, text_color, text, flag
 
 struct scroll_bar
 {
-word size_x,//  equ [edi]     
+	word size_x,
-start_x,//      equ [edi+2]
+	start_x,
-size_y,//		equ [edi+4]
+	size_y,
-start_y;//		equ [edi+6]
+	start_y;
-dword btn_height, //equ [edi+8]
+	dword btn_height,
-type,//			equ [edi+12]
+	type,
-max_area,//		equ [edi+16]
+	max_area,
-cur_area,//		equ [edi+20]
+	cur_area,
-position,//		equ [edi+24]
+	position,
-bckg_col,//		equ [edi+28]
+	bckg_col,
-frnt_col,//		equ [edi+32]
+	frnt_col,
-line_col,//		equ [edi+36]
+	line_col,
-redraw;//		equ [edi+40]
+	redraw;
-word delta,//		equ [edi+44]
+	word delta,
-delta2,//		equ [edi+46]
+	delta2,
-r_size_x,//		equ [edi+48]
+	r_size_x,
-r_start_x,//	equ [edi+50]
+	r_start_x,
-r_size_y,//		equ [edi+52]
+	r_size_y,
-r_start_y;//	equ [edi+54]
+	r_start_y;
-dword m_pos,//		equ [edi+56]
+	dword m_pos,
-m_pos_2,//		equ [edi+60]
+	m_pos_2,
-m_keys,//		equ [edi+64]
+	m_keys,
-run_size,//		equ [edi+68]
+	run_size,
-position2,//	equ [edi+72]
+	position2,
-work_size,//	equ [edi+76]
+	work_size,
-all_redraw,//	equ [edi+80]
+	all_redraw,
-ar_offset;//	equ [edi+84]
+	ar_offset;
 };
 
-struct pb //progressbar
+struct progress_bar
 {
-dword value,
+  dword
-left,
+	value,
-top,
+	left,
-width,
+	top,
-height,
+	width,
-style,
+	height,
-min,
+	style,
-max,
+	min,
-back_color,
+	max,
-progress_color,
+	back_color,
-frame_color;
+	progress_color,
+	frame_color;
+};
+
+struct frame
+{
+	dword type;
+	word size_x;                  
+	word start_x;                 
+	word size_y;                  
+	word start_y;                
+	dword ext_col;            
+	dword int_col;            
+	dword draw_text_flag;  // 0-not,1-yes
+	dword text_pointer;          
+	dword text_position;   //  0-up,1-bottom
+	dword font_number;     //  0-monospace,1-variable
+	dword font_size_y;           
+	dword font_color;            
+	dword font_backgr_color;
 };     

programs/cmm/liza/liza.c

@@ -87,7 +87,7 @@ dword col_bg;
 dword panel_color;
 dword border_color;
 
-pb progress_bar = {0, 10, 83, 150, 12, 0, 0, 100, 0xeeeEEE, 8072B7EBh, 0x9F9F9F};
+progress_bar progress_bar = {0, 10, 83, 150, 12, 0, 0, 100, 0xeeeEEE, 8072B7EBh, 0x9F9F9F};
 
 int http_transfer;
 char version[]=" WebView 0.1";