Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiInclude.cpp

diff --git a/src/frontends/qt4/GuiInclude.cpp b/src/frontends/qt4/GuiInclude.cpp
index 642e514e741d12d7c1d60a73e246d38dac048eaf..08da8668bf5d29d3c1558bba7f70b87ded202200 100644 (file)
--- a/src/frontends/qt4/GuiInclude.cpp
+++ b/src/frontends/qt4/GuiInclude.cpp
@@ -26,6 +26,7 @@
 #include "support/os.h"
 #include "support/lstrings.h"
 #include "support/FileFilterList.h"
+#include "support/FileName.h"
 #include "support/filetools.h"
 
 #include "insets/InsetListingsParams.h"
@@ -33,7 +34,6 @@
 
 #include <QPushButton>
 #include <QCheckBox>
-#include <QCloseEvent>
 #include <QLineEdit>
 
 #include <utility>
@@ -47,10 +47,9 @@ namespace frontend {
 
 
 GuiInclude::GuiInclude(GuiView & lv)
-       : GuiCommand(lv, "include")
+       : GuiCommand(lv, "include", qt_("Child Document"))
 {
        setupUi(this);
-       setViewTitle(_("Child Document"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -127,13 +126,6 @@ void GuiInclude::set_listings_msg()
 }
 
 
-void GuiInclude::closeEvent(QCloseEvent * e)
-{
-       slotClose();
-       e->accept();
-}
-
-
 void GuiInclude::typeChanged(int v)
 {
        switch (v) {
@@ -289,9 +281,9 @@ void GuiInclude::browse()
        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);
 }
 
 
@@ -311,9 +303,9 @@ bool GuiInclude::isValid()
 }
 
 
-docstring GuiInclude::browse(docstring const & in_name, Type in_type) const
+QString GuiInclude::browse(QString 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;
@@ -327,10 +319,10 @@ docstring GuiInclude::browse(docstring const & in_name, Type in_type) const
                break;
        }
 
-       docstring const docpath = from_utf8(onlyPath(buffer().absFileName()));
+       QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
 
        return browseRelFile(in_name, docpath, title, filters, false, 
-               _("Documents|#o#O"), from_utf8(lyxrc.document_path));
+               qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 }
 
 
@@ -342,7 +334,7 @@ void GuiInclude::edit(string const & file)
        else
                // tex file or other text file in verbatim mode
                formats.edit(buffer(), 
-                       makeAbsPath(file, onlyPath(buffer().absFileName())),
+                       makeAbsPath(file, support::onlyPath(buffer().absFileName())),
                        "text");
 }