mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Merge branch 'KDE/4.11' into KDE/4.12
Revert "Files passed as arguments: Ignore unsupported files"
This reverts commit cd9e50ae4f
.
See bug#327224 for details.
This commit is contained in:
commit
ee92ff0d42
|
@ -31,7 +31,6 @@
|
||||||
#include "panels/information/informationpanel.h"
|
#include "panels/information/informationpanel.h"
|
||||||
#include "settings/dolphinsettingsdialog.h"
|
#include "settings/dolphinsettingsdialog.h"
|
||||||
#include "statusbar/dolphinstatusbar.h"
|
#include "statusbar/dolphinstatusbar.h"
|
||||||
#include "views/dolphinview.h"
|
|
||||||
#include "views/dolphinviewactionhandler.h"
|
#include "views/dolphinviewactionhandler.h"
|
||||||
#include "views/dolphinremoteencoding.h"
|
#include "views/dolphinremoteencoding.h"
|
||||||
#include "views/draganddrophelper.h"
|
#include "views/draganddrophelper.h"
|
||||||
|
@ -248,20 +247,8 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// dirs could contain URLs that actually point to archives or other files.
|
if (dirs.count() == 1) {
|
||||||
// Replace them by URLs we can open where possible and filter the rest out.
|
m_activeViewContainer->setUrl(dirs.first());
|
||||||
QList<KUrl> urlsToOpen;
|
|
||||||
foreach (const KUrl& rawUrl, dirs) {
|
|
||||||
const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl);
|
|
||||||
item.determineMimeType();
|
|
||||||
const KUrl& url = DolphinView::openItemAsFolderUrl(item);
|
|
||||||
if (!url.isEmpty()) {
|
|
||||||
urlsToOpen.append(url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (urlsToOpen.count() == 1) {
|
|
||||||
m_activeViewContainer->setUrl(urlsToOpen.first());
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -271,12 +258,12 @@ void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
|
||||||
|
|
||||||
// Open each directory inside a new tab. If the "split view" option has been enabled,
|
// Open each directory inside a new tab. If the "split view" option has been enabled,
|
||||||
// always show two directories within one tab.
|
// always show two directories within one tab.
|
||||||
QList<KUrl>::const_iterator it = urlsToOpen.constBegin();
|
QList<KUrl>::const_iterator it = dirs.begin();
|
||||||
while (it != urlsToOpen.constEnd()) {
|
while (it != dirs.end()) {
|
||||||
openNewTab(*it);
|
openNewTab(*it);
|
||||||
++it;
|
++it;
|
||||||
|
|
||||||
if (hasSplitView && (it != urlsToOpen.constEnd())) {
|
if (hasSplitView && (it != dirs.end())) {
|
||||||
const int tabIndex = m_viewTab.count() - 1;
|
const int tabIndex = m_viewTab.count() - 1;
|
||||||
m_viewTab[tabIndex].secondaryView->setUrl(*it);
|
m_viewTab[tabIndex].secondaryView->setUrl(*it);
|
||||||
++it;
|
++it;
|
||||||
|
|
Loading…
Reference in a new issue