Changeset 251

Timestamp:

05/27/07 17:33:58 (2 years ago)

Author:

Ant

Message:

small fixes for SourceCodeView? version

Files:

• trunk/src/leds/CodeEdit.d (modified) (2 diffs)
• trunk/src/leds/CodeView.d (modified) (4 diffs)
• trunk/src/leds/Project.d (modified) (3 diffs)
• trunk/src/leds/ProjectTarget.d (modified) (4 diffs)
• trunk/src/leds/ProjectTargetUI.d (modified) (4 diffs)
• trunk/src/leds/Scintilla.d (modified) (2 diffs)
• trunk/src/leds/SimpleCodeEdit.d (modified) (3 diffs)
• trunk/src/leds/SourceViewEdit.d (added)

trunk/src/leds/CodeEdit.d

@@ -27 +27 @@
-public:
-
+public interface EditMark
+{
+    void setVisible(bool setting);
+    bool getVisible();
+    bool getDeleted();
+    char[] getName();
+    //GtkTextBuffer*      gtk_text_mark_get_buffer            (GtkTextMark *mark);
+    bool getLeftGravity();
+}
+
-/**
- * This defines a code editor inteface for leds.
@@ -360 +370 @@
-    void hideLines(int line , int lastLine);
-    int getLineVisible(int line);
+    
+    void grabFocus();
-
-//SCI_LINEDOWN      

trunk/src/leds/CodeView.d

@@ -23 +23 @@
-module leds.CodeView;
-
-
+//
-
-private:
-
-
-
-
+
+
+
+private 
-    
-import glib.Spawn;
@@ -1259 +1259 @@
-        }
-        findText(selected,backwards);
+        codeEdit.grabFocus();
-    }
-    
@@ -1419 +1420 @@
-    void grabFocus()
-    {
-etWidget().g
+
-    }
-    
@@ -2741 +2742 @@
-     * @return 
-     */
-it
-
-//
+ool
+
+
-        userAllowClose = false;
-        if (!inChange )

trunk/src/leds/Project.d

@@ -777 +777 @@
-    static class BeepCompiler : Compiler
-    {
-
-
-
+bool usePhobos, 
+
+usePhobos, 
-        }
-        
@@ -817 +817 @@
-        private void setupCompiler(ProjectTarget target)
-        {
-
+target.runtime == "phobos"
-            char[] baseSrc = target.getBaseDir.toString();
-            compiler.addArg("-I"~baseSrc);
@@ -830 +830 @@
-            foreach (String arg ; target.linkLibraries )
-            {
-
+()
-                {
-                    compiler.addArg(lib.toString());                    
-                }
-            }
+            
+            foreach ( String arg ; target.versionTags )
+            {
+                compiler.addArg("-version="~arg.toString());
+            }
+            
-            
-            if ( target.exec )

trunk/src/leds/ProjectTarget.d

@@ -129 +129 @@
-    bit lib;
-    bit staticLib;
+    String runtime;
+    bit runtimePhobos;
+    bit runtimeTango;
+    
-    bit cFlag;
-    bit dFlag;
@@ -159 +163 @@
-        //srcdirs = new String();
-        baseDir = new String();
+        runtime = new String("phobos");
-        linkerFlags = new String();
-        linkCommand = new String();
@@ -411 +416 @@
-                    case "versionTags":
-                        target.versionTags ~= getWords(tokens);
-
+
+
+
+
+
-                        break;
-                        
@@ -457 +466 @@
-                ~  "\n+ lib:" ~ getString(target.lib)
-                ~  "\n+ staticLib:" ~ getString(target.staticLib)
+                ~  "\n+ runtime:" ~ target.runtime
-                ~  "\n+ -c:" ~ getString(target.cFlag)
-                ~  "\n+ -d:" ~ getString(target.dFlag)

trunk/src/leds/ProjectTargetUI.d

@@ -502 +502 @@
-        addPUI("lib");
-        addPUI("staticLib");
+        addPUI("runtime");
-        addPUI("basedir");
-        addPUI("srcdirs");
@@ -700 +701 @@
-        props.set("lib", target.lib);
-        props.set("staticLib", target.staticLib);
+        props.set("runtime", target.runtime);
+        
-        props.set("srcdirs", target.srcdirs);
-        props.set("basedir", target.baseDir);
@@ -776 +779 @@
-        target.lib = props.get("lib", target.lib);
-        target.staticLib = props.get("staticLib", target.staticLib);
+        target.runtime = props.get("runtime", target.runtime);
+        target.runtimePhobos = props.get("runtimePhobos", target.runtimePhobos);
+        target.runtimeTango = props.get("runtimeTango", target.runtimeTango);
+        
-        target.srcdirs = props.get("srcdirs", target.srcdirs);
-        target.baseDir = props.get("basedir", target.baseDir);
@@ -850 +857 @@
-        props.add(PropsTypes.YES_NO, "exec","", "exec","","Target.",  "Select the type of target\nThis can be a library or an executable");
-        props.add(PropsTypes.YES_NO, "lib","", "lib","","Target.");
-
+
+
+
+
+
+
+
-        props.add(PropsTypes.MULTY_DIRECTORY, "srcdirs","", "sources","","Source.", "Select the directories that contain your sources\nor the *.d modules to include");
-        props.add(PropsTypes.TEXT, "basedir","", "basedir","","Source.", "This is the base directory for you target");

trunk/src/leds/Scintilla.d

@@ -1657 +1657 @@
-private import gtkc.gobject;
-
+public class ScintillaMark : EditMark
+{
+    void setVisible(bool setting)
+    {
+    }
+    
+    bool getVisible()
+    {
+        return true;
+    }
+
+    bool getDeleted()
+    {
+        return false;
+    }
+
+    char[] getName()
+    {
+        return "";
+    }
+
+    //GtkTextBuffer*      gtk_text_mark_get_buffer            (GtkTextMark *mark);
+    bool getLeftGravity()
+    {
+        return true;
+    }
+
+}
+
-public:
-class Scintilla : Container , CodeEdit
@@ -2806 +2835 @@
-    //  return getColor(new String(name), def);
-    //}
+
+    void grabFocus()
+    {
+        getWidget().grabFocus();
+    }
-    
-}

trunk/src/leds/SimpleCodeEdit.d

@@ -100 +100 @@
-    bit userListSelectionSignals;
-    
+    import gtkc.gobjecttypes;
-    
-    /**
@@ -970 +971 @@
-    }
-
+    void grabFocus()
+    {
+        view.grabFocus();
+    }
-}
-
@@ -1576 +1581 @@
-        return true;
-    }
+
+
-    
-}