kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'KDE/4.14'

Browse source
This commit is contained in:
Emmanuel Pescosta 2014-10-29 12:20:10 +01:00
commit 5227d6be42
2 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dolphin/src/panels/information/phononwidget.cpp
View file

@ -165,6 +165,12 @@ void PhononWidget::stateChanged(Phonon::State newstate)
m_stopButton->show();
m_playButton->hide();
break;
case Phonon::StoppedState:
if (m_videoPlayer) {
m_videoPlayer->hide();
}
emit hasVideoChanged(false);
// fall through
default:
m_stopButton->hide();
m_playButton->show();
@ -207,16 +213,7 @@ void PhononWidget::stop()
{
if (m_media) {
m_media->stop();
m_stopButton->hide();
m_playButton->show();
}
if (m_videoPlayer) {
m_videoPlayer->hide();
}
emit hasVideoChanged(false);
}
void PhononWidget::slotHasVideoChanged(bool hasVideo)

14
lib/konq/konq_operations.cpp
View file

@ -470,8 +470,18 @@ void KonqOperations::doDropFileCopy()
for (KUrl::List::ConstIterator it = lst.begin(); it != lst.end(); ++it)
{
bool local = (*it).isLocalFile();
if ( KProtocolManager::supportsDeleting( *it ) && (!local || QFileInfo((*it).directory()).isWritable() ))
mlst.append(*it);
if ( KProtocolManager::supportsDeleting( *it ) ) {
if (!local) {
mlst.append(*it);
} else {
QFileInfo itemInfo((*it).toLocalFile());
QFileInfo dirInfo(itemInfo.absolutePath());
// Posix does not permit the movement of a read-only folder, regardless of the permissions of its parent
if (dirInfo.isWritable() && (!itemInfo.isDir() || itemInfo.isWritable())) {
mlst.append(*it);
}
}
}
if ( local && KDesktopFile::isDesktopFile((*it).toLocalFile()))
isDesktopFile = true;
if ( local && (*it).path().startsWith(KGlobalSettings::desktopPath()))