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

icons16.png: update folder and sys icons

Browse Source 
cedit: new version by akron1
eolite: fix scroll

git-svn-id: svn://kolibrios.org@8762 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2021-06-05 15:18:11 +00:00
parent d63e24c6da
commit a443da65df
16 changed files with 181 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
data/common/icons16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

1
data/common/settings/app.ini
View File

@ -7,6 +7,7 @@ ShowDeviceName=1
RealFileNamesCase=1 RealFileNamesCase=1
InfoAfterCopy=0 InfoAfterCopy=0
ShowStatusBar=1 ShowStatusBar=1
LineHeight=20
[Kiv] [Kiv]
Next=PgDn Next=PgDn

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

@ -284,7 +284,7 @@ void Sort_by_Name(int a, b) // for the first call: a = 0, b = sizeof(mas) - 1
void SelectList_DrawLine(dword i) void SelectList_DrawLine(dword i)
{ {
int yyy, list_last; int yyy;
cur = select_list.first + i; cur = select_list.first + i;
strcpy(#temp_filename, io.dir.position(files_mas[cur])); strcpy(#temp_filename, io.dir.position(files_mas[cur]));

8
programs/cmm/eolite/Eolite.c
View File

@ -3,8 +3,8 @@
// 70.5 - get volume info and label // 70.5 - get volume info and label
#define TITLE "Eolite File Manager 4.5" #define TITLE "Eolite File Manager 4.51"
#define ABOUT_TITLE "EOLITE 4.5" #define ABOUT_TITLE "EOLITE 4.51"
#ifndef AUTOBUILD #ifndef AUTOBUILD
#include "lang.h--" #include "lang.h--"
@ -276,7 +276,7 @@ void main()
if (getElementSelectedFlag(files.cur_y) == false) selected_count = 0; //on redraw selection would be flashed, see [L001] if (getElementSelectedFlag(files.cur_y) == false) selected_count = 0; //on redraw selection would be flashed, see [L001]
EventShowListMenu(); EventShowListMenu();
} }
break; //break;
} }
if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+16) && (mouse.y>files.y-17) && (mouse.y<files.y) if (mouse.x>=files.x+files.w) && (mouse.x<=files.x+files.w+16) && (mouse.y>files.y-17) && (mouse.y<files.y)
@ -740,7 +740,7 @@ void Line_ReDraw(dword bgcol, filenum){
file_name_off, file_name_off,
file_size=0, file_size=0,
y=filenum*files.item_h+files.y, y=filenum*files.item_h+files.y,
icon_y = files.item_h-icon_size/2+1+y; icon_y = files.item_h-icon_size/2+y;
BDVK file; BDVK file;
char full_path[4096]; char full_path[4096];
char label_file_name[4096]; char label_file_name[4096];

3
programs/cmm/eolite/include/about.h
View File

@ -42,8 +42,7 @@ void about_dialog()
about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2; about_x = -strlen(ABOUT_TITLE)*18+about_form.cwidth/2;
WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE); WriteTextB(about_x+2,107,0x82,0xD49CD2,ABOUT_TITLE);
WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE); WriteTextB(about_x,105,0x82,0x9D129D,ABOUT_TITLE);
DrawRectangle3D(0,154,about_form.cwidth,1,sc.work_dark,sc.work_light); WriteTextLines(73,163,0x90,sc.work_text," By Leency\nand KolibriOS Team\n 2008-2021",20);
WriteTextLines(7,163,0x90,sc.work_text,"KolibriOS File Manager\nAuthors: Leency, Veliant\nPunk_Joker, Pavelyakov\n2008 - 2020",20);
#ifdef LANG_RUS #ifdef LANG_RUS
DrawStandartCaptButton(60,about_form.cheight-38,11,"ˆáâ®à¨ï ࠧࠡ®âª¨"); DrawStandartCaptButton(60,about_form.cheight-38,11,"ˆáâ®à¨ï ࠧࠡ®âª¨");
#endif #endif

2
programs/cmm/eolite/include/settings.h
View File

