XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

add calc+ to autobuild as /kolibrios/utils/calcplus; software_widget: show notification if program is not found; other small changes

Browse Source 
git-svn-id: svn://kolibrios.org@6253 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2016-02-19 13:34:31 +00:00
parent 227be33173
commit 6e1d7d18af
10 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/Tupfile.lua
View File

@ -203,6 +203,7 @@ extra_files = {
{"kolibrios/res/skins/", "../skins/authors.txt"},
{"kolibrios/settings/app_plus.ini", "common/settings/app_plus.ini"},
{"kolibrios/utils/appearance", PROGS .. "/cmm/appearance/appearance.com"},
{"kolibrios/utils/calcplus", PROGS .. "/other/calcplus/calcplus"},
}
if build_type == "rus" then tup.append_table(extra_files, {
{"Docs/cp866/config.txt", build_type .. "/docs/CONFIG.TXT"},

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

@ -6,6 +6,7 @@ window_title=KolibriOS Additional Software
[Media]
zSea=/kolibrios/media/zsea/zsea,46
FPlay=/kolibrios/media/fplay,40
[3D Tools]
Info3DsPro=/kolibrios/3d/info3ds/info3ds,75
@ -16,4 +17,5 @@ voxel_editor=/kolibrios/3d/voxel_editor/voxel_editor
3dsHeart=/kolibrios/3d/3dsheart,78
[Other]
Calc+=/kolibrios/utils/calcplus,4
Life=/kolibrios/demos/life2,13

2
programs/cmm/app_plus/app_plus.c
View File

@ -25,7 +25,7 @@ dword scr_pal[] = {0xFFFFFF,0xBBDDFF,0x4166B5,0xE0E4E6,0xAFBEDD,0xC4D4E8,0x52ACD
#define APP_PLUS_INI_NOT_EXISTS "'APP+\n/kolibrios/settings/app_plus.ini is not exists.\nProgram terminated.' -tE"
#define WINDOW_TITLE_TEXT "Error"
#define CONTENT_HEADER_TEXT "/KOLIBRIOS/ NOT MOUNTED"
#define CONTENT_HEADER_TEXT "/KOLIBRIOS/ IS NOT MOUNTED"
#define DESCRIPTION_TEXT "Try to find it manually. It should look
like image on the right.
Note: this action can be done only once

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

@ -181,8 +181,8 @@ void DrawTab(dword x,y, but_id, text)
void DrawScroller()
{
scroll1.bckg_col = 0xBBBbbb;
scroll1.frnt_col = system.color.work;
scroll1.bckg_col = MixColors(system.color.work, 0xBBBbbb, 80);
scroll1.frnt_col = MixColors(system.color.work,0xFFFfff,120);
scroll1.line_col = system.color.work_graph;
scroll1.max_area = list.count;

2
programs/cmm/software_widget/compile.bat
View File

@ -1,4 +1,4 @@
C-- software_widget.c
@C-- software_widget.c
@del game_center
@copy software_widget.com game_center
@copy software_widget.com syspanel

14
programs/cmm/software_widget/software_widget.c
View File

@ -5,7 +5,7 @@ SOFTWARE CENTER v2.8
#define MEMSIZE 0x9000
#include "..\lib\strings.h"
#include "..\lib\mem.h"
#include "..\lib\file_system.h"
#include "..\lib\io.h"
#include "..\lib\gui.h"
#include "..\lib\obj\libio_lib.h"
@ -87,7 +87,7 @@ void main()
case evButton:
id=GetButtonID();
if (id==1) ExitProcess();
if (id>=100) RunProgram(app_path_collection.get(id-100), "");
if (id>=100) EventRunApp(id-100);
break;
case evReDraw:
@ -177,6 +177,16 @@ void draw_top_bar()
label.write_center(0,5, Form.cwidth, list.y, system.color.work, system.color.work_text, 16, #window_title);
}
void EventRunApp(dword appid)
{
if (file_exists(app_path_collection.get(appid))) {
io.run(app_path_collection.get(appid), "");
}
else {
notify("'Application not found' -E");
}
}
stop:

2
programs/other/personal/Tupfile.lua Normal file
View File

@ -0,0 +1,2 @@
if tup.getconfig("NO_FASM") ~= "" then return end
tup.rule("personal.asm", "fasm %f %o " .. tup.getconfig("KPACK_CMD"), "personal")

3
programs/other/personal/build.bat Normal file
View File

@ -0,0 +1,3 @@
@fasm personal.asm personal
@kpack personal
@pause

12
programs/other/personal/inc/button.inc
View File

@ -130,14 +130,10 @@ button_draw:
call button_draw_all
; arrow
pusha
mov eax , 7
mov ebx , arrowa
mov ecx , 6 shl 16 + 10
mov edx , 46 shl 16 + 13
int 0x40
mov ebx , arrowb
mov edx , 17 shl 16 + 13
int 0x40
mov ecx,[sc.btn_text]
or ecx,0x90000000
mcall 4,<15,11>, ,arrowa
mcall ,<45,11>, ,arrowb
popa
ret

8
programs/other/personal/personal.asm
View File

@ -13,7 +13,7 @@
dd 0x0
dd 0x0
include 'macros.inc'
include '../../macros.inc'
;=============================================================================;
;============================[ EVENTS ]===========================;
;=============================================================================;
@ -145,10 +145,8 @@ include 'inc/list.inc' ;
;; button -------------------------------------------------
bnext new_button
bback new_button
arrowa:
file 'l.raw'
arrowb:
file 'r.raw'
arrowa db '<',0
arrowb db '>',0
;; edit ---------------------------------------------------
edit_cnt dd 1 ; counter
edit_win db 'WINDOW',0 ; 1