kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut the ropes between DolphinMainWindow and DolphinNewFileMenu. Error handling is now done via signals.

Browse source 
REVIEW: 111989
This commit is contained in:
Emmanuel Pescosta 2013-08-16 20:22:33 +02:00
parent b6477f4e65
commit 804e83f893
5 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dolphincontextmenu.cpp
View file

@ -196,7 +196,7 @@ void DolphinContextMenu::openItemContextMenu()
if (m_selectedItems.count() == 1) {
if (m_fileInfo.isDir()) {
// setup 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), this);
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
newFileMenu->checkUpToDate();
@ -204,6 +204,7 @@ void DolphinContextMenu::openItemContextMenu()
newFileMenu->setEnabled(selectedItemsProps.supportsWriting());
connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
connect(newFileMenu, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString)));
KMenu* menu = newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

3
src/dolphincontextmenu.h
View file

@ -95,6 +95,9 @@ protected:
virtual void keyPressEvent(QKeyEvent *ev);
virtual void keyReleaseEvent(QKeyEvent *ev);
signals:
void errorMessage(const QString& error);
private:
void openTrashContextMenu();
void openTrashItemContextMenu();

6
src/dolphinmainwindow.cpp
View file

@ -1297,6 +1297,8 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
{
QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
contextMenu.data()->setCustomActions(customActions);
connect(contextMenu.data(), SIGNAL(errorMessage(QString)),
this, SLOT(showErrorMessage(QString)));
const DolphinContextMenu::Command command = contextMenu.data()->open();
switch (command) {
@ -1482,13 +1484,15 @@ DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QW
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
m_newFileMenu = new DolphinNewFileMenu(this);
m_newFileMenu = new DolphinNewFileMenu(actionCollection(), this);
KMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(KIcon("document-new"));
m_newFileMenu->setDelayed(false);
connect(menu, SIGNAL(aboutToShow()),
this, SLOT(updateNewMenu()));
connect(m_newFileMenu, SIGNAL(errorMessage(QString)),
this, SLOT(showErrorMessage(QString)));
KAction* newWindow = actionCollection()->addAction("new_window");
newWindow->setIcon(KIcon("window-new"));

11
src/dolphinnewfilemenu.cpp
View file

@ -20,17 +20,13 @@
#include "dolphinnewfilemenu.h"
#include "dolphinmainwindow.h"
#include "dolphinviewcontainer.h"
#include "views/dolphinnewfilemenuobserver.h"
#include "views/dolphinview.h"
#include <KActionCollection>
#include <KIO/Job>
DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
KNewFileMenu(parent->actionCollection(), "create_new", parent),
m_mainWin(parent)
DolphinNewFileMenu::DolphinNewFileMenu(KActionCollection* collection, QObject* parent) :
KNewFileMenu(collection, "create_new", parent)
{
DolphinNewFileMenuObserver::instance().attach(this);
}
@ -43,8 +39,7 @@ DolphinNewFileMenu::~DolphinNewFileMenu()
void DolphinNewFileMenu::slotResult(KJob* job)
{
if (job->error()) {
DolphinViewContainer* container = m_mainWin->activeViewContainer();
container->showMessage(job->errorString(), DolphinViewContainer::Error);
emit errorMessage(job->errorString());
} else {
KNewFileMenu::slotResult(job);
}

9
src/dolphinnewfilemenu.h
View file

@ -23,7 +23,6 @@
#include <KNewFileMenu>
class DolphinMainWindow;
class KJob;
/**
@ -39,15 +38,15 @@ class DolphinNewFileMenu : public KNewFileMenu
Q_OBJECT
public:
DolphinNewFileMenu(DolphinMainWindow* parent);
DolphinNewFileMenu(KActionCollection* collection, QObject* parent);
virtual ~DolphinNewFileMenu();
signals:
void errorMessage(const QString& error);
protected slots:
/** @see KNewFileMenu::slotResult() */
virtual void slotResult(KJob* job);
private:
DolphinMainWindow* m_mainWin;
};
#endif