*/
#include "dolphinpart.h"
+#include <kdebug.h>
#include "dolphinviewactionhandler.h"
#include "dolphinsortfilterproxymodel.h"
#include "dolphinview.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 <kpluginfactory.h>
-#include <kpropertiesdialog.h>
#include <ktoggleaction.h>
#include <kio/netaccess.h>
#include <ktoolinvocation.h>
#include <QClipboard>
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"))
+K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin"))
DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args)
: KParts::ReadOnlyPart(parent)
m_dirLister = new KDirLister;
m_dirLister->setAutoUpdate(true);
- m_dirLister->setMainWindow(parentWidget->window());
+ if (parentWidget) {
+ m_dirLister->setMainWindow(parentWidget->window());
+ }
m_dirLister->setDelayedMimeTypes(true);
//connect(m_dirLister, SIGNAL(started(KUrl)), this, SLOT(slotStarted()));
connect(m_dirLister, SIGNAL(completed(KUrl)), this, SLOT(slotCompleted(KUrl)));
connect(m_dirLister, SIGNAL(canceled(KUrl)), this, SLOT(slotCanceled(KUrl)));
+ connect(m_dirLister, SIGNAL(percent(int)), this, SLOT(updateProgress(int)));
m_dolphinModel = new DolphinModel(this);
m_dolphinModel->setDirLister(m_dirLister);
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(requestContextMenu(KFileItem,KUrl,QList<QAction*>)),
+ this, SLOT(slotOpenContextMenu(KFileItem,KUrl,QList<QAction*>)));
connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
m_extension, SIGNAL(selectionInfo(KFileItemList)));
connect(m_view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(slotSelectionChanged(KFileItemList)));
connect(m_view, SIGNAL(requestItemInfo(KFileItem)),
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
+ connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
+ this, SLOT(slotRedirection(KUrl, KUrl)));
+
+ // Watch for changes that should result in updates to the
+ // status bar text.
+ connect(m_dirLister, SIGNAL(deleteItem(const KFileItem&)),
+ this, SLOT(updateStatusBar()));
+ connect(m_dirLister, SIGNAL(clear()),
+ this, SLOT(updateStatusBar()));
+ connect(m_view, SIGNAL(selectionChanged(const KFileItemList)),
+ this, SLOT(updateStatusBar()));
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
m_actionHandler->setCurrentView(m_view);
editMimeTypeAction->setText( i18nc("@action:inmenu Edit", "&Edit File Type..." ) );
connect(editMimeTypeAction, SIGNAL(triggered()), SLOT(slotEditMimeType()));
- KAction *propertiesAction = actionCollection()->addAction( "properties" );
- propertiesAction->setText( i18nc("@action:inmenu Edit", "Properties") );
- propertiesAction->setShortcut(Qt::ALT+Qt::Key_Return);
- connect(propertiesAction, SIGNAL(triggered()), SLOT(slotProperties()));
-
// View menu: all done by DolphinViewActionHandler
// Go menu
void DolphinPart::slotRequestItemInfo(const KFileItem& item)
{
emit m_extension->mouseOverInfo(item);
+ if (item.isNull()) {
+ updateStatusBar();
+ } else {
+ ReadOnlyPart::setStatusBarText(item.getStatusBarInfo());
+ }
}
void DolphinPart::slotItemTriggered(const KFileItem& item)
emit m_extension->createNewWindow(url, args);
}
-void DolphinPart::slotOpenContextMenu(const KFileItem& _item, const KUrl&)
+void DolphinPart::slotOpenContextMenu(const KFileItem& _item,
+ const KUrl&,
+ const QList<QAction*>& customActions)
{
KParts::BrowserExtension::PopupFlags popupFlags = KParts::BrowserExtension::DefaultPopupItems
| KParts::BrowserExtension::ShowProperties
KParts::BrowserExtension::ActionGroupMap actionGroups;
QList<QAction *> editActions;
+ editActions += customActions;
+
if (!_item.isNull()) { // only for context menu on one or more items
bool sDeleting = true;
bool sMoving = true;
addDel = true;
}
else {
- KConfigGroup configGroup( KGlobal::config(), "KDE" );
- if ( configGroup.readEntry( "ShowDeleteCommand", false) )
+ KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
+ KConfigGroup configGroup(globalConfig, "KDE");
+ if ( configGroup.readEntry("ShowDeleteCommand", false) )
addDel = true;
}
}
editActions.append(actionCollection()->action("move_to_trash"));
if (addDel)
editActions.append(actionCollection()->action("delete"));
- actionGroups.insert("editactions", editActions);
+
+ // Normally KonqPopupMenu only shows the "Create new" subdir in the current view
+ // since otherwise the created file would not be visible.
+ // But in treeview mode we should allow it.
+ if (m_view->itemsExpandable())
+ popupFlags |= KParts::BrowserExtension::ShowCreateDirectory;
+
}
+ 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()
actionGroups);
}
-void DolphinPart::slotUrlChanged(const KUrl& url)
+void DolphinPart::slotRedirection(const KUrl& oldUrl, const KUrl& newUrl)
{
- KParts::ReadOnlyPart::setUrl(url);
- QString prettyUrl = url.pathOrUrl();
- emit m_extension->setLocationBarUrl(prettyUrl);
+ //kDebug() << oldUrl << newUrl << "currentUrl=" << url();
+ if (oldUrl == url()) {
+ KParts::ReadOnlyPart::setUrl(newUrl);
+ const QString prettyUrl = newUrl.pathOrUrl();
+ emit m_extension->setLocationBarUrl(prettyUrl);
+ }
}
void DolphinPart::slotRequestUrlChange(const KUrl& url)
}
}
-void DolphinPart::slotProperties()
-{
- const KFileItemList items = m_view->selectedItems();
- if (!items.isEmpty()) {
- KPropertiesDialog dialog(items.first().url(), m_view);
- dialog.exec();
- }
-}
-
void DolphinPart::setCurrentViewMode(const QString& viewModeName)
{
QAction* action = actionCollection()->action(viewModeName);
m_newMenu->setPopupFiles(url());
}
+void DolphinPart::updateStatusBar()
+{
+ emit ReadOnlyPart::setStatusBarText(m_view->statusBarText());
+}
+
+void DolphinPart::updateProgress(int percent)
+{
+ m_extension->loadingProgress(percent);
+}
+
#include "dolphinpart.moc"
projects / dolphin.git / blobdiff