Some string(widget->text()) fixes. Weirdness

[lyx.git] / src / frontends / qt2 / QInclude.C

diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C
index 03b1d283b9eb44e92686e564e2ff970d3c595b3d..032a1016f813ef2234824a6b9f127b952f7b00f4 100644 (file)
--- a/src/frontends/qt2/QInclude.C
+++ b/src/frontends/qt2/QInclude.C
@@ -1,9 +1,11 @@
 /**
  * \file QInclude.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 John Levon <moz@compsoc.man.ac.uk>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS
  */
 
 #include <config.h>
@@ -15,7 +17,7 @@
 #include "ControlInclude.h"
 #include "gettext.h"
 #include "debug.h"
- 
+
 #include "QIncludeDialog.h"
 #include "QInclude.h"
 #include "Qt2BC.h"
@@ -25,10 +27,12 @@
 #include <qcheckbox.h>
 #include <qcombobox.h>
 
+
 typedef Qt2CB<ControlInclude, Qt2DB<QIncludeDialog> > base_class;
 
-QInclude::QInclude(ControlInclude & c, Dialogs &)
-       : base_class(c, _("Include"))
+
+QInclude::QInclude()
+       : base_class(_("Include"))
 {
 }
 
@@ -41,7 +45,6 @@ void QInclude::build_dialog()
        bc().setCancel(dialog_->closePB);
        bc().addReadOnly(dialog_->filenameED);
        bc().addReadOnly(dialog_->browsePB);
-       bc().addReadOnly(dialog_->typesetCB);
        bc().addReadOnly(dialog_->visiblespaceCB);
        bc().addReadOnly(dialog_->typeCO);
 }
@@ -49,54 +52,49 @@ void QInclude::build_dialog()
 
 void QInclude::update_contents()
 {
-       if (controller().params().noload) {
-               dialog_->filenameED->setText("");
-               dialog_->typesetCB->setChecked(false);
-               dialog_->visiblespaceCB->setChecked(false);
-               dialog_->visiblespaceCB->setEnabled(false);
-               //dialog_->typeCO->setEnabled(true);
-               return;
-       }
+       InsetInclude::Params const & params = controller().params();
 
-       dialog_->filenameED->setText(controller().params().cparams.getContents().c_str());
-
-       string const cmdname = controller().params().cparams.getCmdName();
-
-       // FIXME: ??
-       dialog_->typesetCB->setChecked(controller().params().noload);
+       dialog_->filenameED->setText(params.cparams.getContents().c_str());
 
        dialog_->visiblespaceCB->setChecked(false);
        dialog_->visiblespaceCB->setEnabled(false);
 
-       if (cmdname == "input")
-               dialog_->typeCO->setCurrentItem(1);
-       else if (!cmdname.empty()) {
-               dialog_->typeCO->setCurrentItem(2);
-               dialog_->visiblespaceCB->setChecked(cmdname == "verbatiminput*");
-               dialog_->visiblespaceCB->setEnabled(true);
+       switch (params.flag) {
+               case InsetInclude::INPUT:
+                       dialog_->typeCO->setCurrentItem(0);
+                       break;
+
+               case InsetInclude::INCLUDE:
+                       dialog_->typeCO->setCurrentItem(1);
+                       break;
+
+               case InsetInclude::VERBAST:
+                       dialog_->visiblespaceCB->setChecked(true);
+                       /* fall through */
+               case InsetInclude::VERB:
+                       dialog_->typeCO->setCurrentItem(2);
+                       dialog_->visiblespaceCB->setEnabled(true);
+                       break;
        }
-       else dialog_->typeCO->setCurrentItem(0);
-
 }
 
 
 void QInclude::apply()
 {
-       controller().params().noload = dialog_->typesetCB->isChecked();
+       InsetInclude::Params & params = controller().params();
 
-       controller().params().cparams.
-               setContents(dialog_->filenameED->text().latin1());
+       params.cparams.setContents(dialog_->filenameED->text().latin1());
 
        int const item = dialog_->typeCO->currentItem();
-       if (item==1)
-               controller().params().flag = InsetInclude::INPUT;
-       else if (item==0)
-               controller().params().flag = InsetInclude::INCLUDE;
+       if (item == 0)
+               params.flag = InsetInclude::INPUT;
+       else if (item == 1)
+               params.flag = InsetInclude::INCLUDE;
        else {
                if (dialog_->visiblespaceCB->isChecked())
-                       controller().params().flag = InsetInclude::VERBAST;
+                       params.flag = InsetInclude::VERBAST;
                else
-                       controller().params().flag = InsetInclude::VERB;
+                       params.flag = InsetInclude::VERB;
        }
 }
 
@@ -106,10 +104,10 @@ void QInclude::browse()
        ControlInclude::Type type;
 
        int const item = dialog_->typeCO->currentItem();
-       if (item==0)
-               type = ControlInclude::INCLUDE;
-       else if (item==1)
+       if (item == 0)
                type = ControlInclude::INPUT;
+       else if (item == 1)
+               type = ControlInclude::INCLUDE;
        else
                type = ControlInclude::VERBATIM;