WebSVN – Kolibri OS – Diff – /programs/develop/cedit/SRC/CEdit.ob07

 *)
 MODULE CEdit;
 IMPORT
-    SYSTEM, OpenDlg, K := KolibriOS,
+    OpenDlg, K := KolibriOS,
     U := Utils, Lines, Menu, List,
     G := Graph, T := Text, E := Encodings,
     CB := Clipboard, Languages,
     ChangeLog, Scroll,
-    RW, Ini, box_lib, LibImg;
+    RW, Ini, box_lib, Icons;
 CONST
-    header = "CEdit (24-may-2021)";
+    header = "CEdit (03-jun-2021)";
-    ShellFilter = "";(* "SH|"; *)
+    ShellFilter = "";
     btnProgram = 75;
     btnTools = 76;
-    MainMenuHeight = fontHeight + 7;
     MainMenuHeight = fontHeight + 7;
     btnColor = 0CCCCCCH;
     btnHeight = 25;
     btnWidth = 75;
     btnTop = MainMenuHeight + 3;
     toolBtnSize = 24;
     toolbarDelim = 7;
     TOP = btnTop + toolBtnSize + 7;
-    RIGHT = scrollWidth - 2;
-    BOTTOM = scrollWidth + 25;
     RIGHT = scrollWidth - 2;
-    winColor = K.winColor; minWinWidth = 635; minWinHeight = 542;
+    BOTTOM = scrollWidth + 25;
-    toolbarColor = 0DFDFDFH;
+    minWinWidth = 635; minWinHeight = 542;
     menuSaveAs = 13;
     menuFolder = 14;
     menuExit = 15;
-    menuNumbers = 20;
-    (*menuSettings = 21;*)
+    menuNumbers = 20;
     menuColors = 1000;
     menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1;
     menuWin1251 = 63;
     menuPipet = 70;
+    menuSysFunc = 71;
     menuSysFunc = 71;
 VAR
     canvas: G.tCanvas;
     font: G.tFont;
     T.getPos(text, col, line);
     U.int2str(line, s1);
     U.int2str(col, s2);
     U.append(s1, ": ");
     U.append(s1, s2);
-    K.DrawText(LEFT, y, 0, s1)
+    K.DrawText(LEFT, y, K.textColor, s1)
 END WritePos;
     IF value THEN
         edit.flags := ORD(BITS(edit.flags) + {1})
     ELSE
         edit.flags := ORD(BITS(edit.flags) - {1})
     END;
-(*    IF value THEN
-        edit.color := 0FFFFFFH
-    ELSE
-        edit.color := 0D0D0D0H
-    END;*)
     IF search THEN
         box_lib.edit_box_draw(edit)
     END
 END EditBox_SetFocus;
     top := (canvas.height - height) DIV 2 + TOP;
     bottom := top + height - 1;
     right := left + width - 1;
     x := minWidth DIV 2 + left;
     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);
-    K.DrawText(x, y, 0, s);
+    K.DrawText(x, y, K.textColor, s);
 END Message;
         EditBox_SetFocus(GotoEdit, FALSE)
     END
 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;
 CONST
     iconPad = (toolBtnSize - 16) DIV 2;
 VAR
     x, color: INTEGER;
 BEGIN
     x := searchLeft + (toolBtnSize + 5)*2;
     IF text.modified THEN
-        icons16(icons, 5, x + iconPad, btnTop + iconPad)
+        Icons.draw(icons, 5, x + iconPad, btnTop + iconPad)
     ELSE
-        icons16(grayIcons, 5, x + iconPad, btnTop + iconPad)
+        Icons.draw(grayIcons, 5, x + iconPad, btnTop + iconPad)
     END;
     IF text.edition # NIL THEN
         x := searchLeft + (toolBtnSize + 5)*4 + toolbarDelim*2;
         IF ChangeLog.isFirstGuard(text.edition) THEN
-            icons16(grayIcons, 37, x + iconPad, btnTop + iconPad)
+            Icons.draw(grayIcons, 37, x + iconPad, btnTop + iconPad)
         ELSE
