feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Improve handling of author information

Browse Source 
Task-number: QTCREATORBUG-2610
Reviewed-by: Robert Loehning
This commit is contained in:
Tobias Hunger
2010-10-05 16:31:26 +02:00
parent 0248aefdf7
commit e506bdba93
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/gitsubmiteditorwidget.cpp
View File

@@ -122,7 +122,6 @@ GitSubmitEditorWidget::GitSubmitEditorWidget(QWidget *parent) :
m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this); m_emailValidator = new QRegExpValidator(QRegExp(QLatin1String("[^@ ]+@[^@ ]+\\.[a-zA-Z]+")), this);
m_gitSubmitPanelUi.emailLineEdit->setValidator(m_emailValidator);
connect(m_gitSubmitPanelUi.authorLineEdit, SIGNAL(textChanged(QString)), connect(m_gitSubmitPanelUi.authorLineEdit, SIGNAL(textChanged(QString)),
this, SLOT(authorInformationChanged())); this, SLOT(authorInformationChanged()));
connect(m_gitSubmitPanelUi.emailLineEdit, SIGNAL(textChanged(QString)), connect(m_gitSubmitPanelUi.emailLineEdit, SIGNAL(textChanged(QString)),
@@ -152,18 +151,21 @@ void GitSubmitEditorWidget::setPanelData(const GitSubmitEditorPanelData &data)
bool GitSubmitEditorWidget::canSubmit() const bool GitSubmitEditorWidget::canSubmit() const
{ {
if (m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() if (m_gitSubmitPanelUi.invalidAuthorLabel->isVisible()
|| !emailIsValid()) || m_gitSubmitPanelUi.invalidEmailLabel->isVisible())
return false; return false;
return SubmitEditorWidget::canSubmit(); return SubmitEditorWidget::canSubmit();
} }
void GitSubmitEditorWidget::authorInformationChanged() void GitSubmitEditorWidget::authorInformationChanged()
{ {
bool bothEmpty = m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() &&
m_gitSubmitPanelUi.emailLineEdit->text().isEmpty();
m_gitSubmitPanelUi.invalidAuthorLabel-> m_gitSubmitPanelUi.invalidAuthorLabel->
setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty()); setVisible(m_gitSubmitPanelUi.authorLineEdit->text().isEmpty() && !bothEmpty);
m_gitSubmitPanelUi.invalidEmailLabel-> m_gitSubmitPanelUi.invalidEmailLabel->
setVisible(!emailIsValid()); setVisible(!emailIsValid() && !bothEmpty);
updateSubmitAction(); updateSubmitAction();
} }