* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index eac0eda6d93d06adc2266ed4c1dd34a53bc980b4..57484c86f174426fd29c12c7d158339017d265d7 100644 (file)
--- a/src/frontends/qt4/GuiBranch.cpp
+++ b/src/frontends/qt4/GuiBranch.cpp
@@ -3,7 +3,9 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Jürgen Spitzmüller
+ * \author Angus Leeming
+ * \author Martin Vermeer
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,26 +14,26 @@
 
 #include "GuiBranch.h"
 
-#include "ControlBranch.h"
-
 #include "qt_helpers.h"
+
+#include "Buffer.h"
+#include "BufferParams.h"
 #include "BranchList.h"
+#include "FuncRequest.h"
 
 #include "insets/InsetBranch.h"
 
 #include <QPushButton>
-#include <QCloseEvent>
 
+using namespace std;
 
 namespace lyx {
 namespace frontend {
 
-GuiBranchDialog::GuiBranchDialog(LyXView & lv)
-       : GuiDialog(lv, "branch")
+GuiBranch::GuiBranch(GuiView & lv)
+       : GuiDialog(lv, "branch", qt_("Branch Settings"))
 {
        setupUi(this);
-       setController(new ControlBranch(*this));
-       setViewTitle(_("Branch Settings"));
 
        connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
        connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
@@ -43,31 +45,18 @@ GuiBranchDialog::GuiBranchDialog(LyXView & lv)
 }
 
 
-ControlBranch & GuiBranchDialog::controller() const
-{
-       return static_cast<ControlBranch &>(Dialog::controller());
-}
-
-
-void GuiBranchDialog::closeEvent(QCloseEvent * e)
-{
-       slotWMHide();
-       e->accept();
-}
-
-
-void GuiBranchDialog::change_adaptor()
+void GuiBranch::change_adaptor()
 {
        changed();
 }
 
 
-void GuiBranchDialog::update_contents()
+void GuiBranch::updateContents()
 {
        typedef BranchList::const_iterator const_iterator;
 
-       BranchList const & branchlist = controller().branchlist();
-       docstring const cur_branch = controller().params().branch;
+       BranchList const & branchlist = buffer().params().branchlist();
+       docstring const cur_branch = params_.branch;
 
        branchCO->clear();
 
@@ -76,7 +65,7 @@ void GuiBranchDialog::update_contents()
        int id = 0;
        int count = 0;
        for (const_iterator it = begin; it != end; ++it, ++count) {
-               docstring const & branch = it->getBranch();
+               docstring const & branch = it->branch();
                branchCO->addItem(toqstr(branch));
 
                if (cur_branch == branch)
@@ -86,13 +75,35 @@ void GuiBranchDialog::update_contents()
 }
 
 
-void GuiBranchDialog::applyView()
+void GuiBranch::applyView()
 {
-       docstring const type = qstring_to_ucs4(branchCO->currentText());
-       controller().params().branch = type;
+       params_.branch = qstring_to_ucs4(branchCO->currentText());
 }
 
+
+bool GuiBranch::initialiseParams(string const & data)
+{
+       InsetBranch::string2params(data, params_);
+       return true;
+}
+
+
+void GuiBranch::clearParams()
+{
+       params_ = InsetBranchParams();
+}
+
+
+void GuiBranch::dispatchParams()
+{
+       dispatch(FuncRequest(getLfun(), InsetBranch::params2string(params_)));
+}
+
+
+Dialog * createGuiBranch(GuiView & lv) { return new GuiBranch(lv); }
+
+
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiBranch_moc.cpp"
+#include "moc_GuiBranch.cpp"