diff options
| -rw-r--r-- | src/settings/dolphin_generalsettings.kcfg | 2 | ||||
| -rw-r--r-- | src/settings/general/behaviorsettingspage.cpp | 9 | ||||
| -rw-r--r-- | src/views/tooltips/tooltipmanager.cpp | 19 |
3 files changed, 23 insertions, 7 deletions
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg index 62c171846..5a6bba06b 100644 --- a/src/settings/dolphin_generalsettings.kcfg +++ b/src/settings/dolphin_generalsettings.kcfg @@ -48,7 +48,7 @@ </entry> <entry name="GlobalViewProps" type="Bool"> <label>Should the view properties be used for all folders</label> - <default>false</default> + <default>true</default> </entry> <entry name="BrowseThroughArchives" type="Bool"> <label>Browse through archives</label> diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index 0747891b3..c7a909eca 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -48,14 +48,15 @@ BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) : // View properties - m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder")); m_globalViewProps = new QRadioButton(i18nc("@option:radio", "Use common properties for all folders")); + m_localViewProps = new QRadioButton(i18nc("@option:radio", "Remember properties for each folder")); + m_localViewProps->setToolTip(i18nc("@info", "Dolphin will create an hidden .directory file in each folder you change view properties for.")); QButtonGroup* viewGroup = new QButtonGroup(this); - viewGroup->addButton(m_localViewProps); viewGroup->addButton(m_globalViewProps); - topLayout->addRow(i18nc("@title:group", "View: "), m_localViewProps); - topLayout->addRow(QString(), m_globalViewProps); + viewGroup->addButton(m_localViewProps); + topLayout->addRow(i18nc("@title:group", "View: "), m_globalViewProps); + topLayout->addRow(QString(), m_localViewProps); topLayout->addItem(new QSpacerItem(0, Dolphin::VERTICAL_SPACER_HEIGHT, QSizePolicy::Fixed, QSizePolicy::Fixed)); diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 9e79a8f70..2990f4249 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -25,6 +25,7 @@ #include <KIO/PreviewJob> #include <KJobWidgets> #include <KToolTipWidget> +#include <KIconLoader> #include <QApplication> #include <QDesktopWidget> @@ -34,6 +35,15 @@ #include <QTimer> #include <QWindow> +class IconLoaderSingleton { +public: + IconLoaderSingleton() = default; + + KIconLoader self; +}; + +Q_GLOBAL_STATIC(IconLoaderSingleton, iconLoader) + ToolTipManager::ToolTipManager(QWidget* parent) : QObject(parent), m_showToolTipTimer(nullptr), @@ -167,8 +177,13 @@ void ToolTipManager::previewFailed() if (!m_toolTipRequested) { return; } - - const QPixmap pixmap = QIcon::fromTheme(m_item.iconName()).pixmap(128, 128); + QPalette pal; + for (auto state : { QPalette::Active, QPalette::Inactive, QPalette::Disabled }) { + pal.setBrush(state, QPalette::WindowText, pal.toolTipText()); + pal.setBrush(state, QPalette::Window, pal.toolTipBase()); + } + iconLoader->self.setCustomPalette(pal); + const QPixmap pixmap = KDE::icon(m_item.iconName(), &iconLoader->self).pixmap(128, 128); m_fileMetaDataWidget->setPreview(pixmap); if (!m_showToolTipTimer->isActive()) { showToolTip(); |