If we are in a closeEvent, we don't want to close all buffers, because these may...

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

diff --git a/src/frontends/qt4/GuiPrint.cpp b/src/frontends/qt4/GuiPrint.cpp
index aedba1b8859c59736bd920502b09e546abdf9452..32b3c8f5641e420439f3ace26888b1a4eefbcdb0 100644 (file)
--- a/src/frontends/qt4/GuiPrint.cpp
+++ b/src/frontends/qt4/GuiPrint.cpp
@@ -20,10 +20,9 @@
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "FuncRequest.h"
-#include "support/gettext.h"
+#include "LyXRC.h"
 
 #include "support/convert.h"
-#include "support/FileFilterList.h"
 #include "support/filetools.h"
 #include "support/os.h"
 
@@ -57,13 +56,13 @@ GuiPrint::GuiPrint(GuiView & lv)
        connect(allRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(reverseCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(collateCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
-       connect(fromED, SIGNAL(textChanged(const QString&)),
+       connect(fromED, SIGNAL(textChanged(QString)),
                this, SLOT(pagerangeChanged()));
-       connect(fromED, SIGNAL(textChanged(const QString&)),
+       connect(fromED, SIGNAL(textChanged(QString)),
                this, SLOT(change_adaptor()));
-       connect(toED, SIGNAL(textChanged(const QString&)),
+       connect(toED, SIGNAL(textChanged(QString)),
                this, SLOT(pagerangeChanged()));
-       connect(toED, SIGNAL(textChanged(const QString&)),
+       connect(toED, SIGNAL(textChanged(QString)),
                this, SLOT(change_adaptor()));
        connect(fileRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
        connect(printerRB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
@@ -86,7 +85,7 @@ void GuiPrint::browseClicked()
 {
        QString file =
                browseRelFile(QString(), bufferFilepath(), qt_("Print to file"),
-                            FileFilterList(_("PostScript files (*.ps)")), true);
+                            QStringList(qt_("PostScript files (*.ps)")), true);
        if (!file.isEmpty()) {
                fileED->setText(file);
                changed();
@@ -145,9 +144,9 @@ void GuiPrint::updateContents()
 
        collateCB->setChecked(params_.sorted_copies);
 
-       if (params_.all_pages) {
+       if (params_.all_pages)
                allRB->setChecked(true);
-       } else {
+       else {
                rangeRB->setChecked(true);
                fromED->setText(QString::number(params_.from_page));
                toED->setText(QString::number(params_.to_page));
@@ -157,31 +156,27 @@ void GuiPrint::updateContents()
 
 void GuiPrint::applyView()
 {
-       PrinterParams::Target t = PrinterParams::PRINTER;
-       if (fileRB->isChecked())
-               t = PrinterParams::FILE;
-
-       params_ = PrinterParams(t,
-               fromqstr(printerED->text()),
-               os::internal_path(fromqstr(fileED->text())),
-               allRB->isChecked(),
-               fromED->text().toUInt(),
-               toED->text().toUInt(),
-               oddCB->isChecked(),
-               evenCB->isChecked(),
-               copiesSB->text().toUInt(),
-               collateCB->isChecked(),
-               reverseCB->isChecked()
-       );
+       params_.target        = fileRB->isChecked()
+               ?  PrinterParams::FILE : PrinterParams::PRINTER;
+       params_.printer_name  = fromqstr(printerED->text());
+       params_.file_name     = os::internal_path(fromqstr(fileED->text()));
+       params_.all_pages     = allRB->isChecked();
+       params_.from_page     = fromED->text().toUInt();
+       params_.to_page       = toED->text().toUInt();
+       params_.odd_pages     = oddCB->isChecked();
+       params_.even_pages    = evenCB->isChecked();
+       params_.count_copies  = copiesSB->text().toUInt();
+       params_.sorted_copies = collateCB->isChecked();
+       params_.reverse_order = reverseCB->isChecked();
 }
 
 
 bool GuiPrint::initialiseParams(string const &)
 {
        /// get global printer parameters
-       string const name = support::changeExtension(buffer().absFileName(),
+       params_ = PrinterParams();
+       params_.file_name = support::changeExtension(buffer().absFileName(),
                                        lyxrc.print_file_extension);
-       params_ = PrinterParams(PrinterParams::PRINTER, lyxrc.printer, name);
 
        setButtonsValid(true); // so that the user can press Ok
        return true;
@@ -257,4 +252,4 @@ Dialog * createGuiPrint(GuiView & lv) { return new GuiPrint(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiPrint_moc.cpp"
+#include "moc_GuiPrint.cpp"