mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-12 12:54:29 +00:00
Merge remote-tracking branch 'origin/KDE/4.12'
This commit is contained in:
commit
4ddc3cfdde
|
@ -84,6 +84,8 @@ void DolphinViewActionHandler::setCurrentView(DolphinView* view)
|
|||
this, SLOT(slotSortRoleChanged(QByteArray)));
|
||||
connect(view, SIGNAL(zoomLevelChanged(int,int)),
|
||||
this, SLOT(slotZoomLevelChanged(int,int)));
|
||||
connect(view, SIGNAL(writeStateChanged(bool)),
|
||||
this, SLOT(slotWriteStateChanged(bool)));
|
||||
}
|
||||
|
||||
DolphinView* DolphinViewActionHandler::currentView()
|
||||
|
@ -99,6 +101,7 @@ void DolphinViewActionHandler::createActions()
|
|||
newDirAction->setText(i18nc("@action", "Create Folder..."));
|
||||
newDirAction->setShortcut(Qt::Key_F10);
|
||||
newDirAction->setIcon(KIcon("folder-new"));
|
||||
newDirAction->setEnabled(false); // Will be enabled in slotWriteStateChanged(bool) if the current URL is writable
|
||||
connect(newDirAction, SIGNAL(triggered()), this, SIGNAL(createDirectory()));
|
||||
|
||||
// File menu
|
||||
|
@ -482,6 +485,11 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
|
|||
showHiddenFilesAction->setChecked(shown);
|
||||
}
|
||||
|
||||
void DolphinViewActionHandler::slotWriteStateChanged(bool isFolderWritable)
|
||||
{
|
||||
m_actionCollection->action("create_dir")->setEnabled(isFolderWritable);
|
||||
}
|
||||
|
||||
KToggleAction* DolphinViewActionHandler::iconsModeAction()
|
||||
{
|
||||
KToggleAction* iconsView = m_actionCollection->add<KToggleAction>("icons");
|
||||
|
|
|
@ -196,6 +196,11 @@ private Q_SLOTS:
|
|||
*/
|
||||
void slotHiddenFilesShownChanged(bool shown);
|
||||
|
||||
/**
|
||||
* Updates the state of the 'Create Folder...' action.
|
||||
*/
|
||||
void slotWriteStateChanged(bool isFolderWritable);
|
||||
|
||||
/**
|
||||
* Opens the view properties dialog, which allows to modify the properties
|
||||
* of the currently active view.
|
||||
|
|
Loading…
Reference in a new issue