Subversion Repositories Kolibri OS

Rev

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

Rev 7227 Rev 7243
Line 66... Line 66...
66 
proc_info Form;
 66 
proc_info Form;
Line 67... Line 67...
67 
 
 67 
 
68 
word dkFsize;
 68 
word dkFsize;
Line 69... Line -...
69 
byte dkLocation, dkAshow;
 - 
 
70 
 
 69 
byte dkLocation, dkAshow;
71 
byte tbAttachment, tbPanelHeight, tbSoftenHeight, tbButtonOffset,
 70 
 
Line 72... Line 71...
72 
     tbSoftenUp, tbSoftenDown, tbMinLeftButton, tbMinRightButton, tbMenuButton,
 71 
byte tbAttachment, tbSoftenUp, tbSoftenDown, tbMinLeftButton, tbMinRightButton,
73 
     tbRunApplButton, tbClnDeskButton, tbClock, tbCpuUsage, tbChangeLang;
 72 
tbMenuButton, tbRunApplButton, tbClnDeskButton, tbClock, tbCpuUsage, tbChangeLang;
74 
 
 73 
 
75 
enum {
 74 
enum {
76 
	TASKBAR,
 75 
	TASKBAR,
Line -... Line 76...
- 
 
 76 
	DOCKY,
- 
 
 77 
	ALL
- 
 
 78 
};
Line 77... Line 79...
77 
	DOCKY,
 79 
 
78 
	ALL
 80 
more_less_box tbPanelHeight  = { NULL, 6, 99, PANEL_HEIGHT };
79 
};
 81 
more_less_box tbSoftenHeight = { NULL, 0, 99, SOFTEN_HEIGHT };
Line 105... Line 107...
105 
					if (id==110) tbClnDeskButton ^= 1;
 107 
					if (id==110) tbClnDeskButton ^= 1;
106 
					if (id==111) tbClock ^= 1;
 108 
					if (id==111) tbClock ^= 1;
107 
					if (id==112) tbCpuUsage ^= 1;
 109 
					if (id==112) tbCpuUsage ^= 1;
108 
					if (id==113) tbChangeLang ^= 1;
 110 
					if (id==113) tbChangeLang ^= 1;
109 
					if (id==114) tbMenuButton ^= 1;
 111 
					if (id==114) tbMenuButton ^= 1;
110 
					if (id==120) tbPanelHeight++;
 112 
					tbPanelHeight.click(id);
111 
					if (id==121) && (tbPanelHeight>6) tbPanelHeight--;
 - 
 
112 
					if (id==122) tbSoftenHeight++;
 113 
					tbSoftenHeight.click(id);
113 
					if (id==123) && (tbSoftenHeight>0) tbSoftenHeight--;
 - 
 
114 
					if (id==124) tbButtonOffset++;
 114 
					tbButtonOffset.click(id);
115 
					if (id==125) && (tbButtonOffset>0) tbButtonOffset--;
 - 
 
116 
					DrawWindowContent(TASKBAR);
 115 
					DrawWindowContent(TASKBAR);
117 
					SaveCfg(TASKBAR);
 116 
					SaveCfg(TASKBAR);
118 
					RestartProcess(TASKBAR);
 117 
					RestartProcess(TASKBAR);
119 
				}
 118 
				}
120 
				//docky buttons
119 
				//docky buttons
Line 145... Line 144...
145 
				if (Form.status_window>2) break;
 144 
				if (Form.status_window>2) break;
146 
				DrawWindowContent(ALL);
 145 
				DrawWindowContent(ALL);
147 
	}
 146 
	}
148 
}
 147 
}
Line 149... Line -...
149 
 
 - 
 
150 
 
 148 
 
151 
void DrawWindowContent(byte panel_type)
 149 
void DrawWindowContent(byte panel_type)
152 
{
 150 
{
153 
	#define PD 10
 151 
	#define PD 10
154 
	dword frame_y;
 152 
	dword frame_y;
Line 168... Line 166...
168 
		CheckBox(win_center_x, y.n, 112, CPU_USAGE, tbCpuUsage);
 166 
		CheckBox(win_center_x, y.n, 112, CPU_USAGE, tbCpuUsage);
169 
		CheckBox(22, y.inc(24), 107, MIN_LEFT_BUTTON, tbMinLeftButton);
 167 
		CheckBox(22, y.inc(24), 107, MIN_LEFT_BUTTON, tbMinLeftButton);
170 
		CheckBox(win_center_x, y.n, 113, CHANGE_LANG, tbChangeLang);
 168 
		CheckBox(win_center_x, y.n, 113, CHANGE_LANG, tbChangeLang);
171 
		CheckBox(22, y.inc(24), 108, MIN_RIGHT_BUTTON, tbMinRightButton);
 169 
		CheckBox(22, y.inc(24), 108, MIN_RIGHT_BUTTON, tbMinRightButton);
172 
		CheckBox(win_center_x, y.n, 114, MENU_BUTTON, tbMenuButton);
170 
		CheckBox(win_center_x, y.n, 114, MENU_BUTTON, tbMenuButton);
173 
		MoreLessBox(22, y.inc(28), 120, 121, tbPanelHeight, PANEL_HEIGHT);
 171 
		tbPanelHeight.draw(22, y.inc(28));
174 
		MoreLessBox(22, y.inc(32), 122, 123, tbSoftenHeight, SOFTEN_HEIGHT);
 172 
		tbSoftenHeight.draw(22, y.inc(32));
175 
		MoreLessBox(22, y.inc(32), 124, 125, tbButtonOffset, BUTTON_OFFSET);
 173 
		tbButtonOffset.draw(22, y.inc(32));
176 
		DrawFrame(PD, frame_y, Form.cwidth-PD-PD, y.inc(32)-frame_y, TASK_FRAME_T);
 174 
		DrawFrame(PD, frame_y, Form.cwidth-PD-PD, y.inc(32)-frame_y, TASK_FRAME_T);
177 
	}
 175 
	}
