* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiDialog.cpp b/src/frontends/qt4/GuiDialog.cpp
index b53877bd9d82e8bdc5370812226af6a3d45d98ad..7d4bf582116f11ddffcabfd8692db2870270ee27 100644 (file)
--- a/src/frontends/qt4/GuiDialog.cpp
+++ b/src/frontends/qt4/GuiDialog.cpp
@@ -11,31 +11,30 @@
 #include <config.h>
 
 #include "GuiDialog.h"
-#include "debug.h"
+
+#include "GuiView.h"
 #include "qt_helpers.h"
-#include "frontends/LyXView.h"
+#include "FuncRequest.h"
 
-using std::string;
+#include "support/debug.h"
 
-namespace lyx {
-namespace frontend {
+#include <QCloseEvent>
 
-GuiDialog::GuiDialog(LyXView & lv, std::string const & name)
-       : is_closing_(false), name_(name), controller_(0)
-{
-       lyxview_ = &lv;
-}
+using namespace std;
 
+namespace lyx {
+namespace frontend {
 
-GuiDialog::~GuiDialog()
-{
-       delete controller_;
-}
+GuiDialog::GuiDialog(GuiView & lv, QString const & name, QString const & title)
+       : QDialog(&lv), Dialog(lv, name, "LyX: " + title), updating_(false), 
+         is_closing_(false)
+{}
 
 
-void GuiDialog::setViewTitle(docstring const & title)
+void GuiDialog::closeEvent(QCloseEvent * ev)
 {
-       setWindowTitle("LyX: " + toqstr(title));
+       slotClose();
+       ev->accept();
 }
 
 
@@ -52,19 +51,26 @@ void GuiDialog::slotApply()
 }
 
 
+void GuiDialog::slotAutoApply()
+{
+       apply();
+       bc().autoApply();
+}
+
+
 void GuiDialog::slotOK()
 {
        is_closing_ = true;
        apply();
        is_closing_ = false;
-       QDialog::hide();
+       hideView();
        bc().ok();
 }
 
 
 void GuiDialog::slotClose()
 {
-       QDialog::hide();
+       hideView();
        bc().cancel();
 }
 
@@ -74,76 +80,26 @@ void GuiDialog::slotRestore()
        // Tell the controller that a request to refresh the dialog's contents
        // has been received. It's up to the controller to supply the necessary
        // info by calling GuiDialog::updateView().
-       controller().updateDialog(name_);
+       updateDialog();
        bc().restore();
 }
 
-void GuiDialog::checkStatus()
-{
-       // buffer independant dialogs are always active.
-       // This check allows us leave canApply unimplemented for some dialogs.
-       if (!controller().isBufferDependent())
-               return;
-
-       // deactivate the dialog if we have no buffer
-       if (!controller().isBufferAvailable()) {
-               bc().setReadOnly(true);
-               return;
-       }
-
-       // check whether this dialog may be active
-       if (controller().canApply()) {
-               bool const readonly = controller().isBufferReadonly();
-               bc().setReadOnly(readonly);
-               // refreshReadOnly() is too generous in _enabling_ widgets
-               // update dialog to disable disabled widgets again
 
-               if (!readonly || controller().canApplyToReadOnly())
-                       updateView();
-
-       } else {
-               bc().setReadOnly(true);
-       }       
-}
-
-
-bool GuiDialog::isVisibleView() const
-{
-       return QDialog::isVisible();
-}
-
-
-void GuiDialog::showView()
+void GuiDialog::changed()
 {
-       QSize const hint = sizeHint();
-       if (hint.height() >= 0 && hint.width() >= 0)
-               setMinimumSize(hint);
-
-       updateView();  // make sure its up-to-date
-       if (controller().exitEarly())
+       if (updating_)
                return;
-
-       if (QWidget::isVisible()) {
-               raise();
-               activateWindow();
-       } else {
-               QWidget::show();
-       }
-       setFocus();
-}
-
-
-void GuiDialog::hideView()
-{
-       QDialog::hide();
+       bc().setValid(isValid());
 }
 
 
-void GuiDialog::changed()
+void GuiDialog::enableView(bool enable)
 {
-       if (updating_)
-               return;
-       bc().setValid(isValid());
+       if (!enable) {
+               bc().setReadOnly(true);
+               bc().setValid(false);
+       }
+       Dialog::enableView(enable);
 }
 
 
@@ -151,93 +107,18 @@ void GuiDialog::updateView()
 {
        setUpdatesEnabled(false);
 
+       bc().setReadOnly(isBufferReadonly());
        // protect the BC from unwarranted state transitions
        updating_ = true;
        updateContents();
        updating_ = false;
-
-       setUpdatesEnabled(true);
-       QDialog::update();
-}
-
-
-void GuiDialog::showData(string const & data)
-{
-       if (controller().isBufferDependent() && !controller().isBufferAvailable())
-               return;
-
-       if (!controller().initialiseParams(data)) {
-               lyxerr << "Dialog \"" << name_
-                      << "\" failed to translate the data "
-                       "string passed to show()" << std::endl;
-               return;
-       }
-
-       bc().setReadOnly(controller().isBufferReadonly());
-       showView();
        // The widgets may not be valid, so refresh the button controller
        bc().refresh();
-}
 
-
-void GuiDialog::updateData(string const & data)
-{
-       if (controller().isBufferDependent() && !controller().isBufferAvailable())
-               return;
-
-       if (!controller().initialiseParams(data)) {
-               lyxerr << "Dialog \"" << name_
-                      << "\" could not be initialized" << std::endl;
-               return;
-       }
-
-       bc().setReadOnly(controller().isBufferReadonly());
-       updateView();
-       // The widgets may not be valid, so refresh the button controller
-       bc().refresh();
-}
-
-
-void GuiDialog::hide()
-{
-       if (!isVisibleView())
-               return;
-
-       controller().clearParams();
-       hideView();
-       controller().disconnect(name_);
-}
-
-
-void GuiDialog::apply()
-{
-       if (controller().isBufferDependent()) {
-               if (!controller().isBufferAvailable() ||
-                   (controller().isBufferReadonly() && !controller().canApplyToReadOnly()))
-                       return;
-       }
-
-       applyView();
-       controller().dispatchParams();
-
-       if (controller().disconnectOnApply() && !is_closing_) {
-               controller().disconnect(name_);
-               controller().initialiseParams(string());
-               updateView();
-       }
-}
-
-
-void GuiDialog::setController(Controller * controller)
-{
-       BOOST_ASSERT(controller);
-       BOOST_ASSERT(!controller_);
-       controller_ = controller;
-       controller_->setLyXView(*lyxview_);
+       setUpdatesEnabled(true);
 }
 
-
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDialog_moc.cpp"
+#include "moc_GuiDialog.cpp"