Changeset 700

Timestamp:

07/25/07 02:37:45 (1 year ago)

Author:

Gregor

Message:

Lots of new features.

Files:

• other/dps/trunk/dsss.conf (modified) (1 diff)
• other/dps/trunk/dsssps/components.d (modified) (4 diffs)
• other/dps/trunk/dsssps/dps.d (modified) (9 diffs)
• other/dps/trunk/dsssps/prefs.d (added)
• other/dps/trunk/dsssps/process.d (added)
• other/dps/trunk/sss/conf.d (modified) (4 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.sys.Environment;
@@ -6 +8 @@
-import wx.wx;
-
+import dsssps.dps;
+import dsssps.prefs;
+import dsssps.process;
+
-class Component : wxTreeItemData {
-
+
+
-}
-
@@ -24 +31 @@
-
-    /// Edit the file
-
+wxTreeCtrl tree, wxEvent e
-    {
-Process("gvim " ~ name, Environment.get())).execute(
+DPSProcessRun(editor ~ " " ~ name, &(dpsApp.loadTopDSSSConf))).Show(false
-    }
-
@@ -32 +39 @@
-    char[] name;
-}
+
+class CompFileBuild : CompFile {
+    this(char[] name) { super(name); }
+
+    override void popupMenu(wxTreeCtrl tree, wxEvent e)
+    {
+        // Create the menu
+        wxMenu topMenu = new wxMenu();
+
+        topMenu.Append(++floatingIds, "Build");
+        dpsApp.EVT_MENU(floatingIds, &OnBuild);
+
+        topMenu.Append(++floatingIds, "Build Verbose");
+        dpsApp.EVT_MENU(floatingIds, &OnBuildVerbose);
+
+        // And display it
+        tree.PopupMenu(topMenu, (cast(wxTreeEvent) e).point);
+    }
+
+    /// Callback for building
+    void OnBuild(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build " ~ fname)).Show(true);
+    }
+
+    /// Callback for building verbose
+    void OnBuildVerbose(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build " ~ fname ~ " -v")).Show(true);
+    }
+}
+
+class CompTop : Component {
+    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, "Edit dsss.conf");
+        dpsApp.EVT_MENU(floatingIds, &OnEditDSSSConf);
+
+        // Then display it
+        tree.PopupMenu(topMenu, (cast(wxTreeEvent) e).point);
+    }
+
+    /// Callback for building
+    void OnBuild(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build")).Show(true);
+    }
+
+    /// Callback for building verbose
+    void OnBuildVerbose(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss build -v")).Show(true);
+    }
+
+    /// Callback for cleaning
+    void OnClean(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessWindow("dsss distclean")).Show(true);
+    }
+
+    /// Callback for editing
+    void OnEditDSSSConf(Object s, wxEvent e)
+    {
+        // FIXME
+        (new DPSProcessRun(editor ~ " dsss.conf", &(dpsApp.loadTopDSSSConf))).Show(false);
+    }
+}

other/dps/trunk/dsssps/dps.d

