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 (11-sep-2021)";
+    header = "CEdit (14-sep-2021)";
     ShellFilter = "";
     btnNo = 41;
     btnFindNext = 60;
     btnReplace = 61;
     btnReplaceAll = 62;
     btnGoto = 63;
-    btnCloseFind = 64;
+    btnCloseSearch = 64;
-    btnHideFind = 65;
+    btnHideSearch = 65;
     mainMenuBtn = 70;
     menuFileX = searchLeft;
     menuEditX = menuFileX + 4*fontWidth + 9;
     menuSearchX = menuEditX + 4*fontWidth + 9;
     menuEncodingX = menuSearchX + 6*fontWidth + 9;
-    menuEOLX = menuEncodingX + 8*fontWidth + 9;
-    menuViewX = menuEOLX + 3*fontWidth + 9;
+    menuViewX = menuEncodingX + 8*fontWidth + 9;
-    menuSyntaxX = menuViewX + 4*fontWidth + 9;
+    menuLanguageX = menuViewX + 4*fontWidth + 9;
-    menuProgramX = menuSyntaxX + 6*fontWidth + 9;
+    menuProgramX = menuLanguageX + 8*fontWidth + 9;
     menuToolsX = menuProgramX + 7*fontWidth + 9;
     menuCut = 1;
     menuNumbers = 20;
     menuFontSize = 21;
     menuColors = 1000;
     menuMaxColors = menuColors + Ini.MAX_SECTIONS - 1;
-    menuNone = 30;
+    menuText = 30;
     menuC = 31;
     menuFasm = 32;
     menuIni = 33;
     menuJSON = 34;
     menuUTF8BOM = 60;
     menuUTF8 = 61;
     menuCP866 = 62;
+    menuWin1251 = 63;
-    menuWin1251 = 63;
+    menuEOL = 140;
     menuPipet = 70;
     menuToggleBookmark = 131;
     menuNextBookmark = 132;
     menuPrevBookmark = 133;
-    menuLF = 140;
+    menuLF = 141;
-    menuCRLF = 141;
+    menuCRLF = 142;
-    menuCR = 142;
+    menuCR = 143;
     replaced: INTEGER;
     mainTID, delay: INTEGER;
     context, menuFile, menuEdit, menuSearch, menuEncoding,
-    menuEOL, menuView, menuSyntax, menuProgram, menuTools,
+    menuView, menuLanguage, menuProgram, menuTools,
-    subCurLine, subIndent, subCase, subBookmark: Menu.tMenu;
+    subCurLine, subIndent, subCase, subBookmark, subEOL: Menu.tMenu;
     DEC(top, Tabs.tabHeight);
     right := left + EditBox_Width + SEARCH_PADDING*2;
     bottom := top + 395 + btnHeight + SEARCH_PADDING;
     color := K.borderColor;
     Rect(left, top, right, bottom, color);
-    K.CreateButton(btnCloseFind, right - 20, top, 20, 20, 0EF999FH, "");
+    K.CreateButton(btnCloseSearch, 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 + 14, right - 6, top + 5, 0FFFFFFH);
     K.DrawLine(right - 15, top + 15, right - 5, top + 5, 0FFFFFFH);
     K.DrawLine(right - 14, top + 15, right - 5, top + 6, 0FFFFFFH);
-    K.CreateButton(btnHideFind, right - 40, top, 20, 20, K.btnColor, "");
+    K.CreateButton(btnHideSearch, right - 40, top, 20, 20, K.btnColor, "");
     K.DrawLine(right - 34, top + 14, right - 26, top + 14, K.btnTextColor);
     K.DrawLine(right - 34, top + 15, right - 26, top + 15, K.btnTextColor);
     OD._type := OpenDlg.tsave;
     U.getFileName(text.fileName, OD.FileName, U.SLASH);
     IF OD.FileName = "" THEN
         OD.FileName := "NewFile.";
         CASE text.lang OF
-        |Languages.langNone:   ext := "txt"
+        |Languages.langText:   ext := "txt"
         |Languages.langC:      ext := "c"
         |Languages.langFasm:   ext := "asm"
         |Languages.langIni:    ext := "ini"
         |Languages.langJSON:   ext := "json"
         |Languages.langLua:    ext := "lua"
 END Close;
+PROCEDURE CloseMenu;
+BEGIN
+    Menu.close(subEOL);
+    Menu.close(subCurLine);
+    Menu.close(subIndent);
-PROCEDURE CloseMenu;
+    Menu.close(subCase);
-BEGIN
+    Menu.close(subBookmark);
     Menu.close(menuFile);
     Menu.close(menuEdit);
