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

 IMPORT
     OpenDlg, K := KolibriOS,
     U := Utils, Lines, Menu, List,
     G := Graph, T := Text, E := Encodings,
     CB := Clipboard, Languages,
-    ChangeLog, Scroll,
+    ChangeLog, Scroll, CheckBox,
     RW, Ini, box_lib, Icons, Tabs, Timer;
 CONST
-    header = "CEdit (07-sep-2021)";
+    header = "CEdit (08-sep-2021)";
     ShellFilter = "";
     leftButton: BOOLEAN;
     hScroll, vScroll: Scroll.tScroll;
     LEFT: INTEGER;
     FindEdit, ReplaceEdit, GotoEdit: box_lib.edit_box;
-    CS, WH, BKW: box_lib.checkbox;
+    CS, WH, BKW: CheckBox.tCheckBox;
     new_searchText, searchText, replaceText, gotoText: T.tString;
         END;
         T.getScroll(text, scrollX, scrollY);
         DrawScroll(vScroll, LEFT + canvas.width, TOP - 1, scrollY, text.count - 1);
+        DrawScroll(hScroll, LEFT, TOP + canvas.height, scrollX, text.maxLength);
+        IF search & searchOpened THEN
+	        CheckBox.paint(BKW);
+	        CheckBox.paint(CS);
+	        CheckBox.paint(WH);
-        DrawScroll(hScroll, LEFT, TOP + canvas.height, scrollX, text.maxLength);
+        END;
         G.DrawCanvas(canvas, LEFT, TOP);
         NotFound;
     INC(top, 15);
     INC(left, SEARCH_PADDING);
     K.DrawText866(left, top, K.textColor, "find");
     K.DrawText866(left, top + 55, K.textColor, "replace with");
     K.DrawText866(left, top + 330, K.textColor, "go to line");
-    BKW.top_s := BKW.top_s MOD 65536 + (top + 110) * 65536;
+    BKW.top := top + 110;
-    CS.top_s := CS.top_s MOD 65536 + (top + 140) * 65536;
+    BKW.left := left;
-    WH.top_s := WH.top_s MOD 65536 + (top + 170) * 65536;
+    CS.top := top + 140;
-    BKW.left_s := BKW.left_s MOD 65536 + left * 65536;
+    CS.left := left;
-    CS.left_s := CS.left_s MOD 65536 + left * 65536;
+    WH.top := top + 170;
-    WH.left_s := WH.left_s MOD 65536 + left * 65536;
+    WH.left := left;
     FindEdit.top := top + 20;
     ReplaceEdit.top := top + 75;
     GotoEdit.top := top + 350;
     FindEdit.left := left;
     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, K.textColor, "backward");
-    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, K.textColor, "whole word");
     y := top + 200;
     K.CreateButton(btnFindNext, left, y, btnWidth, btnHeight, K.btnColor, "next"); 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, K.btnColor, "replace all");
     K.CreateButton(btnGoto, left, top + 380, btnWidth, btnHeight, K.btnColor, "go");
 BEGIN
     FindEdit := createEdit(searchLeft, TOP + 20);
     ReplaceEdit := createEdit(searchLeft, TOP + 20 + 55);
     GotoEdit := createEdit(searchLeft, TOP + 20 + 330);
     GotoEdit.flags := ORD(BITS(GotoEdit.flags) + BITS(8000H));
-    BKW := box_lib.kolibri_new_check_box(searchLeft, TOP + 90 + 20, 16, 16, "", 8*fontWidth + 4);
+    BKW := CheckBox.create("backward");
-    CS := box_lib.kolibri_new_check_box(searchLeft, TOP + 120 + 20, 16, 16, "", 10*fontWidth + 4);
+    CS  := CheckBox.create("match case");
-    WH := box_lib.kolibri_new_check_box(searchLeft, TOP + 150 + 20, 16, 16, "", 10*fontWidth + 4);
+    WH  := CheckBox.create("whole word");
 END createSearchForm;
     	Scroll.MouseDown(vScroll, x + LEFT, y + TOP);
         T.getScroll(text, scrollX, scrollY);
         T.scroll(text, 0, vScroll.value - scrollY);
         repaint
     END;
