X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fxforms%2FFormInclude.C;h=636574b121c51444b9c75c75c1a59a348c1d4714;hb=27652900a60fd078f161ce866ddaed21dba21eff;hp=8389ff38b17702a79f109e9bf96993113f984564;hpb=765db1102d7edf01d2fd7b667c75095f843ab476;p=lyx.git

diff --git a/src/frontends/xforms/FormInclude.C b/src/frontends/xforms/FormInclude.C
index 8389ff38b1..636574b121 100644
--- a/src/frontends/xforms/FormInclude.C
+++ b/src/frontends/xforms/FormInclude.C
@@ -4,205 +4,152 @@
  * Read the file COPYING
  *
  * \author Alejandro Aguilar Sierra
- * \author John Levon
+ * \author John Levon, moz@compsoc.man.ac.uk
+ * \author Angus Leeming, a.leeming@.ac.uk
  */
+
 #include <config.h>
 #include <algorithm>
-#include <utility>
 
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include "Dialogs.h"
+#include "xformsBC.h"
+#include "ControlInclude.h"
 #include "FormInclude.h"
-#include "insets/insetinclude.h" 
-#include "frontends/FileDialog.h"
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "LyXView.h"
-#include "buffer.h"
-#include "lyxrc.h" 
-#include "lyxfunc.h" 
-#include "xforms_helpers.h" 
- 
 #include "form_include.h"
+#include "insets/insetinclude.h"
+#include "xforms_helpers.h" // setEnabled
+#include "support/lstrings.h" // strip
 
-using std::make_pair;
-using std::pair;
-
-FormInclude::FormInclude(LyXView * lv, Dialogs * d)
-	: FormCommand(lv, d, _("Include file"), new OkCancelPolicy),
-	  dialog_(0)
-{
-	d->showInclude.connect(slot(this, &FormInclude::showInset));
-	d->createInclude.connect(slot(this, &FormInclude::createInset));
-}
+typedef FormCB<ControlInclude, FormDB<FD_form_include> > base_class;
 
-
-FormInclude::~FormInclude()
-{
-	delete dialog_;
-}
-
-
-FL_FORM * FormInclude::form() const
-{
-	if (dialog_) 
-		return dialog_->form;
-	return 0;
-}
+FormInclude::FormInclude(ControlInclude & c)
+	: base_class(c, _("Include file"))
+{}
 
 
 void FormInclude::build()
 {
-	dialog_ = build_include();
+	dialog_.reset(build_include());
 
-	// Workaround dumb xforms sizing bug
-	minw_ = form()->w;
-	minh_ = form()->h;
+	fl_set_input_return(dialog_->input_filename, FL_RETURN_CHANGED);
 
 	// Manage the ok and cancel buttons
-	bc_.setOK(dialog_->button_ok);
-	bc_.setCancel(dialog_->button_cancel);
-	bc_.refresh();
-
-	bc_.addReadOnly(dialog_->browsebt);
-	bc_.addReadOnly(dialog_->flag1);
-	bc_.addReadOnly(dialog_->flag2);
-	bc_.addReadOnly(dialog_->flag3);
-	bc_.addReadOnly(dialog_->flag4);
-	bc_.addReadOnly(dialog_->filename);
-	bc_.addReadOnly(dialog_->flag41);
+	bc().setOK(dialog_->button_ok);
+	bc().setCancel(dialog_->button_cancel);
+
+	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);
 }
 
 
 void FormInclude::update()
 {
-	bc_.readOnly(lv_->buffer()->isReadonly());
-
-	if (!inset_) {
-		fl_set_input(dialog_->filename, "");
-		fl_set_button(dialog_->flag1, 0);
-		fl_set_button(dialog_->flag2, 0);
-		fl_set_button(dialog_->flag3, 1);
-		fl_set_button(dialog_->flag4, 0);
-		fl_set_button(dialog_->flag41, 0);
-		fl_deactivate_object(dialog_->flag41);
-		fl_set_object_lcol(dialog_->flag41, FL_INACTIVE);
+	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_->filename, params.getContents().c_str());
- 
-	string const cmdname = params.getCmdName();
- 
-	/* FIXME: what do with Don't typeset here ... */
-	//fl_set_button(dialog_->flag1, int(inset_->isNoLoad()));
- 
-	fl_set_button(dialog_->flag2, cmdname == "input");
-	fl_set_button(dialog_->flag3, cmdname == "include");
+
+	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));
+
+	fl_set_button(dialog_->check_useinput, cmdname == "input");
+	fl_set_button(dialog_->check_useinclude, cmdname == "include");
 	if (cmdname == "verbatiminput" || cmdname == "verbatiminput*") {
-		fl_set_button(dialog_->flag4, 1);
-		fl_set_button(dialog_->flag41, cmdname == "verbatiminput*");
+		fl_set_button(dialog_->check_verbatim, 1);
+		fl_set_button(dialog_->check_visiblespace, cmdname == "verbatiminput*");
+		setEnabled(dialog_->check_visiblespace, true);
 	} else {
-		fl_set_button(dialog_->flag41, 0);
-		fl_deactivate_object(dialog_->flag41);
-		fl_set_object_lcol(dialog_->flag41, FL_INACTIVE);
+		fl_set_button(dialog_->check_visiblespace, 0);
+		setEnabled(dialog_->check_visiblespace, false);
 	}
