mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
digiKam: use system font
This commit is contained in:
Gerasim Troeglazov
@@ -6,7 +6,7 @@ photos and RAW files."
|
||||
HOMEPAGE="https://digikam.org/"
|
||||
COPYRIGHT="2010-2020 KDE Organisation"
|
||||
LICENSE="GNU LGPL v2"
|
||||
REVISION="3"
|
||||
REVISION="4"
|
||||
SOURCE_URI="https://download.kde.org/stable/digikam/$portVersion/digikam-$portVersion.tar.xz"
|
||||
CHECKSUM_SHA256="b103c8463adf04939583199e13f8e83015d8a4a9ad79ebfd502d2a50b5a5abbe"
|
||||
SOURCE_DIR="digikam-$portVersion"
|
||||
|
||||
@@ -132,7 +132,7 @@ index 874e7bb..cff1f55 100644
|
||||
|
||||
// LibGphoto2 includes
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From c4c43c12be843605695df92157c76c1b1838df20 Mon Sep 17 00:00:00 2001
|
||||
@@ -156,7 +156,7 @@ index 76bb183..47fa056 100644
|
||||
|
||||
Setup::~Setup()
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From d4304e9dc5e65f5e7a9604acc211a18a018499ee Mon Sep 17 00:00:00 2001
|
||||
@@ -237,5 +237,199 @@ index 6402347..19ba011 100644
|
||||
|
||||
// Extra 'File' menu actions ---------------------------------------------
|
||||
--
|
||||
2.28.0
|
||||
2.30.0
|
||||
|
||||
|
||||
From 4b059162627b85be26073f0dbe539db7260ff183 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 10 Jan 2021 20:23:37 +1000
|
||||
Subject: Remove custom application font
|
||||
|
||||
|
||||
diff --git a/core/libs/settings/applicationsettings_miscs.cpp b/core/libs/settings/applicationsettings_miscs.cpp
|
||||
index 62a9d43..b664143 100644
|
||||
--- a/core/libs/settings/applicationsettings_miscs.cpp
|
||||
+++ b/core/libs/settings/applicationsettings_miscs.cpp
|
||||
@@ -444,7 +444,11 @@ void ApplicationSettings::setApplicationFont(const QFont& font)
|
||||
|
||||
QFont ApplicationSettings::getApplicationFont() const
|
||||
{
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ return QFontDatabase::systemFont(QFontDatabase::GeneralFont);
|
||||
+#else
|
||||
return d->applicationFont;
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace Digikam
|
||||
diff --git a/core/showfoto/main/showfotosettings.cpp b/core/showfoto/main/showfotosettings.cpp
|
||||
index 0e8a63f..c064205 100644
|
||||
--- a/core/showfoto/main/showfotosettings.cpp
|
||||
+++ b/core/showfoto/main/showfotosettings.cpp
|
||||
@@ -361,7 +361,11 @@ QString ShowfotoSettings::getIconTheme() const
|
||||
|
||||
QFont ShowfotoSettings::getApplicationFont() const
|
||||
{
|
||||
+#ifdef Q_OS_HAIKU
|
||||
+ return QFontDatabase::systemFont(QFontDatabase::GeneralFont);
|
||||
+#else
|
||||
return d->applicationFont;
|
||||
+#endif
|
||||
}
|
||||
|
||||
bool ShowfotoSettings::getShowSplash() const
|
||||
diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
index 574b290..05b4260 100644
|
||||
--- a/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
+++ b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
@@ -99,7 +99,9 @@ public:
|
||||
QComboBox* sortOrderComboBox;
|
||||
QComboBox* applicationStyle;
|
||||
QComboBox* applicationIcon;
|
||||
+#ifndef Q_OS_HAIKU
|
||||
DFontSelect* applicationFont;
|
||||
+#endif
|
||||
|
||||
SystemSettingsWidget* systemSettingsWidget;
|
||||
|
||||
@@ -250,10 +252,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
{
|
||||
d->applicationIcon->addItem(it.key(), it.value());
|
||||
}
|
||||
-
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont = new DFontSelect(i18n("Application font:"), appearancePanel);
|
||||
d->applicationFont->setToolTip(i18n("Select here the font used to display text in whole application."));
|
||||
-
|
||||
+#endif
|
||||
// --------------------------------------------------------
|
||||
|
||||
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
|
||||
@@ -263,7 +265,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
layout2->addWidget(tabStyleHbox);
|
||||
layout2->addWidget(appStyleHbox);
|
||||
layout2->addWidget(iconThemeHbox);
|
||||
+#ifndef Q_OS_HAIKU
|
||||
layout2->addWidget(d->applicationFont);
|
||||
+#endif
|
||||
layout2->addStretch();
|
||||
|
||||
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
|
||||
@@ -304,7 +308,9 @@ void SetupMisc::readSettings()
|
||||
#endif
|
||||
|
||||
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(d->settings->getIconTheme()));
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont->setFont(d->settings->getApplicationFont());
|
||||
+#endif
|
||||
}
|
||||
|
||||
void SetupMisc::applySettings()
|
||||
@@ -327,7 +333,9 @@ void SetupMisc::applySettings()
|
||||
#endif
|
||||
|
||||
d->settings->setIconTheme(d->applicationIcon->currentData().toString());
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->settings->setApplicationFont(d->applicationFont->font());
|
||||
+#endif
|
||||
d->settings->syncConfig();
|
||||
}
|
||||
|
||||
diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp
|
||||
index 9c2ea58..ef658fb 100644
|
||||
--- a/core/utilities/setup/setupmisc.cpp
|
||||
+++ b/core/utilities/setup/setupmisc.cpp
|
||||
@@ -113,8 +113,9 @@ public:
|
||||
QComboBox* stringComparisonType;
|
||||
QComboBox* applicationStyle;
|
||||
QComboBox* applicationIcon;
|
||||
+#ifndef Q_OS_HAIKU
|
||||
DFontSelect* applicationFont;
|
||||
-
|
||||
+#endif
|
||||
QSpinBox* minimumSimilarityBound;
|
||||
|
||||
SystemSettingsWidget* systemSettingsWidget;
|
||||
@@ -290,9 +291,10 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
d->applicationIcon->addItem(it.key(), it.value());
|
||||
}
|
||||
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont = new DFontSelect(i18n("Application font:"), appearancePanel);
|
||||
d->applicationFont->setToolTip(i18n("Select here the font used to display text in whole application."));
|
||||
-
|
||||
+#endif
|
||||
// --------------------------------------------------------
|
||||
|
||||
layout2->setContentsMargins(spacing, spacing, spacing, spacing);
|
||||
@@ -303,7 +305,9 @@ SetupMisc::SetupMisc(QWidget* const parent)
|
||||
layout2->addWidget(tabStyleHbox);
|
||||
layout2->addWidget(appStyleHbox);
|
||||
layout2->addWidget(iconThemeHbox);
|
||||
+#ifndef Q_OS_HAIKU
|
||||
layout2->addWidget(d->applicationFont);
|
||||
+#endif
|
||||
layout2->addStretch();
|
||||
|
||||
d->tab->insertTab(Appearance, appearancePanel, i18nc("@title:tab", "Appearance"));
|
||||
@@ -422,7 +426,9 @@ void SetupMisc::applySettings()
|
||||
#endif
|
||||
|
||||
settings->setIconTheme(d->applicationIcon->currentData().toString());
|
||||
+#ifndef Q_OS_HAIKU
|
||||
settings->setApplicationFont(d->applicationFont->font());
|
||||
+#endif
|
||||
settings->saveSettings();
|
||||
}
|
||||
|
||||
@@ -459,7 +465,9 @@ void SetupMisc::readSettings()
|
||||
#endif
|
||||
|
||||
d->applicationIcon->setCurrentIndex(d->applicationIcon->findData(settings->getIconTheme()));
|
||||
+#ifndef Q_OS_HAIKU
|
||||
d->applicationFont->setFont(settings->getApplicationFont());
|
||||
+#endif
|
||||
}
|
||||
|
||||
} // namespace Digikam
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
From 6c8263cc21ef134aa0d5cf467650389b11bff39d Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 10 Jan 2021 23:37:50 +1000
|
||||
Subject: Remove applicationFont initialization
|
||||
|
||||
|
||||
diff --git a/core/showfoto/setup/showfotosetupmisc.cpp b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
index 05b4260..515d573 100644
|
||||
--- a/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
+++ b/core/showfoto/setup/showfotosetupmisc.cpp
|
||||
@@ -76,7 +76,9 @@ public:
|
||||
sortOrderComboBox(nullptr),
|
||||
applicationStyle(nullptr),
|
||||
applicationIcon(nullptr),
|
||||
+#ifndef Q_OS_HAIKU
|
||||
applicationFont(nullptr),
|
||||
+#endif
|
||||
systemSettingsWidget(nullptr),
|
||||
settings(ShowfotoSettings::instance())
|
||||
{
|
||||
diff --git a/core/utilities/setup/setupmisc.cpp b/core/utilities/setup/setupmisc.cpp
|
||||
index ef658fb..baea842 100644
|
||||
--- a/core/utilities/setup/setupmisc.cpp
|
||||
+++ b/core/utilities/setup/setupmisc.cpp
|
||||
@@ -83,7 +83,9 @@ public:
|
||||
stringComparisonType(nullptr),
|
||||
applicationStyle(nullptr),
|
||||
applicationIcon(nullptr),
|
||||
+#ifndef Q_OS_HAIKU
|
||||
applicationFont(nullptr),
|
||||
+#endif
|
||||
minimumSimilarityBound(nullptr),
|
||||
systemSettingsWidget(nullptr),
|
||||
groupingButtons(QHash<int, QButtonGroup*>())
|
||||
--
|
||||
2.30.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user