+    IF search & searchOpened THEN
+	   	CheckBox.MouseDown(BKW, x + LEFT, y + TOP);
+	   	CheckBox.MouseDown(CS,  x + LEFT, y + TOP);
+	   	CheckBox.MouseDown(WH,  x + LEFT, y + TOP);
+   	END;
     IF (0 <= x) & (x < canvas.width) & (0 <= y) & (y < canvas.height) THEN
         leftButton := TRUE;
         SetFocus(FindEdit, FALSE);
         IF ~shift THEN
             T.resetSelect(text)
 PROCEDURE LeftButtonUp;
 BEGIN
     leftButton := FALSE;
     Scroll.MouseUp(hScroll);
+    Scroll.MouseUp(vScroll);
+    CheckBox.MouseUp(BKW);
+    CheckBox.MouseUp(CS);
-    Scroll.MouseUp(vScroll)
+    CheckBox.MouseUp(WH);
 END LeftButtonUp;
                 DEC(x, menu.width)
             END;
             CanvasToScreen(x, y)
         END
     ELSIF menu = menuEncoding THEN
-        Menu.setCheck(menu, menuUTF8BOM, ORD(text.enc = E.UTF8BOM)*2);
+        Menu.option(menu, menuUTF8BOM, text.enc = E.UTF8BOM);
-        Menu.setCheck(menu, menuUTF8,    ORD(text.enc = E.UTF8)*2);
+        Menu.option(menu, menuUTF8,    text.enc = E.UTF8);
-        Menu.setCheck(menu, menuCP866,   ORD(text.enc = E.CP866)*2);
+        Menu.option(menu, menuCP866,   text.enc = E.CP866);
-        Menu.setCheck(menu, menuWin1251, ORD(text.enc = E.W1251)*2);
+        Menu.option(menu, menuWin1251, text.enc = E.W1251);
         INC(x, menuEncodingX)
     ELSIF menu = menuEOL THEN
-		Menu.setCheck(menu, menuCRLF, ORD(text.eol = RW.EOL_CRLF)*2);
+		Menu.option(menu, menuCRLF, text.eol = RW.EOL_CRLF);
-		Menu.setCheck(menu, menuLF,   ORD(text.eol = RW.EOL_LF)*2);
+		Menu.option(menu, menuLF,   text.eol = RW.EOL_LF);
-		Menu.setCheck(menu, menuCR,   ORD(text.eol = RW.EOL_CR)*2);
+		Menu.option(menu, menuCR,   text.eol = RW.EOL_CR);
 		INC(x, menuEOLX)
     ELSIF menu = menuView THEN
-        Menu.setCheck(menu, menuNumbers,  ORD(text.numbers));
+        Menu.check(menu, menuNumbers,  text.numbers);
-        Menu.setCheck(menu, menuFontSize, ORD(font = font2));
+        Menu.check(menu, menuFontSize, font = font2);
         FOR i := 0 TO Ini.sections.count - 1 DO
-            Menu.setCheck(menu, menuColors + i, ORD(Ini.curSectionNum = i)*2)
+            Menu.option(menu, menuColors + i, Ini.curSectionNum = i)
         END;
         INC(x, menuViewX)
     ELSIF menu = menuSyntax THEN
