Subversion Repositories Kolibri OS

Rev

Rev 7219 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 7219 Rev 7227
Line 52... Line 52...
52 
	?define FSIZE "Full width"
 52 
	?define FSIZE "Full width"
53 
	?define ASHOW "Always show"
 53 
	?define ASHOW "Always show"
54 
	?define CHANGE_POS "Click on image to change position"
 54 
	?define CHANGE_POS "Click on image to change position"
55 
#endif
 55 
#endif
Line 56... Line -...
56 
 
 - 
 
57 
 
 - 
 
58 
frame taskbar_frame = { 0, NULL, 10, NULL, 16, NULL, 0xFFFfff, 1, TASK_FRAME_T, 0, 1, 12, 0x000111, 0xCCCccc };
 - 
 
59 
frame docky_frame   = { 0, NULL, 10, NULL, NULL, NULL, 0xFFFfff, 1, DOCK_FRAME_T, 0, 1, 12, 0x000111, 0xCCCccc };
 - 
 
60 
 
 56 
 
61 
char taskbar_ini_path[] = "/sys/settings/taskbar.ini";
 57 
char taskbar_ini_path[] = "/sys/settings/taskbar.ini";
62 
_ini taskbar_flags_ini = { #taskbar_ini_path, "Flags" };
 58 
_ini taskbar_flags_ini = { #taskbar_ini_path, "Flags" };
Line 63... Line 59...
63 
_ini taskbar_vars_ini = { #taskbar_ini_path, "Variables" };
 59 
_ini taskbar_vars_ini = { #taskbar_ini_path, "Variables" };
Line 145... Line 141...
145 
		case evReDraw:
 141 
		case evReDraw:
146 
				system.color.get();
 142 
				system.color.get();
147 
				DefineAndDrawWindow(130, 150, 465, 398 + skin_height, 0x34, system.color.work, WINDOW_TITLE, 0);
 143 
				DefineAndDrawWindow(130, 150, 465, 398 + skin_height, 0x34, system.color.work, WINDOW_TITLE, 0);
148 
				GetProcessInfo(#Form, SelfInfo);
 144 
				GetProcessInfo(#Form, SelfInfo);
149 
				if (Form.status_window>2) break;
 145 
				if (Form.status_window>2) break;
150 
				taskbar_frame.size_x = docky_frame.size_x = - taskbar_frame.start_x * 2 + Form.cwidth;
 - 
 
151 
				taskbar_frame.font_color = docky_frame.font_color = system.color.work_text;
 - 
 
152 
				taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = system.color.work;
 - 
 
153 
				taskbar_frame.ext_col = docky_frame.ext_col = system.color.work_graph;
 - 
 
154 
				DrawWindowContent(ALL);
 146 
				DrawWindowContent(ALL);
155 
	}
 147 
	}
156 
}
 148 
}
Line 157... Line 149...
157 
 
 149 
 
158 
 
 150 
 
- 
 
 151 
void DrawWindowContent(byte panel_type)
- 
 
 152 
{
159 
void DrawWindowContent(byte panel_type)
 153 
	#define PD 10
160 
{
 154 
	dword frame_y;
Line 161... Line 155...
161 
	word win_center_x = Form.cwidth / 2 + 20;
 155 
	word win_center_x = Form.cwidth / 2 + 20;
162 
	incn y;
 156 
	incn y;
- 
 
 157 
 
163 
 
 158 
	if (panel_type==ALL) || (panel_type==TASKBAR)
164 
	if (panel_type==ALL) || (panel_type==TASKBAR)
 159 
	{
165 
	{
 160 
		frame_y = 15;
166 
		y.n = taskbar_frame.start_y;
 161 
		y.n = frame_y;
167 
		DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 100 + BT_HIDE, 0);
 162 
		DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 100 + BT_HIDE, 0);
168 
		_PutImage(22, y.n, 37, 27, tbAttachment * 37 * 27 * 3 + panels_img.data);
 163 
		_PutImage(22, y.n, 37, 27, tbAttachment * 37 * 27 * 3 + panels_img.data);
Line 176... Line 171...
176 
		CheckBox(22, y.inc(24), 108, MIN_RIGHT_BUTTON, tbMinRightButton);
 171 
		CheckBox(22, y.inc(24), 108, MIN_RIGHT_BUTTON, tbMinRightButton);
177 
		CheckBox(win_center_x, y.n, 114, MENU_BUTTON, tbMenuButton);
172 
		CheckBox(win_center_x, y.n, 114, MENU_BUTTON, tbMenuButton);
178 
		MoreLessBox(22, y.inc(28), 120, 121, tbPanelHeight, PANEL_HEIGHT);
 173 
		MoreLessBox(22, y.inc(28), 120, 121, tbPanelHeight, PANEL_HEIGHT);
179 
		MoreLessBox(22, y.inc(32), 122, 123, tbSoftenHeight, SOFTEN_HEIGHT);
 174 
		MoreLessBox(22, y.inc(32), 122, 123, tbSoftenHeight, SOFTEN_HEIGHT);
180 
		MoreLessBox(22, y.inc(32), 124, 125, tbButtonOffset, BUTTON_OFFSET);
 175 
		MoreLessBox(22, y.inc(32), 124, 125, tbButtonOffset, BUTTON_OFFSET);
181 
		taskbar_frame.size_y = y.inc(32) - taskbar_frame.start_y;
 176 
		DrawFrame(PD, frame_y, Form.cwidth-PD-PD, y.inc(32)-frame_y, TASK_FRAME_T);
182 
	}
 177 
	}
183 
	if (panel_type==ALL) || (panel_type==DOCKY)
 178 
	if (panel_type==ALL) || (panel_type==DOCKY)
184 
	{
 179 
	{
185 
		docky_frame.start_y = y.inc(20);
 180 
		frame_y = calc(y.inc(20));
186 
		DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 200 + BT_HIDE, 0);
 181 
		DefineButton(22, y.inc(18), panels_img.w-1, 27-1, 200 + BT_HIDE, 0);
187 
		_PutImage(22, y.n,  37, 27, dkLocation + 1 * 37 * 27 * 3 + panels_img.data);
 182 
		_PutImage(22, y.n,  37, 27, dkLocation + 1 * 37 * 27 * 3 + panels_img.data);
188 
		WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
 183 
		WriteText(68, y.inc(7), 0x90, system.color.work_text, CHANGE_POS);
189 
		CheckBox(22, y.inc(35), 201, FSIZE,  dkFsize);
 184 
		CheckBox(22, y.inc(35), 201, FSIZE,  dkFsize);
190 
		CheckBox(win_center_x, y.n, 202, ASHOW, dkAshow);
 185 
		CheckBox(win_center_x, y.n, 202, ASHOW, dkAshow);
191 
		docky_frame.size_y = y.inc(30) - docky_frame.start_y;
 186 
		DrawFrame(PD, frame_y, Form.cwidth-PD-PD, Form.cheight-frame_y-PD, DOCK_FRAME_T);
192 
	}
 - 
 
193 
	if (panel_type==ALL)
 - 
 
194 
	{
 - 
 
195 
		frame_draw stdcall (#taskbar_frame);
 - 
 
196 
		frame_draw stdcall (#docky_frame);
 - 
 
197 
	}
 187 
	}
198 
}
 188 
}
Line 199... Line 189...
199 
 
 189 
 
200 
void LoadCfg()
 190 
void LoadCfg()