From 473b41df34a823b8ac1943251dce4c14685c531d Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 25 Jan 2016 23:13:50 +0000 Subject: [PATCH] syspanel.ini: fix appearance path 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 --- data/common/settings/syspanel.ini | 2 +- programs/cmm/appearance/appearance.c | 15 ++++++--------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/data/common/settings/syspanel.ini b/data/common/settings/syspanel.ini index 0d227e99de..1a9810f241 100644 --- a/data/common/settings/syspanel.ini +++ b/data/common/settings/syspanel.ini @@ -10,7 +10,7 @@ VideoMode=vmode,7 NetConfig=/sys/network/netcfg,33 SysSetup=setup,5 Date&Time=calendar,52 -Appearance=/kolibrios/appearance,62 +Appearance=/kolibrios/utils/appearance,62 Background=/sys/media/palitra,61 WinColors=desktop,59 Volume=@VOLUME,64 diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 4b0947210a..506f006182 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -30,12 +30,12 @@ unsigned char icons[]= FROM "icons.raw"; llist list[2]; int active; -enum { WALLPAPERS, SKINS }; +enum { SKINS, WALLPAPERS }; char folder_path[4096]; char cur_file_path[4096]; char temp_filename[4096]; -int files_mas[100]; +int files_mas[400]; int cur; @@ -151,13 +151,11 @@ void main() load_dll(boxlib, #box_lib_init,0); list[SKINS].cur_y = list[WALLPAPERS].cur_y = -1; list[SKINS].first = list[WALLPAPERS].first = 0; - TabClick(WALLPAPERS); + TabClick(SKINS); list[WALLPAPERS].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: if (!CheckActiveProcess(Form.ID)) break; mouse.get(); @@ -213,7 +211,6 @@ void main() IF (Form.status_window>=2) break; DrawTabs(); Draw_List(); - } } } @@ -242,8 +239,8 @@ void DrawTab(dword x,y, but_id, is_active, text) void DrawTabs() { DrawBar(0,0, Form.cwidth, PANEL_H-1, system.color.work); - DrawTab(10,7, 2, list[WALLPAPERS].active, T_WALLPAPERS); - DrawTab(strlen(T_WALLPAPERS)*6+BT_PADDING+21,7, 3, list[SKINS].active, T_SKINS); + DrawTab(10,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-1, Form.cwidth, 1, 0xEEEeee); }