@@ -24 +24 @@
-
-import dsssps.components;
+import dsssps.prefs;
-
-char[] binPath;
@@ -33 +34 @@
-{
-    wxTreeCtrl components; /// The components tree
-
+
+
+
+
-    /// Load the top dsss.conf file into the components tree
-    void loadTopDSSSConf()
@@ -44 +48 @@
-        DSSSConf conf = readConfig([]);
-
+        // set up the head
+        wxTreeItemId top = components.AddRoot(conf.settings[""]["name"], 0, -1, new CompTop());
+
-        // then call loadDSSSConf to load it in
-        wxTreeItemId top = components.AddRoot(conf.settings[""]["name"]);
-        loadDSSSConf(components, top, conf);
-    }
@@ -85 +91 @@
-                comp = tree.AppendItem(top,
-                    sect ~ " [binary]", 1, -1,
-
+Build
-
-                // now use rebuild to get the list
@@ -108 +114 @@
-                }
-
+                // then use rebuild to get the list of non-existing files
+                p = new Process("rebuild -notfound " ~ sect, Environment.get());
+                p.execute();
+                flist = null;
+                foreach (line; new LineIterator!(char)(p.stdout)) {
+                    flist ~= line.dup;
+                }
+                p.wait();
+
+                // sort it
+                flist.sort;
+                if (flist.length != 0) {
+                    // OK, need to add a not-found section
+                    wxTreeItemId notfound =
+                        tree.AppendItem(comp,
+                            "Non-existent files", 0, -1);
+
+                    foreach (file; flist) {
+                        tree.AppendItem(notfound,
+                            file, 1, -1,
+                            new CompFile(file));
+                    }
+                }
+
-            } else {
-                // otherwise, just the top
@@ -118 +148 @@
-    }
-
-    // IDs for important elements
-    enum Elem { Tree };
-
-    public override bool OnInit()
-    {
-        wxFrame frame = new wxFrame(null, wxID_ANY, "DSSS Project Studio");
+
+        // set up the menus
+        wxMenu fileMenu = new wxMenu();
+
+        fileMenu.Append(Elem.MenuPreferences, "Preferences");
+        EVT_MENU(Elem.MenuPreferences, &OnPreferences);
+
+        fileMenu.Append(Elem.MenuQuit, "Quit");
+        EVT_MENU(Elem.MenuQuit, &OnQuit);
+
+        wxMenuBar menuBar = new wxMenuBar();
+        menuBar.Append(fileMenu, "File");
+        frame.menuBar(menuBar);
-        
-        // get some images for the tree
@@ -134 +174 @@
-        components.AssignImageList(il);
-        EVT_TREE_ITEM_ACTIVATED(Elem.Tree, &activatedFile);
+        EVT_TREE_ITEM_RIGHT_CLICK(Elem.Tree, &treeMenu);
-
-        // load in the dsss.conf file
@@ -148 +189 @@
-    {
-        // s should be a wxTreeItemId
-
-
-
-
-
-
+
-        wxTreeItemId i = wtc.Selection();
-        wxTreeItemData d = wtc.GetItemData(i);
@@ -160 +196 @@
-            if (c !is null) {
-                // activate it
-
+wtc, e
-            }
-        }
-    }
+
+    /// Pop up the menu for the tree
+    void treeMenu(Object s, wxEvent e)
+    {
+        wxTreeCtrl wtc = cast(wxTreeCtrl) e.EventObject();
+        wxTreeItemId i = wtc.Selection();
+        wxTreeItemData d = wtc.GetItemData(i);
+        if (d !is null) {
+            Component c = cast(Component) d;
+            if (c !is null) {
+                c.popupMenu(wtc, e);
+            }
+        }
+    }
+
+    /// Pressed "preferences"
+    void OnPreferences(Object s, wxEvent e)
+    {
+        Cout("Preferences.").newline;
+    }
+
+    /// Pressed "Quit"
+    void OnQuit(Object s, wxEvent e)
+    {
+        exit(0);
+    }
-}
+
+DPSApp dpsApp;
+
+/// Use this int for "floating" wx IDs: ++floatingIds to get a new one
+int floatingIds = 99;
-
-int main(char[][] args)
-{
-    binPath = Environment.exePath(args[0]).path();
-
-
+
+
+
-    return 0;
-}

other/dps/trunk/sss/conf.d

@@ -432 +432 @@
-    char[] confFile;
-    
-Name
+
-        if (genconfig) {
-            // this makes no sense
@@ -439 +439 @@
-        }
-        
-        // before reading the config, distclean if it's changed
-        if (configF == configFName) {
-            if ((new FilePath(configLBName)).exists()) {
-                if (fileNewer(configFName, configLBName)) {
-                    // our config has changed
-                    distclean(readConfig(null, false, configLBName));
-                }
-            }
-        
-            // copy in our new dsss.lastbuild
-            (new FilePath(configLBName)).copy(configFName);
-        }
-        
-        // Read the config file
-Name
+
-    } else {
-        // Generate the config file
@@ -479 +466 @@
-        if (genconfig) {
-            // write it
-Name
+
-        }
-        
@@ -916 +903 @@
-                proc = new Process(cmd);
-            }
+            proc.execute();
-            
-            // now catch its output