@ -166,7 +166,7 @@ void LoadIniSettings()
Form.left = ini.GetInt("WinX", 200); Form.left = ini.GetInt("WinX", 200);
Form.top = ini.GetInt("WinY", 50); Form.top = ini.GetInt("WinY", 50);
Form.width = ini.GetInt("WinW", 550); Form.width = ini.GetInt("WinW", 550);
Form.height = ini.GetInt("WinH", 506); Form.height = ini.GetInt("WinH", 503);
ini.GetString("DefaultPath", #path, 4096, "/rd/1"); ini.GetString("DefaultPath", #path, 4096, "/rd/1");
ini.GetString("DefaultPath", #path_start, 4096, "/rd/1"); ini.GetString("DefaultPath", #path_start, 4096, "/rd/1");
path_start_ed.size = path_start_ed.pos = strlen(#path_start); path_start_ed.size = path_start_ed.pos = strlen(#path_start);

BIN
programs/develop/cedit/CEDIT
View File

Binary file not shown.

2
programs/develop/cedit/CEDIT.INI
View File

@ -48,7 +48,7 @@ KW3 =
[lang_C] [lang_C]
KW1 = auto,break,case,char,const,continue,default,do,double,else,enum,extern,float,for,goto,if,int,long,register,return,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile,while KW1 = auto,break,case,char,const,continue,default,do,double,else,enum,extern,float,for,goto,if,int,long,register,return,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile,while
KW2 = #define,#error,#include,#elif,#if,#line,#else,#ifdef,#pragma,#endif,#ifndef,#undef KW2 = define,error,include,elif,if,line,else,ifdef,pragma,endif,ifndef,undef
KW3 = KW3 =
[lang_Lua] [lang_Lua]

245
programs/develop/cedit/SRC/CEdit.ob07
View File

@ -20,17 +20,17 @@
MODULE CEdit; MODULE CEdit;
IMPORT IMPORT
SYSTEM, OpenDlg, K := KolibriOS, OpenDlg, K := KolibriOS,
U := Utils, Lines, Menu, List, U := Utils, Lines, Menu, List,
G := Graph, T := Text, E := Encodings, G := Graph, T := Text, E := Encodings,
CB := Clipboard, Languages, CB := Clipboard, Languages,
ChangeLog, Scroll, ChangeLog, Scroll,
RW, Ini, box_lib, LibImg; RW, Ini, box_lib, Icons;
CONST CONST
header = "CEdit (24-may-2021)"; header = "CEdit (03-jun-2021)";
ShellFilter = "";(* "SH|"; *) ShellFilter = "";
EditFilter = "SH|ASM|TXT|INC|OB07|C|CPP|H|PAS|PP|LUA|INI"; EditFilter = "SH|ASM|TXT|INC|OB07|C|CPP|H|PAS|PP|LUA|INI";
fontWidth = K.fontWidth; fontWidth = K.fontWidth;
@ -73,7 +73,6 @@ CONST
MainMenuHeight = fontHeight + 7; MainMenuHeight = fontHeight + 7;
btnColor = 0CCCCCCH;
btnHeight = 25; btnHeight = 25;
btnWidth = 75; btnWidth = 75;
btnTop = MainMenuHeight + 3; btnTop = MainMenuHeight + 3;
@ -84,9 +83,7 @@ CONST
RIGHT = scrollWidth - 2; RIGHT = scrollWidth - 2;
BOTTOM = scrollWidth + 25; BOTTOM = scrollWidth + 25;
winColor = K.winColor; minWinWidth = 635; minWinHeight = 542; minWinWidth = 635; minWinHeight = 542;
toolbarColor = 0DFDFDFH;
SEARCH_PADDING = 10; SEARCH_PADDING = 10;
searchLeft = 10; searchLeft = 10;
@ -121,7 +118,6 @@ CONST
menuExit = 15; menuExit = 15;
menuNumbers = 20; menuNumbers = 20;
(*menuSettings = 21;*)
menuColors = 1000; menuColors = 1000;
menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1; menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1;
@ -148,6 +144,7 @@ CONST
menuPipet = 70; menuPipet = 70;
menuSysFunc = 71; menuSysFunc = 71;
VAR VAR
canvas: G.tCanvas; canvas: G.tCanvas;
font: G.tFont; font: G.tFont;
@ -190,7 +187,7 @@ BEGIN
U.int2str(col, s2); U.int2str(col, s2);
U.append(s1, ": "); U.append(s1, ": ");
U.append(s1, s2); U.append(s1, s2);
K.DrawText(LEFT, y, 0, s1) K.DrawText(LEFT, y, K.textColor, s1)
END WritePos; END WritePos;
@ -206,11 +203,6 @@ BEGIN
ELSE ELSE
edit.flags := ORD(BITS(edit.flags) - {1}) edit.flags := ORD(BITS(edit.flags) - {1})
END; END;
(* IF value THEN
edit.color := 0FFFFFFH
ELSE
edit.color := 0D0D0D0H
END;*)
IF search THEN IF search THEN
box_lib.edit_box_draw(edit) box_lib.edit_box_draw(edit)
END END
@ -241,9 +233,9 @@ BEGIN
right := left + width - 1; right := left + width - 1;
x := minWidth DIV 2 + left; x := minWidth DIV 2 + left;
y := (height - fontHeight) DIV 2 + top; y := (height - fontHeight) DIV 2 + top;
K.DrawRect(left, top, width, height, winColor); K.DrawRect(left, top, width, height, K.winColor);
Rect(left, top, right, bottom, borderColor); Rect(left, top, right, bottom, borderColor);
K.DrawText(x, y, 0, s); K.DrawText(x, y, K.textColor, s);
END Message; END Message;
@ -276,15 +268,6 @@ BEGIN
END Replaced; END Replaced;
PROCEDURE icons16 (icons, n, x, y: INTEGER);
VAR
sizeX, sizeY, data: INTEGER;
BEGIN
LibImg.GetInf(icons, sizeX, sizeY, data);
K.DrawImage(data + 16*16*3*n, 16, 16, x, y)
END icons16;
PROCEDURE toolbarIcons; PROCEDURE toolbarIcons;
CONST CONST
iconPad = (toolBtnSize - 16) DIV 2; iconPad = (toolBtnSize - 16) DIV 2;
@ -293,56 +276,51 @@ VAR
BEGIN BEGIN
x := searchLeft + (toolBtnSize + 5)*2; x := searchLeft + (toolBtnSize + 5)*2;
IF text.modified THEN IF text.modified THEN
icons16(icons, 5, x + iconPad, btnTop + iconPad) Icons.draw(icons, 5, x + iconPad, btnTop + iconPad)
ELSE ELSE
icons16(grayIcons, 5, x + iconPad, btnTop + iconPad) Icons.draw(grayIcons, 5, x + iconPad, btnTop + iconPad)
END; END;
IF text.edition # NIL THEN IF text.edition # NIL THEN
x := searchLeft + (toolBtnSize + 5)*4 + toolbarDelim*2; x := searchLeft + (toolBtnSize + 5)*4 + toolbarDelim*2;
IF ChangeLog.isFirstGuard(text.edition) THEN IF ChangeLog.isFirstGuard(text.edition) THEN
icons16(grayIcons, 37, x + iconPad, btnTop + iconPad) Icons.draw(grayIcons, 37, x + iconPad, btnTop + iconPad)
ELSE ELSE
icons16(icons, 37, x + iconPad, btnTop + iconPad) Icons.draw(icons, 37, x + iconPad, btnTop + iconPad)
END; END;
x := searchLeft + (toolBtnSize + 5)*5 + toolbarDelim*2; x := searchLeft + (toolBtnSize + 5)*5 + toolbarDelim*2;
IF ChangeLog.isLastGuard(text.edition) THEN IF ChangeLog.isLastGuard(text.edition) THEN
icons16(grayIcons, 36, x + iconPad, btnTop + iconPad) Icons.draw(grayIcons, 36, x + iconPad, btnTop + iconPad)
ELSE ELSE
icons16(icons, 36, x + iconPad, btnTop + iconPad) Icons.draw(icons, 36, x + iconPad, btnTop + iconPad)
END END
(* ELSE
x := searchLeft + (toolBtnSize + 5)*4;
icons16(grayIcons, 37, x + iconPad, btnTop + iconPad);
x := searchLeft + (toolBtnSize + 5)*5;
icons16(grayIcons, 36, x + iconPad, btnTop + iconPad)*)
END; END;
IF T.selected(text) THEN IF T.selected(text) THEN
color := 00000FFH color := K.caseColor
ELSE ELSE
color := 0808080H color := K.disCaseColor
END; END;
x := searchLeft + (toolBtnSize + 5)*6 + toolbarDelim*3; x := searchLeft + (toolBtnSize + 5)*6 + toolbarDelim*3;
K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, toolbarColor); K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, K.toolbarColor);
K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, color, "AB"); K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, color, "AB");
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, toolbarColor); K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, K.toolbarColor);
K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, color, "ab"); K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, color, "ab");
x := searchLeft + (toolBtnSize + 5)*8 + toolbarDelim*4; x := searchLeft + (toolBtnSize + 5)*8 + toolbarDelim*4;
IF buildScript # "" THEN IF buildScript # "" THEN
icons16(icons, 54, x + iconPad, btnTop + iconPad) Icons.draw(icons, 54, x + iconPad, btnTop + iconPad)
ELSE ELSE
icons16(grayIcons, 54, x + iconPad, btnTop + iconPad) Icons.draw(grayIcons, 54, x + iconPad, btnTop + iconPad)
END; END;
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
IF runScript # "" THEN IF runScript # "" THEN
icons16(icons, 53, x + iconPad, btnTop + iconPad) Icons.draw(icons, 53, x + iconPad, btnTop + iconPad)
ELSE ELSE
icons16(grayIcons, 53, x + iconPad, btnTop + iconPad) Icons.draw(grayIcons, 53, x + iconPad, btnTop + iconPad)
END END
END toolbarIcons; END toolbarIcons;
@ -350,9 +328,9 @@ END toolbarIcons;
PROCEDURE WriteModified (x, y: INTEGER); PROCEDURE WriteModified (x, y: INTEGER);
BEGIN BEGIN
modified := text.modified; modified := text.modified;
K.DrawRect(x, TOP + canvas.height + scrollWidth - 1, 9*fontWidth, BOTTOM - scrollWidth + 1, winColor); K.DrawRect(x, TOP + canvas.height + scrollWidth - 1, 9*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
IF modified THEN IF modified THEN
K.DrawText866(x, y, 0, "modified") K.DrawText866(x, y, K.textColor, "modified")
END END
END WriteModified; END WriteModified;
@ -370,7 +348,7 @@ BEGIN
T.draw(text); T.draw(text);
K.ClientSize(width, height); K.ClientSize(width, height);
y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2; y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2;
K.DrawRect(LEFT, TOP + canvas.height + scrollWidth - 1, 16*fontWidth, BOTTOM - scrollWidth + 1, winColor); K.DrawRect(LEFT, TOP + canvas.height + scrollWidth - 1, 16*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
WritePos(y); WritePos(y);
IF modified # text.modified THEN IF modified # text.modified THEN
@ -421,7 +399,7 @@ VAR
BEGIN BEGIN
right := left + EditBox_Width + SEARCH_PADDING*2; right := left + EditBox_Width + SEARCH_PADDING*2;
bottom := top + 395 + btnHeight + SEARCH_PADDING; bottom := top + 395 + btnHeight + SEARCH_PADDING;
color := T.colors.border; color := K.borderColor;
Rect(left, top, right, bottom, color); Rect(left, top, right, bottom, color);
K.CreateButton(btnCloseFind, right - 20, top, 20, 20, 0EF999FH, ""); K.CreateButton(btnCloseFind, right - 20, top, 20, 20, 0EF999FH, "");
K.DrawLine(right - 14, top + 5, right - 5, top + 14, 0FFFFFFH); K.DrawLine(right - 14, top + 5, right - 5, top + 14, 0FFFFFFH);
@ -433,11 +411,11 @@ BEGIN
INC(top, 15); INC(top, 15);
INC(left, SEARCH_PADDING); INC(left, SEARCH_PADDING);
K.DrawText866(left, top, 0, "find"); K.DrawText866(left, top, K.textColor, "find");
K.DrawText866(left, top + 55, 0, "replace with"); K.DrawText866(left, top + 55, K.textColor, "replace with");
K.CreateButton(btnFindEdit + ORD({30}), left, top + 20, EditBox_Width, fontHeight + 5, 0, ""); K.CreateButton(btnFindEdit + ORD({30}), left, top + 20, EditBox_Width, fontHeight + 5, 0, "");
K.CreateButton(btnReplaceEdit + ORD({30}), left, top + 75, EditBox_Width, fontHeight + 5, 0, ""); K.CreateButton(btnReplaceEdit + ORD({30}), left, top + 75, EditBox_Width, fontHeight + 5, 0, "");
K.DrawText866(left, top + 330, 0, "go to line"); K.DrawText866(left, top + 330, K.textColor, "go to line");
K.CreateButton(btnGotoEdit + ORD({30}), left, top + 350, EditBox_Width, fontHeight + 5, 0, ""); K.CreateButton(btnGotoEdit + ORD({30}), left, top + 350, EditBox_Width, fontHeight + 5, 0, "");
BKW.top_s := BKW.top_s MOD 65536 + (top + 110) * 65536; BKW.top_s := BKW.top_s MOD 65536 + (top + 110) * 65536;
CS.top_s := CS.top_s MOD 65536 + (top + 140) * 65536; CS.top_s := CS.top_s MOD 65536 + (top + 140) * 65536;
@ -454,66 +432,19 @@ BEGIN
box_lib.edit_box_draw(FindEdit); box_lib.edit_box_draw(FindEdit);
box_lib.edit_box_draw(ReplaceEdit); box_lib.edit_box_draw(ReplaceEdit);
box_lib.edit_box_draw(GotoEdit); box_lib.edit_box_draw(GotoEdit);
box_lib.check_box_draw2(BKW); K.DrawText866(left + 20, top + 110, 0, "backward"); box_lib.check_box_draw2(BKW); K.DrawText866(left + 20, top + 110, K.textColor, "backward");
box_lib.check_box_draw2(CS); K.DrawText866(left + 20, top + 140, 0, "match case"); box_lib.check_box_draw2(CS); K.DrawText866(left + 20, top + 140, K.textColor, "match case");
box_lib.check_box_draw2(WH); K.DrawText866(left + 20, top + 170, 0, "whole word"); box_lib.check_box_draw2(WH); K.DrawText866(left + 20, top + 170, K.textColor, "whole word");
y := top + 200; y := top + 200;
K.CreateButton(btnFindNext, left, y, btnWidth, btnHeight, btnColor, "next"); INC(y, btnHeight + 10); K.CreateButton(btnFindNext, left, y, btnWidth, btnHeight, K.btnColor, "next"); INC(y, btnHeight + 10);
K.CreateButton(btnReplace, left, y, btnWidth, btnHeight, btnColor, "replace"); INC(y, btnHeight + 10); K.CreateButton(btnReplace, left, y, btnWidth, btnHeight, K.btnColor, "replace"); INC(y, btnHeight + 10);
K.CreateButton(btnReplaceAll, left, y, btnWidth + 5*fontWidth - 2, btnHeight, btnColor, "replace all"); K.CreateButton(btnReplaceAll, left, y, btnWidth + 5*fontWidth - 2, btnHeight, K.btnColor, "replace all");
K.CreateButton(btnGoto, left, top + 380, btnWidth, btnHeight, btnColor, "go"); K.CreateButton(btnGoto, left, top + 380, btnWidth, btnHeight, K.btnColor, "go");
END SearchPanel; END SearchPanel;
PROCEDURE gray (icons: INTEGER);
VAR
sizeX, sizeY, data, x, y: INTEGER;
b, g, r, gr: BYTE;
BEGIN
LibImg.GetInf(icons, sizeX, sizeY, data);
FOR y := 0 TO sizeY - 1 DO
FOR x := 0 TO sizeX - 1 DO
SYSTEM.GET8(data, b);
SYSTEM.GET8(data + 1, g);
SYSTEM.GET8(data + 2, r);
gr := (r + g + b) DIV 3;
SYSTEM.PUT8(data, gr);
SYSTEM.PUT8(data + 1, gr);
SYSTEM.PUT8(data + 2, gr);
INC(data, 3);
END
END
END gray;
PROCEDURE iconsBackColor (icons: INTEGER);
VAR
sizeX, sizeY, data, x, y: INTEGER;
b, g, r: BYTE;
BEGIN
LibImg.GetInf(icons, sizeX, sizeY, data);
FOR y := 0 TO sizeY - 1 DO
FOR x := 0 TO sizeX - 1 DO
SYSTEM.GET8(data, b);
SYSTEM.GET8(data + 1, g);
SYSTEM.GET8(data + 2, r);
IF b + g + r = 765 THEN
b := toolbarColor MOD 256;
g := toolbarColor DIV 256 MOD 256;
r := toolbarColor DIV 65536 MOD 256
END;
SYSTEM.PUT8(data, b);
SYSTEM.PUT8(data + 1, g);
SYSTEM.PUT8(data + 2, r);
INC(data, 3);
END
END
END iconsBackColor;
PROCEDURE draw_window; PROCEDURE draw_window;
CONST CONST
selMenuColor = 0CCE8FFH;
iconPad = (toolBtnSize - 16) DIV 2; iconPad = (toolBtnSize - 16) DIV 2;
VAR VAR
width, height, x, y: INTEGER; width, height, x, y: INTEGER;
@ -521,10 +452,10 @@ VAR
PROCEDURE drawToolbarBtn (id, x: INTEGER); PROCEDURE drawToolbarBtn (id, x: INTEGER);
BEGIN BEGIN
K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, toolbarColor); K.DrawRect(x, btnTop, toolBtnSize, toolBtnSize, K.toolbarColor);
K.DrawLine(x, btnTop + toolBtnSize, x + toolBtnSize, btnTop + toolBtnSize, 0808080H); K.DrawLine(x, btnTop + toolBtnSize, x + toolBtnSize, btnTop + toolBtnSize, K.shadowColor);
K.DrawLine(x + toolBtnSize, btnTop, x + toolBtnSize, btnTop + toolBtnSize, 0808080H); K.DrawLine(x + toolBtnSize, btnTop, x + toolBtnSize, btnTop + toolBtnSize, K.shadowColor);
K.CreateButton(id + ORD({30}), x, btnTop, toolBtnSize, toolBtnSize, btnColor, ""); K.CreateButton(id + ORD({30}), x, btnTop, toolBtnSize, toolBtnSize, K.btnColor, "");
END drawToolbarBtn; END drawToolbarBtn;
@ -533,26 +464,27 @@ VAR
menuColor, n: INTEGER; menuColor, n: INTEGER;
BEGIN BEGIN
IF menu.tid # 0 THEN IF menu.tid # 0 THEN
menuColor := selMenuColor menuColor := K.selMenuColor
ELSE ELSE
menuColor := winColor menuColor := K.winColor
END; END;
n := LENGTH(caption); n := LENGTH(caption);
K.DrawRect(x, 0, n*fontWidth + 2, MainMenuHeight, menuColor); K.DrawRect(x, 0, n*fontWidth + 2, MainMenuHeight, menuColor);
K.CreateButton(btn + ORD({30}), x, 0, n*fontWidth + 2, MainMenuHeight, btnColor, caption); K.CreateButton(btn + ORD({30}), x, 0, n*fontWidth + 2, MainMenuHeight, K.btnColor, "");
K.DrawText(x + 1, (MainMenuHeight - fontHeight) DIV 2 + 1, K.textColor, caption)
END drawMainMenu; END drawMainMenu;
BEGIN BEGIN
K.BeginDraw; K.BeginDraw;
K.CreateWindow(50 + K.GetTickCount() MOD 128, 50 + K.GetTickCount() MOD 128, winWidth, winHeight, winColor, 73H, 0, 0, header); K.CreateWindow(50 + K.GetTickCount() MOD 128, 50 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, header);
IF (text # NIL) & ~K.RolledUp() THEN IF (text # NIL) & ~K.RolledUp() THEN
confirm := FALSE; confirm := FALSE;
K.ClientSize(width, height); K.ClientSize(width, height);
K.DrawRect(0, 0, width, TOP, winColor); K.DrawRect(0, 0, width, TOP, K.winColor);
K.DrawRect(0, 0, LEFT, height, winColor); K.DrawRect(0, 0, LEFT, height, K.winColor);
K.DrawRect(LEFT + canvas.width - 1, TOP + canvas.height - 1, scrollWidth, scrollWidth, winColor); K.DrawRect(LEFT + canvas.width - 1, TOP + canvas.height - 1, scrollWidth, scrollWidth, K.winColor);
drawMainMenu(menuFile, menuFileX, btnFile, "file"); drawMainMenu(menuFile, menuFileX, btnFile, "file");
drawMainMenu(menuEdit, menuEditX, btnEdit, "edit"); drawMainMenu(menuEdit, menuEditX, btnEdit, "edit");
@ -565,18 +497,18 @@ BEGIN
x := searchLeft; x := searchLeft;
drawToolbarBtn(btnNew, x); drawToolbarBtn(btnNew, x);
icons16(icons, 2, x + iconPad, btnTop + iconPad); Icons.draw(icons, 2, x + iconPad, btnTop + iconPad);
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
drawToolbarBtn(btnOpen, x); drawToolbarBtn(btnOpen, x);
icons16(icons, 0, x + iconPad, btnTop + iconPad); Icons.draw(icons, 0, x + iconPad, btnTop + iconPad);
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
drawToolbarBtn(btnSave, x); drawToolbarBtn(btnSave, x);
INC(x, toolBtnSize + 5 + toolbarDelim); INC(x, toolBtnSize + 5 + toolbarDelim);
drawToolbarBtn(btnSearch, x); drawToolbarBtn(btnSearch, x);
icons16(icons, 49, x + iconPad, btnTop + iconPad); Icons.draw(icons, 49, x + iconPad, btnTop + iconPad);
INC(x, toolBtnSize + 5 + toolbarDelim); INC(x, toolBtnSize + 5 + toolbarDelim);
drawToolbarBtn(btnUndo, x); drawToolbarBtn(btnUndo, x);
@ -586,45 +518,46 @@ BEGIN
INC(x, toolBtnSize + 5 + toolbarDelim); INC(x, toolBtnSize + 5 + toolbarDelim);
drawToolbarBtn(btnUpper, x); drawToolbarBtn(btnUpper, x);
K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, 0, "AB");
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
drawToolbarBtn(btnLower, x); drawToolbarBtn(btnLower, x);
K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, 0, "ab");
INC(x, toolBtnSize + 5 + toolbarDelim); INC(x, toolBtnSize + 5 + toolbarDelim);
drawToolbarBtn(btnBuild, x); drawToolbarBtn(btnBuild, x);
icons16(icons, 54, x + iconPad, btnTop + iconPad); Icons.draw(icons, 54, x + iconPad, btnTop + iconPad);
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
drawToolbarBtn(btnRun, x); drawToolbarBtn(btnRun, x);
icons16(icons, 53, x + iconPad, btnTop + iconPad); Icons.draw(icons, 53, x + iconPad, btnTop + iconPad);
INC(x, toolBtnSize + 5); INC(x, toolBtnSize + 5);
K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP, scrollWidth - 1, scrollWidth, btnColor, 0X); K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP, scrollWidth - 1, scrollWidth, K.btnColor, 0X);
K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + (scrollWidth - 9) DIV 2, 0, 18X); K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + (scrollWidth - 9) DIV 2, K.btnTextColor, 18X);
K.CreateButton(btnDown, LEFT + canvas.width - 1, TOP + canvas.height - scrollWidth - 1, scrollWidth - 1, scrollWidth, btnColor, 0X); K.CreateButton(btnDown, LEFT + canvas.width - 1, TOP + canvas.height - scrollWidth - 1, scrollWidth - 1, scrollWidth, K.btnColor, 0X);
K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - scrollWidth + (scrollWidth - 9) DIV 2, 0, 19X); K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - scrollWidth + (scrollWidth - 9) DIV 2, K.btnTextColor, 19X);
K.CreateButton(btnLeft, LEFT, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, btnColor, 0X); K.CreateButton(btnLeft, LEFT, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, K.btnColor, 0X);
K.DrawText69(LEFT + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, 0, 1BX); K.DrawText69(LEFT + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, K.btnTextColor, 1BX);
K.CreateButton(btnRight, LEFT + canvas.width - scrollWidth - 1, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, btnColor, 0X); K.CreateButton(btnRight, LEFT + canvas.width - scrollWidth - 1, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, K.btnColor, 0X);
K.DrawText69(LEFT + canvas.width - scrollWidth - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, 0, 1AX); K.DrawText69(LEFT + canvas.width - scrollWidth - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, K.btnTextColor, 1AX);
K.PutPixel(LEFT + canvas.width + scrollWidth - 2, TOP, K.winColor);
K.PutPixel(LEFT, TOP + canvas.height + scrollWidth - 2, K.winColor);
y := (btnHeight - fontHeight) DIV 2 + btnTop; y := (btnHeight - fontHeight) DIV 2 + btnTop;
CASE text.enc OF CASE text.enc OF
|E.UTF8: K.DrawText866(width - 6*fontWidth, y, 0, "UTF-8") |E.UTF8: K.DrawText866(width - 6*fontWidth, y, K.textColor, "UTF-8")
|E.UTF8BOM: K.DrawText866(width - 10*fontWidth, y, 0, "UTF-8-BOM") |E.UTF8BOM: K.DrawText866(width - 10*fontWidth, y, K.textColor, "UTF-8-BOM")
|E.CP866: K.DrawText866(width - 6*fontWidth, y, 0, "CP866") |E.CP866: K.DrawText866(width - 6*fontWidth, y, K.textColor, "CP866")
|E.W1251: K.DrawText866(width - 13*fontWidth, y, 0, "Windows-1251") |E.W1251: K.DrawText866(width - 13*fontWidth, y, K.textColor, "Windows-1251")
END; END;
IF search THEN IF search THEN
SearchPanel(searchLeft, TOP) SearchPanel(searchLeft, TOP)
END; END;
y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2; y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2;
K.DrawRect(LEFT + 16*fontWidth, TOP + canvas.height + scrollWidth - 1, width - LEFT - 25*fontWidth, BOTTOM - scrollWidth + 1, winColor); K.DrawRect(LEFT + 16*fontWidth, TOP + canvas.height + scrollWidth - 1, width - LEFT - 25*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
K.DrawText866(LEFT + 16*fontWidth, y, 0, text.fileName); K.DrawText866(LEFT + 16*fontWidth, y, K.textColor, text.fileName);
WriteModified(width - 9*fontWidth, y); WriteModified(width - 9*fontWidth, y);
repaint repaint
END; END;
@ -763,11 +696,11 @@ BEGIN
top := (canvas.height - height) DIV 2 + TOP; top := (canvas.height - height) DIV 2 + TOP;
right := left + width - 1; right := left + width - 1;
bottom := top + height - 1; bottom := top + height - 1;
K.DrawRect(left, top, width, height, winColor); K.DrawRect(left, top, width, height, K.winColor);
Rect(left, top, right, bottom, lineColor); Rect(left, top, right, bottom, lineColor);
K.DrawText866(left + (width - 10*fontWidth) DIV 2, top + 10, 0, "save file?"); K.DrawText866(left + (width - 10*fontWidth) DIV 2, top + 10, K.textColor, "save file?");
K.CreateButton(btnYes, left + 10, top + 35, btnWidth, btnHeight, btnColor, "yes"); K.CreateButton(btnYes, left + 10, top + 35, btnWidth, btnHeight, K.btnColor, "yes");
K.CreateButton(btnNo, left + 20 + btnWidth, top + 35, btnWidth, btnHeight, btnColor, "no"); K.CreateButton(btnNo, left + 20 + btnWidth, top + 35, btnWidth, btnHeight, K.btnColor, "no");
END Confirm; END Confirm;
@ -1119,9 +1052,8 @@ VAR
idx: INTEGER; idx: INTEGER;
BEGIN BEGIN
menu := List.create(NIL); menu := List.create(NIL);
Menu.AddMenuItem(menu, menuNumbers, "line numbers"); Menu.AddMenuItem(menu, menuNumbers, "line numbers");
Menu.delimiter(menu); Menu.delimiter(menu);
(*Menu.AddMenuItem(menu, menuSettings, "settings");*)
colors := Ini.sections.first(Ini.tSection); colors := Ini.sections.first(Ini.tSection);
idx := menuColors; idx := menuColors;
@ -1239,7 +1171,6 @@ BEGIN
Menu.setCheck(menu, menuWin1251, ORD(text.enc = E.W1251)*2); Menu.setCheck(menu, menuWin1251, ORD(text.enc = E.W1251)*2);
INC(x, menuEncodingX) INC(x, menuEncodingX)
ELSIF menu = menuView THEN ELSIF menu = menuView THEN
(*Menu.setEnabled(menu, menuSettings, FALSE);*)
Menu.setCheck(menu, menuNumbers, ORD(text.numbers)); Menu.setCheck(menu, menuNumbers, ORD(text.numbers));
FOR i := 0 TO Ini.sections.count - 1 DO FOR i := 0 TO Ini.sections.count - 1 DO
Menu.setCheck(menu, menuColors + i, ORD(Ini.curSectionNum = i)*2) Menu.setCheck(menu, menuColors + i, ORD(Ini.curSectionNum = i)*2)
@ -1280,20 +1211,16 @@ VAR
scroll: INTEGER; scroll: INTEGER;
err: INTEGER; err: INTEGER;
fileName, filePath: RW.tFileName; fileName, filePath: RW.tFileName;
cliWidth, cliHeight: INTEGER;
resized: BOOLEAN; resized: BOOLEAN;
firstClickX, firstClickY, time: INTEGER; firstClickX, firstClickY, time: INTEGER;
BEGIN BEGIN
K.GetSystemColors;
Icons.get(icons, grayIcons);
modified := FALSE; modified := FALSE;
mainTID := K.ThreadID(); mainTID := K.ThreadID();
K.SetIPC(IPC); K.SetIPC(IPC);
U.ptr2str(K.GetName(), AppPath); U.ptr2str(K.GetName(), AppPath);
(* U.getPath(AppPath, fileName);
U.append8(fileName, "/Icons16.png");*)
icons := LibImg.LoadFromFile("/rd/1/Icons16.png", 16, y);
grayIcons := LibImg.LoadFromFile("/rd/1/Icons16.png", 16, y);
gray(grayIcons);
iconsBackColor(icons);
iconsBackColor(grayIcons);
Ini.load(AppPath); Ini.load(AppPath);
K.SetEventsMask({0, 1, 2, 5, 6, 31}); K.SetEventsMask({0, 1, 2, 5, 6, 31});
LeftButtonUp; LeftButtonUp;
@ -1301,6 +1228,8 @@ BEGIN
shift := {}; shift := {};
winWidth := minWinWidth; winWidth := minWinWidth;
winHeight := minWinHeight; winHeight := minWinHeight;
cliWidth := winWidth;
cliHeight := winHeight;
LEFT := 10; LEFT := 10;
canvas := G.CreateCanvas(winWidth - (LEFT + RIGHT + 10), winHeight - (TOP + BOTTOM + 4) - K.SkinHeight()); canvas := G.CreateCanvas(winWidth - (LEFT + RIGHT + 10), winHeight - (TOP + BOTTOM + 4) - K.SkinHeight());
font := G.CreateFont(1, "", {}); font := G.CreateFont(1, "", {});
@ -1330,8 +1259,8 @@ BEGIN
END; END;
OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, ""); OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
vScroll := Scroll.create(scrollWidth, canvas.height - scrollWidth*2 + 1, 0A0A0A0H, winColor); vScroll := Scroll.create(scrollWidth, canvas.height - scrollWidth*2 + 1);
hScroll := Scroll.create(canvas.width - scrollWidth*2, scrollWidth, 0A0A0A0H, winColor); hScroll := Scroll.create(canvas.width - scrollWidth*2, scrollWidth);
T.resize(canvas.width, canvas.height); T.resize(canvas.width, canvas.height);
T.SetPos(text, 0, 0); T.SetPos(text, 0, 0);
confirm := FALSE; confirm := FALSE;
@ -1351,9 +1280,13 @@ BEGIN
WHILE TRUE DO WHILE TRUE DO
CASE K.WaitForEvent() OF CASE K.WaitForEvent() OF
|1: |1:
K.GetSystemColors;
Icons.get(icons, grayIcons);
IF ~K.RolledUp() THEN IF ~K.RolledUp() THEN
K.WinSize(width, height); K.ClientSize(width, height);
IF (width # winWidth) OR (height # winHeight) THEN IF (width # cliWidth) OR (height # cliHeight) THEN
cliWidth := width;
cliHeight := height;
resize; resize;
resized := TRUE resized := TRUE
END; END;

4
programs/develop/cedit/SRC/Ini.ob07
View File

@ -21,7 +21,7 @@ MODULE Ini;
IMPORT IMPORT
KOSAPI, SYSTEM, RW, Text, Utils, File, List, Languages; KOSAPI, SYSTEM, RW, Text, Utils, File, List, Languages, KolibriOS;
CONST CONST
@ -141,7 +141,7 @@ BEGIN
key3 := getColor("key3", 0008080H); key3 := getColor("key3", 0008080H);
Text.setColors(text, back, seltext, selback, modified, saved, curline, numtext, numback, Text.setColors(text, back, seltext, selback, modified, saved, curline, numtext, numback,
comment, string, num, delim, key1, key2, key3, 808080H); comment, string, num, delim, key1, key2, key3);
END selectSection; END selectSection;

59
programs/develop/cedit/SRC/KolibriOS.ob07
View File

@ -23,10 +23,30 @@ IMPORT
KOSAPI, SYSTEM; KOSAPI, SYSTEM;
CONST CONST
(*
winColor* = 0EEEEEEH; winColor* = 0EEEEEEH;
textColor* = 0000000H;
btnColor* = 0CCCCCCH;
btnTextColor* = 0000000H;
toolbarColor* = 0DFDFDFH;
scrollColor* = 0A0A0A0H;
scrollBkColor* = winColor;
borderColor* = 0808080H;
selMenuColor* = 0CCE8FFH;
shadowColor* = 0808080H;
caseColor* = 00000FFH;
disCaseColor* = 0808080H;
*)
fontWidth* = 8; fontWidth* = 8;
fontHeight* = 16; fontHeight* = 16;
VAR
winColor*, textColor*, btnColor*, btnTextColor*,
toolbarColor*, scrollColor*, scrollBkColor*,
borderColor*, selMenuColor*, shadowColor*,
caseColor*, disCaseColor*: INTEGER;
PROCEDURE GetCommandLine* (): INTEGER; PROCEDURE GetCommandLine* (): INTEGER;
RETURN KOSAPI.GetCommandLine() RETURN KOSAPI.GetCommandLine()
@ -154,7 +174,7 @@ BEGIN
KOSAPI.sysfunc5(8, LSL(Left, 16) + Width, LSL(Top, 16) + Height, id, Color); KOSAPI.sysfunc5(8, LSL(Left, 16) + Width, LSL(Top, 16) + Height, id, Color);
x := Left + (Width - fontWidth * LENGTH(Caption)) DIV 2; x := Left + (Width - fontWidth * LENGTH(Caption)) DIV 2;
y := Top + (Height - fontHeight) DIV 2 + 1; y := Top + (Height - fontHeight) DIV 2 + 1;
DrawText(x, y, 0, Caption) DrawText(x, y, btnTextColor, Caption)
END CreateButton; END CreateButton;
@ -298,4 +318,41 @@ BEGIN
END SendIPC; END SendIPC;
PROCEDURE PutPixel* (x, y, color: INTEGER);
BEGIN
KOSAPI.sysfunc4(1, x, y, color)
END PutPixel;
PROCEDURE GetSystemColors*;
VAR
buf: ARRAY 10 OF INTEGER;
BEGIN
(* winColor := 0EEEEEEH;
textColor := 0000000H;
btnColor := 0CCCCCCH;
btnTextColor := 0000000H;
scrollColor := 0A0A0A0H;
scrollBkColor := winColor;
borderColor := 0808080H;
*)
selMenuColor := 0CCE8FFH;
toolbarColor := 0DFDFDFH;
shadowColor := 0808080H;
caseColor := 00000FFH;
disCaseColor := 0808080H;
ASSERT(LEN(buf) >= 10);
KOSAPI.sysfunc4(48, 3, SYSTEM.ADR(buf[0]), 40);
winColor := buf[5];
textColor := buf[8];
btnColor := buf[6];
btnTextColor := buf[7];
scrollColor := btnColor;
scrollBkColor := winColor;
borderColor := buf[9];
END GetSystemColors;
END KolibriOS. END KolibriOS.

9
programs/develop/cedit/SRC/Languages.ob07
View File

@ -319,7 +319,7 @@ BEGIN
END comments; END comments;
PROCEDURE EnterKW (s: ARRAY OF CHAR; VAR KW: tKeyWords); PROCEDURE EnterKW (s: ARRAY OF CHAR; VAR KW: tKeyWords; CPrep: BOOLEAN);
CONST CONST
SPACE = 20X; CR = 0DX; LF = 0AX; TAB = 9X; COMMA = ","; SPACE = 20X; CR = 0DX; LF = 0AX; TAB = 9X; COMMA = ",";
VAR VAR
@ -333,7 +333,8 @@ BEGIN
k := KW.cnt; k := KW.cnt;
i := 0; i := 0;
REPEAT REPEAT
j := 0; KW.words[k, 0] := "#";
j := ORD(CPrep);
WHILE (s[i] # 0X) & ~delim(s[i]) DO WHILE (s[i] # 0X) & ~delim(s[i]) DO
KW.words[k, j] := WCHR(ORD(s[i])); KW.words[k, j] := WCHR(ORD(s[i]));
INC(i); INC(i);
@ -360,8 +361,8 @@ BEGIN
KW[i].cnt := 0; KW[i].cnt := 0;
key[2] := CHR(ORD("1") + i); key[2] := CHR(ORD("1") + i);
getStr(lang, key, s); getStr(lang, key, s);
EnterKW(s, KW[i]) EnterKW(s, KW[i], (lang = "lang_C") & (i = 1))
END; END
END loadKW; END loadKW;

9
programs/develop/cedit/SRC/Menu.ob07
View File

@ -48,7 +48,6 @@ TYPE
END; END;
tMenu* = POINTER TO RECORD tMenu* = POINTER TO RECORD
(*stack: POINTER TO RECORD stk: ARRAY 250000 OF INTEGER END;*)
tid*: INTEGER; tid*: INTEGER;
winX, winY, width*, height*: INTEGER; winX, winY, width*, height*: INTEGER;
selItem, cliItem: INTEGER; selItem, cliItem: INTEGER;
@ -163,7 +162,7 @@ VAR
item: List.tItem; item: List.tItem;
BEGIN BEGIN
item := List.getItem(m.items, i); item := List.getItem(m.items, i);
IF item(tItem).enabled THEN IF (item # NIL) & item(tItem).enabled THEN
m.click(m, item(tItem).id); m.click(m, item(tItem).id);
exit(m) exit(m)
END END
@ -304,10 +303,6 @@ BEGIN
IF m.tid = 0 THEN IF m.tid = 0 THEN
m.winX := x; m.winX := x;
m.winY := y; m.winY := y;
(* DISPOSE(m.stack);
NEW(m.stack);
SYSTEM.PUT(SYSTEM.ADR(m.stack.stk[LEN(m.stack.stk) - 1]), m);
lastTID := K.CreateThread(SYSTEM.ADR(window), m.stack.stk);*)
SYSTEM.PUT(SYSTEM.ADR(stack[LEN(stack) - 1]), m); SYSTEM.PUT(SYSTEM.ADR(stack[LEN(stack) - 1]), m);
lastTID := K.CreateThread(SYSTEM.ADR(window), stack); lastTID := K.CreateThread(SYSTEM.ADR(window), stack);
m.tid := lastTID m.tid := lastTID
@ -319,7 +314,6 @@ PROCEDURE close* (m: tMenu);
BEGIN BEGIN
IF m.tid # 0 THEN IF m.tid # 0 THEN
K.ExitID(m.tid); K.ExitID(m.tid);
(*DISPOSE(m.stack);*)
m.tid := 0 m.tid := 0
END END
END close; END close;
@ -346,7 +340,6 @@ BEGIN
m.height := items.count*fontHeight - 2; m.height := items.count*fontHeight - 2;
m.font := G.CreateFont(1, "", {}); m.font := G.CreateFont(1, "", {});
m.canvas := G.CreateCanvas(m.width + 1, m.height + 1); m.canvas := G.CreateCanvas(m.width + 1, m.height + 1);
(*m.stack := NIL;*)
G.SetFont(m.canvas, m.font); G.SetFont(m.canvas, m.font);
RETURN m RETURN m
END create; END create;

10
programs/develop/cedit/SRC/Text.ob07
View File

@ -26,6 +26,7 @@ IMPORT
RW, Search, RW, Search,
E := Encodings, E := Encodings,
CB := Clipboard, CB := Clipboard,
K := KolibriOS,
ChangeLog, ChangeLog,
Lang := Languages; Lang := Languages;
@ -91,7 +92,7 @@ VAR
ShowCursor: PROCEDURE; ShowCursor: PROCEDURE;
colors*: RECORD colors*: RECORD
text, back, seltext, selback, modified, saved, curline, numtext, numback, border*: INTEGER; text, back, seltext, selback, modified, saved, curline, numtext, numback: INTEGER;
comment, string, num, delim, key1, key2, key3: INTEGER comment, string, num, delim, key1, key2, key3: INTEGER
END; END;
canvas: G.tCanvas; canvas: G.tCanvas;
@ -766,7 +767,7 @@ BEGIN
ELSIF lang = Lang.langIni THEN ELSIF lang = Lang.langIni THEN
IF depth = 0 THEN IF depth = 0 THEN
IF c = ";" THEN IF (c = ";") OR (c = "#") THEN
PrintLex(text, line, i, n, y, colors.comment, backColor); PrintLex(text, line, i, n, y, colors.comment, backColor);
i := n i := n
ELSIF c = '"' THEN ELSIF c = '"' THEN
@ -1851,7 +1852,7 @@ BEGIN
IF drawCursor THEN IF drawCursor THEN
cursor(text) cursor(text)
END; END;
G.SetColor(canvas, colors.border); G.SetColor(canvas, K.borderColor);
G.Rect(canvas, 0, 0, size.X - 1, size.Y - 1); G.Rect(canvas, 0, 0, size.X - 1, size.Y - 1);
END draw; END draw;
@ -1890,7 +1891,7 @@ END create;
PROCEDURE setColors* (text, back, seltext, selback, modified, saved, curline, numtext, numback, PROCEDURE setColors* (text, back, seltext, selback, modified, saved, curline, numtext, numback,
comment, string, num, delim, key1, key2, key3, border: INTEGER); comment, string, num, delim, key1, key2, key3: INTEGER);
BEGIN BEGIN
colors.text := text; colors.text := text;
colors.back := back; colors.back := back;
@ -1908,7 +1909,6 @@ BEGIN
colors.key1 := key1; colors.key1 := key1;
colors.key2 := key2; colors.key2 := key2;
colors.key3 := key3; colors.key3 := key3;
colors.border := border;
END setColors; END setColors;

21
programs/develop/cedit/SRC/scroll.ob07
View File

@ -19,7 +19,7 @@
MODULE Scroll; MODULE Scroll;
IMPORT G := Graph; IMPORT G := Graph, K := KolibriOS;
TYPE TYPE
@ -27,7 +27,6 @@ TYPE
vertical, mouse: BOOLEAN; vertical, mouse: BOOLEAN;
canvas: G.tCanvas; canvas: G.tCanvas;
xSize*, ySize*, pos, mousePos: INTEGER; xSize*, ySize*, pos, mousePos: INTEGER;
color, bkColor: INTEGER;
value*, maxVal*: INTEGER value*, maxVal*: INTEGER
END; END;
@ -50,21 +49,25 @@ BEGIN
pos := 0 pos := 0
END; END;
canvas := scroll.canvas; canvas := scroll.canvas;
G.SetColor(canvas, scroll.bkColor); G.SetColor(canvas, K.scrollBkColor);
G.clear(canvas); G.clear(canvas);
G.SetColor(canvas, 0808080H); G.SetColor(canvas, K.borderColor);
G.Rect(canvas, 0, 0, scroll.xSize - 1, scroll.ySize - 1); G.Rect(canvas, 0, 0, scroll.xSize - 1, scroll.ySize - 1);
G.SetColor(canvas, scroll.color); G.SetColor(canvas, K.scrollColor);
DEC(b, 2); DEC(b, 2);
IF scroll.vertical THEN IF scroll.vertical THEN
G.FillRect(canvas, 1, pos + 1, b, pos + b); G.FillRect(canvas, 1, pos + 1, b, pos + b);
G.SetColor(canvas, 0404040H); G.SetColor(canvas, K.borderColor);
G.Rect(canvas, 0, pos, b + 2, pos + b + 1);
G.SetColor(canvas, K.btnTextColor);
G.HLine(canvas, pos + 1 + b DIV 2, 4, b - 4); G.HLine(canvas, pos + 1 + b DIV 2, 4, b - 4);
G.HLine(canvas, pos + 1 + b DIV 2 - 3, 6, b - 6); G.HLine(canvas, pos + 1 + b DIV 2 - 3, 6, b - 6);
G.HLine(canvas, pos + 1 + b DIV 2 + 3, 6, b - 6); G.HLine(canvas, pos + 1 + b DIV 2 + 3, 6, b - 6);
ELSE ELSE
G.FillRect(canvas, pos + 1, 1, pos + b, b); G.FillRect(canvas, pos + 1, 1, pos + b, b);
G.SetColor(canvas, 0404040H); G.SetColor(canvas, K.borderColor);
G.Rect(canvas, pos, 0, pos + b + 1, b + 2);
G.SetColor(canvas, K.btnTextColor);
G.VLine(canvas, pos + b DIV 2, 4, b - 4); G.VLine(canvas, pos + b DIV 2, 4, b - 4);
G.VLine(canvas, pos + b DIV 2 - 3, 6, b - 6); G.VLine(canvas, pos + b DIV 2 - 3, 6, b - 6);
G.VLine(canvas, pos + b DIV 2 + 3, 6, b - 6); G.VLine(canvas, pos + b DIV 2 + 3, 6, b - 6);
@ -74,7 +77,7 @@ BEGIN
END draw; END draw;
PROCEDURE create* (xSize, ySize: INTEGER; color, bkColor: INTEGER): tScroll; PROCEDURE create* (xSize, ySize: INTEGER): tScroll;
VAR VAR
scroll: tScroll; scroll: tScroll;
BEGIN BEGIN
@ -85,8 +88,6 @@ BEGIN
scroll.maxVal := 30; scroll.maxVal := 30;
scroll.value := 0; scroll.value := 0;
scroll.mouse := FALSE; scroll.mouse := FALSE;
scroll.bkColor := bkColor;
scroll.color := color;
scroll.canvas := G.CreateCanvas(xSize, ySize) scroll.canvas := G.CreateCanvas(xSize, ySize)
RETURN scroll RETURN scroll
END create; END create;

2
programs/system/menu/trunk/menu.asm
View File

@ -22,7 +22,7 @@
;****************************************************************************** ;******************************************************************************
BTN_HEIGHT = 26 BTN_HEIGHT = 26
BTN_WIDTH = 178 BTN_WIDTH = 178
TXT_Y = (BTN_HEIGHT)/2-6 TXT_Y = (BTN_HEIGHT)/2-7
FONT_TYPE = 0x90000000 FONT_TYPE = 0x90000000
PANEL_HEIGHT = 20 PANEL_HEIGHT = 20