From 960abe2aec4c5fb0552dddfbfa1429e3bf6f78cb Mon Sep 17 00:00:00 2001 From: Lana Black Date: Fri, 14 Jun 2024 23:04:27 +0000 Subject: [PATCH] So many broken APIs. --- app/settings/screensdialog/screensmodel.cpp | 4 +- .../settingsdialog/layoutscontroller.cpp | 9 +-- app/settings/settingsdialog/layoutsmodel.cpp | 19 +++--- .../settingsdialog/layoutstableview.cpp | 7 ++- .../settingsdialog/settingsdialog.cpp | 21 ++++--- .../settingsdialog/tablayoutshandler.cpp | 59 ++++++++++--------- 6 files changed, 63 insertions(+), 56 deletions(-) diff --git a/app/settings/screensdialog/screensmodel.cpp b/app/settings/screensdialog/screensmodel.cpp index 9c27b0dd3..a3d8d4022 100644 --- a/app/settings/screensdialog/screensmodel.cpp +++ b/app/settings/screensdialog/screensmodel.cpp @@ -289,10 +289,8 @@ QVariant Screens::data(const QModelIndex &index, int role) const } else if (role == ISSELECTEDROLE) { return c_screens[row].isSelected; } else if (role == SCREENDATAROLE) { - QVariant scrVariant; Latte::Data::Screen scrdata = c_screens[row]; - scrVariant.setValue(scrdata); - return scrVariant; + return QVariant::fromValue(scrdata); } else if (role == SORTINGROLE) { //! reverse id priority, smaller id has higher priority QString idstr = sortableId(c_screens[row].id); diff --git a/app/settings/settingsdialog/layoutscontroller.cpp b/app/settings/settingsdialog/layoutscontroller.cpp index cfe28ed16..38d1f72ea 100644 --- a/app/settings/settingsdialog/layoutscontroller.cpp +++ b/app/settings/settingsdialog/layoutscontroller.cpp @@ -34,10 +34,11 @@ #include // KDE -#include -#include -#include +#include +#include +#include #include +#include namespace Latte { namespace Settings { @@ -467,7 +468,7 @@ QString Layouts::uniqueTempDirectory() QString Layouts::uniqueLayoutName(QString name) { - int pos_ = name.lastIndexOf(QRegExp(QString(" - [0-9]+"))); + int pos_ = name.lastIndexOf(QRegularExpression(QString(" - [0-9]+"))); if (m_model->containsCurrentName(name) && pos_ > 0) { name = name.left(pos_); diff --git a/app/settings/settingsdialog/layoutsmodel.cpp b/app/settings/settingsdialog/layoutsmodel.cpp index 6dedea1f7..2eee1150b 100644 --- a/app/settings/settingsdialog/layoutsmodel.cpp +++ b/app/settings/settingsdialog/layoutsmodel.cpp @@ -20,9 +20,9 @@ // KDE #include -// KActivities -#include -#include +// PlasmaActivities +#include +#include namespace Latte { namespace Settings { @@ -484,9 +484,7 @@ QVariant Layouts::data(const QModelIndex &index, int role) const return isNewLayout ? true : (original != m_layoutsTable[row]); } else if (role == BACKGROUNDUSERROLE) { Latte::Data::LayoutIcon _icon = icon(row); - QVariant iconVariant; - iconVariant.setValue(_icon); - return iconVariant; + QVariant::fromValue(_icon); } else if (role == ERRORSROLE) { return m_layoutsTable[row].errors; } else if (role == WARNINGSROLE) { @@ -510,9 +508,7 @@ QVariant Layouts::data(const QModelIndex &index, int role) const return m_layoutsTable[row].background; } else if (role == Qt::UserRole) { Latte::Data::LayoutIcon _icon = icon(row); - QVariant iconVariant; - iconVariant.setValue(_icon); - return iconVariant; + QVariant::fromValue(_icon); } break; case NAMECOLUMN: @@ -570,11 +566,11 @@ QVariant Layouts::data(const QModelIndex &index, int role) const } else if (m_layoutsTable[row].activities.contains(Latte::Data::Layout::FREEACTIVITIESID)) { return sortingPriority(HIGHPRIORITY, row); } else { - return sortingPriority(MEDIUMPRIORITY, row) + m_layoutsTable[row].activities.count(); + return sortingPriority(MEDIUMPRIORITY, row) + QString::number(m_layoutsTable[row].activities.count()); } } - return sortingPriority(NORMALPRIORITY, row) + m_layoutsTable[row].activities.count(); + return sortingPriority(NORMALPRIORITY, row) + QString::number(m_layoutsTable[row].activities.count()); } if (role == ORIGINALASSIGNEDACTIVITIESROLE) { @@ -828,6 +824,7 @@ const Latte::Data::Layout &Layouts::currentData(const QString &id) return m_layoutsTable[id]; } + // FIXME: return Latte::Data::Layout(); } diff --git a/app/settings/settingsdialog/layoutstableview.cpp b/app/settings/settingsdialog/layoutstableview.cpp index 422b17cb0..31e9d6470 100644 --- a/app/settings/settingsdialog/layoutstableview.cpp +++ b/app/settings/settingsdialog/layoutstableview.cpp @@ -36,8 +36,11 @@ LayoutsTableView::LayoutsTableView(QWidget *parent) m_overlayDropMessage->setAlignment(Qt::AlignCenter); QPalette palette = m_overlayDropMessage->palette(); - QColor backgroundColor = palette.color(QPalette::Background); - QColor foregroundColor = palette.color(QPalette::Foreground); + // FIXME: + // These were QPalette::Background and QPalette::Forground respectively in Qt5. + // Maybe these need to be changed, I don't know yet. + QColor backgroundColor = palette.color(QPalette::Window); + QColor foregroundColor = palette.color(QPalette::WindowText); QColor borderColor = foregroundColor; borderColor.setAlphaF(0.5); diff --git a/app/settings/settingsdialog/settingsdialog.cpp b/app/settings/settingsdialog/settingsdialog.cpp index 0166087bd..e43bbe4d2 100644 --- a/app/settings/settingsdialog/settingsdialog.cpp +++ b/app/settings/settingsdialog/settingsdialog.cpp @@ -34,6 +34,7 @@ #include #include #include +#include namespace Latte { @@ -74,8 +75,8 @@ SettingsDialog::SettingsDialog(QWidget *parent, Latte::Corona *corona) loadConfig(); resize(m_windowSize); - m_ui->buttonBox->button(QDialogButtonBox::Apply)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); - m_ui->buttonBox->button(QDialogButtonBox::Reset)->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); + m_ui->buttonBox->button(QDialogButtonBox::Apply)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_S)); + m_ui->buttonBox->button(QDialogButtonBox::Reset)->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_L)); //! SIGNALS connect(m_ui->tabWidget, &QTabWidget::currentChanged, this, &SettingsDialog::onCurrentTabChanged); @@ -129,13 +130,13 @@ void SettingsDialog::initFileMenu() m_importFullAction = m_fileMenu->addAction(i18n("Import Configuration...")); m_importFullAction->setIcon(QIcon::fromTheme("document-import")); - m_importFullAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_I)); + m_importFullAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I)); m_importFullAction->setToolTip(i18n("Import your full configuration from previous backup")); connect(m_importFullAction, &QAction::triggered, this, &SettingsDialog::importFullConfiguration); m_exportFullAction = m_fileMenu->addAction(i18n("Export Configuration...")); m_exportFullAction->setIcon(QIcon::fromTheme("document-export")); - m_exportFullAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_E)); + m_exportFullAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_E)); m_exportFullAction->setToolTip(i18n("Export your full configuration to create backup")); connect(m_exportFullAction, &QAction::triggered, this, &SettingsDialog::exportFullConfiguration); @@ -143,13 +144,13 @@ void SettingsDialog::initFileMenu() QAction *screensAction = m_fileMenu->addAction(i18n("&Screens...")); screensAction->setIcon(QIcon::fromTheme("document-properties")); - screensAction->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_S)); + screensAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_S)); screensAction->setToolTip(i18n("Examing your screens and remove deprecated references")); connect(screensAction, &QAction::triggered, this, &SettingsDialog::showScreensDialog); QAction *quitAction = m_fileMenu->addAction(i18n("&Quit Latte")); quitAction->setIcon(QIcon::fromTheme("application-exit")); - quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + quitAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); //! triggers @@ -300,10 +301,12 @@ void SettingsDialog::importFullConfiguration() connect(msg, &QFileDialog::finished, msg, &QFileDialog::deleteLater); connect(importBtn, &QPushButton::clicked, this, [&, file](bool check) { + Q_UNUSED(check); m_corona->importFullConfiguration(file); }); connect(takeBackupBtn, &QPushButton::clicked, this, [&](bool check) { + Q_UNUSED(check); exportFullConfiguration(); }); @@ -478,9 +481,9 @@ bool SettingsDialog::saveChanges() KMessageBox::ButtonCode result = saveChangesConfirmation(saveChangesText); - if (result == KMessageBox::Yes) { + if (result == KMessageBox::PrimaryAction) { save(); - } else if (result == KMessageBox::No) { + } else if (result == KMessageBox::SecondaryAction) { reset(); } else { return false; @@ -605,7 +608,7 @@ void SettingsDialog::dropEvent(QDropEvent *event) void SettingsDialog::updateWindowActivities() { if (KWindowSystem::isPlatformX11()) { - KWindowSystem::setOnActivities(winId(), QStringList()); + KX11Extras::setOnActivities(winId(), QStringList()); } } diff --git a/app/settings/settingsdialog/tablayoutshandler.cpp b/app/settings/settingsdialog/tablayoutshandler.cpp index 78b2c1d15..64c2a1681 100644 --- a/app/settings/settingsdialog/tablayoutshandler.cpp +++ b/app/settings/settingsdialog/tablayoutshandler.cpp @@ -34,9 +34,11 @@ //! KDE #include #include -#include +#include #include -#include + +//! KNewStuff +#include namespace Latte { @@ -86,16 +88,16 @@ void TabLayouts::initUi() connect(this, &Settings::Handler::TabLayouts::dataChanged, this, &TabLayouts::updatePerLayoutButtonsState); connect(m_corona->activitiesConsumer(), &KActivities::Consumer::runningActivitiesChanged, this, &TabLayouts::updatePerLayoutButtonsState); - connect(m_inMemoryButtons, static_cast(&QButtonGroup::buttonToggled), - [ = ](int id, bool checked) { + connect(m_inMemoryButtons, &QButtonGroup::buttonToggled, + [ this ](int id, bool checked) { if (checked) { - m_layoutsController->setInMultipleMode(id == MemoryUsage::MultipleLayouts); + this->m_layoutsController->setInMultipleMode(id == MemoryUsage::MultipleLayouts); if (id == MemoryUsage::MultipleLayouts) { - m_layoutsController->sortByColumn(Model::Layouts::ACTIVITYCOLUMN, Qt::AscendingOrder); + this->m_layoutsController->sortByColumn(Model::Layouts::ACTIVITYCOLUMN, Qt::AscendingOrder); } else { - m_layoutsController->sortByColumn(Model::Layouts::NAMECOLUMN, Qt::AscendingOrder); + this->m_layoutsController->sortByColumn(Model::Layouts::NAMECOLUMN, Qt::AscendingOrder); } } }); @@ -116,14 +118,14 @@ void TabLayouts::initLayoutMenu() m_switchLayoutAction = m_layoutMenu->addAction(i18nc("switch layout","Switch")); m_switchLayoutAction->setToolTip(i18n("Switch to selected layout")); m_switchLayoutAction->setIcon(QIcon::fromTheme("user-identity")); - m_switchLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Tab)); + m_switchLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Tab)); connectActionWithButton(m_ui->switchButton, m_switchLayoutAction); connect(m_switchLayoutAction, &QAction::triggered, this, &TabLayouts::switchLayout); m_activitiesManagerAction = m_layoutMenu->addAction(i18n("&Activities")); m_activitiesManagerAction->setToolTip(i18n("Show Plasma Activities manager")); m_activitiesManagerAction->setIcon(QIcon::fromTheme("activities")); - m_activitiesManagerAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_A)); + m_activitiesManagerAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_A)); connectActionWithButton(m_ui->activitiesButton, m_activitiesManagerAction); connect(m_activitiesManagerAction, &QAction::triggered, this, &TabLayouts::toggleActivitiesManager); @@ -132,7 +134,7 @@ void TabLayouts::initLayoutMenu() m_newLayoutAction = m_layoutMenu->addAction(i18nc("new layout", "&New")); m_newLayoutAction->setToolTip(i18n("New layout")); m_newLayoutAction->setIcon(QIcon::fromTheme("add")); - m_newLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N)); + m_newLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_N)); connectActionWithButton(m_ui->newButton, m_newLayoutAction); connect(m_newLayoutAction, &QAction::triggered, m_ui->newButton, &QPushButton::showMenu); @@ -145,7 +147,7 @@ void TabLayouts::initLayoutMenu() m_duplicateLayoutAction = m_layoutMenu->addAction(i18nc("duplicate layout", "&Duplicate")); m_duplicateLayoutAction->setToolTip(i18n("Duplicate selected layout")); m_duplicateLayoutAction->setIcon(QIcon::fromTheme("edit-copy")); - m_duplicateLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_D)); + m_duplicateLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_D)); connectActionWithButton(m_ui->duplicateButton, m_duplicateLayoutAction); connect(m_duplicateLayoutAction, &QAction::triggered, this, &TabLayouts::duplicateLayout); @@ -162,7 +164,7 @@ void TabLayouts::initLayoutMenu() m_enabledLayoutAction = m_layoutMenu->addAction(i18n("Ena&bled")); m_enabledLayoutAction->setToolTip(i18n("Assign in activities in order to be activated through Plasma Activities")); m_enabledLayoutAction->setIcon(QIcon::fromTheme("edit-link")); - m_enabledLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_B)); + m_enabledLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_B)); m_enabledLayoutAction->setCheckable(true); connectActionWithButton(m_ui->enabledButton, m_enabledLayoutAction); connect(m_enabledLayoutAction, &QAction::triggered, this, &TabLayouts::toggleEnabledLayout); @@ -170,7 +172,7 @@ void TabLayouts::initLayoutMenu() m_readOnlyLayoutAction = m_layoutMenu->addAction(i18nc("read only layout", "&Read Only")); m_readOnlyLayoutAction->setToolTip(i18n("Make selected layout read-only")); m_readOnlyLayoutAction->setIcon(QIcon::fromTheme("object-locked")); - m_readOnlyLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + m_readOnlyLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_R)); m_readOnlyLayoutAction->setCheckable(true); connectActionWithButton(m_ui->readOnlyButton, m_readOnlyLayoutAction); connect(m_readOnlyLayoutAction, &QAction::triggered, this, &TabLayouts::lockLayout); @@ -178,14 +180,14 @@ void TabLayouts::initLayoutMenu() m_viewsAction = m_layoutMenu->addAction(i18nc("layout docks / panels", "Docks, &Panels...")); m_viewsAction->setToolTip(i18n("Show selected layouts docks and panels")); m_viewsAction->setIcon(QIcon::fromTheme("window")); - m_viewsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P)); + m_viewsAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_P)); connectActionWithButton(m_ui->viewsBtn, m_viewsAction); connect(m_viewsAction, &QAction::triggered, this, &TabLayouts::showViewsDialog); m_detailsAction = m_layoutMenu->addAction(i18nc("layout details", "De&tails...")); m_detailsAction->setToolTip(i18n("Show selected layout details")); m_detailsAction->setIcon(QIcon::fromTheme("view-list-details")); - m_detailsAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_T)); + m_detailsAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_T)); connectActionWithButton(m_ui->detailsButton, m_detailsAction); connect(m_detailsAction, &QAction::triggered, this, &TabLayouts::showDetailsDialog); @@ -196,7 +198,7 @@ void TabLayouts::initLayoutMenu() m_importLayoutAction = m_layoutMenu->addAction(i18nc("import layout", "&Import")); m_importLayoutAction->setToolTip(i18n("Import layout from various resources")); m_importLayoutAction->setIcon(QIcon::fromTheme("document-import")); - m_importLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_I)); + m_importLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_I)); connectActionWithButton(m_ui->importButton, m_importLayoutAction); connect(m_importLayoutAction, &QAction::triggered, m_ui->importButton, &QPushButton::showMenu); @@ -208,7 +210,7 @@ void TabLayouts::initLayoutMenu() m_exportLayoutAction = m_layoutMenu->addAction(i18nc("export layout", "&Export")); m_exportLayoutAction->setToolTip(i18n("Export selected layout at your system")); m_exportLayoutAction->setIcon(QIcon::fromTheme("document-export")); - m_exportLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_E)); + m_exportLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_E)); connectActionWithButton(m_ui->exportButton, m_exportLayoutAction); connect(m_exportLayoutAction, &QAction::triggered, m_ui->exportButton, &QPushButton::showMenu); @@ -228,12 +230,12 @@ void TabLayouts::initImportLayoutSubMenu() QAction *importLayoutAction = m_layoutImportSubMenu->addAction(i18nc("import layout", "&Import From Local File...")); importLayoutAction->setIcon(QIcon::fromTheme("document-import")); - importLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_I)); + importLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_I)); connect(importLayoutAction, &QAction::triggered, this, &TabLayouts::importLayout); QAction *downloadLayoutAction = m_layoutImportSubMenu->addAction(i18nc("download layout", "Import From K&DE Online Store...")); downloadLayoutAction->setIcon(QIcon::fromTheme("get-hot-new-stuff")); - downloadLayoutAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_D)); + downloadLayoutAction->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_D)); connect(downloadLayoutAction, &QAction::triggered, this, &TabLayouts::downloadLayout); } @@ -248,12 +250,12 @@ void TabLayouts::initExportLayoutSubMenu() QAction *exportForBackup = m_layoutExportSubMenu->addAction(i18nc("export for backup","&Export For Backup...")); exportForBackup->setIcon(QIcon::fromTheme("document-export")); - exportForBackup->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_E)); + exportForBackup->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_E)); connect(exportForBackup, &QAction::triggered, this, &TabLayouts::exportLayoutForBackup); QAction *exportAsTemplate = m_layoutExportSubMenu->addAction(i18nc("export as template","Export As &Template...")); exportAsTemplate->setIcon(QIcon::fromTheme("document-export")); - exportAsTemplate->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_T)); + exportAsTemplate->setShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_T)); connect(exportAsTemplate, &QAction::triggered, this, &TabLayouts::exportLayoutAsTemplate); } @@ -466,12 +468,14 @@ void TabLayouts::downloadLayout() return; } - KNS3::DownloadDialog dialog(QStringLiteral("latte-layouts.knsrc"), m_parentDialog); + KNSWidgets::Dialog dialog(QStringLiteral("latte-layouts.knsrc"), m_parentDialog); dialog.resize(m_parentDialog->downloadWindowSize()); dialog.exec(); - if (!dialog.changedEntries().isEmpty() && !dialog.installedEntries().isEmpty()) { - for (const auto &entry : dialog.installedEntries()) { + if (!dialog.changedEntries().isEmpty() /* && !dialog.installedEntries().isEmpty() */) { + //for (const auto &entry : dialog.installedEntries()) { + // FIXME: Check if this actually works lol + for (const KNSCore::Entry &entry : dialog.changedEntries()) { for (const auto &entryFile : entry.installedFiles()) { Latte::Layouts::Importer::LatteFileVersion version = Latte::Layouts::Importer::fileVersion(entryFile); @@ -817,7 +821,7 @@ void TabLayouts::onCurrentPageChanged() void TabLayouts::onDragEnterEvent(QDragEnterEvent *event) { - if (!isHoveringLayoutsTable(event->pos())) { + if (!isHoveringLayoutsTable(event->position().toPoint())) { return; } @@ -827,12 +831,13 @@ void TabLayouts::onDragEnterEvent(QDragEnterEvent *event) void TabLayouts::onDragLeaveEvent(QDragLeaveEvent *event) { + Q_UNUSED(event); m_ui->layoutsView->dragLeft(); } void TabLayouts::onDragMoveEvent(QDragMoveEvent *event) { - if (!isHoveringLayoutsTable(event->pos())) { + if (!isHoveringLayoutsTable(event->position().toPoint())) { event->ignore(); m_ui->layoutsView->dragLeft(); return; @@ -843,7 +848,7 @@ void TabLayouts::onDragMoveEvent(QDragMoveEvent *event) void TabLayouts::onDropEvent(QDropEvent *event) { - if (!isHoveringLayoutsTable(event->pos())) { + if (!isHoveringLayoutsTable(event->position().toPoint())) { event->ignore(); m_ui->layoutsView->dragLeft(); return;