diff options
| author | Tobias Hunger <tobias.hunger@nokia.com> | 2010-10-05 16:31:26 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@nokia.com> | 2010-10-05 17:40:04 +0200 |
| commit | e506bdba9307776ef062a72d9cce70be13c44c97 (patch) | |
| tree | 681c9178e3390aa7395017a1c8148425f8664c55 /src/plugins/git | |
| parent | 0248aefdf78adf7ec3d300541c0590622e09947d (diff) | |
| download | qt-creator-e506bdba9307776ef062a72d9cce70be13c44c97.tar.gz | |
Git: Improve handling of author information
Task-number: QTCREATORBUG-2610
Reviewed-by: Robert Loehning
Diffstat (limited to 'src/plugins/git')
| -rw-r--r-- | src/plugins/git/gitsubmiteditorwidget.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/plugins/git/gitsubmiteditorwidget.cpp b/src/plugins/git/gitsubmiteditorwidget.cpp index d58a927fe2..25e1a66693 100644 --- a/src/plugins/git/gitsubmiteditorwidget.cpp +++ b/src/plugins/git/gitsubmiteditorwidget.cpp @@ -122,7 +122,6 @@ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) : m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this); - m_gitSubmitPanelUi.emailLineEdit->setValidator(m_emailValidator); connect(m_gitSubmitPanelUi.authorLineEdit, SIGNAL(textChanged(QString)), this, SLOT(authorInformationChanged())); connect(m_gitSubmitPanelUi.emailLineEdit, SIGNAL(textChanged(QString)), @@ -152,18 +151,21 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data) bool GitSubmitEditorWidget::canSubmit() const { - if (m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() - || !emailIsValid()) + if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible() + || m_gitSubmitPanelUi.invalidEmailLabel->isVisible()) return false; return SubmitEditorWidget::canSubmit(); } void GitSubmitEditorWidget::authorInformationChanged() { + bool bothEmpty = m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() && + m_gitSubmitPanelUi.emailLineEdit->text().isEmpty(); + m_gitSubmitPanelUi.invalidAuthorLabel-> - setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty()); + setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() && !bothEmpty); m_gitSubmitPanelUi.invalidEmailLabel-> - setVisible(!emailIsValid()); + setVisible(!emailIsValid() && !bothEmpty); updateSubmitAction(); } |