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

     CB := Clipboard, Languages,
     ChangeLog, Scroll,
     RW, Ini, box_lib, Icons;
 CONST
-    header = "CEdit (03-jun-2021)";
+    header = "CEdit (06-jun-2021)";
     ShellFilter = "";
     menuSaveAs = 13;
     menuFolder = 14;
     menuExit = 15;
+    menuNumbers = 20;
-    menuNumbers = 20;
+    menuFontSize = 21;
     menuColors = 1000;
     menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1;
     menuSysFunc = 71;
 VAR
     canvas: G.tCanvas;
-    font: G.tFont;
+    font, font1, font2: G.tFont;
     text: T.tText;
     winWidth, winHeight: INTEGER;
     shift: SET;
     END drawToolbarBtn;
     PROCEDURE drawMainMenu (menu: Menu.tMenu; x: INTEGER; btn: INTEGER; caption: ARRAY OF WCHAR);
     VAR
-        menuColor, n: INTEGER;
+        menuColor, textColor, n: INTEGER;
     BEGIN
+        IF menu.tid # 0 THEN
-        IF menu.tid # 0 THEN
+            menuColor := K.textColor;
-            menuColor := K.selMenuColor
+            textColor := K.winColor
+        ELSE
-        ELSE
+            menuColor := K.winColor;
-            menuColor := K.winColor
+            textColor := K.textColor
         END;
         n := LENGTH(caption);
         K.DrawRect(x, 0, n*fontWidth + 2, MainMenuHeight, menuColor);
         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)
+        K.DrawText(x + 1, (MainMenuHeight - fontHeight) DIV 2 + 1, textColor, caption)
     END drawMainMenu;
 BEGIN
     K.BeginDraw;
-    K.CreateWindow(50 + K.GetTickCount() MOD 128, 50 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, header);
+    K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, header);
         EditBox_SetFocus(GotoEdit, TRUE);
         EditBox_SetFocus(FindEdit, FALSE);
         EditBox_SetFocus(ReplaceEdit, FALSE)
     |menuNumbers:
         T.toggleNumbers(text)
+    |menuFontSize:
+        IF font = font1 THEN
+            font := font2
+        ELSE
+            font := font1
+        END;
+        resize
     |menuNone:
         T.setLang(text, Languages.langNone)
     |menuC:
         T.setLang(text, Languages.langC)
     |menuFasm:
     colors: Ini.tSection;
     idx: INTEGER;
 BEGIN
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuNumbers, "line numbers");
+    Menu.AddMenuItem(menu, menuFontSize, "x2");
     Menu.delimiter(menu);
     colors := Ini.sections.first(Ini.tSection);
     idx := menuColors;
         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.setCheck(menu, menuNumbers, ORD(text.numbers));
+        Menu.setCheck(menu, menuNumbers,  ORD(text.numbers));
+        Menu.setCheck(menu, menuFontSize, ORD(font = font2));
         FOR i := 0 TO Ini.sections.count - 1 DO
             Menu.setCheck(menu, menuColors + i, ORD(Ini.curSectionNum = i)*2)
         END;
         INC(x, menuViewX)
     ELSIF menu = menuSyntax THEN
 END ShowMenu;
 PROCEDURE main;
 VAR
-    width, height, x, y, scrollX, scrollY: INTEGER;
+    width, height, x, y, scrollX, scrollY, i: INTEGER;
     key: INTEGER;
     msState: SET;
     scroll: INTEGER;
     Ini.load(AppPath);
     K.SetEventsMask({0, 1, 2, 5, 6, 31});
     LeftButtonUp;
     resized := FALSE;
     shift := {};
+    K.ScreenSize(winWidth, winHeight);
+    winWidth := (winWidth * 80) DIV 100 - (128 + 30);
+    winHeight := winHeight - (128 + 30);
-    winWidth := minWinWidth;
+    winWidth := MAX(winWidth, minWinWidth);
-    winHeight := minWinHeight;
+    winHeight := MAX(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, "", {});
+    font1 := G.CreateFont(1, "", {});
+    font2 := G.CreateFont(2, "", {});
+    font := font1;
     G.SetFont(canvas, font);
     T.init(NIL);
     T.setCanvas(canvas);
     U.ptr2str(K.GetCommandLine(), fileName);
     context := CreateContextMenu();
     runScript := "";
     debugScript := "";
     WHILE TRUE DO
         CASE K.WaitForEvent() OF
         |1:
+            FOR i := 0 TO 1 DO
-            K.GetSystemColors;
+                K.GetSystemColors;
-            Icons.get(icons, grayIcons);
+                Icons.get(icons, grayIcons);
-            IF ~K.RolledUp() THEN
+                IF ~K.RolledUp() THEN
-                K.ClientSize(width, height);
+                    K.ClientSize(width, height);
-                IF (width # cliWidth) OR (height # cliHeight) THEN
+                    IF (width # cliWidth) OR (height # cliHeight) THEN
-                    cliWidth := width;
+                        cliWidth := width;
-                    cliHeight := height;
+                        cliHeight := height;
-                    resize;
+                        resize;
-                    resized := TRUE
+                        resized := TRUE;
-                END;
+                    END;
-                K.SetEventsMask({0, 1, 2, 5, 6, 31})
+                    K.SetEventsMask({0, 1, 2, 5, 6, 31})
-            ELSE
+                ELSE
-                K.SetEventsMask({0, 30, 31})
+                    K.SetEventsMask({0, 30, 31})
-            END;
+                END;
-            draw_window
+                draw_window
+            END
         |2:
             key := K.GetKey();
             getKBState;
             IF key DIV 65536 = 61 THEN (* F3 *)
                 key := -1;
                 IF search & (searchText # "") THEN
+                    IF T.SHIFT IN shift THEN
+                        notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW))
+                    ELSE
-                    notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
+                        notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
-                END
+                    END
+                END
             ELSIF key DIV 65536 = 67 THEN (* F9 *)
                 key := -1;
                 IF T.CTRL IN shift THEN
                     Script(buildScript)
                 ELSE
                     Script(runScript)
                 END
+            ELSIF key DIV 65536 = 1 THEN
+                key := -1; (* Esc *)
+                IF search THEN
+                    Search
+                END
             ELSIF (key DIV 65536 = 55) & (key DIV 256 MOD 256 = 52) THEN
                 key := -1 (* PrtScn *)
             ELSIF (T.CTRL IN shift) & (key DIV 65536 = 33) THEN
                 key := -1;
                 IF ~search THEN

Subversion Repositories Kolibri OS

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