Changeset 714

Timestamp:

07/27/07 02:18:48 (1 year ago)

Author:

Gregor

Message:

dsssps/components.d: Added "Move Up"/"Move Down" feature.

Files:

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

other/dps/trunk/dsss.conf

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

other/dps/trunk/dsssps/components.d

@@ -15 +15 @@
-import dsssps.prefs;
-import dsssps.process;
+import dsssps.sconf;
-
-class Component : wxTreeItemData {
@@ -70 +71 @@
-            "dsss distclean" ~ buildName);
-        dpsApp.aui.Update();
+    }
+}
+
+/// A template set of functions for sections
+template TCompSect() {
+    char[] sectName;
+
+    /// Menu and setup for sections
+    void sectMenu(char[] ssn, wxMenu topMenu)
+    {
+        sectName = ssn.dup;
+
+        topMenu.Append(++floatingIds, "Move Up");
+        dpsApp.EVT_MENU(floatingIds, &OnMoveUp);
+
+        topMenu.Append(++floatingIds, "Move Down");
+        dpsApp.EVT_MENU(floatingIds, &OnMoveDown);
+    }
+
+    /// Move this section up
+    void OnMoveUp(Object s, wxEvent e)
+    {
+        DSSSConfS dcs = readDSSSConfSimple("dsss.conf");
+        int i;
+        for (i = 0;
+             i < dcs.sections.length &&
+             dcs.sections[i] != sectName;
+             i++) {}
+        if (i == 0 || i == dcs.sections.length) return;
+
+        char[][] newS =
+            dcs.sections[0..(i-1)] ~
+            [sectName] ~
+            dcs.sections[(i-1)..i] ~
+            dcs.sections[(i+1)..$];
+        dcs.sections = newS;
+
+        writeDSSSConfSimple("dsss.conf", dcs);
+        dpsApp.loadTopDSSSConf();
+    }
+
+    /// Move this section down
+    void OnMoveDown(Object s, wxEvent e)
+    {
+        DSSSConfS dcs = readDSSSConfSimple("dsss.conf");
+        int i;
+        for (i = 0;
+             i < dcs.sections.length &&
+             dcs.sections[i] != sectName;
+             i++) {}
+        if (i >= dcs.sections.length - 1) return;
+
+        char[][] newS =
+            dcs.sections[0..i] ~
+            dcs.sections[(i+1)..(i+2)] ~
+            [sectName] ~
+            dcs.sections[(i+2)..$];
+        dcs.sections = newS;
+
+        writeDSSSConfSimple("dsss.conf", dcs);
+        dpsApp.loadTopDSSSConf();
-    }
-}
@@ -102 +164 @@
-
-    mixin TCompBuild;
+    mixin TCompSect;
-
-    override void popupMenu(wxTreeCtrl tree, wxEvent e)
@@ -108 +171 @@
-        wxMenu topMenu = new wxMenu();
-
-build option
+menu
-        buildMenu(" " ~ name, topMenu);
+        sectMenu(name, topMenu);
-
-        // And display it
@@ -124 +188 @@
-
-    mixin TCompBuild;
+    mixin TCompSect;
-
-    override void popupMenu(wxTreeCtrl tree, wxEvent e)
@@ -130 +195 @@
-        wxMenu topMenu = new wxMenu();
-
-build option
+menu
-        buildMenu(" " ~ name, topMenu);
+        sectMenu(name, topMenu);
-
-        // And display it
@@ -305 +371 @@
-        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)