badpork/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

syspanel.ini: fix appearance path

Browse Source 
appearance.c: do not show wallpaper tab is /kolibrios/res/wallpapers folder isn't exists

git-svn-id: svn://kolibrios.org@6096 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-01-25 23:13:50 +00:00
parent 3724b5e1bb
commit 473b41df34
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/common/settings/syspanel.ini
View File

@ -10,7 +10,7 @@ VideoMode=vmode,7
NetConfig=/sys/network/netcfg,33 NetConfig=/sys/network/netcfg,33
SysSetup=setup,5 SysSetup=setup,5
Date&Time=calendar,52 Date&Time=calendar,52
Appearance=/kolibrios/appearance,62 Appearance=/kolibrios/utils/appearance,62
Background=/sys/media/palitra,61 Background=/sys/media/palitra,61
WinColors=desktop,59 WinColors=desktop,59
Volume=@VOLUME,64 Volume=@VOLUME,64

15
programs/cmm/appearance/appearance.c
View File

@ -30,12 +30,12 @@ unsigned char icons[]= FROM "icons.raw";
llist list[2]; llist list[2];
int active; int active;
enum { WALLPAPERS, SKINS }; enum { SKINS, WALLPAPERS };
char folder_path[4096]; char folder_path[4096];
char cur_file_path[4096]; char cur_file_path[4096];
char temp_filename[4096]; char temp_filename[4096];
int files_mas[100]; int files_mas[400];
int cur; int cur;
@ -151,13 +151,11 @@ void main()
load_dll(boxlib, #box_lib_init,0); load_dll(boxlib, #box_lib_init,0);
list[SKINS].cur_y = list[WALLPAPERS].cur_y = -1; list[SKINS].cur_y = list[WALLPAPERS].cur_y = -1;
list[SKINS].first = list[WALLPAPERS].first = 0; list[SKINS].first = list[WALLPAPERS].first = 0;
TabClick(WALLPAPERS); TabClick(SKINS);
list[WALLPAPERS].SetSizes(0, 230, 350, 400-PANEL_H, 18); list[WALLPAPERS].SetSizes(0, 230, 350, 400-PANEL_H, 18);
list[SKINS].SetSizes(0, 230, 350, 400-PANEL_H, 18); list[SKINS].SetSizes(0, 230, 350, 400-PANEL_H, 18);
loop() loop() switch(WaitEvent())
{ {
switch(WaitEvent())
{
case evMouse: case evMouse:
if (!CheckActiveProcess(Form.ID)) break; if (!CheckActiveProcess(Form.ID)) break;
mouse.get(); mouse.get();
@ -213,7 +211,6 @@ void main()
IF (Form.status_window>=2) break; IF (Form.status_window>=2) break;
DrawTabs(); DrawTabs();
Draw_List(); Draw_List();
}
} }
} }
@ -242,8 +239,8 @@ void DrawTab(dword x,y, but_id, is_active, text)
void DrawTabs() void DrawTabs()
{ {
DrawBar(0,0, Form.cwidth, PANEL_H-1, system.color.work); DrawBar(0,0, Form.cwidth, PANEL_H-1, system.color.work);
DrawTab(10,7, 2, list[WALLPAPERS].active, T_WALLPAPERS); DrawTab(10,7, 3, list[SKINS].active, T_SKINS);
DrawTab(strlen(T_WALLPAPERS)*6+BT_PADDING+21,7, 3, list[SKINS].active, T_SKINS); if (isdir(WALP_STANDART_PATH)) DrawTab(strlen(T_SKINS)*6+BT_PADDING+21,7, 2, list[WALLPAPERS].active, T_WALLPAPERS);
DrawBar(0,PANEL_H-2, Form.cwidth, 1, system.color.work_graph); DrawBar(0,PANEL_H-2, Form.cwidth, 1, system.color.work_graph);
DrawBar(0,PANEL_H-1, Form.cwidth, 1, 0xEEEeee); DrawBar(0,PANEL_H-1, Form.cwidth, 1, 0xEEEeee);
} }