-            icons16(icons, 37, x + iconPad, btnTop + iconPad)
+            Icons.draw(icons, 37, x + iconPad, btnTop + iconPad)
         END;
         x := searchLeft + (toolBtnSize + 5)*5 + toolbarDelim*2;
         IF ChangeLog.isLastGuard(text.edition) THEN
-            icons16(grayIcons, 36, x + iconPad, btnTop + iconPad)
-        ELSE
-            icons16(icons, 36, x + iconPad, btnTop + iconPad)
-        END
-(*    ELSE
-        x := searchLeft + (toolBtnSize + 5)*4;
+            Icons.draw(grayIcons, 36, x + iconPad, btnTop + iconPad)
-        icons16(grayIcons, 37, x + iconPad, btnTop + iconPad);
+        ELSE
-        x := searchLeft + (toolBtnSize + 5)*5;
+            Icons.draw(icons, 36, x + iconPad, btnTop + iconPad)
-        icons16(grayIcons, 36, x + iconPad, btnTop + iconPad)*)
+        END
     END;
     IF T.selected(text) THEN
-        color := 00000FFH
+        color := K.caseColor
     ELSE
-        color := 0808080H
+        color := K.disCaseColor
     END;
     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");
     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");
     x := searchLeft + (toolBtnSize + 5)*8 + toolbarDelim*4;
     IF buildScript # "" THEN
-        icons16(icons, 54, x + iconPad, btnTop + iconPad)
+        Icons.draw(icons, 54, x + iconPad, btnTop + iconPad)
     ELSE
-        icons16(grayIcons, 54, x + iconPad, btnTop + iconPad)
+        Icons.draw(grayIcons, 54, x + iconPad, btnTop + iconPad)
     END;
     INC(x, toolBtnSize + 5);
     IF runScript # "" THEN
-        icons16(icons, 53, x + iconPad, btnTop + iconPad)
+        Icons.draw(icons, 53, x + iconPad, btnTop + iconPad)
     ELSE
-        icons16(grayIcons, 53, x + iconPad, btnTop + iconPad)
+        Icons.draw(grayIcons, 53, x + iconPad, btnTop + iconPad)
     END
 END toolbarIcons;
             confirm := FALSE
         END;
         T.draw(text);
         K.ClientSize(width, height);
         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);
         IF modified # text.modified THEN
             WriteModified(width - 9*fontWidth, y)
 VAR
     y, right, bottom, color: INTEGER;
 BEGIN
     right := left + EditBox_Width + SEARCH_PADDING*2;
     bottom := top + 395 + btnHeight + SEARCH_PADDING;
-    color := T.colors.border;
+    color := K.borderColor;
     Rect(left, top, right, bottom, color);
     K.CreateButton(btnCloseFind, right - 20, top, 20, 20, 0EF999FH, "");
     K.DrawLine(right - 14, top + 5, right - 5, top + 14, 0FFFFFFH);
     K.DrawLine(right - 15, top + 5, right - 5, top + 15, 0FFFFFFH);
     K.DrawLine(right - 15, top + 6, right - 6, top + 15, 0FFFFFFH);
     K.DrawLine(right - 15, top + 15, right - 5, top + 5, 0FFFFFFH);
     K.DrawLine(right - 14, top + 15, right - 5, top + 6, 0FFFFFFH);
     INC(top, 15);
     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(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, "");
     BKW.top_s := BKW.top_s MOD 65536 + (top + 110) * 65536;
     CS.top_s := CS.top_s MOD 65536 + (top + 140) * 65536;
     WH.top_s := WH.top_s MOD 65536 + (top + 170) * 65536;
     ReplaceEdit.left := left;
     GotoEdit.left := left;
     box_lib.edit_box_draw(FindEdit);
     box_lib.edit_box_draw(ReplaceEdit);
     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;
-    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;
-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;
-CONST
+PROCEDURE draw_window;
-    selMenuColor = 0CCE8FFH;
+CONST
     iconPad = (toolBtnSize - 16) DIV 2;
 VAR
     width, height, x, y: INTEGER;
     PROCEDURE drawToolbarBtn (id, x: INTEGER);
     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;
     PROCEDURE drawMainMenu (menu: Menu.tMenu; x: INTEGER; btn: INTEGER; caption: ARRAY OF WCHAR);
     VAR
         menuColor, n: INTEGER;
     BEGIN
         IF menu.tid # 0 THEN
