#include <kprotocolmanager.h>
#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
#include <QtGui/QKeyEvent>
#include <QtGui/QItemSelection>
#include <QtGui/QBoxLayout>
#include <QtCore/QTimer>
#include <QtGui/QScrollBar>
+#include <kdesktopfile.h>
#include <kfileitemdelegate.h>
#include <kfileplacesmodel.h>
#include <kglobalsettings.h>
#include <kurlnavigator.h>
#include <krun.h>
+#include "dolphin_generalsettings.h"
#include "dolphinmodel.h"
#include "dolphincolumnview.h"
-#include "dolphincontroller.h"
+#include "dolphinviewcontroller.h"
#include "dolphinmainwindow.h"
#include "dolphindirlister.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphindetailsview.h"
#include "dolphiniconsview.h"
-#include "dolphincontextmenu.h"
#include "draganddrophelper.h"
#include "filterbar.h"
+#include "settings/dolphinsettings.h"
#include "statusbar/dolphinstatusbar.h"
+#include "viewmodecontroller.h"
#include "viewproperties.h"
-#include "settings/dolphinsettings.h"
-#include "dolphin_generalsettings.h"
-DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
- QWidget* parent,
- const KUrl& url) :
+DolphinViewContainer::DolphinViewContainer(const KUrl& url, QWidget* parent) :
QWidget(parent),
m_isFolderWritable(false),
- m_mainWindow(mainWindow),
m_topLayout(0),
m_urlNavigator(0),
m_view(0),
const GeneralSettings* settings = DolphinSettings::instance().generalSettings();
m_urlNavigator->setUrlEditable(settings->editableUrl());
m_urlNavigator->setShowFullPath(settings->showFullPath());
- m_urlNavigator->setHomeUrl(settings->homeUrl());
+ m_urlNavigator->setHomeUrl(KUrl(settings->homeUrl()));
KUrlComboBox* editor = m_urlNavigator->editor();
editor->setCompletionMode(KGlobalSettings::Completion(settings->urlCompletionMode()));
m_view = new DolphinView(this, url, m_proxyModel);
connect(m_view, SIGNAL(urlChanged(const KUrl&)),
m_urlNavigator, SLOT(setUrl(const KUrl&)));
- connect(m_view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)),
- this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList<QAction*>&)));
- connect(m_view, SIGNAL(contentsMoved(int, int)),
- this, SLOT(saveContentsPos(int, int)));
connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
this, SLOT(showItemInfo(KFileItem)));
connect(m_view, SIGNAL(errorMessage(const QString&)),
this, SLOT(showOperationCompletedMessage(const QString&)));
connect(m_view, SIGNAL(itemTriggered(KFileItem)),
this, SLOT(slotItemTriggered(KFileItem)));
- connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
- this, SLOT(saveRootUrl(const KUrl&)));
connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
this, SLOT(redirect(KUrl, KUrl)));
connect(m_view, SIGNAL(selectionChanged(const KFileItemList&)),
this, SLOT(delayedStatusBarUpdate()));
connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
- this, SLOT(restoreView(const KUrl&)));
+ this, SLOT(slotUrlNavigatorLocationChanged(const KUrl&)));
+ connect(m_urlNavigator, SIGNAL(urlAboutToBeChanged(const KUrl&)),
+ this, SLOT(saveViewState()));
connect(m_urlNavigator, SIGNAL(historyChanged()),
this, SLOT(slotHistoryChanged()));
+ // initialize status bar
m_statusBar = new DolphinStatusBar(this, m_view);
m_statusBarTimer = new QTimer(this);
m_statusBarTimer->setSingleShot(true);
connect(m_statusBarTimer, SIGNAL(timeout()),
this, SLOT(updateStatusBar()));
+ KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self();
+ connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)),
+ this, SLOT(delayedStatusBarUpdate()));
+
+ // initialize filter bar
m_filterBar = new FilterBar(this);
m_filterBar->setVisible(settings->filterBar());
connect(m_filterBar, SIGNAL(filterChanged(const QString&)),
m_dirLister = 0; // deleted by m_dolphinModel
}
-const KUrl& DolphinViewContainer::url() const
+KUrl DolphinViewContainer::url() const
{
- return m_urlNavigator->url();
+ return m_urlNavigator->locationUrl();
}
void DolphinViewContainer::setActive(bool active)
m_urlNavigator->setActive(active);
m_view->setActive(active);
if (active) {
- m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+ emit writeStateChanged(m_isFolderWritable);
}
}
void DolphinViewContainer::setUrl(const KUrl& newUrl)
{
- if (newUrl != m_urlNavigator->url()) {
- m_urlNavigator->setUrl(newUrl);
+ if (newUrl != m_urlNavigator->locationUrl()) {
+ m_urlNavigator->setLocationUrl(newUrl);
// Temporary disable the 'File'->'Create New...' menu until
// the write permissions can be checked in a fast way at
// DolphinViewContainer::slotDirListerCompleted().
m_isFolderWritable = false;
if (isActive()) {
- m_mainWindow->newMenu()->menu()->setEnabled(false);
+ emit writeStateChanged(false);
}
}
}
}
}
-bool DolphinViewContainer::isUrlEditable() const
-{
- return m_urlNavigator->isUrlEditable();
-}
-
void DolphinViewContainer::delayedStatusBarUpdate()
{
// Invoke updateStatusBar() with a small delay. This assures that
|| (m_statusBar->type() == DolphinStatusBar::Information))
&& (m_statusBar->progress() == 100);
- const QString text(m_view->statusBarText());
+ const QString text = m_view->statusBarText();
m_statusBar->setDefaultText(text);
if (updateStatusBarMsg) {
void DolphinViewContainer::initializeProgress()
{
if (url().protocol() == "nepomuksearch") {
- // The Nepomuk IO-slave does not provide any progress information. Give
+ // The Nepomuk IO-slave does not provide progress information right away. Give
// an immediate hint to the user that a searching is done:
m_statusBar->setProgressText(i18nc("@info", "Searching..."));
m_statusBar->setProgress(-1);
}
if (isActive()) {
- m_mainWindow->newMenu()->menu()->setEnabled(m_isFolderWritable);
+ emit writeStateChanged(m_isFolderWritable);
}
}
delayedStatusBarUpdate();
}
-void DolphinViewContainer::openContextMenu(const KFileItem& item,
- const KUrl& url,
- const QList<QAction*>& customActions)
-{
- DolphinContextMenu contextMenu(m_mainWindow, item, url);
- contextMenu.setCustomActions(customActions);
- contextMenu.open();
-}
-
-void DolphinViewContainer::saveContentsPos(int x, int y)
+void DolphinViewContainer::activate()
{
- // TODO: If DolphinViewContainer uses DolphinView::saveState(...) to save the
- // view state in KDE 4.5, this funciton can be removed.
- m_urlNavigator->savePosition(x, y);
+ setActive(true);
}
-void DolphinViewContainer::activate()
+void DolphinViewContainer::saveViewState()
{
- setActive(true);
+ QByteArray locationState;
+ QDataStream stream(&locationState, QIODevice::WriteOnly);
+ m_view->saveState(stream);
+ m_urlNavigator->saveLocationState(locationState);
}
-void DolphinViewContainer::restoreView(const KUrl& url)
+void DolphinViewContainer::slotUrlNavigatorLocationChanged(const KUrl& url)
{
if (KProtocolManager::supportsListing(url)) {
- m_view->updateView(url, m_urlNavigator->savedRootUrl());
+ m_view->setUrl(url);
if (isActive()) {
// When an URL has been entered, the view should get the focus.
// The focus must be requested asynchronously, as changing the URL might create
}
}
-void DolphinViewContainer::saveRootUrl(const KUrl& url)
-{
- Q_UNUSED(url);
- m_urlNavigator->saveRootUrl(m_view->rootUrl());
-}
-
void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
{
DragAndDropHelper::instance().dropUrls(KFileItem(), destination, event, this);
Q_UNUSED(oldUrl);
const bool block = m_urlNavigator->signalsBlocked();
m_urlNavigator->blockSignals(true);
- m_urlNavigator->setUrl(newUrl);
+
+ // Assure that the location state is reset for redirection URLs. This
+ // allows to skip redirection URLs when going back or forward in the
+ // URL history.
+ m_urlNavigator->saveLocationState(QByteArray());
+ m_urlNavigator->setLocationUrl(newUrl);
+
m_urlNavigator->blockSignals(block);
}
void DolphinViewContainer::slotHistoryChanged()
{
- const int index = m_urlNavigator->historyIndex();
- if (index > 0) {
- // The "Go Forward" action is enabled. Try to mark
- // the previous directory as active item:
- const KUrl url = m_urlNavigator->historyUrl(index - 1);
- m_view->activateItem(url);
- QPoint pos = m_urlNavigator->savedPosition();
- m_view->setRestoredContentsPosition(pos);
+ QByteArray locationState = m_urlNavigator->locationState();
+
+ if (!locationState.isEmpty()) {
+ QDataStream stream(&locationState, QIODevice::ReadOnly);
+ m_view->restoreState(stream);
}
}
}
}
+ if (item.mimetype() == "application/x-desktop") {
+ // redirect to the url in Type=Link desktop files
+ KDesktopFile desktopFile(url.toLocalFile());
+ if (desktopFile.hasLinkType()) {
+ url = desktopFile.readUrl();
+ m_view->setUrl(url);
+ return;
+ }
+ }
+
item.run();
}
projects / dolphin.git / blobdiff