Use <cstdint> instead of <boost/cstdint.hpp>

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

diff --git a/src/frontends/qt4/GuiSymbols.cpp b/src/frontends/qt4/GuiSymbols.cpp
index f327bb5a644eabc7e6a43959503d99477435673f..ea863b49686fb03137119c61654346e836582305 100644 (file)
--- a/src/frontends/qt4/GuiSymbols.cpp
+++ b/src/frontends/qt4/GuiSymbols.cpp
@@ -27,6 +27,8 @@
 #include "support/gettext.h"
 
 #include <QChar>
+#include <QDialogButtonBox>
+#include <QPushButton>
 #include <QString>
 
 #include <cstdio>
@@ -192,7 +194,7 @@ QString getBlock(char_type c)
 }
 
 
-} // namespace anon
+} // namespace
 
 
 /////////////////////////////////////////////////////////////////////
@@ -288,7 +290,7 @@ GuiSymbols::GuiSymbols(GuiView & lv)
 {
        setupUi(this);
 
-       //Translate names
+       // Translate names
        for (int i = 0 ; i < no_blocks; ++i)
                unicode_blocks[i].qname = qt_(unicode_blocks[i].name);
 
@@ -319,8 +321,8 @@ void GuiSymbols::updateView()
        chosenLE->clear();
 
        string new_encoding = bufferview()->cursor().getEncoding()->name();
-       if (buffer().params().inputenc != "auto" &&
-           buffer().params().inputenc != "default")
+       if (buffer().params().inputenc != "auto-legacy" &&
+           buffer().params().inputenc != "auto-legacy-plain")
                new_encoding = buffer().params().encoding().name();
        if (new_encoding == encoding_)
                // everything up to date
@@ -338,47 +340,58 @@ void GuiSymbols::updateView()
 void GuiSymbols::enableView(bool enable)
 {
        chosenLE->setEnabled(enable);
-       okPB->setEnabled(enable);
-       applyPB->setEnabled(enable);
+       buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable);
+       buttonBox->button(QDialogButtonBox::Apply)->setEnabled(enable);
+       if (enable)
+               buttonBox->button(QDialogButtonBox::Close)->setText(qt_("Cancel"));
+       else
+               buttonBox->button(QDialogButtonBox::Close)->setText(qt_("Close"));
 }
 
 
-void GuiSymbols::on_applyPB_clicked()
+void GuiSymbols::on_buttonBox_clicked(QAbstractButton * button)
 {
-       dispatchParams();
+       QDialogButtonBox * bbox = qobject_cast<QDialogButtonBox*>(sender());
+       switch (bbox->standardButton(button)) {
+       case QDialogButtonBox::Ok:
+               slotOK();
+               break;
+       case QDialogButtonBox::Apply:
+               dispatchParams();
+               break;
+       case QDialogButtonBox::Close:
+               hide();
+               break;
+       default:
+               break;
+       }
 }
 
 
-void GuiSymbols::on_okPB_clicked()
+void GuiSymbols::slotOK()
 {
        dispatchParams();
        hide();
 }
 
 
-void GuiSymbols::on_closePB_clicked()
-{
-       hide();
-}
-
-
 void GuiSymbols::on_symbolsLW_activated(QModelIndex const &)
 {
-       on_okPB_clicked();
+       slotOK();
 }
 
 
 void GuiSymbols::on_chosenLE_textChanged(QString const & text)
 {
        bool const empty_sel = text.isEmpty();
-       okPB->setEnabled(!empty_sel);
-       applyPB->setEnabled(!empty_sel);
+       buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!empty_sel);
+       buttonBox->button(QDialogButtonBox::Apply)->setEnabled(!empty_sel);
 }
 
 
 void GuiSymbols::on_chosenLE_returnPressed()
 {
-       on_okPB_clicked();
+       slotOK();
 }