WebSVN – Kolibri OS – Diff – /programs/cmm/software_widget/software_widget.c

 #include "..\lib\collection.h"
 proc_info Form;
 llist list;
 collection app_path_collection;
-byte kolibrios_mounted;
+bool kolibrios_mounted;
 int window_width,
 	window_height;
 int list_pos,
 	row,
 	col,
 	default_icon;
 char window_title[128],
  	dword graph;
  	dword dark;
  	dword light;
  } swc;
-block ipos[128];
+block selection[128];
-void load_config()
+void load_ini_config(dword _ini_path)
 {
-	ini_get_str stdcall (#settings_ini_path, "Config", "title", #window_title, sizeof(window_title), "Software widget");
+	_ini ini;
-	ini_get_int stdcall (#settings_ini_path, "Config", "win_width", 690);
+	ini.path = _ini_path;
-	window_width = EAX;
+	ini.section = "Config";
-	ini_get_int stdcall (#settings_ini_path, "Config", "cell_w", 73);
+	ini.GetString("title", #window_title, sizeof(window_title), "Software widget");
-	list.item_w = EAX;
+	window_width = ini.GetInt("win_width", 690);
-	ini_get_int stdcall (#settings_ini_path, "Config", "cell_h", 71);
+	list.item_w  = ini.GetInt("cell_w", 73);
-	list.item_h = EAX;
-	ini_get_int stdcall (#settings_ini_path, "Config", "default_icon", 2);
+	list.item_h  = ini.GetInt("cell_h", 71);
-	default_icon = EAX;
 	default_icon = ini.GetInt("default_icon", 2);
+}
 void main()
+{
 	dword id;
 	kfont.init(DEFAULT_FONT);
 	load_dll(libio,  #libio_init,1);
 	load_dll(libimg, #libimg_init,1);
-	load_dll(libini, #lib_init,1);
 	load_dll(libini, #lib_init,1);
-	kolibrios_mounted = dir_exists("/kolibrios");
-	if (param)
+	kolibrios_mounted = dir_exists("/kolibrios");
-		strcpy(#settings_ini_path, #param);
+	if (param) {
 		strcpy(#settings_ini_path, #param);
-	else
+	} else {
 		strcpy(#settings_ini_path, "/sys/settings/");
 		strcat(#settings_ini_path, I_Path + strrchr(I_Path, '/'));
 		strcat(#settings_ini_path, ".ini");
+	}
 		case evKey:
 			GetKeys();
 			if (SCAN_CODE_LEFT == key_scancode) key_scancode = SCAN_CODE_UP;
 			if (SCAN_CODE_RIGHT == key_scancode) key_scancode = SCAN_CODE_DOWN;
 			if (list.ProcessKey(key_scancode)) DrawSelection();
-			if (SCAN_CODE_ENTER == key_scancode) EventRunApp(list.cur_y);
+			if (SCAN_CODE_ENTER == key_scancode) EventIconClick(list.cur_y);
 			break;
 		case evButton:
 			id=GetButtonID();
 			if (id==1) ExitProcess();
-			if (id>=100) EventRunApp(id-100);
+			if (id>=100) EventIconClick(id-100);
 			break;
 		case evReDraw:
 			if (small_screen) {
 				DrawTitle(#window_title);
 				list.y = 0;
 			} else {
 				DrawTitle(NULL);
-				draw_top_bar();
+				DrawTopBar();
+			}
 			DrawList();
 			DrawBar(0, row +1 * list.item_h + list_pos, Form.cwidth, -row - 1 * list.item_h - list_pos + Form.cheight, swc.list_bg);
 			DrawSelection();
+	}
 	list.visible = list.count;
+}
 byte draw_icons_from_section(dword key_value, key_name, sec_name, f_name)
-{
-	int tmp,
+{
-		icon_id,
+	int icon_id = default_icon,
 		icon_char_pos;
+	int space_pos;
-	int text_w;
+	dword icon_x, icon_y, text_x, text_y;
 	//do not show items located in /kolibrios/ if this directory not mounted
 		row++;
 		col=0;
+	}
 	if (col==0) DrawBar(0, row * list.item_h + list_pos, Form.cwidth, list.item_h, swc.list_bg);
-	DefineButton(col*list.item_w+6, row*list.item_h + list_pos,list.item_w,list.item_h-5,list.count + 100 + BT_HIDE,0);
-	tmp = list.item_w/2;
+	DefineButton(col*list.item_w+6, row*list.item_h + list_pos,list.item_w,list.item_h-3,list.count + 100 + BT_HIDE,0);
 	icon_char_pos = strchr(key_value, ',');
+	icon_x = col*list.item_w+calc(list.item_w/2)-10;
+	icon_y = row*list.item_h+5 + list_pos;
-	if (icon_char_pos) icon_id = atoi(icon_char_pos+1); else icon_id = default_icon;
+	selection[list.count].x = icon_x-2;
-	img_draw stdcall(skin.image, col*list.item_w+tmp-10, row*list.item_h+5 + list_pos, 32, 32, 0, icon_id*32);
+	selection[list.count].y = icon_y-2;
+	if (icon_char_pos) ESBYTE[icon_char_pos] = '\0'; //delete icon from string
+	app_path_collection.add(key_value);
+	text_x = col*list.item_w+5;
-	if (icon_char_pos) ESBYTE[icon_char_pos] = '\0'; //delete icon from string
+	text_y = list.item_h - 40 / 2;
+	if (kfont.getsize(key_name)+30
+		kfont.WriteIntoWindowCenter(text_x, row*list.item_h+46 + list_pos, list.item_w,0, swc.list_bg, swc.text, 12, key_name);
+	} else {
-	app_path_collection.add(key_value);
+		space_pos = strrchr(key_name, ' ');
-	//kfont.WriteIntoWindowCenter(col*list.item_w+7,row*list.item_h+47 + list_pos, list.item_w,0, swc.list_bg, swc.dark, 12, key_name);
+		ESBYTE[key_name+space_pos-1] = '\0';
+		kfont.WriteIntoWindowCenter(text_x, row*list.item_h+46 + list_pos - 2, list.item_w,0, swc.list_bg, swc.text, 12, key_name);
-	text_w = kfont.WriteIntoWindowCenter(col*list.item_w+5,row*list.item_h+46 + list_pos, list.item_w,0, swc.list_bg, swc.text, 12, key_name);
+		kfont.WriteIntoWindowCenter(text_x, row*list.item_h+46 + list_pos + 14, list.item_w,0, swc.list_bg, swc.text, 12, key_name+space_pos);
-	ipos[list.count].x = list.item_w-text_w/2+calc(col*list.item_w)+5;
+	}
-	ipos[list.count].y = row*list.item_h+46 + list_pos + 16;
+	if (icon_char_pos) icon_id = atoi(icon_char_pos+1);
-	ipos[list.count].w = text_w;
+	img_draw stdcall(skin.image, icon_x, icon_y, 32, 32, 0, icon_id*32);
 	list.count++;
 	col++;
+	}
 	ini_enum_keys stdcall (f_name, sec_name, #draw_icons_from_section);
 	return true;
+}
-void draw_top_bar()
+void DrawTopBar()
+{
 	DrawBar(0,0,Form.cwidth, list.y-2, system.color.work);
 	DrawBar(0,list.y-2, Form.cwidth, 1, MixColors(system.color.work, system.color.work_graph, 180));
 	DrawBar(0,list.y-1, Form.cwidth, 1, system.color.work_graph);
 	kfont.WriteIntoWindowCenter(0,5, Form.cwidth, list.y, system.color.work, system.color.work_text, 16, #window_title);
 }
-void EventRunApp(dword appid)
+void EventIconClick(dword appid)
+{
 	char run_app_path[4096]=0;
 	dword app_path = app_path_collection.get(appid);
 		app_path+=3;
+	}
 	strcat(#run_app_path, app_path);
 	// }end
-	if (file_exists(#run_app_path))
 	if (file_exists(#run_app_path)) {
 		io.run(#run_app_path, param_pos); //0 or offset
-		if (param_pos) ESBYTE[param_pos - 1] = '|';
-	}
+		if (param_pos) ESBYTE[param_pos - 1] = '|';
-	else
 	} else {
 		notify("'Application not found' -E");
+	}
+}
 void DrawSelection()
+{
 	int i;
 	dword col;
 	for (i=0; i
 		if (i==list.cur_y) col=0x0080FF; else col=swc.list_bg;
-		DrawBar(ipos[i].x, ipos[i].y, ipos[i].w+2, 3, col);
+		DrawWideRectangle(selection[i].x, selection[i].y, 36, 36, 2, col);
+	}

Subversion Repositories Kolibri OS

(root)/programs/cmm/software_widget/software_widget.c – Rev 7654 → 7769