178 
	if (panel_type==ALL) || (panel_type==DOCKY)
 176 
	if (panel_type==ALL) || (panel_type==DOCKY)
179 
	{
 177 
	{
180 
		frame_y = calc(y.inc(20));
 178 
		frame_y = calc(y.inc(20));
Line 196... Line 194...
196 
	tbMinRightButton = taskbar_flags_ini.GetInt("MinRightButton", 1);
 194 
	tbMinRightButton = taskbar_flags_ini.GetInt("MinRightButton", 1);
197 
	tbClock          = taskbar_flags_ini.GetInt("Clock", 1);
195 
	tbClock          = taskbar_flags_ini.GetInt("Clock", 1);
198 
	tbCpuUsage       = taskbar_flags_ini.GetInt("CpuUsage", 1);
196 
	tbCpuUsage       = taskbar_flags_ini.GetInt("CpuUsage", 1);
199 
	tbChangeLang     = taskbar_flags_ini.GetInt("ChangeLang", 1);
197 
	tbChangeLang     = taskbar_flags_ini.GetInt("ChangeLang", 1);
200 
	tbMenuButton     = taskbar_flags_ini.GetInt("MenuButton", 1);
198 
	tbMenuButton     = taskbar_flags_ini.GetInt("MenuButton", 1);
201 
	tbPanelHeight  = taskbar_vars_ini.GetInt("PanelHeight", 18);
199 
	tbPanelHeight.value  = taskbar_vars_ini.GetInt("PanelHeight", 28);
202 
	tbSoftenHeight = taskbar_vars_ini.GetInt("SoftenHeight", 4);
200 
	tbSoftenHeight.value = taskbar_vars_ini.GetInt("SoftenHeight", 4);
203 
	tbButtonOffset = taskbar_vars_ini.GetInt("ButtonTopOffset", 3);
 201 
	tbButtonOffset.value = taskbar_vars_ini.GetInt("ButtonTopOffset", 3);
204 
	tbButtonOffset = taskbar_vars_ini.GetInt("ButtonBotOffset", 3);
 202 
	tbButtonOffset.value = taskbar_vars_ini.GetInt("ButtonBotOffset", 3);
Line 205... Line 203...
205 
 
 203 
 
206 
	dkLocation = docky_ini.GetInt("location", 0);
 204 
	dkLocation = docky_ini.GetInt("location", 0);
207 
	dkFsize = docky_ini.GetInt("fsize", 0);
205 
	dkFsize = docky_ini.GetInt("fsize", 0);
208 
	dkAshow = docky_ini.GetInt("ashow", 0);
206 
	dkAshow = docky_ini.GetInt("ashow", 0);
Line 220... Line 218...
220 
		taskbar_flags_ini.SetInt("ClnDeskButton", tbClnDeskButton);
 218 
		taskbar_flags_ini.SetInt("ClnDeskButton", tbClnDeskButton);
221 
		taskbar_flags_ini.SetInt("Clock", tbClock);
 219 
		taskbar_flags_ini.SetInt("Clock", tbClock);
222 
		taskbar_flags_ini.SetInt("CpuUsage", tbCpuUsage);
 220 
		taskbar_flags_ini.SetInt("CpuUsage", tbCpuUsage);
223 
		taskbar_flags_ini.SetInt("ChangeLang", tbChangeLang);
 221 
		taskbar_flags_ini.SetInt("ChangeLang", tbChangeLang);
224 
		taskbar_flags_ini.SetInt("MenuButton", tbMenuButton);
 222 
		taskbar_flags_ini.SetInt("MenuButton", tbMenuButton);
225 
		taskbar_vars_ini.SetInt("PanelHeight", tbPanelHeight);
 223 
		taskbar_vars_ini.SetInt("PanelHeight", tbPanelHeight.value);
226 
		taskbar_vars_ini.SetInt("SoftenHeight", tbSoftenHeight);
 224 
		taskbar_vars_ini.SetInt("SoftenHeight", tbSoftenHeight.value);
227 
		taskbar_vars_ini.SetInt("ButtonTopOffset", tbButtonOffset);
 225 
		taskbar_vars_ini.SetInt("ButtonTopOffset", tbButtonOffset.value);
228 
		taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset);
 226 
		taskbar_vars_ini.SetInt("ButtonBottOffset", tbButtonOffset.value);
229 
	}
 227 
	}
230 
	if (panel_type==DOCKY) {
 228 
	if (panel_type==DOCKY) {
231 
		docky_ini.SetInt("location", dkLocation);
 229 
		docky_ini.SetInt("location", dkLocation);
232 
		docky_ini.SetInt("fsize", dkFsize);
 230 
		docky_ini.SetInt("fsize", dkFsize);
233 
		docky_ini.SetInt("ashow", dkAshow);
 231 
		docky_ini.SetInt("ashow", dkAshow);