Changeset 249

Timestamp:

03/31/07 13:06:52 (2 years ago)

Author:

Ant

Message:

started editor GtkSourceView? (incomplete). use -sv to use the new editor

Files:

• trunk/src/leds/CodeView.d (modified) (4 diffs)
• trunk/src/leds/DockerFiles.d (modified) (8 diffs)
• trunk/src/leds/LanguageD.d (modified) (3 diffs)
• trunk/src/leds/Leds.d (modified) (5 diffs)
• trunk/src/leds/Scintilla.d (modified) (1 diff)

trunk/src/leds/CodeView.d

@@ -23 +23 @@
-module leds.CodeView;
-
+debug = saveFile;
+
-private:
-import leds.FileView;
@@ -77 +79 @@
-import leds.Scintilla;
-import leds.SimpleCodeEdit;
+import leds.SourceViewEdit;
-
-private import gtk.Widget;
@@ -207 +210 @@
-            {
-                codeEdit = new SimpleCodeEdit();
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-            else
-            {
-        //      codeEdit = new SimpleCodeEdit();
-                codeEdit = new Scintilla();
-            }
@@ -801 +806 @@
-        int textLength = codeEdit.getLength();
-        
+        debug(saveFile)writefln("CodeView.saveField 1");
-        String text = codeEdit.getText();
+        debug(saveFile)writefln("CodeView.saveField 1 text:\n%s",text);
-        
-        buf.write(text.toString());

trunk/src/leds/DockerFiles.d

@@ -19 +19 @@
-module leds.DockerFiles;
-
+//debug = loadState;
+
-private import leds.Docker;
-
@@ -218 +220 @@
-        Leds leds = Leds.leds;
-        String ledsHome = leds.getHomeDir();
-    
-
-        XmlDocument xdoc = new XmlDocument("openedFiles1.leds");
@@ -292 +293 @@
-    public void loadState(char[] workspaceName)
-    {
+        debug(loadState)writefln("DockerFiles.loadState 1");
-        Leds leds = Leds.leds;
-        String ledsHome = leds.getHomeDir();
-        XmlParser parser = new XmlParser();
-        char[] text;
-
+
+
+
-            text = cast(char[])FileBuffer.read(Path.join(ledsHome,"openedFiles1.leds"));
-
+
+
+
+
-            return;
-        }
@@ -305 +312 @@
-
-        String currFile = null;
+        debug(loadState)writefln("DockerFiles.loadState 4");
-        foreach( XmlNode wspace ; wspaces )
-        {
+            debug(loadState)writefln("DockerFiles.loadState 5");
-            if ( workspaceName == wspace.getAttributeValue("name", "") )
-            {
-                
+                debug(loadState)writefln("DockerFiles.loadState 6");
-                XmlNode xnode = wspace.getChildNode("view");
-                if ( xnode !is null )
-                {
+                    debug(loadState)writefln("DockerFiles.loadState 7");
-                    switch (xnode.getAttributeValue("tabsPosition", "top") )
-                    {
@@ -323 +334 @@
-                }
-                
+                debug(loadState)writefln("DockerFiles.loadState 8");
-                FileView currView = null;
-                XmlNode xOpenedFiles = wspace.getChildNode("openedFiles");
-                foreach ( XmlNode xFile ; xOpenedFiles.getNodes("file") )
-                {
+                    debug(loadState)writefln("DockerFiles.loadState 9");
-                    XmlNode xProject = xFile.getChildNode("project");
-                    XmlNode xEditing = xFile.getChildNode("editing");
@@ -334 +347 @@
-                    if ( xFile.getAttributeValue("current", 0) == 1 )
-                    {
+                        debug(loadState)writefln("DockerFiles.loadState 10");
-                        currFile = new String(xFile.getAttributeValue("name", "untitled"));
-                    }
-                    if ( xEditing !is null )
-                    {
+                        debug(loadState)writefln("DockerFiles.loadState 11");
-                        firstLine = xEditing.getAttributeValue("firstLine", firstLine);
-                        cursorPosition = xEditing.getAttributeValue("cursorPosition", cursorPosition);
@@ -349 +364 @@
-                    // this would be better doing catch exceptions, but that fails for 
-                    // some reason.
+                    debug(loadState)writefln("DockerFiles.loadState 12");
-                    if (!Path.exists(new String(xFile.getAttributeValue("name", "untitled")))) {
-                        continue;
-                    }
-                    
+                    debug(loadState)writefln("DockerFiles.loadState 13");
-                    FileView fileView = workspace.openFile(
-                            new String(xFile.getAttributeValue("name", "untitled")),
-                            projectName,
-                            false);
+                    debug(loadState)writefln("DockerFiles.loadState 14");
-                    fileView.lineScroll(firstLine);
+                    debug(loadState)writefln("DockerFiles.loadState 14a");
-                    fileView.gotoPos(cursorPosition);
+                    debug(loadState)writefln("DockerFiles.loadState 15");
-
-                    
@@ -366 +386 @@
-            }
-        }
+        debug(loadState)writefln("DockerFiles.loadState 16");
-        if ( currFile !is null )
-        {
+            debug(loadState)writefln("DockerFiles.loadState 17");
-            workspace.bringToFront(currFile);
-
+
+
+
-    }
-

trunk/src/leds/LanguageD.d

@@ -1 +1 @@
-module leds.LanguageD;
-
-
+
+
-
-import leds.Language;
@@ -749 +750 @@
-    void setLex(Scintilla scintilla)
-    {
-//
+debug(setLex)
-        scintilla.send(SCI_SETLEXER, SCLEX_D, 0);
-        scintilla.send(SCI_SETSTYLEBITS, 5, 0); // not sure what this does.
@@ -803 +804 @@
-        //SCE_C_GLOBALCLASS=19; 
-
-//printf("setDLex
+debug(setLex)printf("setDColors
-        
-        scintilla.send(SCI_STYLESETFORE, SCE_D_COMMENT,         scintilla.getColor("color.Comment.D", 0x009000));
-        scintilla.send(SCI_STYLESETFORE, SCE_D_COMMENTLINE,     scintilla.getColor("color.CommentLine.D", 0x009000));
-        scintilla.send(SCI_STYLESETFORE, SCE_D_COMMENTDOC,      scintilla.getColor("color.CommentDoc.D", 0x009000));
-   
+
-        scintilla.send(SCI_STYLESETFORE, SCE_D_COMMENTLINEDOC,  scintilla.getColor("color.CommentDoc.D", 0x009000));
-        scintilla.send(SCI_STYLESETFORE, SCE_D_COMMENTDOCKEYWORD, scintilla.getColor("color.CommentDoc.D", 0x00C000));

trunk/src/leds/Leds.d

@@ -50 +50 @@
-const int VERSION_MINOR = 9;
-const int VERSION_MICRO = 79;
-alph
+bet
-
-private:
@@ -72 +72 @@
-"\n"
-;
-
-
-static const char [] ledsAboutMessage = 
@@ -261 +260 @@
-                debug(startup) printf("Leds.init 10\n");
-                workspace.openSavedState();
+                debug(startup) printf("Leds.init 10a\n");
-            }
-            else
@@ -393 +393 @@
-                        " --home          specify leds home directory [default ~/.leds]\n"
-                        " --data          specify leds data directory [default ~/.leds_data]\n"
-
-
+
+
+
+
+
-                        "\n"
-                        "files            files to open\n"
@@ -410 +413 @@
-            case "--editor":
-                editorType = new String(args[++offset]);
+                break;
+            
+            case "-sv":
+                editorType = new String("sv");
+                break;
-            
-            default:

trunk/src/leds/Scintilla.d

@@ -1417 +1417 @@
-    /* Assume scintilla.dll is in same directory as current executable */
-    version(Windows) scintilla_Linker = new Linker("scintilla.dll");
-
+.1.6.3
-    scintilla_Linker.link(scintillaLinks);
-}