X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiBranches.h;h=803a7017ee6872c1014fab72b7f9ae3691edda15;hb=8e7d7e42952f0119db1c192386a63d1d9ede3b7f;hp=7e36a120eef285ad5826d36bcc5b4beba2dbd993;hpb=9a95d2a936748c057db94a3083c4b9e6587eea0b;p=lyx.git

diff --git a/src/frontends/qt4/GuiBranches.h b/src/frontends/qt4/GuiBranches.h
index 7e36a120ee..803a7017ee 100644
--- a/src/frontends/qt4/GuiBranches.h
+++ b/src/frontends/qt4/GuiBranches.h
@@ -12,15 +12,14 @@
 #ifndef GUIBRANCHES_H
 #define GUIBRANCHES_H
 
-#include "ui_BranchesUi.h"
-#include "GuiDocument.h"
 #include "BranchList.h"
+#include "ButtonController.h"
 
-#include <QWidget>
-
-#include <vector>
-#include <string>
+#include "ui_BranchesUnknownUi.h"
+#include "ui_BranchesUi.h"
 
+#include <QDialog>
+#include <QWidget>
 
 class QTreeWidgetItem;
 
@@ -30,36 +29,62 @@ class BufferParams;
 
 namespace frontend {
 
-class GuiBranches: public QWidget, public Ui::BranchesUi
+class BranchesUnknownDialog : public QDialog, public Ui::BranchesUnknownUi
+{
+public:
+	BranchesUnknownDialog(QWidget * parent) : QDialog(parent)
+	{
+		Ui::BranchesUnknownUi::setupUi(this);
+		QDialog::setModal(true);
+	}
+};
+
+class GuiBranches : public QWidget, public Ui::BranchesUi
 {
 	Q_OBJECT
 public:
-	GuiBranches(QWidget * parent=0, Qt::WFlags f=0);
+	GuiBranches(QWidget * parent = 0);
 
 	void update(BufferParams const & params);
 	void apply(BufferParams & params) const;
+	void setUnknownBranches(QStringList const & b) { unknown_branches_ = b; }
 
 Q_SIGNALS:
 	void changed();
+	void renameBranches(docstring const &, docstring const &);
 
 protected:
 	void toggleBranch(QTreeWidgetItem *);
 	void toggleColor(QTreeWidgetItem *);
+	void toggleSuffix(QTreeWidgetItem *);
 	void updateView();
 
 protected Q_SLOTS:
 	void on_addBranchPB_pressed();
 	void on_removePB_pressed();
+	void on_renamePB_pressed();
 	void on_activatePB_pressed();
 	void on_branchesTW_itemDoubleClicked(QTreeWidgetItem *, int);
+	void on_branchesTW_itemSelectionChanged();
 	void on_colorPB_clicked();
+	void on_suffixPB_pressed();
+	void on_unknownPB_pressed();
+	void addUnknown();
+	void addAllUnknown();
+	void unknownBranchSelChanged();
 
 private:
 	/// Contains all legal branches for this doc
 	BranchList branchlist_;
+	///
+	BranchesUnknownDialog * undef_;
+	///
+	ButtonController undef_bc_;
+	///
+	QStringList unknown_branches_;
 };
 
 } // namespace frontend
 } // namespace lyx
 
-#endif // GUIBRANCHES
+#endif // GUIBRANCHES_H