-            menuColor := selMenuColor
+            menuColor := K.selMenuColor
+        ELSE
-        ELSE
+            menuColor := K.winColor
-            menuColor := 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, K.btnColor, "");
-        K.CreateButton(btn + ORD({30}), x, 0, n*fontWidth + 2, MainMenuHeight, btnColor, caption);
+        K.DrawText(x + 1, (MainMenuHeight - fontHeight) DIV 2 + 1, K.textColor, caption)
     END drawMainMenu;
 BEGIN
     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
         confirm := FALSE;
         drawMainMenu(menuTools, menuToolsX, btnTools, "tools");
         x := searchLeft;
         drawToolbarBtn(btnNew, x);
-        icons16(icons, 2, x + iconPad, btnTop + iconPad);
+        Icons.draw(icons, 2, x + iconPad, btnTop + iconPad);
         INC(x, toolBtnSize + 5);
         drawToolbarBtn(btnOpen, x);
-        icons16(icons, 0, x + iconPad, btnTop + iconPad);
+        Icons.draw(icons, 0, x + iconPad, btnTop + iconPad);
         INC(x, toolBtnSize + 5);
         drawToolbarBtn(btnSave, x);
         INC(x, toolBtnSize + 5 + toolbarDelim);
         drawToolbarBtn(btnSearch, x);
-        icons16(icons, 49, x + iconPad, btnTop + iconPad);
+        Icons.draw(icons, 49, x + iconPad, btnTop + iconPad);
         INC(x, toolBtnSize + 5 + toolbarDelim);
         drawToolbarBtn(btnUndo, x);
-        INC(x, toolBtnSize + 5);
+        drawToolbarBtn(btnUndo, x);
-        drawToolbarBtn(btnRedo, x);
+        INC(x, toolBtnSize + 5);
         INC(x, toolBtnSize + 5 + toolbarDelim);
+        drawToolbarBtn(btnRedo, x);
-        drawToolbarBtn(btnUpper, x);
+        INC(x, toolBtnSize + 5 + toolbarDelim);
         K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, 0, "AB");
-        INC(x, toolBtnSize + 5);
+        drawToolbarBtn(btnUpper, x);
         INC(x, toolBtnSize + 5);
-        drawToolbarBtn(btnLower, x);
-        K.DrawText69(x + (toolBtnSize - 12) DIV 2, btnTop + (toolBtnSize - 9) DIV 2 + 2, 0, "ab");
+        drawToolbarBtn(btnLower, x);
         INC(x, toolBtnSize + 5 + toolbarDelim);
         drawToolbarBtn(btnBuild, x);
-        icons16(icons, 54, x + iconPad, btnTop + iconPad);
+        Icons.draw(icons, 54, x + iconPad, btnTop + iconPad);
         INC(x, toolBtnSize + 5);
         drawToolbarBtn(btnRun, x);
