#include "dolphinmainwindow.h"
#include "dolphinnewfilemenu.h"
-#include "settings/dolphinsettings.h"
#include "dolphinviewcontainer.h"
#include "dolphin_generalsettings.h"
-#include <kactioncollection.h>
-#include <kdesktopfile.h>
+#include <KActionCollection>
+#include <KDesktopFile>
#include <kfileitemactionplugin.h>
#include <kabstractfileitemactionplugin.h>
-#include <kfileitemactions.h>
-#include <kfileitemlistproperties.h>
-#include <kfileplacesmodel.h>
-#include <kglobal.h>
+#include <KFileItemActions>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KGlobal>
#include <KIconLoader>
#include <KIO/NetAccess>
-#include <kmenu.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
-#include <kmimetypetrader.h>
-#include <kmodifierkeyinfo.h>
+#include <KMenu>
+#include <KMenuBar>
+#include <KMessageBox>
+#include <KMimeTypeTrader>
+#include <KModifierKeyInfo>
#include <KNewFileMenu>
#include <konqmimedata.h>
#include <konq_operations.h>
-#include <kservice.h>
+#include <KService>
#include <KLocale>
-#include <kpropertiesdialog.h>
-#include <kstandardaction.h>
-#include <kstandarddirs.h>
+#include <KPropertiesDialog>
+#include <KStandardAction>
+#include <KStandardDirs>
+#include <KToolBar>
-#include <QtGui/QApplication>
-#include <QtGui/QClipboard>
-#include <QtCore/QDir>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include "views/dolphinplacesmodel.h"
#include "views/dolphinview.h"
#include "views/viewmodecontroller.h"
K_GLOBAL_STATIC(KModifierKeyInfo, m_keyInfo)
DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
+ const QPoint& pos,
const KFileItem& fileInfo,
const KUrl& baseUrl) :
+ QObject(parent),
+ m_pos(pos),
m_mainWindow(parent),
m_fileInfo(fileInfo),
m_baseUrl(baseUrl),
if (m_keyInfo->isKeyPressed(Qt::Key_Shift) || m_keyInfo->isKeyLatched(Qt::Key_Shift)) {
m_shiftPressed = true;
}
- connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key, bool)),
- this, SLOT(slotKeyModifierPressed(Qt::Key, bool)));
+ connect(m_keyInfo, SIGNAL(keyPressed(Qt::Key,bool)),
+ this, SLOT(slotKeyModifierPressed(Qt::Key,bool)));
}
m_removeAction = new QAction(this);
void DolphinContextMenu::slotRemoveActionTriggered()
{
const KActionCollection* collection = m_mainWindow->actionCollection();
- if (m_shiftPressed) {
- collection->action("delete")->trigger();
- } else {
+ if (moveToTrash()) {
collection->action("move_to_trash")->trigger();
+ } else {
+ collection->action("delete")->trigger();
}
}
QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
m_popup->addAction(propertiesAction);
- addShowMenubarAction();
+ addShowMenuBarAction();
- QAction *action = m_popup->exec(QCursor::pos());
+ QAction *action = m_popup->exec(m_pos);
if (action == emptyTrashAction) {
- const QString text(i18nc("@info", "Do you really want to empty the Trash? All items will be deleted."));
- const bool del = KMessageBox::warningContinueCancel(m_mainWindow,
- text,
- QString(),
- KGuiItem(i18nc("@action:button", "Empty Trash"),
- KIcon("user-trash"))
- ) == KMessageBox::Continue;
- if (del) {
- KonqOperations::emptyTrash(m_mainWindow);
- }
+ KonqOperations::emptyTrash(m_mainWindow);
} else if (action == addToPlacesAction) {
- const KUrl& url = m_mainWindow->activeViewContainer()->url();
+ const KUrl url = m_mainWindow->activeViewContainer()->url();
if (url.isValid()) {
- DolphinSettings::instance().placesModel()->addPlace(i18nc("@label", "Trash"), url);
+ DolphinPlacesModel::instance()->addPlace(i18nc("@label", "Trash"), url);
}
}
}
QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
m_popup->addAction(propertiesAction);
- if (m_popup->exec(QCursor::pos()) == restoreAction) {
+ if (m_popup->exec(m_pos) == restoreAction) {
KUrl::List selectedUrls;
foreach (const KFileItem &item, m_selectedItems) {
selectedUrls.append(item.url());
// setup 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow);
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
- newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+ newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
newFileMenu->checkUpToDate();
newFileMenu->setPopupFiles(m_fileInfo.url());
newFileMenu->setEnabled(selectedItemsProperties().supportsWriting());
addVersionControlPluginActions();
// insert 'Copy To' and 'Move To' sub menus
- if (DolphinSettings::instance().generalSettings()->showCopyMoveMenu()) {
+ if (GeneralSettings::showCopyMoveMenu()) {
m_copyToMenu.setItems(m_selectedItems);
m_copyToMenu.setReadOnly(!selectedItemsProperties().supportsWriting());
m_copyToMenu.addActionsTo(m_popup);
QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
m_popup->addAction(propertiesAction);
- QAction* activatedAction = m_popup->exec(QCursor::pos());
+ QAction* activatedAction = m_popup->exec(m_pos);
if (activatedAction) {
if (activatedAction == addToPlacesAction) {
const KUrl selectedUrl(m_fileInfo.url());
if (selectedUrl.isValid()) {
- DolphinSettings::instance().placesModel()->addPlace(placesName(selectedUrl),
- selectedUrl);
+ DolphinPlacesModel::instance()->addPlace(placesName(selectedUrl),
+ selectedUrl);
}
} else if (activatedAction == openParentInNewWindowAction) {
m_command = OpenParentFolderInNewWindow;
// setup 'Create New' menu
KNewFileMenu* newFileMenu = m_mainWindow->newFileMenu();
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
- newFileMenu->setViewShowsHiddenFiles(view->showHiddenFiles());
+ newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
newFileMenu->checkUpToDate();
newFileMenu->setPopupFiles(m_baseUrl);
m_popup->addMenu(newFileMenu->menu());
addCustomActions();
- QAction* propertiesAction = m_popup->addAction(i18nc("@action:inmenu", "Properties"));
- propertiesAction->setIcon(KIcon("document-properties"));
-
- addShowMenubarAction();
+ QAction* propertiesAction = m_mainWindow->actionCollection()->action("properties");
+ m_popup->addAction(propertiesAction);
- QAction* action = m_popup->exec(QCursor::pos());
- if (action == propertiesAction) {
- const KUrl& url = m_mainWindow->activeViewContainer()->url();
+ addShowMenuBarAction();
- KPropertiesDialog* dialog = new KPropertiesDialog(url, m_mainWindow);
- dialog->setAttribute(Qt::WA_DeleteOnClose);
- dialog->show();
- } else if (addToPlacesAction && (action == addToPlacesAction)) {
- const KUrl& url = m_mainWindow->activeViewContainer()->url();
+ QAction* action = m_popup->exec(m_pos);
+ if (addToPlacesAction && (action == addToPlacesAction)) {
+ const KUrl url = m_mainWindow->activeViewContainer()->url();
if (url.isValid()) {
- DolphinSettings::instance().placesModel()->addPlace(placesName(url), url);
+ DolphinPlacesModel::instance()->addPlace(placesName(url), url);
}
}
}
}
}
-void DolphinContextMenu::addShowMenubarAction()
+void DolphinContextMenu::addShowMenuBarAction()
{
- KAction* showMenuBar = m_mainWindow->showMenuBarAction();
- if (!m_mainWindow->menuBar()->isVisible()) {
+ const KActionCollection* ac = m_mainWindow->actionCollection();
+ QAction* showMenuBar = ac->action(KStandardAction::name(KStandardAction::ShowMenubar));
+ if (!m_mainWindow->menuBar()->isVisible() && !m_mainWindow->toolBar()->isVisible()) {
m_popup->addSeparator();
m_popup->addAction(showMenuBar);
}
bool DolphinContextMenu::placeExists(const KUrl& url) const
{
- const KFilePlacesModel* placesModel = DolphinSettings::instance().placesModel();
+ const KFilePlacesModel* placesModel = DolphinPlacesModel::instance();
const int count = placesModel->rowCount();
for (int i = 0; i < count; ++i) {
return action;
}
-KFileItemListProperties& DolphinContextMenu::selectedItemsProperties()
+KFileItemListProperties& DolphinContextMenu::selectedItemsProperties() const
{
if (!m_selectedItemsProperties) {
m_selectedItemsProperties = new KFileItemListProperties(m_selectedItems);
void DolphinContextMenu::updateRemoveAction()
{
const KActionCollection* collection = m_mainWindow->actionCollection();
- const bool moveToTrash = selectedItemsProperties().isLocal() && !m_shiftPressed;
// Using m_removeAction->setText(action->text()) does not apply the &-shortcut.
// This is only done until the original action has been shown at least once. To
// bypass this issue, the text and &-shortcut is applied manually.
const QAction* action = 0;
- if (moveToTrash) {
+ if (moveToTrash()) {
action = collection->action("move_to_trash");
m_removeAction->setText(i18nc("@action:inmenu", "&Move to Trash"));
} else {
m_removeAction->setShortcuts(action->shortcuts());
}
+bool DolphinContextMenu::moveToTrash() const
+{
+ return selectedItemsProperties().isLocal() && !m_shiftPressed;
+}
+
#include "dolphincontextmenu.moc"
projects / dolphin.git / blobdiff