diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp index 9b0d06cab..2ba9b20b5 100644 --- a/src/lib/gui/dialogs/ScreenSettingsDialog.cpp +++ b/src/lib/gui/dialogs/ScreenSettingsDialog.cpp @@ -30,6 +30,7 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget *parent, Screen *pScreen, con { ui->setupUi(this); + ui->m_pButtonBox->button(QDialogButtonBox::Cancel)->setFocus(); ui->m_pLabelAliasError->setStyleSheet(kStyleErrorActiveLabel); ui->m_pLabelNameError->setStyleSheet(kStyleErrorActiveLabel); @@ -39,7 +40,6 @@ ScreenSettingsDialog::ScreenSettingsDialog(QWidget *parent, Screen *pScreen, con const auto valNameError = new validators::ValidationError(this, ui->m_pLabelNameError); const auto valName = new validators::ScreenNameValidator(ui->m_pLineEditName, valNameError, pScreens); ui->m_pLineEditName->setValidator(valName); - ui->m_pLineEditName->selectAll(); const auto valAliasError = new validators::ValidationError(this, ui->m_pLabelAliasError); const auto valAlias = new validators::AliasValidator(ui->m_pLineEditAlias, valAliasError); diff --git a/src/lib/gui/dialogs/ScreenSettingsDialog.ui b/src/lib/gui/dialogs/ScreenSettingsDialog.ui index 709b6c76f..ba5d62913 100644 --- a/src/lib/gui/dialogs/ScreenSettingsDialog.ui +++ b/src/lib/gui/dialogs/ScreenSettingsDialog.ui @@ -6,601 +6,15 @@ 0 0 - 939 - 842 + 503 + 558 - - - 0 - 1 - - - - - 400 - 620 - - Computer settings - - - - - - 0 - 0 - - - - Aliases - - - - - - - - - 0 - 0 - - - - - 168 - 20 - - - - 255 - - - - - - - true - - - &Add - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - m_pLabelNameError - - - true - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - QAbstractItemView::SelectionMode::ExtendedSelection - - - - - - - false - - - &Remove - - - - - - - - - - Dead Corners - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Top-left - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Top-right - - - 100 - - - - - - - - 0 - 0 - - - - Corner si&ze - - - - - - - - 0 - 0 - - - - - 70 - 0 - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Bottom-left - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - Bottom-right - - - - - - - - - - Fixes - - - - - - - 0 - 0 - - - - CAPS LOCK key - - - - - - - - 0 - 0 - - - - SCROLL LOCK key - - - - - - - - 0 - 0 - - - - NUM LOCK key - - - - - - - - 0 - 0 - - - - XTest for Xinerama - - - false - - - - - - - - - - - 0 - 0 - - - - Qt::Orientation::Horizontal - - - QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save - - - - - - - Modifier Keys - - - - - - - 40 - 16777215 - - - - &Shift - - - m_pComboBoxShift - - - - - - - 1 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - S&uper - - - m_pComboBoxSuper - - - - - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - Al&t - - - m_pComboBoxAlt - - - - - - - 4 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - 3 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - &Ctrl - - - m_pComboBoxCtrl - - - - - - - - 40 - 16777215 - - - - M&eta - - - m_pComboBoxMeta - - - - - - - 2 - - - - Shift - - - - - Ctrl - - - - - Alt - - - - - Meta - - - - - Super - - - - - None - - - - - - - - Qt::Orientation::Vertical - - - - 20 - 40 - - - - - - - - + + @@ -611,37 +25,41 @@ Computer Info - - - - - - 0 - 0 - - - - Name - - - m_pLineEditName - - + + + + + + + + 0 + 0 + + + + Name + + + m_pLineEditName + + + + + + + + 0 + 0 + + + + 255 + + + + - - - - - 0 - 0 - - - - 255 - - - - + @@ -666,8 +84,625 @@ + + + + + + + + Modifier Keys + + + + + + + 40 + 16777215 + + + + M&eta + + + m_pComboBoxMeta + + + + + + + &Ctrl + + + m_pComboBoxCtrl + + + + + + + S&uper + + + m_pComboBoxSuper + + + + + + + Al&t + + + m_pComboBoxAlt + + + + + + + 3 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + + 40 + 16777215 + + + + &Shift + + + m_pComboBoxShift + + + + + + + 2 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + 4 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + 1 + + + + Shift + + + + + Ctrl + + + + + Alt + + + + + Meta + + + + + Super + + + + + None + + + + + + + + + + + Dead Corners + + + + + + + + + 0 + 0 + + + + Top Left + + + 100 + + + + + + + + 0 + 0 + + + + Top Right + + + Qt::LayoutDirection::RightToLeft + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + Corner si&ze + + + m_pSpinBoxSwitchCornerSize + + + + + + + + 0 + 0 + + + + + 70 + 0 + + + + + + + + + + Qt::Orientation::Vertical + + + + 20 + 40 + + + + + + + + + + + 0 + 0 + + + + Bottom Left + + + + + + + + 0 + 0 + + + + Bottom Right + + + Qt::LayoutDirection::RightToLeft + + + + + + + + + + + + + + + + Fixes + + + + + + + 0 + 0 + + + + SCROLL LOCK key + + + + + + + + 0 + 0 + + + + CAPS LOCK key + + + + + + + + 0 + 0 + + + + NUM LOCK key + + + + + + + + 0 + 0 + + + + XTest for Xinerama + + + false + + + + + + + + + + + 0 + 0 + + + + Aliases + + + + + + + + + 0 + 0 + + + + + 168 + 20 + + + + 255 + + + + + + + true + + + &Add + + + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + m_pLabelNameError + + + true + + + + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + QAbstractItemView::SelectionMode::ExtendedSelection + + + + + + + false + + + &Remove + + + + + + + + + + + + + + + 0 + 0 + + + + Qt::Orientation::Horizontal + + + QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save + + + + + m_pLineEditName + m_pComboBoxMeta + m_pComboBoxShift + m_pComboBoxCtrl + m_pComboBoxSuper + m_pComboBoxAlt + m_pCheckBoxCornerTopRight + m_pCheckBoxCornerTopLeft + m_pSpinBoxSwitchCornerSize + m_pCheckBoxCornerBottomLeft + m_pCheckBoxCornerBottomRight + m_pCheckBoxScrollLock + m_pCheckBoxCapsLock + m_pCheckBoxNumLock + m_pCheckBoxXTest + m_pLineEditAlias + m_pButtonAddAlias + m_pListAliases + m_pButtonRemoveAlias + @@ -677,8 +712,8 @@ accept() - 222 - 502 + 231 + 548 157 @@ -693,8 +728,8 @@ reject() - 290 - 508 + 299 + 548 286