rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed: Bug #3886 - Alias is allowed to match screen name

This commit is contained in:
Nick Bolton 2014-03-14 16:34:23 +00:00
parent 77eae25279
commit 78f30db6e9
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/gui/src/ScreenSettingsDialog.cpp
View File

@ -63,7 +63,10 @@ void ScreenSettingsDialog::accept()
{ {
if (m_pLineEditName->text().isEmpty()) if (m_pLineEditName->text().isEmpty())
{ {
QMessageBox::warning(this, tr("Screen name is empty"), tr("The name for a screen can not be empty. Please fill in a name or cancel the dialog.")); QMessageBox::warning(
this, tr("Screen name is empty"),
tr("The screen name cannot be empty. "
"Please either fill in a name or cancel the dialog."));
return; return;
} }
@ -72,7 +75,18 @@ void ScreenSettingsDialog::accept()
m_pScreen->setName(m_pLineEditName->text()); m_pScreen->setName(m_pLineEditName->text());
for (int i = 0; i < m_pListAliases->count(); i++) for (int i = 0; i < m_pListAliases->count(); i++)
m_pScreen->addAlias(m_pListAliases->item(i)->text()); {
QString alias(m_pListAliases->item(i)->text());
if (alias == m_pLineEditName->text())
{
QMessageBox::warning(
this, tr("Screen name matches alias"),
tr("The screen name cannot be the same as an alias. "
"Please either remove the alias or change the screen name."));
return;
}
m_pScreen->addAlias(alias);
}
m_pScreen->setModifier(Screen::Shift, m_pComboBoxShift->currentIndex()); m_pScreen->setModifier(Screen::Shift, m_pComboBoxShift->currentIndex());
m_pScreen->setModifier(Screen::Ctrl, m_pComboBoxCtrl->currentIndex()); m_pScreen->setModifier(Screen::Ctrl, m_pComboBoxCtrl->currentIndex());