+        Icons.draw(icons, 53, x + iconPad, btnTop + iconPad);
+        INC(x, toolBtnSize + 5);
-        icons16(icons, 53, x + iconPad, btnTop + iconPad);
+        K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP, scrollWidth - 1, scrollWidth, K.btnColor, 0X);
-        INC(x, toolBtnSize + 5);
+        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, K.btnColor, 0X);
-        K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP, scrollWidth - 1, scrollWidth, btnColor, 0X);
+        K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - scrollWidth + (scrollWidth - 9) DIV 2, K.btnTextColor, 19X);
-        K.DrawText69(LEFT + canvas.width - 1 + (scrollWidth - 6) DIV 2, TOP + (scrollWidth - 9) DIV 2, 0, 18X);
-        K.CreateButton(btnDown, LEFT + canvas.width - 1, TOP + canvas.height - scrollWidth - 1, scrollWidth - 1, scrollWidth, btnColor, 0X);
+        K.CreateButton(btnLeft, LEFT, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, 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 + (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, K.btnColor, 0X);
-        K.CreateButton(btnLeft, LEFT, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, btnColor, 0X);
+        K.DrawText69(LEFT + canvas.width - scrollWidth - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, K.btnTextColor, 1AX);
         K.DrawText69(LEFT + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, 0, 1BX);
-        K.CreateButton(btnRight, LEFT + canvas.width - scrollWidth - 1, TOP + canvas.height - 1, scrollWidth, scrollWidth - 1, btnColor, 0X);
+        K.PutPixel(LEFT + canvas.width + scrollWidth - 2, TOP, K.winColor);
-        K.DrawText69(LEFT + canvas.width - scrollWidth - 1 + (scrollWidth - 6) DIV 2, TOP + canvas.height - 1 + (scrollWidth - 9) DIV 2 + 1, 0, 1AX);
+        K.PutPixel(LEFT, TOP + canvas.height + scrollWidth - 2, K.winColor);
         y := (btnHeight - fontHeight) DIV 2 + btnTop;
         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")
     confirm := TRUE;
     left := (canvas.width - width) DIV 2 + LEFT;
     top := (canvas.height - height) DIV 2 + TOP;
     right := left + width - 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);
-    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;
     idx: INTEGER;
 BEGIN
     menu := List.create(NIL);
-    Menu.AddMenuItem(menu, menuNumbers,  "line numbers");
+    Menu.AddMenuItem(menu, menuNumbers, "line numbers");
     Menu.delimiter(menu);
-    (*Menu.AddMenuItem(menu, menuSettings, "settings");*)
     colors := Ini.sections.first(Ini.tSection);
     idx := menuColors;
     WHILE colors # NIL DO
         Menu.setCheck(menu, menuUTF8,    ORD(text.enc = E.UTF8)*2);
         Menu.setCheck(menu, menuCP866,   ORD(text.enc = E.CP866)*2);
         Menu.setCheck(menu, menuWin1251, ORD(text.enc = E.W1251)*2);
         INC(x, menuEncodingX)
     ELSIF menu = menuView THEN
-        (*Menu.setEnabled(menu, menuSettings, FALSE);*)
         Menu.setCheck(menu, menuNumbers, ORD(text.numbers));
         FOR i := 0 TO Ini.sections.count - 1 DO
             Menu.setCheck(menu, menuColors + i, ORD(Ini.curSectionNum = i)*2)
         END;
         INC(x, menuViewX)
     key: INTEGER;
     msState: SET;
     scroll: INTEGER;
     err: INTEGER;
     fileName, filePath: RW.tFileName;
+    cliWidth, cliHeight: INTEGER;
     resized: BOOLEAN;
     firstClickX, firstClickY, time: INTEGER;
 BEGIN
+    K.GetSystemColors;
+    Icons.get(icons, grayIcons);
     modified := FALSE;
     mainTID := K.ThreadID();
     K.SetIPC(IPC);
     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);
     K.SetEventsMask({0, 1, 2, 5, 6, 31});
     LeftButtonUp;
     resized := FALSE;
     shift := {};
     winWidth := minWinWidth;
     winHeight := minWinHeight;
+    cliWidth := winWidth;
+    cliHeight := winHeight;
     LEFT := 10;
     canvas := G.CreateCanvas(winWidth - (LEFT + RIGHT + 10), winHeight - (TOP + BOTTOM + 4) - K.SkinHeight());
     font := G.CreateFont(1, "", {});
     G.SetFont(canvas, font);
     T.init(NIL);
             U.getPath(fileName, filePath)
         END
     END;
     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.SetPos(text, 0, 0);
     confirm := FALSE;
     notFound := FALSE;
     runScript := "";
     debugScript := "";
     WHILE TRUE DO
         CASE K.WaitForEvent() OF
         |1:
+            K.GetSystemColors;
+            Icons.get(icons, grayIcons);
             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;
                     resized := TRUE
                 END;
                 K.SetEventsMask({0, 1, 2, 5, 6, 31})
             ELSE

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 8741 → 8762