Differential D9568 Diff 25821 src/EditProfileDialog.cpp

Changeset View

Standalone View

View Options

src/EditProfileDialog.cpp

Show First 20 Lines • Show All 527 Lines • ▼ Show 20 Line(s)525{
528 528​
529 _ui->transparencyWarningWidget->setVisible(false); 529​ _ui->transparencyWarningWidget->setVisible(false);
530 _ui->transparencyWarningWidget->setWordWrap(true); 530​ _ui->transparencyWarningWidget->setWordWrap(true);
531 _ui->transparencyWarningWidget->setCloseButtonVisible(false); 531​ _ui->transparencyWarningWidget->setCloseButtonVisible(false);
532 _ui->transparencyWarningWidget->setMessageType(KMessageWidget::Warning); 532​ _ui->transparencyWarningWidget->setMessageType(KMessageWidget::Warning);
533 533​
534 _ui->editColorSchemeButton->setEnabled(false); 534​ _ui->editColorSchemeButton->setEnabled(false);
535 _ui->removeColorSchemeButton->setEnabled(false); 535​ _ui->removeColorSchemeButton->setEnabled(false);
536​ _ui->resetColorSchemeButton->setEnabled(false);
536 537​
537 // setup color list 538​ // setup color list
538 updateColorSchemeList(true); 539​ updateColorSchemeList(true);
539 540​
540 _ui->colorSchemeList->setMouseTracking(true); 541​ _ui->colorSchemeList->setMouseTracking(true);
541 _ui->colorSchemeList->installEventFilter(this); 542​ _ui->colorSchemeList->installEventFilter(this);
542 _ui->colorSchemeList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn); 543​ _ui->colorSchemeList->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
543 544​
544 connect(_ui->colorSchemeList->selectionModel(), 545​ connect(_ui->colorSchemeList->selectionModel(),
545 &QItemSelectionModel::selectionChanged, this, 546​ &QItemSelectionModel::selectionChanged, this,
546 &Konsole::EditProfileDialog::colorSchemeSelected); 547​ &Konsole::EditProfileDialog::colorSchemeSelected);
547 connect(_ui->colorSchemeList, &QListView::entered, this, 548​ connect(_ui->colorSchemeList, &QListView::entered, this,
548 &Konsole::EditProfileDialog::previewColorScheme); 549​ &Konsole::EditProfileDialog::previewColorScheme);
549 550​
550 updateColorSchemeButtons(); 551​ updateColorSchemeButtons();
551 552​
552 connect(_ui->editColorSchemeButton, &QPushButton::clicked, this, 553​ connect(_ui->editColorSchemeButton, &QPushButton::clicked, this,
553 &Konsole::EditProfileDialog::editColorScheme); 554​ &Konsole::EditProfileDialog::editColorScheme);
554 connect(_ui->removeColorSchemeButton, &QPushButton::clicked, this, 555​ connect(_ui->removeColorSchemeButton, &QPushButton::clicked, this,
555 &Konsole::EditProfileDialog::removeColorScheme); 556​ &Konsole::EditProfileDialog::removeColorScheme);
556 connect(_ui->newColorSchemeButton, &QPushButton::clicked, this, 557​ connect(_ui->newColorSchemeButton, &QPushButton::clicked, this,
557 &Konsole::EditProfileDialog::newColorScheme); 558​ &Konsole::EditProfileDialog::newColorScheme);
558 559​
560​ connect(_ui->resetColorSchemeButton, &QPushButton::clicked, this,
561​ &Konsole::EditProfileDialog::resetColorScheme);
562​
559 // setup font preview 563​ // setup font preview
560 const bool antialias = profile->antiAliasFonts(); 564​ const bool antialias = profile->antiAliasFonts();
561 565​
562 QFont profileFont = profile->font(); 566​ QFont profileFont = profile->font();
563 profileFont.setStyleStrategy(antialias ? QFont::PreferAntialias : QFont::NoAntialias); 567​ profileFont.setStyleStrategy(antialias ? QFont::PreferAntialias : QFont::NoAntialias);
564 568​
565 _ui->fontPreviewLabel->installEventFilter(this); 569​ _ui->fontPreviewLabel->installEventFilter(this);
566 _ui->fontPreviewLabel->setFont(profileFont); 570​ _ui->fontPreviewLabel->setFont(profileFont);
▲ Show 20 Lines • Show All 268 Lines • ▼ Show 20 Line(s)838 if (!selected.isEmpty()) {
835 const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name(); 839​ const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
836 840​
837 if (ColorSchemeManager::instance()->deleteColorScheme(name)) { 841​ if (ColorSchemeManager::instance()->deleteColorScheme(name)) {
838 _ui->colorSchemeList->model()->removeRow(selected.first().row()); 842​ _ui->colorSchemeList->model()->removeRow(selected.first().row());
839 } 843​ }
840 } 844​ }
841} 845​}
842 846​
847​void EditProfileDialog::resetColorScheme()
848​{
849​ removeColorScheme();
850​ updateColorSchemeList(true);
851​}
852​
843void EditProfileDialog::showColorSchemeEditor(bool isNewScheme) 853​void EditProfileDialog::showColorSchemeEditor(bool isNewScheme)
844{ 854​{
845 // Finding selected ColorScheme 855​ // Finding selected ColorScheme
846 QModelIndexList selected = _ui->colorSchemeList->selectionModel()->selectedIndexes(); 856​ QModelIndexList selected = _ui->colorSchemeList->selectionModel()->selectedIndexes();
847 QAbstractItemModel *model = _ui->colorSchemeList->model(); 857​ QAbstractItemModel *model = _ui->colorSchemeList->model();
848 const ColorScheme *colors = nullptr; 858​ const ColorScheme *colors = nullptr;
849 if (!selected.isEmpty()) { 859​ if (!selected.isEmpty()) {
850 colors = model->data(selected.first(), Qt::UserRole + 1).value<const ColorScheme *>(); 860​ colors = model->data(selected.first(), Qt::UserRole + 1).value<const ColorScheme *>();
▲ Show 20 Lines • Show All 67 Lines • ▼ Show 20 Line(s)916{
918 } 928​ }
919 929​
920 updateColorSchemeButtons(); 930​ updateColorSchemeButtons();
921} 931​}
922 932​
923void EditProfileDialog::updateColorSchemeButtons() 933​void EditProfileDialog::updateColorSchemeButtons()
924{ 934​{
925 enableIfNonEmptySelection(_ui->editColorSchemeButton, _ui->colorSchemeList->selectionModel()); 935​ enableIfNonEmptySelection(_ui->editColorSchemeButton, _ui->colorSchemeList->selectionModel());
926 enableIfNonEmptySelection(_ui->removeColorSchemeButton, _ui->colorSchemeList->selectionModel()); 936​
937​ QModelIndexList selected = _ui->colorSchemeList->selectionModel()->selectedIndexes();
938​
939​ if (!selected.isEmpty()) {
940​ const QString &name = selected.first().data(Qt::UserRole + 1).value<const ColorScheme *>()->name();
941​
942​ bool isResettable = ColorSchemeManager::instance()->canResetColorScheme(name);
hindenburgUnsubmitted
Done

can you name this better than on? isResetable?

I'm not sure the "Reset" is the best way to describe what we're doing. Nothing comes to mind though.

hindenburg: can you name this better than on? isResetable? I'm not sure the "Reset" is the best way to…
ahmadsamirAuthorUnsubmitted
Not Done

I changed it to use isResettable.

About the name, "Reset", it's either that or DiscardColorschemeChanges, which sort of means the same thing...

ahmadsamir: I changed it to use isResettable. About the name, "Reset", it's either that or…
943​ _ui->resetColorSchemeButton->setEnabled(isResettable);
944​
945​ bool isDeletable = ColorSchemeManager::instance()->isColorSchemeDeletable(name);
946​ // if a colorScheme can be restored then it can't be deleted
947​ _ui->removeColorSchemeButton->setEnabled(isDeletable && !isResettable);
948​ } else {
949​ _ui->removeColorSchemeButton->setEnabled(false);
950​ _ui->resetColorSchemeButton->setEnabled(false);
951​ }
952​
927} 953​}
928 954​
929void EditProfileDialog::updateKeyBindingsButtons() 955​void EditProfileDialog::updateKeyBindingsButtons()
930{ 956​{
931 enableIfNonEmptySelection(_ui->editKeyBindingsButton, _ui->keyBindingList->selectionModel()); 957​ enableIfNonEmptySelection(_ui->editKeyBindingsButton, _ui->keyBindingList->selectionModel());
932 enableIfNonEmptySelection(_ui->removeKeyBindingsButton, _ui->keyBindingList->selectionModel()); 958​ enableIfNonEmptySelection(_ui->removeKeyBindingsButton, _ui->keyBindingList->selectionModel());
933} 959​}
934 960​
▲ Show 20 Lines • Show All 680 Lines • Show Last 20 Lines