]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/xforms/FormInclude.C
Yet more dialog tweaking from Rob.
[lyx.git] / src / frontends / xforms / FormInclude.C
index 372db8d4226861d1638a0612584f51ff6ea76917..cc5c82d0299195d24190c97a60935ad96ea34932 100644 (file)
@@ -1,11 +1,13 @@
 /**
  * \file FormInclude.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author John Levon, moz@compsoc.man.ac.uk
- * \author Angus Leeming, a.leeming@.ac.uk
+ * \author John Levon
+ * \author Angus Leeming 
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
 #pragma implementation
 #endif
 
+#include "debug.h"
 #include "xformsBC.h"
 #include "ControlInclude.h"
 #include "FormInclude.h"
-#include "form_include.h"
+#include "forms/form_include.h"
 #include "insets/insetinclude.h"
 #include "xforms_helpers.h" // setEnabled
-#include "support/lstrings.h" // compare
+#include "support/lstrings.h" // strip
+#include FORMS_H_LOCATION
 
-typedef FormCB<ControlInclude, FormDB<FD_form_include> > base_class;
+typedef FormCB<ControlInclude, FormDB<FD_include> > base_class;
 
-FormInclude::FormInclude(ControlInclude & c)
-       : base_class(c, _("Include file"))
+FormInclude::FormInclude()
+       : base_class(_("Include file"))
 {}
 
 
 void FormInclude::build()
 {
-       dialog_.reset(build_include());
+       dialog_.reset(build_include(this));
+
+       fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
+       setPrehandler(dialog_->input_filename);
 
        // Manage the ok and cancel buttons
        bc().setOK(dialog_->button_ok);
-       bc().setCancel(dialog_->button_cancel);
+       bc().setCancel(dialog_->button_close);
 
        bc().addReadOnly(dialog_->button_browse);
-       bc().addReadOnly(dialog_->check_verbatim);
-       bc().addReadOnly(dialog_->check_typeset);
-       bc().addReadOnly(dialog_->check_useinput);
-       bc().addReadOnly(dialog_->check_useinclude);
+       bc().addReadOnly(dialog_->radio_verbatim);
+       bc().addReadOnly(dialog_->radio_useinput);
+       bc().addReadOnly(dialog_->radio_useinclude);
 }
 
 
 void FormInclude::update()
 {
-       if (controller().params().noload) {
-               fl_set_input(dialog_->input_filename, "");
-               fl_set_button(dialog_->check_typeset, 0);
-               fl_set_button(dialog_->check_useinput, 0);
-               fl_set_button(dialog_->check_useinclude, 1);
-               fl_set_button(dialog_->check_verbatim, 0);
-               fl_set_button(dialog_->check_visiblespace, 0);
-               fl_deactivate_object(dialog_->check_visiblespace);
-               fl_set_object_lcol(dialog_->check_visiblespace, FL_INACTIVE);
-               return;
-       }
-
        fl_set_input(dialog_->input_filename,
                     controller().params().cparams.getContents().c_str());
 
        string const cmdname = controller().params().cparams.getCmdName();
 
-       fl_set_button(dialog_->check_typeset,
-                     int(controller().params().noload));
+       if (cmdname == "input")
+               fl_set_button(dialog_->check_preview,
+                             int(controller().params().cparams.preview()));
+       else
+               fl_set_button(dialog_->check_preview, 0);
+
+       setEnabled(dialog_->check_preview, (cmdname == "input"));
 
-       fl_set_button(dialog_->check_useinput, cmdname == "input");
-       fl_set_button(dialog_->check_useinclude, cmdname == "include");
+       fl_set_button(dialog_->radio_useinput, cmdname == "input");
+       fl_set_button(dialog_->radio_useinclude, cmdname == "include");
        if (cmdname == "verbatiminput" || cmdname == "verbatiminput*") {
-               fl_set_button(dialog_->check_verbatim, 1);
+               fl_set_button(dialog_->radio_verbatim, 1);
                fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
                setEnabled(dialog_->check_visiblespace, true);
+               setEnabled(dialog_->button_load, false);
        } else {
                fl_set_button(dialog_->check_visiblespace, 0);
                setEnabled(dialog_->check_visiblespace, false);
+               setEnabled(dialog_->button_load, true);
        }
+
        if (cmdname.empty())
-               fl_set_button(dialog_->check_useinclude, 1);
+               fl_set_button(dialog_->radio_useinclude, 1);
 }
 
 
 void FormInclude::apply()
 {
-       controller().params().noload = fl_get_button(dialog_->check_typeset);
+       controller().params().cparams
+               .preview(fl_get_button(dialog_->check_preview));
 
-       controller().params().cparams.
-               setContents(fl_get_input(dialog_->input_filename));
+       string const file = fl_get_input(dialog_->input_filename);
+       if (controller().fileExists(file))
+               controller().params().cparams.setContents(file);
+       else
+               controller().params().cparams.setContents("");
 
-       if (fl_get_button(dialog_->check_useinput))
+       if (fl_get_button(dialog_->radio_useinput))
                controller().params().flag = InsetInclude::INPUT;
-       else if (fl_get_button(dialog_->check_useinclude))
+       else if (fl_get_button(dialog_->radio_useinclude))
                controller().params().flag = InsetInclude::INCLUDE;
-       else if (fl_get_button(dialog_->check_verbatim)) {
+       else if (fl_get_button(dialog_->radio_verbatim)) {
                if (fl_get_button(dialog_->check_visiblespace))
                        controller().params().flag = InsetInclude::VERBAST;
                else
@@ -106,39 +112,54 @@ void FormInclude::apply()
 
 ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
 {
+       ButtonPolicy::SMInput action = ButtonPolicy::SMI_VALID;
+
        if (ob == dialog_->button_browse) {
                ControlInclude::Type type;
-               if (fl_get_button(dialog_->check_useinput))
+               if (fl_get_button(dialog_->radio_useinput))
                        type = ControlInclude::INPUT;
-               else if (fl_get_button(dialog_->check_verbatim))
+               else if (fl_get_button(dialog_->radio_verbatim))
                        type = ControlInclude::VERBATIM;
                else
                        type = ControlInclude::INCLUDE;
 
                string const in_name  = fl_get_input(dialog_->input_filename);
-               fl_freeze_form(form()); 
+               fl_freeze_form(form());
                string const out_name = controller().Browse(in_name, type);
                fl_set_input(dialog_->input_filename, out_name.c_str());
-               fl_unfreeze_form(form()); 
-
-               return ButtonPolicy::SMI_VALID;
-       }
-
-       if (ob == dialog_->button_load) {
-               if (compare(fl_get_input(dialog_->input_filename),"")) {
-                       ApplyButton();
-                       return ButtonPolicy::SMI_NOOP;
+               fl_unfreeze_form(form());
+
+       } else if (ob == dialog_->button_load) {
+               string const in_name = fl_get_input(dialog_->input_filename);
+               if (!rtrim(in_name).empty() && controller().fileExists(in_name)) {
+                       controller().OKButton();
+                       controller().load(rtrim(in_name));
+                       action = ButtonPolicy::SMI_NOOP;
                }
-       }
 
-       if (ob == dialog_->check_verbatim) {
+       } else if (ob == dialog_->radio_verbatim) {
                setEnabled(dialog_->check_visiblespace, true);
+               setEnabled(dialog_->button_load, false);
 
-       } else if (ob == dialog_->check_useinclude ||
-                  ob == dialog_->check_useinput) {
+       } else if (ob == dialog_->radio_useinclude ||
+                  ob == dialog_->radio_useinput) {
                fl_set_button(dialog_->check_visiblespace, 0);
                setEnabled(dialog_->check_visiblespace, false);
+               setEnabled(dialog_->button_load, true);
+
+       } else if (ob == dialog_->input_filename) {
+               string const in_name = fl_get_input(dialog_->input_filename);
+               if (rtrim(in_name).empty())
+                       action = ButtonPolicy::SMI_INVALID;
+       }
+
+       if (ob == dialog_->radio_useinput) {
+               setEnabled(dialog_->check_preview, true);
+       } else if (ob == dialog_->radio_verbatim ||
+                  ob == dialog_->radio_useinclude) {
+               fl_set_button(dialog_->check_preview, 0);
+               setEnabled(dialog_->check_preview, false);
        }
-       
-       return ButtonPolicy::SMI_VALID;
+
+       return action;
 }