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

     CB := Clipboard, Languages,
     ChangeLog, Scroll, CheckBox,
     RW, Ini, EB := EditBox, Icons, Tabs, Timer;
 CONST
-    HEADER = "CEdit (21-nov-2021)";
+    HEADER = "CEdit (27-nov-2021)";
     ShellFilter = "";
     winWidth, winHeight: INTEGER;
     AppPath, runScript, buildScript, debugScript: RW.tFileName;
     OD: OpenDlg.Dialog;
+    confirm, notFound, menuFindClicked, search, searchOpened, modified: BOOLEAN;
-    confirm, notFound, menuFindClicked, search, searchOpened, modified: BOOLEAN;
+    eol, enc: INTEGER;
     switch, closing: BOOLEAN;
 VAR
     y: INTEGER;
     s: ARRAY 24 OF WCHAR;
     header: RW.tFileName;
 BEGIN
+	eol := T.getEol(text);
+	enc := T.getEnc(text);
     s := "";
-    U.append(s, RW.eolNames[text.eol]);
+    U.append(s, RW.eolNames[eol]);
     U.append(s, 20X + 20X);
-    U.append(s, E.names[text.enc]);
+    U.append(s, E.names[enc]);
     header := HEADER;
     IF text.fileName # "" THEN
     	U.append8(header, " - ");
     	U.append8(header, text.fileName)
     END;
         T.draw(text);
         y := height - (BOTTOM - scrollWidth) + (BOTTOM - scrollWidth - 16) DIV 2;
         K.DrawRect(LEFT, TOP + canvas.height + scrollWidth, 16*fontWidth, BOTTOM - scrollWidth + 1, K.winColor);
         WritePos(y);
