From 199148837735e1391ca6f053977288c9463fd859 Mon Sep 17 00:00:00 2001
From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Sat, 3 Mar 2012 14:39:32 +0000
Subject: [PATCH] Fix handling of the add branch textfield in GuiBranches

- Enter in the textfield adds the branch,
- Make sure the dialog is not closed when pressing enter,
- Pressing Ctrl+Enter or the Enter on the numpad closes the dialog.

Patch based on a patch from Scott Kostyshak.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40839 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiBranches.cpp  | 47 ++++++++++++++++++++++++++----
 src/frontends/qt4/GuiBranches.h    |  4 +++
 src/frontends/qt4/GuiDocument.cpp  |  1 +
 src/frontends/qt4/ui/BranchesUi.ui |  3 ++
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/frontends/qt4/GuiBranches.cpp b/src/frontends/qt4/GuiBranches.cpp
index c79a42def2..9c59f125e4 100644
--- a/src/frontends/qt4/GuiBranches.cpp
+++ b/src/frontends/qt4/GuiBranches.cpp
@@ -28,6 +28,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <QKeyEvent>
 #include <QListWidget>
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
@@ -71,9 +72,39 @@ GuiBranches::GuiBranches(QWidget * parent)
 	connect(undef_->cancelPB, SIGNAL(clicked()),
 		undef_, SLOT(reject()));
 
+	newBranchLE->installEventFilter(this);
 	newBranchLE->setValidator(new NoNewLineValidator(newBranchLE));
 }
 
+
+bool GuiBranches::eventFilter(QObject * obj, QEvent * event) 
+{
+	QEvent::Type etype = event->type();
+	if (etype == QEvent::KeyPress 
+		  && obj == newBranchLE
+		  && addBranchPB->isEnabled()) {
+		QKeyEvent * keyEvent = static_cast<QKeyEvent *>(event);
+		int const keyPressed = keyEvent->key();
+		Qt::KeyboardModifiers const keyModifiers = keyEvent->modifiers();
+
+		if (keyPressed == Qt::Key_Enter || keyPressed == Qt::Key_Return) {
+			if (!keyModifiers) {
+				on_addBranchPB_pressed();
+			} else if (keyModifiers == Qt::ControlModifier
+				  || keyModifiers == Qt::KeypadModifier
+				  || keyModifiers == (Qt::ControlModifier | Qt::KeypadModifier)) {
+				on_addBranchPB_pressed();
+				newBranchLE->clearFocus();
+				okPressed();
+			}
+			event->accept();
+			return true;
+		}
+	}
+	return QObject::eventFilter(obj, event);
+}
+
+
 void GuiBranches::update(BufferParams const & params)
 {
 	branchlist_ = params.branchlist();
@@ -132,14 +163,20 @@ void GuiBranches::apply(BufferParams & params) const
 }
 
 
+void GuiBranches::on_newBranchLE_textChanged(QString)
+{
+	QString const new_branch = newBranchLE->text();
+	addBranchPB->setEnabled(!new_branch.isEmpty());
+}
+
+
 void GuiBranches::on_addBranchPB_pressed()
 {
 	QString const new_branch = newBranchLE->text();
-	if (!new_branch.isEmpty()) {
-		branchlist_.add(qstring_to_ucs4(new_branch));
-		newBranchLE->clear();
-		updateView();
-	}
+	branchlist_.add(qstring_to_ucs4(new_branch));
+	newBranchLE->clear();
+	addBranchPB->setEnabled(false);
+	updateView();
 }
 
 
diff --git a/src/frontends/qt4/GuiBranches.h b/src/frontends/qt4/GuiBranches.h
index 803a7017ee..fc29167cd0 100644
--- a/src/frontends/qt4/GuiBranches.h
+++ b/src/frontends/qt4/GuiBranches.h
@@ -49,9 +49,12 @@ public:
 	void apply(BufferParams & params) const;
 	void setUnknownBranches(QStringList const & b) { unknown_branches_ = b; }
 
+	bool eventFilter(QObject * obj, QEvent * event);
+
 Q_SIGNALS:
 	void changed();
 	void renameBranches(docstring const &, docstring const &);
+	void okPressed();
 
 protected:
 	void toggleBranch(QTreeWidgetItem *);
@@ -60,6 +63,7 @@ protected:
 	void updateView();
 
 protected Q_SLOTS:
+	void on_newBranchLE_textChanged(QString);
 	void on_addBranchPB_pressed();
 	void on_removePB_pressed();
 	void on_renamePB_pressed();
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index a388a86c9f..aa33c8f81c 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -1289,6 +1289,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(branchesModule, SIGNAL(renameBranches(docstring const &, docstring const &)),
 		this, SLOT(branchesRename(docstring const &, docstring const &)));
+	connect(branchesModule, SIGNAL(okPressed()), this, SLOT(slotOK()));
 	updateUnknownBranches();
 
 
diff --git a/src/frontends/qt4/ui/BranchesUi.ui b/src/frontends/qt4/ui/BranchesUi.ui
index d8e97e22e7..4c83b18f16 100644
--- a/src/frontends/qt4/ui/BranchesUi.ui
+++ b/src/frontends/qt4/ui/BranchesUi.ui
@@ -103,6 +103,9 @@
    </item>
    <item row="0" column="3" >
     <widget class="QPushButton" name="addBranchPB" >
+     <property name="enabled">
+      <bool>false</bool>
+     </property>
      <property name="toolTip" >
       <string>Add a new branch to the list</string>
      </property>