-        Menu.setCheck(menu, menuNone,   ORD(text.lang = Languages.langNone)*2);
+        Menu.option(menu, menuNone,   text.lang = Languages.langNone);
-        Menu.setCheck(menu, menuC,      ORD(text.lang = Languages.langC)*2);
+        Menu.option(menu, menuC,      text.lang = Languages.langC);
-        Menu.setCheck(menu, menuFasm,   ORD(text.lang = Languages.langFasm)*2);
+        Menu.option(menu, menuFasm,   text.lang = Languages.langFasm);
-        Menu.setCheck(menu, menuIni,    ORD(text.lang = Languages.langIni)*2);
+        Menu.option(menu, menuIni,    text.lang = Languages.langIni);
-        Menu.setCheck(menu, menuJSON,   ORD(text.lang = Languages.langJSON)*2);
+        Menu.option(menu, menuJSON,   text.lang = Languages.langJSON);
-        Menu.setCheck(menu, menuLua,    ORD(text.lang = Languages.langLua)*2);
+        Menu.option(menu, menuLua,    text.lang = Languages.langLua);
-        Menu.setCheck(menu, menuOberon, ORD(text.lang = Languages.langOberon)*2);
+        Menu.option(menu, menuOberon, text.lang = Languages.langOberon);
-        Menu.setCheck(menu, menuPascal, ORD(text.lang = Languages.langPascal)*2);
+        Menu.option(menu, menuPascal, text.lang = Languages.langPascal);
         INC(x, menuSyntaxX)
     ELSIF menu = menuProgram THEN
         Menu.setEnabled(menu, menuBuild, buildScript # "");
         Menu.setEnabled(menu, menuDebug, debugScript # "");
         Menu.setEnabled(menu, menuRun, runScript # "");
         repaint
     |menuFind:
         ShowSearchPanel;
         SetFocus(FindEdit, TRUE)
     |menuFindNext:
-        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW));
+        notFound := ~T.findNext(text, BKW.value);
         menuFindClicked := TRUE
     |menuFindPrev:
-        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW));
+        notFound := ~T.findNext(text, ~BKW.value);
         menuFindClicked := TRUE
     |menuGoto:
         ShowSearchPanel;
         SetFocus(GotoEdit, TRUE)
     |menuToggleBookmark:
     ELSE
         IF keyCode = 61 THEN (* F3 *)
             key := -1;
             IF search & (searchText # "") THEN
                 IF shift THEN
-                    notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW))
+                    notFound := ~T.findNext(text, ~BKW.value)
                 ELSE
-                    notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
+                    notFound := ~T.findNext(text, BKW.value)
                 END
             END
         ELSIF keyCode = 60 THEN (* F2 *)
             key := -1;
             IF ctrl THEN
         Script(buildScript)
     |btnRun:
         Script(runScript)
     |btnFindNext:
         IF searchText # "" THEN
-            notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW));
+            notFound := ~T.findNext(text, BKW.value);
             repaint
         END
     |btnReplace:
         T.replace(text, replaceText, LENGTH(searchText));
         repaint
     			Scroll.MouseDown(hScroll, x + LEFT, y + TOP)
     		END;
     		IF ~vScroll.mouse THEN
     			Scroll.MouseDown(vScroll, x + LEFT, y + TOP)
     		END;
+    		IF search & searchOpened THEN
+	    		CheckBox.MouseDown(BKW, x + LEFT, y + TOP);
+	    		CheckBox.MouseDown(CS,  x + LEFT, y + TOP);
+	    		CheckBox.MouseDown(WH,  x + LEFT, y + TOP);
+    		END;
             IF (ABS(x - firstClickX) < 5) & (ABS(y - firstClickY) < 5) THEN
                 IF (0 <= x) & (x < canvas.width) & (0 <= y) & (y < canvas.height) THEN
                     leftButton := FALSE;
                     T.selectWord(text);
                     repaint
     END;
     IF search & searchOpened THEN
         EditBox(FindEdit);
         EditBox(ReplaceEdit);
         EditBox(GotoEdit);
-        box_lib.check_box_mouse2(CS);
-        box_lib.check_box_mouse2(WH);
-        box_lib.check_box_mouse2(BKW);
-        IF box_lib.check_box_get_value(CS) # cs THEN
+        IF CS.value # cs THEN
             cs := ~cs;
             notFound := ~T.search(text, searchText, cs, whole);
             repaint
         END;
-        IF box_lib.check_box_get_value(WH) # whole THEN
+        IF WH.value # whole THEN
             whole := ~whole;
             notFound := ~T.search(text, searchText, cs, whole);
             repaint
         END
     END;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9181 → 9182