-    Menu.close(menuSearch);
-    Menu.close(menuEncoding);
+    Menu.close(menuSearch);
-    Menu.close(menuEOL);
+    Menu.close(menuEncoding);
     Menu.close(menuView);
-    Menu.close(menuSyntax);
+    Menu.close(menuLanguage);
-    Menu.close(menuProgram);
-    Menu.close(menuTools);
-    Menu.close(subCurLine);
-    Menu.close(subIndent);
-    Menu.close(subCase);
+    Menu.close(menuProgram);
-    Menu.close(subBookmark);
+    Menu.close(menuTools);
     Menu.close(context)
         Menu.option(menu, menuUTF8BOM, text.enc = E.UTF8BOM);
         Menu.option(menu, menuUTF8,    text.enc = E.UTF8);
         Menu.option(menu, menuCP866,   text.enc = E.CP866);
         Menu.option(menu, menuWin1251, text.enc = E.W1251);
         INC(x, menuEncodingX)
-    ELSIF menu = menuEOL THEN
-		Menu.option(menu, menuCRLF, text.eol = RW.EOL_CRLF);
-		Menu.option(menu, menuLF,   text.eol = RW.EOL_LF);
-		Menu.option(menu, menuCR,   text.eol = RW.EOL_CR);
-		INC(x, menuEOLX)
     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.option(menu, menuColors + i, Ini.curSectionNum = i)
         END;
         INC(x, menuViewX)
-    ELSIF menu = menuSyntax THEN
+    ELSIF menu = menuLanguage THEN
-        Menu.option(menu, menuNone,   text.lang = Languages.langNone);
+        Menu.option(menu, menuText,   text.lang = Languages.langText);
         Menu.option(menu, menuC,      text.lang = Languages.langC);
         Menu.option(menu, menuFasm,   text.lang = Languages.langFasm);
         Menu.option(menu, menuIni,    text.lang = Languages.langIni);
         Menu.option(menu, menuJSON,   text.lang = Languages.langJSON);
         Menu.option(menu, menuLua,    text.lang = Languages.langLua);
         Menu.option(menu, menuOberon, text.lang = Languages.langOberon);
         Menu.option(menu, menuPascal, text.lang = Languages.langPascal);
