Subversion Repositories Kolibri OS

Rev

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

Rev 5548 Rev 5619
Line 86... Line 86...
86
	     RunApplButton, ClnDeskButton, Clock, CpuUsage, ChangeLang;
86
	     RunApplButton, ClnDeskButton, Clock, CpuUsage, ChangeLang;
87
} taskbar_cfg;
87
} taskbar_cfg;
Line 88... Line 88...
88
 
88
 
89
enum {
89
enum {
90
	TASKBAR,
90
	TASKBAR,
-
 
91
	DOCKY,
91
	DOCKY
92
	ALL
Line 92... Line 93...
92
};
93
};
93
 
94
 
Line 160... Line 161...
160
				if (Form.status_window>2) break;
161
				if (Form.status_window>2) break;
161
				taskbar_frame.size_x = docky_frame.size_x = - taskbar_frame.start_x * 2 + Form.cwidth;
162
				taskbar_frame.size_x = docky_frame.size_x = - taskbar_frame.start_x * 2 + Form.cwidth;
162
				taskbar_frame.font_color = docky_frame.font_color = sc.work_text;
163
				taskbar_frame.font_color = docky_frame.font_color = sc.work_text;
163
				taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = sc.work;
164
				taskbar_frame.font_backgr_color = docky_frame.font_backgr_color = sc.work;
164
				taskbar_frame.ext_col = docky_frame.ext_col = sc.work_graph;
165
				taskbar_frame.ext_col = docky_frame.ext_col = sc.work_graph;
165
				DrawWindowContent();
166
				DrawWindowContent(ALL);
166
	}
167
	}
167
}
168
}
Line 168... Line 169...
168
 
169
 
169
 
170
 
170
void DrawWindowContent() 
171
void DrawWindowContent(byte panel_type)
Line -... Line 172...
-
 
172
{
-
 
173
	word win_center_x;
171
{
174
 
-
 
175
	if (panel_type==ALL)
-
 
176
	{
-
 
177
		frame_draw stdcall (#taskbar_frame);
-
 
178
		frame_draw stdcall (#docky_frame);
172
	word win_center_x;
179
	}
173
 
180
	if (panel_type==ALL) || (panel_type==TASKBAR)
174
  frame_draw stdcall (#taskbar_frame);
181
	{
175
	DefineButton(22, taskbar_frame.start_y + 12, panels_img.w-1, 27-1, 100 + BT_HIDE, 0);
182
		DefineButton(22, taskbar_frame.start_y + 12, panels_img.w-1, 27-1, 100 + BT_HIDE, 0);
176
	_PutImage(22, taskbar_frame.start_y + 12,  37, 27, taskbar_cfg.Attachment * 37 * 27 * 3 + panels_img.data);
183
		_PutImage(22, taskbar_frame.start_y + 12,  37, 27, taskbar_cfg.Attachment * 37 * 27 * 3 + panels_img.data);
Line 185... Line 192...
185
	PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y +  88, 113, CHANGE_LANG, taskbar_cfg.ChangeLang);
192
		PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y +  88, 113, CHANGE_LANG, taskbar_cfg.ChangeLang);
186
	PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 108, 114, MENU_BUTTON, taskbar_cfg.MenuButton);	
193
		PanelCfg_CheckBox(win_center_x, taskbar_frame.start_y + 108, 114, MENU_BUTTON, taskbar_cfg.MenuButton);	
187
	PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 131, 120, 121, taskbar_cfg.PanelHeight, PANEL_HEIGHT);
194
		PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 131, 120, 121, taskbar_cfg.PanelHeight, PANEL_HEIGHT);
188
	PanelCfg_MoreLessBox(win_center_x, taskbar_frame.start_y + 131, 122, 123, taskbar_cfg.SoftenHeight, SOFTEN_HEIGHT);
195
		PanelCfg_MoreLessBox(win_center_x, taskbar_frame.start_y + 131, 122, 123, taskbar_cfg.SoftenHeight, SOFTEN_HEIGHT);
189
	PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 159, 124, 125, taskbar_cfg.ButtonOffset, BUTTON_OFFSET);
196
		PanelCfg_MoreLessBox(22, taskbar_frame.start_y + 159, 124, 125, taskbar_cfg.ButtonOffset, BUTTON_OFFSET);
190
 
197
	}
191
  frame_draw stdcall (#docky_frame);
198
	if (panel_type==ALL) || (panel_type==DOCKY)
-
 
199
	{
192
	DefineButton(22, docky_frame.start_y + 12, panels_img.w-1, 27-1, 200 + BT_HIDE, 0);
200
		DefineButton(22, docky_frame.start_y + 12, panels_img.w-1, 27-1, 200 + BT_HIDE, 0);
193
	_PutImage(22, docky_frame.start_y + 12,  37, 27, docky_cfg.location + 1 * 37 * 27 * 3 + panels_img.data);
201
		_PutImage(22, docky_frame.start_y + 12,  37, 27, docky_cfg.location + 1 * 37 * 27 * 3 + panels_img.data);
194
	WriteText(68, docky_frame.start_y + 20, 0x80, sc.work_text, CHANGE_POS);
202
		WriteText(68, docky_frame.start_y + 20, 0x80, sc.work_text, CHANGE_POS);
195
 
-
 
196
	PanelCfg_CheckBox(22, docky_frame.start_y + 48, 201, FSIZE,  docky_cfg.fsize);
203
		PanelCfg_CheckBox(22, docky_frame.start_y + 48, 201, FSIZE,  docky_cfg.fsize);
197
	PanelCfg_CheckBox(win_center_x, docky_frame.start_y + 48, 202, ASHOW, docky_cfg.ashow);
204
		PanelCfg_CheckBox(win_center_x, docky_frame.start_y + 48, 202, ASHOW, docky_cfg.ashow);
198
}
205
	}
-
 
206
}
Line 199... Line 207...
199
 
207
 
200
void LoadCfg()
208
void LoadCfg()
201
{ 
209
{ 
202
	ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Attachment", 1);     taskbar_cfg.Attachment = EAX;
210
	ini_get_int stdcall (#taskbar_ini_path, #taskbar_c_flags, "Attachment", 1);     taskbar_cfg.Attachment = EAX;