+        IF (enc # T.getEnc(text)) OR (eol # T.getEol(text)) THEN
+        	DrawState(text, width, height)
-        IF modified # text.modified THEN
+        ELSIF modified # text.modified THEN
             WriteModified(width - 8*fontWidth, y)
         END;
                 DEC(x, menu.width)
             END;
             CanvasToScreen(x, y)
         END
     ELSIF menu = menuEncoding THEN
-        Menu.option(menu, menuUTF8BOM, text.enc = E.UTF8BOM);
+        Menu.option(menu, menuUTF8BOM, T.getEnc(text) = E.UTF8BOM);
-        Menu.option(menu, menuUTF8,    text.enc = E.UTF8);
+        Menu.option(menu, menuUTF8,    T.getEnc(text) = E.UTF8);
-        Menu.option(menu, menuCP866,   text.enc = E.CP866);
+        Menu.option(menu, menuCP866,   T.getEnc(text) = E.CP866);
-        Menu.option(menu, menuWin1251, text.enc = E.W1251);
+        Menu.option(menu, menuWin1251, T.getEnc(text) = E.W1251);
         INC(x, menuEncodingX)
     ELSIF menu = menuView THEN
         Menu.check(menu, menuNumbers,  text.numbers);
         Menu.check(menu, menuFontSize, font = font2);
         FOR i := 0 TO Ini.sections.count - 1 DO
     Menu.setEnabled(subIndent, menuDecInd, selected);
     Menu.setEnabled(subCase, menuUpper, selected);
     Menu.setEnabled(subCase, menuLower, selected);
-	Menu.option(subEOL, menuCRLF, text.eol = RW.EOL_CRLF);
+	Menu.option(subEOL, menuCRLF, T.getEol(text) = RW.EOL_CRLF);
-	Menu.option(subEOL, menuLF,   text.eol = RW.EOL_LF);
+	Menu.option(subEOL, menuLF,   T.getEol(text) = RW.EOL_LF);
-	Menu.option(subEOL, menuCR,   text.eol = RW.EOL_CR);
+	Menu.option(subEOL, menuCR,   T.getEol(text) = RW.EOL_CR);
     IF menu # NIL THEN
 	    |menuDebug:
 	        Script(debugScript)
 	    |menuDebugScript:
 	    	setScript(debugScript)
 	    |menuUTF8BOM:
-	        text.enc := E.UTF8BOM
+	    	T.setEnc(text, E.UTF8BOM)
 	    |menuUTF8:
-	        text.enc := E.UTF8
+	    	T.setEnc(text, E.UTF8)
 	    |menuCP866:
-	        text.enc := E.CP866
+	    	T.setEnc(text, E.CP866)
 	    |menuWin1251:
-	        text.enc := E.W1251
+	    	T.setEnc(text, E.W1251)
 	    |menuLF:
-	        text.eol := RW.EOL_LF
+	    	T.setEol(text, RW.EOL_LF)
 	    |menuCRLF:
-	        text.eol := RW.EOL_CRLF
+	    	T.setEol(text, RW.EOL_CRLF)
 	    |menuCR:
-	        text.eol := RW.EOL_CR
+	    	T.setEol(text, RW.EOL_CR)
 	    |menuPipet:
 	        K.Run("/rd/1/develop/pipet", "")
 	    |menuBoard:
 	        K.Run("/rd/1/develop/board", "")
 	    |menuSysFunc:
         CASE key DIV 65536 OF
         |17: menuItem := menuClose
         |21: menuItem := menuRedo
         |30: menuItem := menuSelectAll
         |32: menuItem := menuDuplicate
+        |33,
-        |33: menuItem := menuFind
+: menuItem := menuFind
         |34: menuItem := menuGoto
         |44: menuItem := menuUndo
         |45: menuItem := menuCut
         |46: menuItem := menuCopy
         |47: menuItem := menuPaste
             key := -1;
             T.input(text, -8)
         ELSIF (keyCode = 15) & ctrl THEN (* ctrl+Tab *)
             key := -1;
             SwitchTab((curText + 1) MOD textsCount)
-        ELSIF (keyCode = 33) & ctrl THEN
+        ELSIF ((keyCode = 33) OR (keyCode = 35)) & ctrl THEN (* ctrl+F, ctrl+H*)
             key := -1;
             ShowSearchPanel(FALSE)
-        ELSIF (keyCode = 34) & ctrl THEN
+        ELSIF (keyCode = 34) & ctrl THEN (* ctrl+G *)
             key := -1;
             ShowSearchPanel(TRUE)
         ELSE
             IF EditBox_Focus(FindEdit) THEN
+            	IF keyCode = 15 THEN (* Tab *)
+            		SetFocus(ReplaceEdit, TRUE)
+            	ELSE
-                EB.key(FindEdit, key);
+	                EB.key(FindEdit, key);
-                EditBox_GetValue(FindEdit, new_searchText);
+	                EditBox_GetValue(FindEdit, new_searchText);
-                IF new_searchText # searchText THEN
+	                IF new_searchText # searchText THEN
-                    searchText := new_searchText;
+	                    searchText := new_searchText;
-                    notFound := ~T.search(text, searchText, cs, whole)
+	                    notFound := ~T.search(text, searchText, cs, whole)
-                END
+	                END
+                END
             ELSIF EditBox_Focus(ReplaceEdit) THEN
+            	IF keyCode = 15 THEN (* Tab *)
+            		SetFocus(GotoEdit, TRUE)
+            	ELSE
-                EB.key(ReplaceEdit, key);
+                	EB.key(ReplaceEdit, key);
-                EditBox_GetValue(ReplaceEdit, replaceText)
+                	EditBox_GetValue(ReplaceEdit, replaceText)
+                END
             ELSIF EditBox_Focus(GotoEdit) THEN
+            	IF keyCode = 15 THEN (* Tab *)
+            		SetFocus(FindEdit, TRUE)
+            	ELSE
-                IF (key DIV 256) MOD 256 = 13 THEN
+	                IF (key DIV 256) MOD 256 = 13 THEN
-                    goto
+	                    goto
-                ELSE
+	                ELSE
-                    EB.key(GotoEdit, key)
+	                    EB.key(GotoEdit, key)
-                END
+	                END
+                END
             ELSE
                 CASE keyCode OF
                 |73: key := 33
                 |81: key := 34
                 |71: key := 36
         END
     END;
     OD := OpenDlg.Create(draw_window, OpenDlg.topen, filePath, "");
     insert(0, text);
     Scroll.init(ScrollChange);
-    Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth, hScroll);
+    Scroll.create(FALSE, canvas.width + 1, scrollWidth, scrollWidth, scrollWidth*3 DIV 2, hScroll);
-    Scroll.create(TRUE, scrollWidth, canvas.height + 1, scrollWidth, scrollWidth, vScroll);
+    Scroll.create(TRUE, scrollWidth, canvas.height + 1, scrollWidth, scrollWidth*3 DIV 2, vScroll);
     T.resize(canvas.width, canvas.height);
     T.SetPos(text, 0, 0);
     confirm := FALSE;
     notFound := FALSE;
     menuFindClicked := FALSE;

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9295 → 9336