-        INC(x, menuSyntaxX)
+        INC(x, menuLanguageX)
     ELSIF menu = menuProgram THEN
         Menu.setEnabled(menu, menuBuild, buildScript # "");
         Menu.setEnabled(menu, menuDebug, debugScript # "");
         Menu.setEnabled(menu, menuRun, runScript # "");
         INC(x, menuProgramX)
     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, menuLF,   text.eol = RW.EOL_LF);
-    Menu.setEnabled(subCase, menuLower, selected);
+	Menu.option(subEOL, menuCR,   text.eol = RW.EOL_CR);
     IF menu # NIL THEN
     	Timer.kill;
         IF Menu.opened(menu) THEN
             font := font2
         ELSE
             font := font1
         END;
         resize
-    |menuNone:
+    |menuText:
-        T.setLang(text, Languages.langNone)
+        T.setLang(text, Languages.langText)
     |menuC:
         T.setLang(text, Languages.langC)
     |menuFasm:
         T.setLang(text, Languages.langFasm)
     |menuIni:
     menu := List.create(NIL);
     Menu.AddMenuItem(menu, menuUTF8BOM, E.names[E.UTF8BOM]);
     Menu.AddMenuItem(menu, menuUTF8,    E.names[E.UTF8]);
     Menu.AddMenuItem(menu, menuCP866,   E.names[E.CP866]);
     Menu.AddMenuItem(menu, menuWin1251, E.names[E.W1251]);
+    Menu.delimiter(menu);
+    Menu.AddMenuItem(menu, menuEOL,     "EOL");
+    Menu.child(menu, subEOL);
     RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
 END CreateMenuEncoding;
     RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
 END CreateMenuView;
-PROCEDURE CreateMenuSyntax (): Menu.tMenu;
+PROCEDURE CreateMenuLanguage (): Menu.tMenu;
 VAR
     menu: List.tList;
     Menu.AddMenuItem(menu, menuJSON,   "JSON");
     Menu.AddMenuItem(menu, menuLua,    "Lua");
     Menu.AddMenuItem(menu, menuOberon, "Oberon");
     Menu.AddMenuItem(menu, menuPascal, "Pascal");
     Menu.delimiter(menu);
-    Menu.AddMenuItem(menu, menuNone,   "none");
+    Menu.AddMenuItem(menu, menuText,   "Text");
     RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
-END CreateMenuSyntax;
+END CreateMenuLanguage;
 PROCEDURE CreateMenuProgram (): Menu.tMenu;
     Menu.AddMenuItem(menu, menuPrevBookmark,   "previous    shift-F2");
     RETURN Menu.create(menu, MenuItemClick, MenuKeyDown)
 END CreateMenuBookmark;
+PROCEDURE HideSearch;
+BEGIN
+    SetFocus(FindEdit, FALSE);
+    searchOpened := FALSE;
+    LEFT := searchLeft;
+    resize;
+    draw_window
+END HideSearch;
 PROCEDURE KeyDown (key: INTEGER);
 VAR
     keyCode: INTEGER;
                 Script(buildScript)
             ELSE
                 Script(runScript)
             END
         ELSIF keyCode = 68 THEN (* F10 *)
-            key := -1;
+        	IF shift THEN
+        		ShowMenu(context)
+        	ELSE
-            ShowMenu(menuFile)
+        		ShowMenu(menuFile)
+        	END;
+            key := -1
         ELSIF keyCode = 1 THEN (* Esc *)
-            key := -1;
             IF search THEN
+            	IF shift THEN
+            		HideSearch
+            	ELSE
-                Search
+                	Search
-            END
+                END
+            END;
+            key := -1
         ELSIF (keyCode = 55) & (key DIV 256 MOD 256 = 52) THEN (* PrtScn *)
             key := -1
         ELSIF (keyCode = 14) & shift THEN (* shift+Backspace *)
             key := -1;
             T.input(text, -8)
     |btnSave:
         save(text);
         repaint
     |btnSearch:
         ShowSearchPanel
-    |btnCloseFind:
+    |btnCloseSearch:
         Search
-    |btnHideFind:
+    |btnHideSearch:
-        SetFocus(FindEdit, FALSE);
-        searchOpened := FALSE;
-        LEFT := searchLeft;
-        resize;
+        HideSearch
-        draw_window
     |btnUndo:
         T.undo(text);
         repaint
     |btnRedo:
         T.redo(text);
     subIndent.parent := menuEdit;
     subCase.parent := menuEdit;
     subBookmark := CreateMenuBookmark();
     menuSearch := CreateMenuSearch();
     subBookmark.parent := menuSearch;
+    subEOL := CreateMenuEOL();
     menuEncoding := CreateMenuEncoding();
-    menuEOL := CreateMenuEOL();
+    subEOL.parent := menuEncoding;
     menuView := CreateMenuView();
-    menuSyntax := CreateMenuSyntax();
+    menuLanguage := CreateMenuLanguage();
     menuProgram := CreateMenuProgram();
     menuTools := CreateMenuTools();
     mainMenu := Menu.CreateMain(mainMenuBtn);
     Menu.AddMainItem(mainMenu, "file", menuFile);
     Menu.AddMainItem(mainMenu, "edit", menuEdit);
     Menu.AddMainItem(mainMenu, "search", menuSearch);
-    Menu.AddMainItem(mainMenu, "encoding", menuEncoding);
-    Menu.AddMainItem(mainMenu, "eol", menuEOL);
+    Menu.AddMainItem(mainMenu, "encoding", menuEncoding);
     Menu.AddMainItem(mainMenu, "view", menuView);
-    Menu.AddMainItem(mainMenu, "syntax", menuSyntax);
+    Menu.AddMainItem(mainMenu, "language", menuLanguage);
     Menu.AddMainItem(mainMenu, "program", menuProgram);
     Menu.AddMainItem(mainMenu, "tools", menuTools);
     Menu.init(resetTimer);
     draw_window;
     Timer.create(mainTID);
     WHILE TRUE DO
         CASE K.WaitForEvent() OF
-        |1: (*IF Menu.redraw THEN*)
-       			Redraw(resized, width, height, cliWidth, cliHeight)
+        |1:	Redraw(resized, width, height, cliWidth, cliHeight)
-        	(*ELSE
-        		Menu.Redraw;
-        		K.CreateWindow(30 + K.GetTickCount() MOD 128, 30 + K.GetTickCount() MOD 128, winWidth, winHeight, K.winColor, 73H, 0, 0, header);
-        		repaint
-        	END*)
         |2: KeyDown(K.GetKey())
         |3: BtnClick
         |6: MouseEvent(resized, firstClickX, firstClickY, time)
         |7: receiveIPC
         END

Subversion Repositories Kolibri OS

(root)/programs/develop/cedit/SRC/CEdit.ob07 – Rev 9187 → 9190