[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kile] src/dialogs: Don't accept the new project dialog automatically when 'Ok' is clicked on
From:       Michel Ludwig <michel.ludwig () kdemail ! net>
Date:       2015-12-31 17:53:24
Message-ID: E1aEhPg-00005G-G5 () scm ! kde ! org
[Download RAW message or body]

Git commit ceb32db73212eb278a410fdb5f5be40ebaf8d78e by Michel Ludwig.
Committed on 31/12/2015 at 17:52.
Pushed by mludwig into branch 'master'.

Don't accept the new project dialog automatically when 'Ok' is clicked on

Sanity checks of the user input have to be performed first.

M  +4    -4    src/dialogs/projectdialogs.cpp
M  +2    -2    src/dialogs/projectdialogs.h

http://commits.kde.org/kile/ceb32db73212eb278a410fdb5f5be40ebaf8d78e

diff --git a/src/dialogs/projectdialogs.cpp b/src/dialogs/projectdialogs.cpp
index 843f536..dec503b 100644
--- a/src/dialogs/projectdialogs.cpp
+++ b/src/dialogs/projectdialogs.cpp
@@ -1,7 +1,7 @@
 /*******************************************************************************************
  Copyright (C) 2003 by Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)
             (C) 2007 by Holger Danielsson (holger.danielsson@versanet.de)
-            (C) 2013 by Michel Ludwig (michel.ludwig@kdemail.net)
+            (C) 2013-2015 by Michel Ludwig (michel.ludwig@kdemail.net)
             (C) 2015 by Andreas Cord-Landwehr (cordlandwehr@kde.org)
 ********************************************************************************************/
  
@@ -260,9 +260,8 @@ KileNewProjectDialog::KileNewProjectDialog(KileTemplate::Manager \
*templateManage  okButton->setDefault(true);
 	okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
 	okButton->setDefault(true);
-	connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+	connect(okButton, &QPushButton::clicked, this, \
&KileNewProjectDialog::handleOKButtonClicked);  connect(buttonBox, \
                &QDialogButtonBox::rejected, this, &QDialog::reject);
-	connect(this, &QDialog::accepted, this, &KileNewProjectDialog::onAccepted);
 
 	connect(m_defaultLatexFileExtensionsCombo, static_cast<void \
(QComboBox::*)(int)>(&QComboBox::highlighted), this, \
&KileNewProjectDialog::onExtensionsHighlighted);  connect(m_userFileExtensions, \
&QLineEdit::textEdited, this, &KileNewProjectDialog::onExtensionsTextEdited); @@ \
-312,7 +311,7 @@ QString KileNewProjectDialog::cleanProjectFile()  return \
projectTitle().toLower().trimmed().remove(QRegExp("\\s*")) + ".kilepr";  }
 
-void KileNewProjectDialog::onAccepted()
+void KileNewProjectDialog::handleOKButtonClicked()
 {
 	if (!acceptUserExtensions()) {
 		return;
@@ -387,6 +386,7 @@ void KileNewProjectDialog::onAccepted()
 	}
 
 	m_projectFileWithPath = QUrl::fromLocalFile(projectFilePath);
+        accept();
 }
 
 void KileNewProjectDialog::fillProjectDefaults()
diff --git a/src/dialogs/projectdialogs.h b/src/dialogs/projectdialogs.h
index 147bf9e..0bac169 100644
--- a/src/dialogs/projectdialogs.h
+++ b/src/dialogs/projectdialogs.h
@@ -100,7 +100,7 @@ public:
 	KileNewProjectDialog(KileTemplate::Manager *templateManager, \
KileDocument::Extensions *extensions, QWidget* parent = Q_NULLPTR, const char* name = \
Q_NULLPTR);  ~KileNewProjectDialog();
 
-	KileProject * project() Q_DECL_OVERRIDE;
+	KileProject *project() Q_DECL_OVERRIDE;
 
 	QString cleanProjectFile();
 	QString folder() const {
@@ -118,7 +118,7 @@ public:
 private Q_SLOTS:
 	void clickedCreateNewFileCb();
 	void fillProjectDefaults() Q_DECL_OVERRIDE;
-	void onAccepted();
+	void handleOKButtonClicked();
 
 private:
 	KileTemplate::Manager *m_templateManager;


[prev in list] [next in list] [prev in thread] [next in thread]