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

     CB := Clipboard, Languages,
     ChangeLog, Scroll,
     RW, Ini, box_lib, Icons, Tabs;
 CONST
-    header = "CEdit (10-jul-2021)";
+    header = "CEdit (12-jul-2021)";
     ShellFilter = "";
     canvas := G.CreateCanvas(cliWidth - (LEFT + RIGHT + 1), cliHeight - (TOP + BOTTOM));
     Tabs.setArea(tabs, LEFT, TOP - Tabs.tabHeight, cliWidth - (LEFT + RIGHT + 1), Tabs.tabHeight);
     G.SetFont(canvas, font);
     T.setCanvas(canvas);
     T.resize(canvas.width, canvas.height);
-    Scroll.resize(vScroll, vScroll.xSize, canvas.height - scrollWidth*2 + 1);
+    Scroll.resize(vScroll, vScroll.xSize, canvas.height - scrollWidth*2 + 2);
     Scroll.resize(hScroll, canvas.width - scrollWidth*2, hScroll.ySize);
 END resize;
 PROCEDURE SearchPanel (left, top: INTEGER);
 VAR
+    y, right, bottom, color: INTEGER;
-    y, right, bottom, color: INTEGER;
+BEGIN
-BEGIN
+    DEC(top, Tabs.tabHeight);
     right := left + EditBox_Width + SEARCH_PADDING*2;
     bottom := top + 395 + btnHeight + SEARCH_PADDING;
     color := K.borderColor;
         drawToolbarBtn(btnRun, x);
         INC(x, toolBtnSize + 5);
         toolbarIcons;
-        K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP, scrollWidth - 1, scrollWidth, K.btnColor, 0X);
+        K.CreateButton(btnUp, LEFT + canvas.width - 1, TOP - 1, scrollWidth - 1, scrollWidth, K.btnColor, 0X);
         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.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, K.btnColor, 0X);
         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.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 + canvas.width + scrollWidth - 2, TOP - 1, K.winColor);
     K.CreateButton(btnYes, left + 10, top + 35, btnWidth, btnHeight, K.btnColor, "yes");
     K.CreateButton(btnNo, left + 20 + btnWidth, top + 35, btnWidth, btnHeight, K.btnColor, "no");
 END Confirm;
-PROCEDURE closeFile (conf: BOOLEAN);
+PROCEDURE closeFile (conf: BOOLEAN; n: INTEGER);
 VAR
     i: INTEGER;
 BEGIN
     IF text.modified & conf THEN
         Confirm
     ELSE
-        Tabs.delete(tabs, curText);
+        Tabs.delete(tabs, n);
-        FOR i := curText + 1 TO textsCount - 1 DO
+        FOR i := n + 1 TO textsCount - 1 DO
             texts[i - 1] := texts[i]
         END;
         DEC(textsCount);
-        IF curText = textsCount THEN
+        IF (curText = textsCount) OR (n < curText) THEN
             DEC(curText)
         END;
         IF curText >= 0 THEN
     WHILE (textsCount > 0) & cont DO
         IF text.modified THEN
             Confirm;
             cont := FALSE
         ELSE
-            closeFile(FALSE);
+            closeFile(FALSE, curText);
             repaint
         END
     END
 END close;
         repaint
     |menuSaveAll:
         saveAll;
         repaint
     |menuClose:
-        closeFile(TRUE)
+        closeFile(TRUE, curText)
     |menuFolder:
         K.Run("/rd/1/File Managers/Eolite", text.fileName)
     |menuExit:
         close
     |menuUndo:
 BEGIN
     menuItem := -1;
     getKBState;
     IF (T.CTRL IN shift) THEN
         CASE key DIV 65536 OF
+        |17: menuItem := menuClose
         |21: menuItem := menuRedo
         |30: menuItem := menuSelectAll
         |33: menuItem := menuSearch
         |34: menuItem := menuGoto
         |44: menuItem := menuUndo
     Menu.AddMenuItem(menu, menuSave,    "save        ctrl-S");
     Menu.AddMenuItem(menu, menuSaveAs,  "save as");
     Menu.AddMenuItem(menu, menuSaveAll, "save all");
     Menu.AddMenuItem(menu, menuFolder,  "folder");
     Menu.delimiter(menu);
-    Menu.AddMenuItem(menu, menuClose,   "close");
+    Menu.AddMenuItem(menu, menuClose,   "close       ctrl-W");
     Menu.delimiter(menu);
     Menu.AddMenuItem(menu, menuExit,    "exit");
     RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
 END CreateMenuFile;
     msState: SET;
     scroll: INTEGER;
     err: INTEGER;
     fileName, filePath: RW.tFileName;
     cliWidth, cliHeight: INTEGER;
-    resized: BOOLEAN;
+    resized, middle: BOOLEAN;
     firstClickX, firstClickY, time: INTEGER;
 BEGIN
     K.GetSystemColors;
     Icons.get(icons, grayIcons);
     modified := FALSE;
         END
     END;
     OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
     insert(0, text);
