Changeset 704

Timestamp:

07/25/07 11:37:05 (1 year ago)

Author:

Gregor

Message:

Changed how subdirs work - now can open as project, but does not expand into project.

Files:

• other/dps/trunk/dsss.conf (modified) (1 diff)
• other/dps/trunk/dsssps/components.d (modified) (3 diffs)
• other/dps/trunk/dsssps/dps.d (modified) (4 diffs)
• other/dps/trunk/dsssps/prefs.d (modified) (3 diffs)

other/dps/trunk/dsss.conf

@@ -3 +3 @@
-[dsssps/dps.d]
-target=dps
-
-[foo]

other/dps/trunk/dsssps/components.d

@@ -1 +1 @@
-module dsssps.components;
-
+import tango.io.Console;
-import tango.io.File;
+import tango.io.FileSystem;
-
-import tango.sys.Environment;
@@ -127 +129 @@
-}
-
+/// Top component
-class CompTop : Component {
-    override void popupMenu(wxTreeCtrl tree, wxEvent e)
@@ -177 +180 @@
-    }
-}
+
+/// Component for subdirectories, can build or open as a project
+class CompSubdir : Component {
+    this(char[] name)
+    {
+        this.name = name.dup;
+    }
+
+    char[] fname()
+    {
+        return name.dup;
+    }
+
+    override void popupMenu(wxTreeCtrl tree, wxEvent e)
+    {
+        // Create a menu on-the-fly with "build" and "edit dsss.conf"
+        wxMenu topMenu = new wxMenu();
+        
+        topMenu.Append(++floatingIds, "Build");
+        dpsApp.EVT_MENU(floatingIds, &OnBuild);
+
+        topMenu.Append(++floatingIds, "Build Verbose");
+        dpsApp.EVT_MENU(floatingIds, &OnBuildVerbose);
+
+        topMenu.Append(++floatingIds, "Clean");
+        dpsApp.EVT_MENU(floatingIds, &OnClean);
+
+        topMenu.Append(++floatingIds, "Open as project");
+        dpsApp.EVT_MENU(floatingIds, &OnOpen);
+
+        // Then display it
+        tree.PopupMenu(topMenu, (cast(wxTreeEvent) e).point);
+    }
+
+    /// Callback for building
+    void OnBuild(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build " ~ name)).Show(true);
+    }
+
+    /// Callback for building verbose
+    void OnBuildVerbose(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build -v " ~ name)).Show(true);
+    }
+
+    /// Callback for cleaning
+    void OnClean(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss distclean " ~ name)).Show(true);
+    }
+
+    /// Callback for opening
+    void OnOpen(Object s, wxEvent e)
+    {
+        // chdir to it, then run DPS
+        char[] origdir = FileSystem.getDirectory();
+        try {
+            Cout("DIR: ")(name).newline;
+            FileSystem.setDirectory(name);
+            Cout("DPS: ")(dpsBinPath).newline;
+            (new Process(dpsBinPath, Environment.get())).execute();
+        } catch (Exception e) {} // ignore failures (FIXME)
+        FileSystem.setDirectory(origdir);
+    }
+
+    private:
+    char[] name;
+}

other/dps/trunk/dsssps/dps.d

@@ -25 +25 @@
-import dsssps.components;
-import dsssps.prefs;
-
-char[] binPath;
-
-/**
@@ -78 +76 @@
-                // recurse to load the subdir
-                comp = tree.AppendItem(top,
-
-
-
-
-
-
-
-
-
-
-
+
-
-            } else if (conf.settings[sect]["type"] == "binary") {
@@ -171 +159 @@
-        // get some images for the tree
-        wxImageList il = new wxImageList();
-binPath
-binPath
+dpsBinDir
+dpsBinDir
-        
-        // now set up the tree
@@ -239 +227 @@
-int main(char[][] args)
-{
-    binPath = Environment.exePath(args[0]).path();
-    loadPrefs(args[0]);
-    dpsApp = new DPSApp();

other/dps/trunk/dsssps/prefs.d

@@ -2 +2 @@
-
-import tango.io.FileConst;
+import tango.io.FilePath;
-
-import tango.sys.Environment;
@@ -8 +9 @@
-
-char[] prefFile = ".dpsrc";
+
+/// The path to DPS itself
+char[] dpsBinPath;
+
+/// And the directory in which DPS resides
+char[] dpsBinDir;
-
-/// DSSS directory
@@ -25 +32 @@
-{
-    char[] defDir;
+
+    FilePath dbp = Environment.exePath(argvz);
+    dpsBinPath = dbp.toUtf8().dup;
+    dpsBinDir = dbp.path().dup;
-
-    // figure out the proper preference file