From 57aebb04077966ddc354ba15595024e569322bc5 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 15 Feb 2015 02:39:54 +0000 Subject: [PATCH] software_widget 2.2: work with param, fix for roll-up git-svn-id: svn://kolibrios.org@5406 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/cmm/software_widget/compile.bat | 2 +- programs/cmm/software_widget/software_widget.c | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/programs/cmm/software_widget/compile.bat b/programs/cmm/software_widget/compile.bat index 6969590fe6..b871658473 100644 --- a/programs/cmm/software_widget/compile.bat +++ b/programs/cmm/software_widget/compile.bat @@ -1,7 +1,7 @@ C-- software_widget.c @del game_center @copy software_widget.com game_center -@copy software_widget.com control_panel +@copy software_widget.com system_panel @del software_widget.com @pause @del warning.txt diff --git a/programs/cmm/software_widget/software_widget.c b/programs/cmm/software_widget/software_widget.c index 873bf9785d..cd2c93fd29 100644 --- a/programs/cmm/software_widget/software_widget.c +++ b/programs/cmm/software_widget/software_widget.c @@ -1,5 +1,5 @@ /* -SOFTWARE CENTER v2.15 +SOFTWARE CENTER v2.2 */ #define MEMSIZE 0x3E80 @@ -86,8 +86,15 @@ void main() if (load_dll2(libini, #lib_init,1)!=0) notify("Error: library doesn't exists - libini"); skin.load(); - strcat(#settings_ini_path, #program_path + strrchr(#program_path, '/')); - strcat(#settings_ini_path, ".ini"); + if (#param) + { + strcpy(#settings_ini_path, #param); + } + else + { + strcat(#settings_ini_path, #program_path + strrchr(#program_path, '/')); + strcat(#settings_ini_path, ".ini"); + } load_config(); loop() @@ -108,9 +115,9 @@ void main() case evReDraw: sc.get(); - DefineAndDrawWindow(GetScreenWidth()-window_width/2,GetScreenHeight()-window_height/2,window_width,window_height,0x74,sc.work," "); + DefineAndDrawWindow(GetScreenWidth()-window_width/2,GetScreenHeight()-window_height/2,window_width,window_height,0x74,sc.work,""); GetProcessInfo(#Form, SelfInfo); - if (Form.status_window>2) break; + if (Form.status_window>2) { DrawTitle(#window_title); break; } else DrawTitle(""); col_max = Form.cwidth - 10 / cell_w; current_item_id = 0; draw_top_bar();