rename buffer parameter math_number_before to math_numbering_side

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

diff --git a/src/frontends/qt4/GuiSendto.cpp b/src/frontends/qt4/GuiSendto.cpp
index 0bfb1de465f0051536ce5a13dcabfa18f54c40df..92814f0da9dae7f3c8201aba1cd4e7533ac8741b 100644 (file)
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -15,11 +15,16 @@
 #include "qt_helpers.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
+#include "Converter.h"
 #include "Format.h"
 #include "FuncRequest.h"
 
-#include "support/qstring_helpers.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/qstring_helpers.h"
+
+#include <algorithm>
 
 #include <QLineEdit>
 #include <QListWidget>
@@ -33,7 +38,7 @@ namespace frontend {
 
 
 GuiSendTo::GuiSendTo(GuiView & lv)
-       : GuiDialog(lv, "sendto", qt_("Send Document to Command"))
+       : GuiDialog(lv, "sendto", qt_("Export or Send Document")), format_(0)
 {
        setupUi(this);
 
@@ -49,7 +54,7 @@ GuiSendTo::GuiSendTo(GuiView & lv)
                this, SLOT(changed_adaptor()));
        connect(formatLW, SIGNAL(itemSelectionChanged()),
                this, SLOT(changed_adaptor()));
-       connect(commandCO, SIGNAL(textChanged(QString)),
+       connect(commandCO, SIGNAL(editTextChanged(QString)),
                this, SLOT(changed_adaptor()));
 
        bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy);
@@ -67,43 +72,22 @@ void GuiSendTo::changed_adaptor()
 
 void GuiSendTo::updateContents()
 {
-       all_formats_ = buffer().exportableFormats(false);
-
+       FormatList const & all_formats = 
+           buffer().params().exportableFormats(false);
        // Save the current selection if any
-       Format const * current_format = 0;
+       Format const * current_format = nullptr;
        int const line = formatLW->currentRow();
-       if (line >= 0 && line <= formatLW->count()
+       if (line >= 0 && static_cast<unsigned int>(line) < all_formats.size()
            && formatLW->selectedItems().size() > 0)
-               current_format = all_formats_[line];
-
-       // Check whether the current contents of the browser will be
-       // changed by loading the contents of formats
-       vector<string> keys;
-       keys.resize(all_formats_.size());
-
-       vector<string>::iterator result = keys.begin();
-       vector<Format const *>::const_iterator it  = all_formats_.begin();
-       vector<Format const *>::const_iterator end = all_formats_.end();
-
-       int current_line = -1;
-       for (int ln = 0; it != end; ++it, ++result, ++ln) {
-               *result = (*it)->prettyname();
-               if (current_format 
-                   && (*it)->prettyname() == current_format->prettyname())
-                       current_line = ln;
-       }
-
-       // Reload the browser
+               current_format = all_formats[line];
+       // Reset the list widget
        formatLW->clear();
-
-       for (vector<string>::const_iterator it = keys.begin();
-            it != keys.end(); ++it) {
-               formatLW->addItem(qt_(*it));
+       for (Format const * f : all_formats) {
+               formatLW->addItem(toqstr(translateIfPossible(f->prettyname())));
+               // Restore the selection
+               if (current_format && f->prettyname() == current_format->prettyname())
+                       formatLW->setCurrentRow(formatLW->count() - 1);
        }
-
-       // Restore the selection
-       if (current_line > -1)
-               formatLW->setCurrentItem(formatLW->item(current_line));
 }
 
 
@@ -118,7 +102,9 @@ void GuiSendTo::applyView()
        if (line < 0 || line > formatLW->count())
                return;
 
-       format_ = all_formats_[line];
+       FormatList const & all_formats = 
+           buffer().params().exportableFormats(false);
+       format_ = all_formats[line];
        command_ = command;
 }
 
@@ -131,8 +117,7 @@ bool GuiSendTo::isValid()
                return false;
 
        return (formatLW->selectedItems().size() > 0
-               && formatLW->count() != 0
-               && !commandCO->currentText().isEmpty());
+               && formatLW->count() != 0);
 }
 
 
@@ -155,11 +140,17 @@ void GuiSendTo::paramsToDialog(Format const * /*format*/, QString const & comman
 
 void GuiSendTo::dispatchParams()
 {
-       if (command_.isEmpty() || !format_ || format_->name().empty())
+       if (!format_ || format_->name().empty())
                return;
 
-       string const data = format_->name() + " " + fromqstr(command_);
-       dispatch(FuncRequest(getLfun(), data));
+       string data = format_->name();
+       if (!command_.isEmpty())
+               data += " " + fromqstr(command_);
+
+       FuncCode const lfun = command_.isEmpty() ?
+               LFUN_BUFFER_EXPORT : getLfun();
+
+       dispatch(FuncRequest(lfun, data));
 }
 
 Dialog * createGuiSendTo(GuiView & lv) { return new GuiSendTo(lv); }