kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/16.12'

Browse source
This commit is contained in:
Kai Uwe Broulik 2017-01-03 09:49:02 +01:00
parent 331c8bc89e 996f8520e7
commit 5107523249
3 changed files with 27 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dolphincontextmenu.cpp
View file

@ -307,7 +307,7 @@ void DolphinContextMenu::openItemContextMenu()
if (selectedUrl.isValid()) {
PlacesItemModel model;
const QString text = selectedUrl.fileName();
PlacesItem* item = model.createPlacesItem(text, selectedUrl);
PlacesItem* item = model.createPlacesItem(text, selectedUrl, KIO::iconNameForUrl(selectedUrl));
model.appendItemToGroup(item);
model.saveBookmarks();
}
@ -373,7 +373,8 @@ void DolphinContextMenu::openViewportContextMenu()
if (container->url().isValid()) {
PlacesItemModel model;
PlacesItem* item = model.createPlacesItem(container->placesText(),
container->url());
container->url(),
KIO::iconNameForUrl(container->url()));
model.appendItemToGroup(item);
model.saveBookmarks();
}

35
src/views/dolphinview.cpp
View file

@ -211,19 +211,7 @@ void DolphinView::setActive(bool active)
m_active = active;
QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
if (!active) {
color.setAlpha(150);
}
QWidget* viewport = m_container->viewport();
if (viewport) {
QPalette palette;
palette.setColor(viewport->backgroundRole(), color);
viewport->setPalette(palette);
}
update();
updatePalette();
if (active) {
m_container->setFocus();
@ -721,9 +709,30 @@ void DolphinView::stopLoading()
m_model->cancelDirectoryLoading();
}
void DolphinView::updatePalette()
{
QColor color = KColorScheme(QPalette::Active, KColorScheme::View).background().color();
if (!m_active) {
color.setAlpha(150);
}
QWidget* viewport = m_container->viewport();
if (viewport) {
QPalette palette;
palette.setColor(viewport->backgroundRole(), color);
viewport->setPalette(palette);
}
update();
}
bool DolphinView::eventFilter(QObject* watched, QEvent* event)
{
switch (event->type()) {
case QEvent::PaletteChange:
updatePalette();
break;
case QEvent::KeyPress:
if (GeneralSettings::useTabForSwitchingSplitView()) {
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);

2
src/views/dolphinview.h
View file

@ -762,6 +762,8 @@ private:
QUrl viewPropertiesUrl() const;
private:
void updatePalette();
bool m_active;
bool m_tabsForFiles;
bool m_assureVisibleCurrentIndex;