X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBranch.cpp;h=57484c86f174426fd29c12c7d158339017d265d7;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=17d53df2416e575e92e67eafcb02deb9201f89ed;hpb=9a95d2a936748c057db94a3083c4b9e6587eea0b;p=lyx.git

diff --git a/src/frontends/qt4/GuiBranch.cpp b/src/frontends/qt4/GuiBranch.cpp
index 17d53df241..57484c86f1 100644
--- 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.
  */
@@ -11,102 +13,97 @@
 #include <config.h>
 
 #include "GuiBranch.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::GuiBranchDialog(GuiBranch * form)
-	: form_(form)
+GuiBranch::GuiBranch(GuiView & lv)
+	: GuiDialog(lv, "branch", qt_("Branch Settings"))
 {
 	setupUi(this);
-	connect(okPB, SIGNAL(clicked()),
-		form, SLOT(slotOK()));
-	connect(closePB, SIGNAL(clicked()),
-		form, SLOT(slotClose()));
-	connect(branchCO, SIGNAL( activated(int) ),
-		this, SLOT( change_adaptor() ) );
-}
 
+	connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
+	connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
+	connect(branchCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
 
-void GuiBranchDialog::closeEvent(QCloseEvent * e)
-{
-	form_->slotWMHide();
-	e->accept();
+	bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
+	bc().setOK(okPB);
+	bc().setCancel(closePB);
 }
 
 
-void GuiBranchDialog::change_adaptor()
+void GuiBranch::change_adaptor()
 {
-	form_->changed();
+	changed();
 }
 
 
-/////////////////////////////////////////////////////////////////////
-//
-// GuiBranch
-//
-/////////////////////////////////////////////////////////////////////
-
-
-GuiBranch::GuiBranch(GuiDialog & parent)
-	: GuiView<GuiBranchDialog>(parent, _("Branch Settings"))
-{}
-
-
-void GuiBranch::build_dialog()
-{
-	dialog_.reset(new GuiBranchDialog(this));
-
-	bc().setOK(dialog_->okPB);
-	bc().setCancel(dialog_->closePB);
-}
-
-
-void GuiBranch::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;
 
-	dialog_->branchCO->clear();
+	branchCO->clear();
 
 	const_iterator const begin = branchlist.begin();
 	const_iterator const end = branchlist.end();
 	int id = 0;
 	int count = 0;
 	for (const_iterator it = begin; it != end; ++it, ++count) {
-		docstring const & branch = it->getBranch();
-		dialog_->branchCO->addItem(toqstr(branch));
+		docstring const & branch = it->branch();
+		branchCO->addItem(toqstr(branch));
 
 		if (cur_branch == branch)
 			id = count;
 	}
-	dialog_->branchCO->setCurrentIndex(id);
+	branchCO->setCurrentIndex(id);
 }
 
 
 void GuiBranch::applyView()
 {
-	docstring const type = qstring_to_ucs4(dialog_->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"