-    vScroll := Scroll.create(scrollWidth, canvas.height - scrollWidth*2 + 1);
+    vScroll := Scroll.create(scrollWidth, canvas.height - scrollWidth*2 + 2);
     hScroll := Scroll.create(canvas.width - scrollWidth*2, scrollWidth);
     T.resize(canvas.width, canvas.height);
     T.SetPos(text, 0, 0);
     confirm := FALSE;
             getKBState;
             IF confirm THEN
                 IF key DIV 65536 = 28 THEN (* Enter *)
                     save(text);
                     IF ~text.modified THEN
-                        closeFile(FALSE)
+                        closeFile(FALSE, curText)
                     END;
                     repaint
                 END;
                 key := -1
             END;
                         notFound := ~T.findNext(text, ~box_lib.check_box_get_value(BKW))
                     ELSE
                         notFound := ~T.findNext(text, box_lib.check_box_get_value(BKW))
                     END
                 END
+            ELSIF key DIV 65536 = 60 THEN (* F2 *)
+                key := -1;
+                IF T.CTRL IN shift THEN
+                    T.toggleLabel(text)
+                ELSE
+                    T.gotoLabel(text, ~(T.SHIFT IN shift))
+                END
             ELSIF key DIV 65536 = 67 THEN (* F9 *)
                 key := -1;
                 IF T.CTRL IN shift THEN
                     Script(buildScript)
                 ELSE
                 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 = 15) THEN (* ctrl+Tab *)
+                key := -1;
+                curText := (curText + 1) MOD textsCount;
+                Tabs.switch(tabs, curText);
+                Switch(texts[curText]);
+                draw_window
             ELSIF (T.CTRL IN shift) & (key DIV 65536 = 33) THEN
                 key := -1;
                 IF ~search THEN
                     Search
                 END;
                 EditBox_SetFocus(FindEdit, TRUE);
                 EditBox_SetFocus(ReplaceEdit, FALSE);
-                EditBox_SetFocus(GotoEdit, FALSE);
+                EditBox_SetFocus(GotoEdit, FALSE)
             ELSIF (T.CTRL IN shift) & (key DIV 65536 = 34) THEN
                 key := -1;
                 IF ~search THEN
                     Search
                 END;
                 |83: key := 46
                 |59, 60, 62..66, 68, 87, 88: key := -1 (* F1, F2, F4..F8, F10, F11, F12 *)
                 ELSE
                     IF (T.CTRL IN shift) THEN
                         CASE key DIV 65536 OF
+                        |17: closeFile(TRUE, curText);
+                             key := -2
                         |21: T.redo(text);
                              key := -1
                         |22: key := ORD("U")
                         |24: key := -1;
                              open
                     ELSE
                         T.input(text, E.cp866[key DIV 256 MOD 256]);
                         key := -1
                     END
                 END;
-                IF key # -1 THEN
+                IF key >= 0 THEN
                     T.key(text, key, shift)
                 END
             END;
+            IF key # -2 THEN
-            repaint
+                repaint
+            END
         |3:
-            btn := K.ButtonCode();
+            btn := K.ButtonCode(middle);
-            CASE btn OF
-            |Tabs.btnID .. Tabs.btnID + maxTexts - 1:
+            IF (Tabs.btnID <= btn) & (btn <= Tabs.btnID + maxTexts - 1) THEN
                 DEC(btn, Tabs.btnID);
+                IF middle THEN
+                    IF texts[btn].modified THEN
+                        curText := btn;
+                        Tabs.switch(tabs, btn);
+                        Switch(texts[btn]);
+                        draw_window;
+                    END;
+                    closeFile(TRUE, btn)
+                ELSE
-                curText := btn;
+                    curText := btn;
-                Tabs.switch(tabs, btn);
+                    Tabs.switch(tabs, btn);
-                Switch(texts[btn]);
+                    Switch(texts[btn]);
-                draw_window
+                    draw_window
+                END;
+                btn := 0
+            ELSE
+                IF middle THEN
+                    btn := 0
+                END
+            END;
+            CASE btn OF
             |Tabs.btnID - 1: Tabs.scroll(tabs, -1); switch := TRUE; repaint
             |Tabs.btnID - 2: Tabs.scroll(tabs, +1); switch := TRUE; repaint
             |btnProgram:
                 ShowMenu(menuProgram)
             |btnTools:
                 ShowMenu(menuTools)
             |btnNo:
-                closeFile(FALSE);
+                closeFile(FALSE, curText);
                 repaint
             |btnYes:
                 save(text);
                 IF ~text.modified THEN
-                    closeFile(FALSE)
+                    closeFile(FALSE, curText)
                 END;
                 repaint
             |btnClose:
                 close
             |btnNew:

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 @ 9073 – Rev 9050 → 9060