mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge remote-tracking branch 'origin/Applications/19.04'
This commit is contained in:
commit
bbfa6c4473
|
@ -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>
|
||||
|
|
|
@ -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));
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in a new issue