#include "GuiInclude.h"
-#include "frontend_helpers.h"
-
#include "Buffer.h"
-#include "Format.h"
#include "FuncRequest.h"
-#include "gettext.h"
#include "LyXRC.h"
#include "qt_helpers.h"
#include "LyXRC.h"
-#include "support/os.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/FileFilterList.h"
+#include "support/os.h"
+#include "support/FileName.h"
#include "support/filetools.h"
#include "insets/InsetListingsParams.h"
#include <QPushButton>
#include <QCheckBox>
-#include <QCloseEvent>
#include <QLineEdit>
#include <utility>
-using std::string;
-using std::vector;
-using std::pair;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
+using namespace lyx::support::os;
namespace lyx {
namespace frontend {
-using support::FileFilterList;
-using support::FileName;
-using support::isFileReadable;
-using support::makeAbsPath;
-using support::onlyPath;
-using support::os::internal_path;
-using support::prefixIs;
-using support::getStringFromVector;
-using support::getVectorFromString;
-
-GuiInclude::GuiInclude(LyXView & lv)
- : GuiDialog(lv, "include"), params_("include")
+GuiInclude::GuiInclude(GuiView & lv)
+ : GuiDialog(lv, "include", qt_("Child Document")),
+ params_(insetCode("include"))
{
setupUi(this);
- setViewTitle(_("Child Document"));
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(captionLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(labelLE, SIGNAL(textChanged(const QString&)), this, SLOT(change_adaptor()));
connect(listingsED, SIGNAL(textChanged()), this, SLOT(change_adaptor()));
- connect(listingsED, SIGNAL(textChanged()), this, SLOT(set_listings_msg()));
+ connect(listingsED, SIGNAL(textChanged()), this, SLOT(setListingsMsg()));
connect(bypassCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
- connect(bypassCB, SIGNAL(clicked()), this, SLOT(set_listings_msg()));
+ connect(bypassCB, SIGNAL(clicked()), this, SLOT(setListingsMsg()));
setFocusProxy(filenameED);
}
-void GuiInclude::set_listings_msg()
+void GuiInclude::setListingsMsg()
{
static bool isOK = true;
docstring msg = validate_listings_params();
}
-void GuiInclude::closeEvent(QCloseEvent * e)
-{
- slotClose();
- e->accept();
-}
-
-
void GuiInclude::typeChanged(int v)
{
switch (v) {
}
-void GuiInclude::updateContents()
+void GuiInclude::paramsToDialog(InsetCommandParams const & params_)
{
filenameED->setText(toqstr(params_["filename"]));
typeCO->setCurrentIndex(3);
listingsGB->setEnabled(true);
listingsED->setEnabled(true);
- InsetListingsParams par(params_.getOptions());
+ InsetListingsParams par(to_utf8(params_["lstparams"]));
// extract caption and label and put them into their respective editboxes
vector<string> pars = getVectorFromString(par.separatedParams(), "\n");
for (vector<string>::iterator it = pars.begin();
string extra = getStringFromVector(pars);
listingsED->setPlainText(toqstr(InsetListingsParams(extra).separatedParams()));
}
+
+ // Make sure that the bc is in the INITIAL state
+ if (bc().policy().buttonStatus(ButtonPolicy::OKAY))
+ bc().restore();
}
par.addParam("caption", "{" + caption + "}");
if (!label.empty())
par.addParam("label", "{" + label + "}");
- params_.setOptions(par.params());
+ string const listparams = par.params();
+ params_["lstparams"] = from_utf8(listparams);
} else {
if (visiblespaceCB->isChecked())
params_.setCmdName("verbatiminput*");
else
type = LISTINGS;
- docstring const & name = browse(qstring_to_ucs4(filenameED->text()), type);
- if (!name.empty())
- filenameED->setText(toqstr(name));
+ QString name = browse(filenameED->text(), type);
+ if (!name.isEmpty())
+ filenameED->setText(name);
}
void GuiInclude::edit()
{
- if (isValid()) {
- string const file = fromqstr(filenameED->text());
+ if (!isValid())
+ return;
+ string const file = fromqstr(filenameED->text());
+ if (bc().policy().buttonStatus(ButtonPolicy::OKAY)) {
slotOK();
- edit(file);
- }
+ applyView();
+ } else
+ hideView();
+ dispatch(FuncRequest(LFUN_INSET_EDIT));
}
}
-bool GuiInclude::initialiseParams(string const & data)
-{
- InsetIncludeMailer::string2params(data, params_);
- return true;
-}
-
-
-void GuiInclude::clearParams()
+QString GuiInclude::browse(QString const & in_name, Type in_type) const
{
- params_.clear();
-}
-
-
-void GuiInclude::dispatchParams()
-{
- dispatch(FuncRequest(getLfun(), InsetIncludeMailer::params2string(params_)));
-}
-
-
-docstring GuiInclude::browse(docstring const & in_name, Type in_type) const
-{
- docstring const title = _("Select document to include");
+ QString const title = qt_("Select document to include");
// input TeX, verbatim, or LyX file ?
- FileFilterList filters;
+ QStringList filters;
switch (in_type) {
case INCLUDE:
case INPUT:
- filters = FileFilterList(_("LaTeX/LyX Documents (*.tex *.lyx)"));
+ filters = fileFilters(qt_("LaTeX/LyX Documents (*.tex *.lyx)"));
break;
case VERBATIM:
- break;
case LISTINGS:
break;
}
- pair<docstring, docstring> dir1(_("Documents|#o#O"),
- from_utf8(lyxrc.document_path));
+ QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
+
+ return browseRelToParent(in_name, docpath, title, filters, false,
+ qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
+}
- docstring const docpath = from_utf8(onlyPath(buffer().fileName()));
- return browseRelFile(in_name, docpath, title,
- filters, false, dir1);
+bool GuiInclude::initialiseParams(std::string const & data)
+{
+ InsetCommand::string2params(data, params_);
+ paramsToDialog(params_);
+ return true;
}
-void GuiInclude::edit(string const & file)
+void GuiInclude::dispatchParams()
{
- string const ext = support::getExtension(file);
- if (ext == "lyx")
- dispatch(FuncRequest(LFUN_BUFFER_CHILD_OPEN, file));
- else
- // tex file or other text file in verbatim mode
- formats.edit(buffer(),
- FileName(makeAbsPath(file, onlyPath(buffer().fileName()))),
- "text");
+ std::string const lfun = InsetCommand::params2string(params_);
+ dispatch(FuncRequest(getLfun(), lfun));
}
-Dialog * createGuiInclude(LyXView & lv) { return new GuiInclude(lv); }
+Dialog * createGuiInclude(GuiView & lv) { return new GuiInclude(lv); }
} // namespace frontend
} // namespace lyx
-#include "GuiInclude_moc.cpp"
+#include "moc_GuiInclude.cpp"
projects / lyx.git / blobdiff