Changeset View
Changeset View
Standalone View
Standalone View
effects/desktopgrid/desktopgrid_config.cpp
| Show First 20 Lines • Show All 80 Lines • ▼ Show 20 Line(s) | 53 | { | |||
|---|---|---|---|---|---|
| 81 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Bottom"), QVariant(Qt::AlignHCenter | Qt::AlignBottom)); | 81 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Bottom"), QVariant(Qt::AlignHCenter | Qt::AlignBottom)); | ||
| 82 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Bottom-Left"), QVariant(Qt::AlignLeft | Qt::AlignBottom)); | 82 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Bottom-Left"), QVariant(Qt::AlignLeft | Qt::AlignBottom)); | ||
| 83 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Left"), QVariant(Qt::AlignLeft | Qt::AlignVCenter)); | 83 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Left"), QVariant(Qt::AlignLeft | Qt::AlignVCenter)); | ||
| 84 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Top-Left"), QVariant(Qt::AlignLeft | Qt::AlignTop)); | 84 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Top-Left"), QVariant(Qt::AlignLeft | Qt::AlignTop)); | ||
| 85 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Center"), QVariant(Qt::AlignCenter)); | 85 | m_ui->desktopNameAlignmentCombo->addItem(i18n("Center"), QVariant(Qt::AlignCenter)); | ||
| 86 | 86 | | |||
| 87 | DesktopGridConfig::instance(KWIN_CONFIG); | 87 | DesktopGridConfig::instance(KWIN_CONFIG); | ||
| 88 | addConfig(DesktopGridConfig::self(), m_ui); | 88 | addConfig(DesktopGridConfig::self(), m_ui); | ||
| 89 | connect(m_ui->kcfg_LayoutMode, SIGNAL(currentIndexChanged(int)), this, SLOT(layoutSelectionChanged())); | 89 | connect(m_ui->kcfg_LayoutMode, qOverload<int>(&KComboBox::currentIndexChanged), this, &DesktopGridEffectConfig::layoutSelectionChanged); | ||
broulik: Do we allow C++14? | |||||
zzag: Yes. https://blog.martin-graesslin.com/blog/2017/07/kwin-requires-c14/ | |||||
| 90 | connect(m_ui->desktopNameAlignmentCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(changed())); | 90 | connect(m_ui->desktopNameAlignmentCombo, qOverload<int>(&KComboBox::currentIndexChanged), this, qOverload<>(&DesktopGridEffectConfig::changed)); | ||
| 91 | connect(m_ui->shortcutEditor, SIGNAL(keyChange()), this, SLOT(changed())); | 91 | connect(m_ui->shortcutEditor, &KShortcutsEditor::keyChange, this, qOverload<>(&DesktopGridEffectConfig::changed)); | ||
| 92 | 92 | | |||
| 93 | load(); | 93 | load(); | ||
| 94 | layoutSelectionChanged(); | 94 | layoutSelectionChanged(); | ||
| 95 | } | 95 | } | ||
| 96 | 96 | | |||
| 97 | DesktopGridEffectConfig::~DesktopGridEffectConfig() | 97 | DesktopGridEffectConfig::~DesktopGridEffectConfig() | ||
| 98 | { | 98 | { | ||
| 99 | // If save() is called undoChanges() has no effect | 99 | // If save() is called undoChanges() has no effect | ||
| ▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines | |||||
Do we allow C++14?