kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-02 16:31:23 +00:00
Code Issues Projects Releases Wiki Activity

Port to Qt6

Browse Source
This commit is contained in:
Méven Car 2023-05-07 18:27:41 +02:00
parent 7056356c2e
commit 76e3eab6ea
No known key found for this signature in database
16 changed files with 56 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -7,8 +7,8 @@ set (RELEASE_SERVICE_VERSION_MICRO "70")
set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.15.2")
set(KF6_MIN_VERSION "5.102.0")
set(QT_MIN_VERSION "6.4.0")
set(KF6_MIN_VERSION "5.240.0")
# ECM setup
find_package(ECM ${KF6_MIN_VERSION} CONFIG REQUIRED)
@ -32,14 +32,14 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHIN
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/src/dolphin_version.h"
)
ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINVCS
ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHINVCS
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/dolphinvcs_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/DolphinVcsConfigVersion.cmake"
SOVERSION 5
SOVERSION ${QT_MAJOR_VERSION}
)
ecm_setup_version("5.0.0" VARIABLE_PREFIX DOLPHINPRIVATE
SOVERSION 5
ecm_setup_version(${RELEASE_SERVICE_VERSION} VARIABLE_PREFIX DOLPHINPRIVATE
SOVERSION ${QT_MAJOR_VERSION}
)
find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
@ -77,16 +77,17 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
WindowSystem
WidgetsAddons
Codecs
MoreTools
)
find_package(KF6MoreTools)
find_package(KUserFeedback 1.2.0)
find_package(KUserFeedbackQt6 1.2.0)
set_package_properties(KUserFeedback
PROPERTIES TYPE OPTIONAL
PURPOSE "Used for submission of telemetry data"
)
if(KUserFeedback_FOUND)
if(KUserFeedbackQt6_FOUND)
message ("HAVE_KUSERFEEDBACK")
set(HAVE_KUSERFEEDBACK TRUE)
endif()
@ -119,7 +120,7 @@ set_package_properties(KF6Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
PURPOSE "For adding desktop-wide search and tagging support to dolphin"
)
find_package(KF6BalooWidgets 19.07.70)
find_package(KF6BalooWidgets 23.07.70)
set_package_properties(KF6BalooWidgets PROPERTIES DESCRIPTION "Baloos Widgets"
URL "https://www.kde.org"
TYPE OPTIONAL
@ -150,11 +151,6 @@ else()
set(HAVE_TERMINAL TRUE)
endif()
ecm_set_disabled_deprecation_versions(
QT 5.15
KF 5.90
)
add_subdirectory(src)
add_subdirectory(doc)

7
src/CMakeLists.txt
View File

@ -208,6 +208,7 @@ target_link_libraries(
KF6::WindowSystem
KF6::WidgetsAddons
KF6::Codecs
KF6::KCMUtils
KF6::MoreTools
)
@ -443,8 +444,8 @@ endif()
if (HAVE_KUSERFEEDBACK)
target_link_libraries(
dolphinstatic
KUserFeedbackCore
KUserFeedbackWidgets
KUserFeedbackCoreQt6
KUserFeedbackWidgetsQt6
)
endif()
@ -473,7 +474,7 @@ target_link_libraries(dolphin
if (HAVE_X11)
if (QT_MAJOR_VERSION STREQUAL "5")
target_link_libraries(dolphin PRIVATE Qt5::X11Extras)
target_link_libraries(dolphin PRIVATE Qt{QT_MAJOR_VERSION}::X11Extras)
else()
target_link_libraries(dolphin PRIVATE Qt::GuiPrivate)
endif()

4
src/dolphinnavigatorswidgetaction.cpp
View File

@ -42,7 +42,7 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent)
void DolphinNavigatorsWidgetAction::adjustSpacing()
{
m_previousWindowWidth = parentWidget()->window()->width();
m_previousWindowWidth = qobject_cast<QWidget *>(parent())->window()->width();
auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
const QList<int> splitterSizes = {widthOfSplitterPrimary, m_splitter->width() - widthOfSplitterPrimary};
@ -298,7 +298,7 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper(QWidge
bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
{
if (event->type() == QEvent::Resize) {
if (m_navigatorsWidgetAction->parentWidget()->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) {
if (qobject_cast<QWidget*>(m_navigatorsWidgetAction->parent())->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) {
// The window is being resized which means not all widgets have gotten their new sizes yet.
// Let's wait a bit so the sizes of the navigatorsWidget and the viewContainers have all
// had a chance to be updated.

5
src/dolphinpart.cpp
View File

@ -46,15 +46,16 @@
#include <QStandardPaths>
#include <QTextDocument>
#include <KPluginFactory>
K_PLUGIN_CLASS_WITH_JSON(DolphinPart, "dolphinpart.json")
DolphinPart::DolphinPart(QWidget *parentWidget, QObject *parent, const KPluginMetaData &metaData, const QVariantList &args)
: KParts::ReadOnlyPart(parent)
: KParts::ReadOnlyPart(parent, metaData)
, m_openTerminalAction(nullptr)
, m_removeAction(nullptr)
{
Q_UNUSED(args)
setMetaData(metaData);
m_extension = new DolphinPartBrowserExtension(this);

6
src/dolphintabbar.cpp
View File

@ -32,7 +32,7 @@ DolphinTabBar::DolphinTabBar(QWidget *parent)
void DolphinTabBar::dragEnterEvent(QDragEnterEvent *event)
{
const QMimeData *mimeData = event->mimeData();
const int index = tabAt(event->pos());
const int index = tabAt(event->position().toPoint());
if (mimeData->hasUrls()) {
event->acceptProposedAction();
@ -52,7 +52,7 @@ void DolphinTabBar::dragLeaveEvent(QDragLeaveEvent *event)
void DolphinTabBar::dragMoveEvent(QDragMoveEvent *event)
{
const QMimeData *mimeData = event->mimeData();
const int index = tabAt(event->pos());
const int index = tabAt(event->position().toPoint());
if (mimeData->hasUrls()) {
updateAutoActivationTimer(index);
@ -67,7 +67,7 @@ void DolphinTabBar::dropEvent(QDropEvent *event)
updateAutoActivationTimer(-1);
const QMimeData *mimeData = event->mimeData();
const int index = tabAt(event->pos());
const int index = tabAt(event->position().toPoint());
if (mimeData->hasUrls()) {
Q_EMIT tabDropEvent(index, event);

2
src/kitemviews/kfileitemmodelrolesupdater.cpp
View File

@ -118,7 +118,7 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel *model, QO
m_directoryContentsCounter = new KDirectoryContentsCounter(m_model, this);
connect(m_directoryContentsCounter, &KDirectoryContentsCounter::result, this, &KFileItemModelRolesUpdater::slotDirectoryContentsCountReceived);
const QString pluginNamespace = QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/overlayicon");
const QString pluginNamespace = QStringLiteral("kf" QT_STRINGIFY(QT_MAJOR_VERSION)) + QStringLiteral("/overlayicon");
const auto plugins = KPluginMetaData::findPlugins(pluginNamespace, {}, KPluginMetaData::AllowEmptyMetaData);
for (const KPluginMetaData &data : plugins) {
auto instance = QPluginLoader(data.fileName()).instance();

2
src/panels/places/placespanel.cpp
View File

@ -142,7 +142,7 @@ static bool isInternalDrag(const QMimeData *mimeData)
void PlacesPanel::dragMoveEvent(QDragMoveEvent *event)
{
const QModelIndex index = indexAt(event->pos());
const QModelIndex index = indexAt(event->position().toPoint());
if (index.isValid()) {
auto *placesModel = static_cast<KFilePlacesModel *>(model());

2
src/settings/contextmenu/contextmenusettingspage.cpp
View File

@ -300,7 +300,7 @@ void ContextMenuSettingsPage::loadServices()
}
// Load JSON-based plugins that implement the KFileItemActionPlugin interface
const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_VERSION_MAJOR)) + QStringLiteral("/kfileitemaction"));
const auto jsonPlugins = KPluginMetaData::findPlugins(QStringLiteral("kf" QT_STRINGIFY(QT_MAJOR_VERSION)) + QStringLiteral("/kfileitemaction"));
for (const auto &jsonMetadata : jsonPlugins) {
const QString desktopEntryName = jsonMetadata.pluginId();

9
src/settings/kcm/kcmdolphingeneral.cpp
View File

@ -19,16 +19,17 @@
K_PLUGIN_CLASS_WITH_JSON(DolphinGeneralConfigModule, "kcmdolphingeneral.json")
DolphinGeneralConfigModule::DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
DolphinGeneralConfigModule::DolphinGeneralConfigModule(QObject *parent, const KPluginMetaData &data)
: KCModule(qobject_cast<QWidget *>(parent), data)
, m_pages()
{
setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
QVBoxLayout *topLayout = new QVBoxLayout(this);
const auto parentWidget = qobject_cast<QWidget *>(parent);
QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
topLayout->setContentsMargins(0, 0, 0, 0);
QTabWidget *tabWidget = new QTabWidget(this);
QTabWidget *tabWidget = new QTabWidget(parentWidget);
// initialize 'Behavior' tab
BehaviorSettingsPage *behaviorPage = new BehaviorSettingsPage(QUrl::fromLocalFile(QDir::homePath()), tabWidget);

2
src/settings/kcm/kcmdolphingeneral.h
View File

@ -21,7 +21,7 @@ class DolphinGeneralConfigModule : public KCModule
Q_OBJECT
public:
DolphinGeneralConfigModule(QWidget *parent, const QVariantList &args);
DolphinGeneralConfigModule(QObject *parent, const KPluginMetaData &data);
~DolphinGeneralConfigModule() override;
void save() override;

9
src/settings/kcm/kcmdolphinnavigation.cpp
View File

@ -15,16 +15,17 @@
K_PLUGIN_CLASS_WITH_JSON(DolphinNavigationConfigModule, "kcmdolphinnavigation.json")
DolphinNavigationConfigModule::DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
DolphinNavigationConfigModule::DolphinNavigationConfigModule(QObject *parent)
: KCModule(qobject_cast<QWidget *>(parent))
, m_navigation(nullptr)
{
setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
QVBoxLayout *topLayout = new QVBoxLayout(this);
const auto parentWidget = qobject_cast<QWidget *>(parent);
QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
topLayout->setContentsMargins(0, 0, 0, 0);
m_navigation = new NavigationSettingsPage(this);
m_navigation = new NavigationSettingsPage(parentWidget);
connect(m_navigation, &NavigationSettingsPage::changed, this, &DolphinNavigationConfigModule::markAsChanged);
topLayout->addWidget(m_navigation, 0, {});
}

2
src/settings/kcm/kcmdolphinnavigation.h
View File

@ -19,7 +19,7 @@ class DolphinNavigationConfigModule : public KCModule
Q_OBJECT
public:
DolphinNavigationConfigModule(QWidget *parent, const QVariantList &args);
DolphinNavigationConfigModule(QObject *parent);
~DolphinNavigationConfigModule() override;
void save() override;

10
src/settings/kcm/kcmdolphinviewmodes.cpp
View File

@ -10,6 +10,7 @@
#include <KLocalizedString>
#include <KPluginFactory>
#include <KCModule>
#include <QDBusConnection>
#include <QDBusMessage>
@ -19,16 +20,17 @@
K_PLUGIN_CLASS_WITH_JSON(DolphinViewModesConfigModule, "kcmdolphinviewmodes.json")
DolphinViewModesConfigModule::DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args)
: KCModule(parent, args)
DolphinViewModesConfigModule::DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data)
: KCModule(qobject_cast<QWidget *>(parent), data)
, m_tabs()
{
setButtons(KCModule::Default | KCModule::Help | KCModule::Apply);
QVBoxLayout *topLayout = new QVBoxLayout(this);
const auto parentWidget = qobject_cast<QWidget *>(parent);
QVBoxLayout *topLayout = new QVBoxLayout(parentWidget);
topLayout->setContentsMargins(0, 0, 0, 0);
QTabWidget *tabWidget = new QTabWidget(this);
QTabWidget *tabWidget = new QTabWidget(parentWidget);
// Initialize 'Icons' tab
ViewSettingsTab *iconsTab = new ViewSettingsTab(ViewSettingsTab::IconsMode, tabWidget);

2
src/settings/kcm/kcmdolphinviewmodes.h
View File

@ -19,7 +19,7 @@ class DolphinViewModesConfigModule : public KCModule
Q_OBJECT
public:
DolphinViewModesConfigModule(QWidget *parent, const QVariantList &args);
DolphinViewModesConfigModule(QObject *parent, const KPluginMetaData &data);
~DolphinViewModesConfigModule() override;
void save() override;

16
src/settings/trash/trashsettingspage.cpp
View File

@ -6,7 +6,8 @@
#include "trashsettingspage.h"
#include <KCModuleProxy>
#include <KCModuleLoader>
#include <KCModule>
#include <KPluginMetaData>
#include <QFormLayout>
@ -16,12 +17,13 @@ TrashSettingsPage::TrashSettingsPage(QWidget *parent)
{
QFormLayout *topLayout = new QFormLayout(this);
m_proxy = new KCModuleProxy(KPluginMetaData(QStringLiteral("kcm_trash")));
topLayout->addRow(m_proxy);
m_kcm = KCModuleLoader::loadModule(KPluginMetaData(QStringLiteral("kcm_trash")));
topLayout->addRow(m_kcm->widget());
loadSettings();
connect(m_proxy, &KCModuleProxy::changed, this, &TrashSettingsPage::changed);
connect(m_kcm, &KCModule::needsSaveChanged, this, &TrashSettingsPage::changed);
}
TrashSettingsPage::~TrashSettingsPage()
@ -30,15 +32,15 @@ TrashSettingsPage::~TrashSettingsPage()
void TrashSettingsPage::applySettings()
{
m_proxy->save();
m_kcm->save();
}
void TrashSettingsPage::restoreDefaults()
{
m_proxy->defaults();
m_kcm->defaults();
}
void TrashSettingsPage::loadSettings()
{
m_proxy->load();
m_kcm->load();
}

4
src/settings/trash/trashsettingspage.h
View File

@ -8,7 +8,7 @@
#include "settings/settingspagebase.h"
class KCModuleProxy;
class KCModule;
/**
* @brief Tab page for the 'Trash' settings of the Dolphin settings dialog, it uses the KCM.
@ -29,7 +29,7 @@ public:
private:
void loadSettings();
KCModuleProxy *m_proxy;
KCModule *m_kcm;
};
#endif