#include <konq_operations.h>
-#include <kpropertiesdialog.h>
-#include <kglobalsettings.h>
+#include <kaboutdata.h>
#include <kactioncollection.h>
+#include <kconfiggroup.h>
+#include <kdebug.h>
#include <kdirlister.h>
+#include <kglobalsettings.h>
#include <kiconloader.h>
+#include <klocale.h>
#include <kmessagebox.h>
-#include <kparts/genericfactory.h>
+#include <kpluginfactory.h>
+#include <kpropertiesdialog.h>
#include <ktoggleaction.h>
-#include <kconfiggroup.h>
#include <QActionGroup>
#include <QApplication>
#include <QClipboard>
-typedef KParts::GenericFactory<DolphinPart> DolphinPartFactory;
-K_EXPORT_COMPONENT_FACTORY(dolphinpart, DolphinPartFactory)
+K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
+// The componentdata name must be dolphinpart so that dolphinpart.rc is found
+// Alternatively we would have to install it as dolphin/dolphinpart.rc
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart"))
-DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QStringList& args)
+DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
: KParts::ReadOnlyPart(parent)
{
Q_UNUSED(args)
- setComponentData( DolphinPartFactory::componentData() );
+ setComponentData(DolphinPartFactory::componentData(), false);
m_extension = new DolphinPartBrowserExtension(this);
// make sure that other apps using this part find Dolphin's view-file-columns icons
m_dirLister,
m_dolphinModel,
m_proxyModel);
+ m_view->setTabsForFilesEnabled(true);
setWidget(m_view);
setXMLFile("dolphinpart.rc");
this, SLOT(slotErrorMessage(QString)));
connect(m_view, SIGNAL(itemTriggered(KFileItem)),
this, SLOT(slotItemTriggered(KFileItem)));
+ connect(m_view, SIGNAL(tabRequested(KUrl)),
+ this, SLOT(createNewWindow(KUrl)));
connect(m_view, SIGNAL(requestContextMenu(KFileItem,KUrl)),
this, SLOT(slotOpenContextMenu(KFileItem,KUrl)));
connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(slotRequestItemInfo(KFileItem)));
connect(m_view, SIGNAL(urlChanged(KUrl)),
this, SLOT(slotUrlChanged(KUrl)));
+ connect(m_view, SIGNAL(requestUrlChange(KUrl)),
+ this, SLOT(slotRequestUrlChange(KUrl)));
connect(m_view, SIGNAL(modeChanged()),
this, SIGNAL(viewModeChanged())); // relay signal
// TODO there was a "always open a new window" (when clicking on a directory) setting in konqueror
// (sort of spacial navigation)
+
+ loadPlugins(this, this, componentData());
}
DolphinPart::~DolphinPart()
bool DolphinPart::openUrl(const KUrl& url)
{
- const bool reload = arguments().reload();
+ bool reload = arguments().reload();
+ // A bit of a workaround so that changing the namefilter works: force reload.
+ // Otherwise DolphinView wouldn't relist the URL, so nothing would happen.
+ if (m_nameFilter != m_dirLister->nameFilter())
+ reload = true;
if (m_view->url() == url && !reload) { // DolphinView won't do anything in that case, so don't emit started
return true;
}
setUrl(url); // remember it at the KParts level
- const QString prettyUrl = url.pathOrUrl();
+ KUrl visibleUrl(url);
+ if (!m_nameFilter.isEmpty()) {
+ visibleUrl.addPath(m_nameFilter);
+ }
+ QString prettyUrl = visibleUrl.pathOrUrl();
emit setWindowCaption(prettyUrl);
emit m_extension->setLocationBarUrl(prettyUrl);
emit started(0); // get the wheel to spin
+ m_dirLister->setNameFilter(m_nameFilter);
m_view->setUrl(url);
+ emit aboutToOpenURL();
if (reload)
m_view->reload();
return true;
// since the idea was not to need BrowserArguments for non-browser stuff...
KParts::BrowserArguments browserArgs;
browserArgs.trustedSource = true;
+ emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
+}
- // MMB click support.
- // TODO: this doesn't work, mouseButtons() is always 0.
- // Issue N176832 for the missing QAIV signal; task 177399
- kDebug() << QApplication::mouseButtons();
- if (QApplication::mouseButtons() & Qt::MidButton) {
- kDebug() << "MMB!!" << item.mimetype();
- if (item.mimeTypePtr()->is("inode/directory")) {
- emit m_extension->createNewWindow(item.url(), args);
- } else {
- kDebug() << "run()";
- item.run();
- }
- } else {
- // Left button. [Right button goes to slotOpenContextMenu before triggered can be emitted]
- kDebug() << "LMB";
- emit m_extension->openUrlRequest(item.targetUrl(), args, browserArgs);
- }
+void DolphinPart::createNewWindow(const KUrl& url)
+{
+ // TODO: Check issue N176832 for the missing QAIV signal; task 177399 - maybe this code
+ // should be moved into DolphinPart::slotItemTriggered()
+ KFileItem item(S_IFDIR, (mode_t)-1, url);
+ KParts::OpenUrlArguments args;
+ args.setMimeType(item.mimetype());
+ emit m_extension->createNewWindow(url, args);
}
void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
KParts::BrowserExtension::ActionGroupMap actionGroups;
QList<QAction *> editActions;
- if (!item.isNull()) { // only for context menu on one or more items
+ if (!_item.isNull()) { // only for context menu on one or more items
// TODO if ( sMoving )
editActions.append(actionCollection()->action("rename"));
bool addTrash = false;
bool addDel = false;
- // TODO if ( sMoving && !isIntoTrash && !isTrashLink )
- addTrash = true;
+ bool isIntoTrash = _item.url().protocol() == "trash";
+
+ if ( /*TODO sMoving &&*/ !isIntoTrash )
+ addTrash = true;
/* TODO if ( sDeleting ) */ {
if ( !item.isLocalFile() )
if (addDel)
editActions.append(actionCollection()->action("delete"));
actionGroups.insert("editactions", editActions);
-
- // TODO: We should change the signature of the slots (and signals) for being able
- // to tell for which items we want a popup.
- KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
- : KFileItemList() << item);
- emit m_extension->popupMenu(QCursor::pos(),
- items,
- KParts::OpenUrlArguments(),
- KParts::BrowserArguments(),
- popupFlags,
- actionGroups);
}
+
+ // TODO: We should change the signature of the slots (and signals) for being able
+ // to tell for which items we want a popup.
+ KFileItemList items = (m_view->selectedItems().count() ? m_view->selectedItems()
+ : KFileItemList() << item);
+ emit m_extension->popupMenu(QCursor::pos(),
+ items,
+ KParts::OpenUrlArguments(),
+ KParts::BrowserArguments(),
+ popupFlags,
+ actionGroups);
}
void DolphinPart::slotUrlChanged(const KUrl& url)
+{
+ QString prettyUrl = url.pathOrUrl();
+ emit m_extension->setLocationBarUrl(prettyUrl);
+}
+
+void DolphinPart::slotRequestUrlChange(const KUrl& url)
{
if (m_view->url() != url) {
// If the view URL is not equal to 'url', then an inner URL change has
return m_actionHandler->currentViewModeActionName();
}
+void DolphinPart::setNameFilter(const QString& nameFilter)
+{
+ // This is the "/home/dfaure/*.diff" kind of name filter (KDirLister::setNameFilter)
+ // which is unrelated to DolphinView::setNameFilter which is substring filtering in a proxy.
+ m_nameFilter = nameFilter;
+ // TODO save/restore name filter in saveState/restoreState like KonqDirPart did in kde3?
+}
+
#include "dolphinpart.moc"
projects / dolphin.git / blobdiff