+ 
+	if (cmdname.empty())
+		fl_set_button(dialog_->check_useinclude, 1);
 }
 
 
 void FormInclude::apply()
 {
-	if (lv_->buffer()->isReadonly())
-		return;
-
-	/* FIXME: no way to update internal flags of inset ??? */
- 
-	//inset_->setNoLoad(fl_get_button(dialog_->flag1));
- 
-	params.setContents(fl_get_input(dialog_->filename));
-
-	if (fl_get_button(dialog_->flag2))
-		params.setCmdName("input");
-	else if (fl_get_button(dialog_->flag3))
-		params.setCmdName("include");
-	else if (fl_get_button(dialog_->flag4)) {
-		if (fl_get_button(dialog_->flag41))
-			params.setCmdName("verbatiminput*");
+	controller().params().noload = fl_get_button(dialog_->check_typeset);
+
+	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))
+		controller().params().flag = InsetInclude::INPUT;
+	else if (fl_get_button(dialog_->check_useinclude))
+		controller().params().flag = InsetInclude::INCLUDE;
+	else if (fl_get_button(dialog_->check_verbatim)) {
+		if (fl_get_button(dialog_->check_visiblespace))
+			controller().params().flag = InsetInclude::VERBAST;
 		else
-			params.setCmdName("verbatiminput");	
+			controller().params().flag = InsetInclude::VERB;
 	}
-	
-	if (inset_) {
-		if (params != inset_->params()) {
-			inset_->setParams(params);
-			lv_->view()->updateInset(inset_, true);
-		}
-	} else
-		lv_->getLyXFunc()->Dispatch(LFUN_CHILD_INSERT, params.getAsString());
 }
- 
-#ifdef WITH_WARNINGS
-#warning convert this to use the buttoncontroller
-#endif
-bool FormInclude::input(FL_OBJECT *, long data)
+
+
+ButtonPolicy::SMInput FormInclude::input(FL_OBJECT * ob, long)
 {
-	State state = static_cast<State>(data); 
- 
-	switch (state) {
-		case BROWSE: {
-			// Should browsing too be disabled in RO-mode?
-			FileDialog fileDlg(lv_, _("Select document to include"),
-				LFUN_SELECT_FILE_SYNC,
-				make_pair(string(_("Documents")), string(lyxrc.document_path)));
- 
-			string ext;
-		    
-			/* input TeX, verbatim, or LyX file ? */
-			if (fl_get_button(dialog_->flag2))
-				ext = _("*.tex| LaTeX Documents (*.tex)");
-			else if (fl_get_button(dialog_->flag4))
-				ext = _("*| All files ");
-			else
-				ext = _("*.lyx| LyX Documents (*.lyx)");
-	 
-			string mpath;
- 
-			/* FIXME: what do I do here ? */ 
-			//if (inset_)
-			//	mpath = OnlyPath(inset_->getMasterFilename());
- 
-			FileDialog::Result result = fileDlg.Select(mpath, ext, fl_get_input(dialog_->filename));
-	 
-			// check selected filename
-			if (result.second.empty())
-				break;
-	 
-			string const filename2 = MakeRelPath(result.second, mpath);
-	 
-			if (prefixIs(filename2, ".."))
-				fl_set_input(dialog_->filename, result.second.c_str());
-			else
-				fl_set_input(dialog_->filename, filename2.c_str());
- 
-		}	break;
-
-		case LOAD:
-			apply();
-			lv_->getLyXFunc()->Dispatch(LFUN_CHILDOPEN, params.getContents());
-			break;
-
-		case VERBATIM:
-			setEnabled(dialog_->flag41, true);
-			break;
-	 
-		case INPUTINCLUDE:
-			/* FIXME: huh ? why doesn't this work ? */ 
-			setEnabled(dialog_->flag41, false);
-			fl_set_button(dialog_->flag41, 0);
-			break;
+	ButtonPolicy::SMInput action = ButtonPolicy::SMI_VALID;
+
+	if (ob == dialog_->button_browse) {
+		ControlInclude::Type type;
+		if (fl_get_button(dialog_->check_useinput))
+			type = ControlInclude::INPUT;
+		else if (fl_get_button(dialog_->check_verbatim))
+			type = ControlInclude::VERBATIM;
+		else
+			type = ControlInclude::INCLUDE;
+
+		string const in_name  = fl_get_input(dialog_->input_filename);
+		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()); 
+
+	} else if (ob == dialog_->button_load) {
+		string const in_name = fl_get_input(dialog_->input_filename);
+		if (!strip(in_name).empty() && controller().fileExists(in_name)) {
+//			ApplyButton();
+			OKButton();
+			controller().load(strip(in_name));
+			action = ButtonPolicy::SMI_NOOP;
+		}
+
+	} else if (ob == dialog_->check_verbatim) {
+		setEnabled(dialog_->check_visiblespace, true);
+
+	} else if (ob == dialog_->check_useinclude ||
+		   ob == dialog_->check_useinput) {
+		fl_set_button(dialog_->check_visiblespace, 0);
+		setEnabled(dialog_->check_visiblespace, false);
+
+	} else if (ob == dialog_->input_filename) {
+		string const in_name = fl_get_input(dialog_->input_filename);
+		if (strip(in_name).empty())
+			action = ButtonPolicy::SMI_INVALID;
 	}
-	return true; 
+	
+	return action;
 }