[latexila] Build tool dialog: the final bits

[SÃbastien Wilmet <swilmet src gnome org>]

commit 599312b815cd31def4a79f926398925eb59356f1
Author: SÃbastien Wilmet <swilmet src gnome org>
Date:   Sun Jul 8 06:21:08 2012 +0200

    Build tool dialog: the final bits

 src/build_tool_dialog.vala |   90 ++++++++++++++++++++++++++++++++++++++++---
 src/build_tools.vala       |    7 +--
 2 files changed, 85 insertions(+), 12 deletions(-)
---
diff --git a/src/build_tool_dialog.vala b/src/build_tool_dialog.vala
index 865e117..a0313f8 100644
--- a/src/build_tool_dialog.vala
+++ b/src/build_tool_dialog.vala
@@ -41,7 +41,7 @@ private class BuildToolDialog : Dialog
 
     private static BuildToolDialog _instance = null;
 
-    private ErrorEntry _entry_label;
+    private Entry _entry_label;
     private Entry _entry_desc;
     private Entry _entry_extensions;
 
@@ -97,7 +97,18 @@ private class BuildToolDialog : Dialog
         return_val_if_fail (build_tool != null, false);
 
         _instance.set_build_tool (build_tool);
-        return false;
+
+        bool ok = _instance.run () == ResponseType.OK;
+
+        if (ok)
+        {
+            BuildTool new_build_tool = _instance.retrieve_build_tool ();
+            new_build_tool.show = build_tool.show;
+            build_tools.update (build_tool_num, new_build_tool);
+        }
+
+        _instance.hide ();
+        return ok;
     }
 
     // Returns true if the build tool is created.
@@ -107,7 +118,20 @@ private class BuildToolDialog : Dialog
         return_val_if_fail (_instance != null, false);
 
         _instance.set_new_build_tool ();
-        return false;
+
+        bool ok = _instance.run () == ResponseType.OK;
+
+        if (ok)
+        {
+            BuildTool new_build_tool = _instance.retrieve_build_tool ();
+            new_build_tool.show = true;
+
+            BuildTools build_tools = BuildTools.get_default ();
+            build_tools.add (new_build_tool);
+        }
+
+        _instance.hide ();
+        return ok;
     }
 
     /*************************************************************************/
@@ -115,7 +139,7 @@ private class BuildToolDialog : Dialog
 
     private void init_text_entries ()
     {
-        _entry_label = new ErrorEntry ();
+        _entry_label = new Entry ();
         _entry_desc = new Entry ();
         _entry_extensions = new Entry ();
     }
@@ -379,11 +403,10 @@ private class BuildToolDialog : Dialog
     }
 
     /*************************************************************************/
-    // Run the dialog
+    // Set and retrieve data
 
     private void set_new_build_tool ()
     {
-        _entry_label.error = false;
         _entry_label.text = "";
         _entry_desc.text = "";
         _entry_extensions.text = "";
@@ -398,7 +421,6 @@ private class BuildToolDialog : Dialog
     {
         /* Text entries */
 
-        _entry_label.error = false;
         _entry_label.text = build_tool.label;
         _entry_desc.text = build_tool.description;
         _entry_extensions.text = build_tool.extensions;
@@ -435,6 +457,60 @@ private class BuildToolDialog : Dialog
         _jobs_view.columns_autosize ();
     }
 
+    // Retrieve the build tool from the data stored in the main widgets of the dialog.
+    private BuildTool retrieve_build_tool ()
+    {
+        BuildTool tool = BuildTool ();
+
+        /* Text entries */
+
+        tool.label = _entry_label.text.strip ();
+
+        string desc = _entry_desc.text.strip ();
+        if (desc == "")
+            tool.description = tool.label;
+        else
+            tool.description = desc;
+
+        tool.extensions = _entry_extensions.text.strip ();
+
+        /* Icon */
+
+        TreeIter iter;
+        _icons_combobox.get_active_iter (out iter);
+        TreeModel model = _icons_store as TreeModel;
+        model.get (iter, IconColumn.STOCK_ID, out tool.icon);
+
+        /* Jobs */
+
+        tool.jobs = new Gee.ArrayList<BuildJob?> ();
+
+        model = _jobs_store as TreeModel;
+        bool valid = _jobs_store.get_iter_first (out iter);
+
+        while (valid)
+        {
+            BuildJob job = BuildJob ();
+            string command;
+            string post_processor_name;
+
+            model.get (iter,
+                JobColumn.COMMAND, out command,
+                JobColumn.POST_PROCESSOR, out post_processor_name
+            );
+
+            job.command = command.strip ();
+            job.post_processor = BuildTools.get_post_processor_type_from_name (
+                post_processor_name);
+
+            tool.jobs.add (job);
+
+            valid = _jobs_store.iter_next (ref iter);
+        }
+
+        return tool;
+    }
+
     /*************************************************************************/
     // Misc utilities functions
 
diff --git a/src/build_tools.vala b/src/build_tools.vala
index 0480393..a03f9cb 100644
--- a/src/build_tools.vala
+++ b/src/build_tools.vala
@@ -167,15 +167,12 @@ public class BuildTools
         update_all_menus ();
     }
 
-    public void update (int num, BuildTool tool, bool keep_show = false)
+    public void update (int num, BuildTool tool)
     {
         return_if_fail (_build_tools != null);
-        return_if_fail (num >= 0 && num < _build_tools.size);
+        return_if_fail (0 <= num && num < _build_tools.size);
         BuildTool current_tool = _build_tools.get (num);
 
-        if (keep_show)
-            tool.show = current_tool.show;
-
         if (! is_equal (current_tool, tool))
         {
             tool.compilation = is_compilation (tool.icon);