From e1a32382fd66604d5dfd39cbf7153bf784c4b2f6 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Mon, 20 May 2019 10:40:10 +0000 Subject: [PATCH] @taskbar: remove set ButtonStyle feature as duplication of eskin KolibriN Install update git-svn-id: svn://kolibrios.org@7660 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 2 +- data/common/settings/taskbar.ini | 1 - programs/cmm/appearance/appearance.c | 2 +- programs/cmm/installer/install.c | 95 +++++++++++++++++++---- programs/cmm/lib/gui.h | 6 +- programs/media/kiv/trunk/kiv.asm | 2 +- programs/system/taskbar/trunk/TASKBAR.ASM | 2 - programs/system/taskbar/trunk/i_data.inc | 2 - programs/system/taskbar/trunk/libini.inc | 8 -- programs/system/taskbar/trunk/taskbar.ini | 1 - 10 files changed, 88 insertions(+), 33 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index eb17728133..8a66a92ec0 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -421,7 +421,6 @@ tup.append_table(img_files, { {"GAMES/15", PROGS .. "/games/15/trunk/15"}, {"GAMES/FREECELL", PROGS .. "/games/freecell/freecell"}, {"GAMES/GOMOKU", PROGS .. "/games/gomoku/trunk/gomoku"}, - {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"}, {"GAMES/LIGHTS", PROGS .. "/games/sq_game/trunk/SQ_GAME"}, {"GAMES/LINES", PROGS .. "/games/lines/lines"}, {"GAMES/MSQUARE", PROGS .. "/games/MSquare/trunk/MSquare"}, @@ -554,6 +553,7 @@ tup.append_table(extra_files, { -- For russian build, add russian-only programs. if build_type == "rus" then tup.append_table(img_files, { {"PERIOD", PROGS .. "/other/period/trunk/period"}, + {"GAMES/KLAVISHA", PROGS .. "/games/klavisha/trunk/klavisha"}, {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"}, }) else tup.append_table(img_files, { {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"}, diff --git a/data/common/settings/taskbar.ini b/data/common/settings/taskbar.ini index 2b6cb89017..450730c5f6 100644 --- a/data/common/settings/taskbar.ini +++ b/data/common/settings/taskbar.ini @@ -17,7 +17,6 @@ Clock=1 CpuUsage=1 ChangeLang=1 Attachment=1 -ButtonsStyle=0 [Colors] MenuButton=0,100,0 diff --git a/programs/cmm/appearance/appearance.c b/programs/cmm/appearance/appearance.c index 6a7c9526ac..80d13b0391 100644 --- a/programs/cmm/appearance/appearance.c +++ b/programs/cmm/appearance/appearance.c @@ -5,7 +5,7 @@ ?include "lang.h--" #endif -#define MEMSIZE 0xFE800 +#define MEMSIZE 200*1024 #include "..\lib\mem.h" #include "..\lib\strings.h" #include "..\lib\io.h" diff --git a/programs/cmm/installer/install.c b/programs/cmm/installer/install.c index 4d7f3a8d9f..e5cd1e8000 100644 --- a/programs/cmm/installer/install.c +++ b/programs/cmm/installer/install.c @@ -1,30 +1,97 @@ -#define MEMSIZE 4096*15 -#include "..\lib\strings.h" -#include "..\lib\mem.h" -#include "..\lib\copyf.h" +#define MEMSIZE 1024*160 -#include "..\lib\obj\libini.h" +#include "../lib/io.h" +#include "../lib/gui.h" +#include "../lib/copyf.h" +#include "../lib/obj/libini.h" +#include "../lib/patterns/restart_process.h" -#include "..\lib\patterns\restart_process.h" +char logo[] = " +лллл лллл лллллллллл лллл лллл ллллллллллл + лллл лл ллл ллл ллл лл ллл лл + ллллл лл ллл ллллл лл ллл лл + лл ллл лл ллллллл ллл ллл + лл ллллл ллл ллллл ллл + лл лллл ллл ллл ллл ллл +лллл ллл лллллллллл лллл лллл ллллл +"; + +char intro[] = "ЎЏрЎЁуЉтЅ ­ЎЂЎЅ ЂЈЇу Ћь­ЎЅ ЎфЎрЌЋЅ­ЈЅ ŠЎЋЈЁрЈ, ЊЎтЎрЎЅ р ­ьшЅ ЁыЋЎ ЄЎстуЏ­Ў тЎЋьЊЎ Ђ KolibriNext."; + +#define B_INSTALL 10 void main() +{ + word btn; + load_dll(libini, #lib_init,1); + loop() switch(WaitEventTimeout(300) & 0xFF) + { + case evButton: + btn = GetButtonID(); + if (btn == 1) ExitProcess(); + if (btn == B_INSTALL) EventInstall(); + break; + + case evKey: + GetKeys(); + if (key_scancode == SCAN_CODE_ESC) ExitProcess(); + break; + + case evReDraw: + draw_window(); + break; + + default: + DrawLogo(); + DrawLogo(); + } +} + +#define WINW 400 +#define WINH 300 +void draw_window() +{ + system.color.get(); + DefineAndDrawWindow(screen.width-WINW/2,screen.height-WINH/2, + WINW+9,WINH+skin_height,0x34,system.color.work,"KolibriN10",0); + + DrawLogo(); + + DrawTextViewArea(30, 140, WINW-60, WINH-80, + #intro, -1, system.color.work_text); + + DrawCaptButton(WINW-110/2, WINH-70, 110, 28, B_INSTALL, + 0x0092D8, 0xFFFfff, "“ст ­ЎЂЈть"); +} + +void DrawLogo() +{ + #define LX -46*6+WINW/2 + #define LY 25 + WriteTextLines(LX-1, LY, 0x80, 0x9F87B8, #logo, 9); + WriteTextLines(LX+3, LY, 0x80, 0x7ED1E3, #logo, 9); + + pause(1); + + WriteTextLines(LX+1, LY, 0x80, 0xEC008C, #logo, 9); + WriteTextLines(LX, LY, 0x80, 0xEC008C, #logo, 9); +} + + + + +void EventInstall() { //#include "..\lib\added_sysdir.c"; //SetAdditionalSystemDirectory("kolibrios", abspath("install/kolibrios")+1); - - load_dll(libini, #lib_init,1); ini_set_int stdcall ("/sys/settings/taskbar.ini", "Flags", "Attachment", 0); - copyf(abspath("settings"), "/sys/settings"); + copyf("/kolibrios/KolibriNext/settings", "/sys/settings"); RestartProcessByName("/sys/@icon", MULTIPLE); RestartProcessByName("/sys/@taskbar", SINGLE); RestartProcessByName("/sys/@docky", SINGLE); RunProgram("/sys/media/kiv", "\\S__/kolibrios/res/Wallpapers/Free yourself.jpg"); - - ExitProcess(); } -void Operation_Draw_Progress(dword filename) { debug("copying: "); debugln(filename); } - -stop: \ No newline at end of file +void Operation_Draw_Progress(dword filename) { debug("copying: "); debugln(filename); } \ No newline at end of file diff --git a/programs/cmm/lib/gui.h b/programs/cmm/lib/gui.h index 237b422fd4..2066c151df 100644 --- a/programs/cmm/lib/gui.h +++ b/programs/cmm/lib/gui.h @@ -69,7 +69,7 @@ dword ty = h/2-7+y; if (id>0) DefineButton(x,y,w,h,id,color_b); - WriteText(tx+1,ty+1,0x90,LightenDarkenColor(color_b, -40),text); + WriteText(tx+1,ty+1,0x90,MixColors(color_b,0,230),text); WriteText(tx,ty,0x90,color_t,text); } @@ -84,7 +84,7 @@ int ty = y + padding_v+1; int tw = strlen(text)*8; int w = tw + padding_h + padding_h; - unsigned darker_color = LightenDarkenColor(system.color.work_button, -40); + unsigned darker_color = MixColors(system.color.work_button,0,230); if (id>0) DefineButton(x,y,w,h,id,system.color.work_button); @@ -100,12 +100,14 @@ return w + right_margin; } +/* UNSTABLE :unsigned LightenDarkenColor(dword color, amt) { dword r = color >> 16 + amt << 16; dword b = color >> 8 & 0x00FF + amt << 8; dword g = color & 0x0000FF + amt; return g | b | r ; } +*/ :void ActiveButtonSwitch(int min, max) { diff --git a/programs/media/kiv/trunk/kiv.asm b/programs/media/kiv/trunk/kiv.asm index b1010f0479..a7491f312c 100644 --- a/programs/media/kiv/trunk/kiv.asm +++ b/programs/media/kiv/trunk/kiv.asm @@ -2391,7 +2391,7 @@ aSlide db 'SlideShow',0 aTglbar db 'ToggleBar',0 inifileeskin db '/sys/settings/eskin.ini',0 -amain db 'main',0 +amain db 'bg',0 aprogram db 'program',0 aparam db 'param',0 diff --git a/programs/system/taskbar/trunk/TASKBAR.ASM b/programs/system/taskbar/trunk/TASKBAR.ASM index 5674a47be8..65c450b4da 100644 --- a/programs/system/taskbar/trunk/TASKBAR.ASM +++ b/programs/system/taskbar/trunk/TASKBAR.ASM @@ -585,8 +585,6 @@ load_libraries l_libs_start,end_l_libs call Get_ini - mcall 48,1,[button_style] - mcall 66,4,0,2 ; LShift+RShift mcall 66,,,33h ; LCtrl+LShift mcall 66,,88,110h ; Alt+Ctrl+F12 diff --git a/programs/system/taskbar/trunk/i_data.inc b/programs/system/taskbar/trunk/i_data.inc index e2b3a11cb3..20d37b3368 100644 --- a/programs/system/taskbar/trunk/i_data.inc +++ b/programs/system/taskbar/trunk/i_data.inc @@ -93,7 +93,6 @@ clock_enable: dd 1 cpu_usage_enable: dd 1 chlang_enable: dd 1 place_attachment dd 1 -button_style dd 1 ;------------------------------------------------------------------------------ page_list_enable: dd 0 redraw_window_flag dd 0 @@ -129,7 +128,6 @@ aCpuUsage db 'CpuUsage',0 aChangeLang db 'ChangeLang',0 aPageList db 'PageList',0 aAttachment db 'Attachment',0 -aButtonsStyle db 'ButtonsStyle',0 ;------------------------------------------------------------------------------ aColors db 'Colors',0 aCpuUsageBckgr db 'CpuUsageBckgr',0 diff --git a/programs/system/taskbar/trunk/libini.inc b/programs/system/taskbar/trunk/libini.inc index 769dd21578..6d731feb46 100644 --- a/programs/system/taskbar/trunk/libini.inc +++ b/programs/system/taskbar/trunk/libini.inc @@ -150,14 +150,6 @@ Get_ini: mov eax,1 @@: mov [place_attachment],eax -;-------------------------------------- - invoke ini_get_int,library_path,aFlags,aButtonsStyle,1 - cmp eax,2 - jb @f - - mov eax,1 -@@: - mov [button_style],eax ;-------------------------------------- invoke ini_get_color,library_path,aColors,aMenuButton,0x44aa44 mov [MenuButton_color],eax diff --git a/programs/system/taskbar/trunk/taskbar.ini b/programs/system/taskbar/trunk/taskbar.ini index 3454b9c21a..d4bfc1e1b1 100644 --- a/programs/system/taskbar/trunk/taskbar.ini +++ b/programs/system/taskbar/trunk/taskbar.ini @@ -17,7 +17,6 @@ Clock=1 CpuUsage=1 ChangeLang=1 Attachment=1 -ButtonsStyle=1 [Colors] MenuButton=0,100,0