WebSVN – Kolibri OS – Diff – /programs/cmm/eolite/include/settings.h

 	                      #path_start,#set_mouse_dd, 100000000000010b,0,0};
-more_less_box font_size = { NULL, 9, 22, FONT_SIZE_LABEL };
+more_less_box font_size   = { NULL, 9, 22, FONT_SIZE_LABEL };
 more_less_box line_height = { NULL, 16, 64, LIST_LINE_HEIGHT };
+checkbox show_dev_name    = { SHOW_DEVICE_CLASS };
+checkbox show_real_names  = { SHOW_REAL_NAMES };
+checkbox show_status_bar  = { SHOW_STATUS_BAR };
+checkbox info_after_copy  = { NOTIFY_COPY_END };
+checkbox show_breadcrumb  = { SHOW_BREADCRUMBS };
+checkbox big_icons        = { BIG_ICONS };
+checkbox two_panels       = { USE_TWO_PANELS };
 void settings_dialog()
+{
-	byte id;
+	int id;
 	active_settings=1;
 	font_size.value = kfont.size.pt;
 	line_height.value = files.item_h;
 				break;
 			case evButton:
 				id=GetButtonID();
-				if (id==1) { ExitSettings(); break; }
+				if (1==id) { ExitSettings(); break; }
 				else if (id==5)
+				{
 					RunProgram("tinypad", "/sys/settings/assoc.ini");
 					break;
+				}
+				{
 					ini.SetString("DefaultPath", #path_start,strlen(#path_start));
 					break;
+				}
-				else if (id==20) show_dev_name ^= 1;
+				show_dev_name.click(id);
-				else if (id==21) { action_buf=109; real_files_names_case ^= 1; }
+				if (show_real_names.click(id)) action_buf=109;
-				else if (id==22) info_after_copy ^= 1;
+				info_after_copy.click(id);
-				else if (id==24) two_panels ^= true;
+				two_panels.click(id);
-				else if (id==32) show_breadcrumb ^= true;
+				show_breadcrumb.click(id);
-				else if (id==27) show_status_bar ^= 1;
+				show_status_bar.click(id);
-				else if (font_size.click(id)) {
+				if (font_size.click(id)) {
 					kfont.size.pt = font_size.value;
 					kfont.changeSIZE();
 					BigFontsChange();
+				}
-				else if (line_height.click(id)) {
+				if (line_height.click(id)) files.item_h = line_height.value;
-					files.item_h = line_height.value;
-				}
+				if (big_icons.click(id)) BigIconsSwitch();
-				else if (id==33) {
-					big_icons ^= 1;
-					if (big_icons) {
-							icon_size=32;
-							files.item_h = line_height.value = 34;
-							if (!icons32_default.image)
-							{
-								Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
-								Libimg_LoadImage(#icons32_selected, "/sys/icons32.png");
-								Libimg_ReplaceColor(icons32_default.image, icons32_selected.w,
+				EventRedrawWindow(Form.left,Form.top);
-									icons32_selected.h, 0x00000000, 0xffFFFfff);
-								Libimg_ReplaceColor(icons32_selected.image, icons32_selected.w,
-									icons32_selected.h, 0x00000000, col_selec);
-							}
-						}
-					else {
-							icon_size=16;
-							files.item_h = line_height.value = 18;
-					}
-				}
-				EventRedrawWindow(Form.left,Form.top);
 				break;
 			case evKey:
 				GetKeys();
+{
 	incn y;
 	int x=11, frx=26, but_x;
 	y.n = 0;
-	CheckBox(x, y.inc(14), 20, SHOW_DEVICE_CLASS,  show_dev_name);
+	show_dev_name.draw(x, y.inc(14));
-	CheckBox(x, y.inc(25), 21, SHOW_REAL_NAMES,  real_files_names_case);
+	show_real_names.draw(x, y.inc(25));
-	CheckBox(x, y.inc(25), 27, SHOW_STATUS_BAR,  show_status_bar);
+	show_status_bar.draw(x, y.inc(25));
-	CheckBox(x, y.inc(25), 22, NOTIFY_COPY_END,  info_after_copy);
+	info_after_copy.draw(x, y.inc(25));
-	CheckBox(x, y.inc(25), 32, SHOW_BREADCRUMBS,  show_breadcrumb);
+	show_breadcrumb.draw(x, y.inc(25));
-	CheckBox(x, y.inc(25), 33, BIG_ICONS,  big_icons);
+	big_icons.draw(x, y.inc(25));
-	CheckBox(x, y.inc(25), 24, USE_TWO_PANELS,  two_panels);
+	two_panels.draw(x, y.inc(25));
 	font_size.draw(x, y.inc(31));
 	line_height.draw(x, y.inc(31));
 	DrawFrame(x, y.inc(37), 340, 95, START_PATH);
 	// START_PATH {
 	ini.path = GetIni(#eolite_ini_path, "EOLITE.INI");
 	ini.section = "Config";
 	files.SetFont(6, 9, 10000000b);
-	real_files_names_case = ini.GetInt("RealFileNamesCase", 1);
+	show_real_names.checked = ini.GetInt("RealFileNamesCase", true);
-	show_dev_name   = ini.GetInt("ShowDeviceName", 1);
+	show_dev_name.checked   = ini.GetInt("ShowDeviceName", true);
-	show_status_bar = ini.GetInt("ShowStatusBar", 1);
+	show_status_bar.checked = ini.GetInt("ShowStatusBar", true);
-	info_after_copy = ini.GetInt("InfoAfterCopy", 0);
+	info_after_copy.checked = ini.GetInt("InfoAfterCopy", false);
+	two_panels.checked      = ini.GetInt("TwoPanels", false);
 	kfont.size.pt   = ini.GetInt("FontSize", 13);
-	two_panels      = ini.GetInt("TwoPanels", 0);
 	files.item_h    = ini.GetInt("LineHeight", 19);
 	WinX = ini.GetInt("WinX", 200);
 	WinY = ini.GetInt("WinY", 50);
 	WinW = ini.GetInt("WinW", 550);
 	WinH = ini.GetInt("WinH", 506);
 void SaveIniSettings()
 {
-	ini.SetInt("ShowDeviceName", show_dev_name);
+	ini.SetInt("ShowDeviceName", show_dev_name.checked);
-	ini.SetInt("ShowStatusBar", show_status_bar);
+	ini.SetInt("ShowStatusBar", show_status_bar.checked);
-	ini.SetInt("RealFileNamesCase", real_files_names_case);
+	ini.SetInt("RealFileNamesCase", show_real_names.checked);
-	ini.SetInt("InfoAfterCopy", info_after_copy);
+	ini.SetInt("InfoAfterCopy", info_after_copy.checked);
 	ini.SetInt("FontSize", kfont.size.pt);
-	ini.SetInt("TwoPanels", two_panels);
+	ini.SetInt("TwoPanels", two_panels.checked);
 	ini.SetInt("LineHeight", files.item_h);
 	ini.SetInt("WinX", Form.left);
 	ini.SetInt("WinY", Form.top);
 	ini.SetInt("WinW", Form.width);
 	files.item_h = kfont.size.pt + 4;
 	if (files.item_h<18) files.item_h = 18;
 	files_active.item_h = files_inactive.item_h = files.item_h;
+}
+void BigIconsSwitch()
+{
+	if (big_icons.checked)
+	{
+		icon_size=32;
+		files.item_h = line_height.value = 34;
+		if (!icons32_default.image)
+		{
+			Libimg_LoadImage(#icons32_default, "/sys/icons32.png");
+			Libimg_LoadImage(#icons32_selected, "/sys/icons32.png");
+			Libimg_ReplaceColor(icons32_default.image, icons32_selected.w,
+				icons32_selected.h, 0x00000000, 0xffFFFfff);
+			Libimg_ReplaceColor(icons32_selected.image, icons32_selected.w,
+				icons32_selected.h, 0x00000000, col_selec);
+		}
+	}
+	else {
+		icon_size=16;
+		files.item_h = line_height.value = 18;
+	}
+}

Subversion Repositories Kolibri OS

(root)/programs/cmm/eolite/include/settings.h – Rev 7243 → 7244