Fix regression that creating a sub-folder is not possible

CCBUG: 265714
This commit is contained in:
Peter Penz 2011-02-09 21:15:55 +01:00
parent d3496b1231
commit 4a9561e6b7
4 changed files with 8 additions and 6 deletions

View file

@ -240,12 +240,14 @@ void DolphinContextMenu::openItemContextMenu()
if (m_selectedItems.count() == 1) {
if (m_fileInfo.isDir()) {
// setup 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_popup, m_mainWindow);
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
newFileMenu->checkUpToDate();
newFileMenu->setPopupFiles(m_fileInfo.url());
newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
connect(newFileMenu, SIGNAL(fileCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
connect(newFileMenu, SIGNAL(directoryCreated(KUrl)), newFileMenu, SLOT(deleteLater()));
KMenu* menu = newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));

View file

@ -1412,7 +1412,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
m_newFileMenu = new DolphinNewFileMenu(this, this);
m_newFileMenu = new DolphinNewFileMenu(this);
KMenu* menu = m_newFileMenu->menu();
menu->setTitle(i18nc("@title:menu Create new folder, file, link, etc.", "Create New"));
menu->setIcon(KIcon("document-new"));

View file

@ -29,9 +29,9 @@
#include <KActionCollection>
#include <KIO/Job>
DolphinNewFileMenu::DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin) :
KNewFileMenu(mainWin->actionCollection(), "create_new", parent),
m_mainWin(mainWin)
DolphinNewFileMenu::DolphinNewFileMenu(DolphinMainWindow* parent) :
KNewFileMenu(parent->actionCollection(), "create_new", parent),
m_mainWin(parent)
{
DolphinNewFileMenuObserver::instance().attach(this);
}

View file

@ -39,7 +39,7 @@ class DolphinNewFileMenu : public KNewFileMenu
Q_OBJECT
public:
DolphinNewFileMenu(QWidget* parent, DolphinMainWindow* mainWin);
DolphinNewFileMenu(DolphinMainWindow* parent);
virtual ~DolphinNewFileMenu();
protected slots: