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 3eff7f4cc37ba7bc66ad7164b86e35e07fe70aca..92814f0da9dae7f3c8201aba1cd4e7533ac8741b 100644 (file)
--- a/src/frontends/qt4/GuiSendto.cpp
+++ b/src/frontends/qt4/GuiSendto.cpp
@@ -19,10 +19,12 @@
 #include "Converter.h"
 #include "Format.h"
 #include "FuncRequest.h"
-#include "LyXRC.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>
@@ -36,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);
 
@@ -52,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);
@@ -70,43 +72,22 @@ void GuiSendTo::changed_adaptor()
 
 void GuiSendTo::updateContents()
 {
-       all_formats_ = allFormats();
-
+       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));
 }
 
 
@@ -121,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;
 }
 
@@ -134,15 +117,13 @@ bool GuiSendTo::isValid()
                return false;
 
        return (formatLW->selectedItems().size() > 0
-               && formatLW->count() != 0
-               && !commandCO->currentText().isEmpty());
+               && formatLW->count() != 0);
 }
 
 
 bool GuiSendTo::initialiseParams(string const &)
 {
        format_ = 0;
-       command_ = toqstr(lyxrc.custom_export_command);
        paramsToDialog(format_, command_);
        return true;
 }
@@ -159,66 +140,19 @@ 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_);
 
-// FIXME: Move to Converters?
-vector<Format const *> GuiSendTo::allFormats() const
-{
-       // What formats can we output natively?
-       vector<string> exports;
-       exports.push_back("lyx");
-       exports.push_back("text");
-
-       if (buffer().isLatex()) {
-               if (buffer().params().useXetex)
-                       exports.push_back("xetex");
-               else {
-                       exports.push_back("latex");
-                       exports.push_back("pdflatex");
-               }
-       }
-       else if (buffer().isDocBook())
-               exports.push_back("docbook");
-       else if (buffer().isLiterate())
-               exports.push_back("literate");
-
-       // Loop over these native formats and ascertain what formats we
-       // can convert to
-       vector<Format const *> to;
-
-       vector<string>::const_iterator ex_it  = exports.begin();
-       vector<string>::const_iterator ex_end = exports.end();
-       for (; ex_it != ex_end; ++ex_it) {
-               // Start off with the native export format.
-               // "formats" is LyX's list of recognised formats
-               to.push_back(formats.getFormat(*ex_it));
-
-               Formats::const_iterator fo_it  = formats.begin();
-               Formats::const_iterator fo_end = formats.end();
-               for (; fo_it != fo_end; ++fo_it) {
-                       // we need to hide the default graphic export formats
-                       // from the external menu, because we need them only
-                       // for the internal lyx-view and external latex run
-                       string const name = fo_it->name();
-                       if (name != "eps" && name != "xpm" && name != "png" &&
-                           theConverters().isReachable(*ex_it, name))
-                               to.push_back(&(*fo_it));
-               }
-       }
-
-       // Remove repeated formats.
-       sort(to.begin(), to.end());
-       to.erase(unique(to.begin(), to.end()), to.end());
+       FuncCode const lfun = command_.isEmpty() ?
+               LFUN_BUFFER_EXPORT : getLfun();
 
-       return to;
+       dispatch(FuncRequest(lfun, data));
 }
 
-
 Dialog * createGuiSendTo(GuiView & lv) { return new GuiSendTo(lv); }