X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/be9746e87bb6a42e641dbf36c528a60fb564420a..09860f7cf4bdc6df66393d617184efec773ed1cf:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index ebc0bd43e..7dabe1457 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -21,7 +21,7 @@ #include "dolphinmainwindow.h" -#include +#include #include "dolphinapplication.h" #include "dolphinnewmenu.h" @@ -83,8 +83,8 @@ DolphinMainWindow::DolphinMainWindow(int id) : m_id(id) { setObjectName("Dolphin"); - m_viewContainer[PrimaryIdx] = 0; - m_viewContainer[SecondaryIdx] = 0; + m_viewContainer[PrimaryView] = 0; + m_viewContainer[SecondaryView] = 0; new MainWindowAdaptor(this); QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); @@ -98,6 +98,8 @@ DolphinMainWindow::DolphinMainWindow(int id) : this, SLOT(slotUndoAvailable(bool))); connect(undoManager, SIGNAL(undoTextChanged(const QString&)), this, SLOT(slotUndoTextChanged(const QString&))); + connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)), + this, SLOT(slotHandlePlacesError(const QString&))); } DolphinMainWindow::~DolphinMainWindow() @@ -106,25 +108,43 @@ DolphinMainWindow::~DolphinMainWindow() DolphinApplication::app()->removeMainWindow(this); } -void DolphinMainWindow::setActiveView(DolphinViewContainer* view) +void DolphinMainWindow::toggleViews() { - Q_ASSERT((view == m_viewContainer[PrimaryIdx]) || (view == m_viewContainer[SecondaryIdx])); - if (m_activeViewContainer == view) { + if (m_viewContainer[SecondaryView] == 0) { return; } - m_activeViewContainer->setActive(false); - m_activeViewContainer = view; - m_activeViewContainer->setActive(true); + // move secondary view from the last position of the splitter + // to the first position + m_splitter->insertWidget(0, m_viewContainer[SecondaryView]); - updateHistory(); - updateEditActions(); - updateViewActions(); - updateGoActions(); + DolphinViewContainer* container = m_viewContainer[PrimaryView]; + m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView]; + m_viewContainer[SecondaryView] = container; +} + +void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) +{ + clearStatusBar(); + KonqOperations::rename(this, oldUrl, newUrl); + m_undoCommandTypes.append(KonqUndoManager::RENAME); +} + +void DolphinMainWindow::refreshViews() +{ + Q_ASSERT(m_viewContainer[PrimaryView] != 0); - setCaption(m_activeViewContainer->url().fileName()); + // remember the current active view, as because of + // the refreshing the active view might change to + // the secondary view + DolphinViewContainer* activeViewContainer = m_activeViewContainer; - emit activeViewChanged(); + m_viewContainer[PrimaryView]->view()->refresh(); + if (m_viewContainer[SecondaryView] != 0) { + m_viewContainer[SecondaryView]->view()->refresh(); + } + + setActiveViewContainer(activeViewContainer); } void DolphinMainWindow::dropUrls(const KUrl::List& urls, @@ -156,20 +176,23 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, QString seq = QKeySequence(Qt::ShiftModifier).toString(); seq.chop(1); // chop superfluous '+' QAction* moveAction = popup.addAction(KIcon("goto-page"), - i18n("&Move Here") + '\t' + seq); + i18nc("@action:inmenu", + "&Move Here\t%1", seq)); seq = QKeySequence(Qt::ControlModifier).toString(); seq.chop(1); QAction* copyAction = popup.addAction(KIcon("edit-copy"), - i18n("&Copy Here") + '\t' + seq); + i18nc("@action:inmenu", + "&Copy Here\t%1", seq)); seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString(); seq.chop(1); QAction* linkAction = popup.addAction(KIcon("www"), - i18n("&Link Here") + '\t' + seq); + i18nc("@action:inmenu", + "&Link Here\t%1", seq)); popup.addSeparator(); - popup.addAction(KIcon("process-stop"), i18n("Cancel")); + popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel")); QAction* activatedAction = popup.exec(QCursor::pos()); if (activatedAction == moveAction) { @@ -201,34 +224,11 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls, } } -void DolphinMainWindow::rename(const KUrl& oldUrl, const KUrl& newUrl) -{ - clearStatusBar(); - KonqOperations::rename(this, oldUrl, newUrl); - m_undoCommandTypes.append(KonqUndoManager::RENAME); -} - -void DolphinMainWindow::refreshViews() -{ - Q_ASSERT(m_viewContainer[PrimaryIdx] != 0); - - // remember the current active view, as because of - // the refreshing the active view might change to - // the secondary view - DolphinViewContainer* activeViewContainer = m_activeViewContainer; - - m_viewContainer[PrimaryIdx]->view()->refresh(); - if (m_viewContainer[SecondaryIdx] != 0) { - m_viewContainer[SecondaryIdx]->view()->refresh(); - } - - setActiveView(activeViewContainer); -} - void DolphinMainWindow::changeUrl(const KUrl& url) { - if (activeViewContainer() != 0) { - activeViewContainer()->setUrl(url); + DolphinViewContainer* view = activeViewContainer(); + if (view != 0) { + view->setUrl(url); updateEditActions(); updateViewActions(); updateGoActions(); @@ -264,11 +264,11 @@ void DolphinMainWindow::slotShowHiddenFilesChanged() void DolphinMainWindow::slotCategorizedSortingChanged() { - KToggleAction* categorizedSortingAction = - static_cast(actionCollection()->action("categorized")); + KToggleAction* showInGroupsAction = + static_cast(actionCollection()->action("show_in_groups")); const DolphinView* view = m_activeViewContainer->view(); - categorizedSortingAction->setChecked(view->categorizedSorting()); - categorizedSortingAction->setEnabled(view->supportsCategorizedSorting()); + showInGroupsAction->setChecked(view->categorizedSorting()); + showInGroupsAction->setEnabled(view->supportsCategorizedSorting()); } void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) @@ -276,25 +276,34 @@ void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) QAction* action = 0; switch (sorting) { case DolphinView::SortByName: - action = actionCollection()->action("by_name"); + action = actionCollection()->action("sort_by_name"); break; case DolphinView::SortBySize: - action = actionCollection()->action("by_size"); + action = actionCollection()->action("sort_by_size"); break; case DolphinView::SortByDate: - action = actionCollection()->action("by_date"); + action = actionCollection()->action("sort_by_date"); break; case DolphinView::SortByPermissions: - action = actionCollection()->action("by_permissions"); + action = actionCollection()->action("sort_by_permissions"); break; case DolphinView::SortByOwner: - action = actionCollection()->action("by_owner"); + action = actionCollection()->action("sort_by_owner"); break; case DolphinView::SortByGroup: - action = actionCollection()->action("by_group"); + action = actionCollection()->action("sort_by_group"); break; case DolphinView::SortByType: - action = actionCollection()->action("by_type"); + action = actionCollection()->action("sort_by_type"); + break; +#ifdef HAVE_NEPOMUK + case DolphinView::SortByRating: + action = actionCollection()->action("sort_by_rating"); + break; + case DolphinView::SortByTags: + action = actionCollection()->action("sort_by_tags"); + break; +#endif default: break; } @@ -346,10 +355,10 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) { updateEditActions(); - Q_ASSERT(m_viewContainer[PrimaryIdx] != 0); - int selectedUrlsCount = m_viewContainer[PrimaryIdx]->view()->selectedUrls().count(); - if (m_viewContainer[SecondaryIdx] != 0) { - selectedUrlsCount += m_viewContainer[SecondaryIdx]->view()->selectedUrls().count(); + Q_ASSERT(m_viewContainer[PrimaryView] != 0); + int selectedUrlsCount = m_viewContainer[PrimaryView]->view()->selectedUrls().count(); + if (m_viewContainer[SecondaryView] != 0) { + selectedUrlsCount += m_viewContainer[SecondaryView]->view()->selectedUrls().count(); } QAction* compareFilesAction = actionCollection()->action("compare_files"); @@ -360,9 +369,9 @@ void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) emit selectionChanged(selection); } -void DolphinMainWindow::slotRequestItemInfo(const KUrl& url) +void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) { - emit requestItemInfo(url); + emit requestItemInfo(item); } void DolphinMainWindow::slotHistoryChanged() @@ -384,11 +393,17 @@ void DolphinMainWindow::openNewMainWindow() void DolphinMainWindow::toggleActiveView() { - if (m_activeViewContainer == m_viewContainer[PrimaryIdx]) { - setActiveView(m_viewContainer[SecondaryIdx]); - } else { - setActiveView(m_viewContainer[PrimaryIdx]); + if (m_viewContainer[SecondaryView] == 0) { + // only one view is available + return; } + + Q_ASSERT(m_activeViewContainer != 0); + Q_ASSERT(m_viewContainer[PrimaryView] != 0); + + DolphinViewContainer* left = m_viewContainer[PrimaryView]; + DolphinViewContainer* right = m_viewContainer[SecondaryView]; + setActiveViewContainer(m_activeViewContainer == right ? left : right); } void DolphinMainWindow::closeEvent(QCloseEvent* event) @@ -405,31 +420,31 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) void DolphinMainWindow::saveProperties(KConfig* config) { KConfigGroup primaryView = config->group("Primary view"); - primaryView.writeEntry("Url", m_viewContainer[PrimaryIdx]->url().url()); - primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryIdx]->isUrlEditable()); - if (m_viewContainer[SecondaryIdx] != 0) { + primaryView.writeEntry("Url", m_viewContainer[PrimaryView]->url().url()); + primaryView.writeEntry("Editable Url", m_viewContainer[PrimaryView]->isUrlEditable()); + if (m_viewContainer[SecondaryView] != 0) { KConfigGroup secondaryView = config->group("Secondary view"); - secondaryView.writeEntry("Url", m_viewContainer[SecondaryIdx]->url().url()); - secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryIdx]->isUrlEditable()); + secondaryView.writeEntry("Url", m_viewContainer[SecondaryView]->url().url()); + secondaryView.writeEntry("Editable Url", m_viewContainer[SecondaryView]->isUrlEditable()); } } void DolphinMainWindow::readProperties(KConfig* config) { const KConfigGroup primaryViewGroup = config->group("Primary view"); - m_viewContainer[PrimaryIdx]->setUrl(primaryViewGroup.readEntry("Url")); + m_viewContainer[PrimaryView]->setUrl(primaryViewGroup.readEntry("Url")); bool editable = primaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryIdx]->urlNavigator()->setUrlEditable(editable); + m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); if (config->hasGroup("Secondary view")) { const KConfigGroup secondaryViewGroup = config->group("Secondary view"); - if (m_viewContainer[PrimaryIdx] == 0) { + if (m_viewContainer[PrimaryView] == 0) { toggleSplitView(); } - m_viewContainer[PrimaryIdx]->setUrl(secondaryViewGroup.readEntry("Url")); + m_viewContainer[PrimaryView]->setUrl(secondaryViewGroup.readEntry("Url")); editable = secondaryViewGroup.readEntry("Editable Url", false); - m_viewContainer[PrimaryIdx]->urlNavigator()->setUrlEditable(editable); - } else if (m_viewContainer[SecondaryIdx] != 0) { + m_viewContainer[PrimaryView]->urlNavigator()->setUrlEditable(editable); + } else if (m_viewContainer[SecondaryView] != 0) { toggleSplitView(); } } @@ -485,6 +500,14 @@ void DolphinMainWindow::quit() close(); } +void DolphinMainWindow::slotHandlePlacesError(const QString &message) +{ + if (!message.isEmpty()) { + DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); + statusBar->setMessage(message, DolphinStatusBar::Error); + } +} + void DolphinMainWindow::slotHandleJobError(KJob* job) { if (job->error() != 0) { @@ -498,7 +521,7 @@ void DolphinMainWindow::slotDeleteFileFinished(KJob* job) { if (job->error() == 0) { DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - statusBar->setMessage(i18n("Delete operation completed."), + statusBar->setMessage(i18nc("@info:status", "Delete operation completed."), DolphinStatusBar::OperationCompleted); } } @@ -515,28 +538,28 @@ void DolphinMainWindow::slotUndoAvailable(bool available) DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); switch (command) { case KonqUndoManager::COPY: - statusBar->setMessage(i18n("Copy operation completed."), + statusBar->setMessage(i18nc("@info:status", "Copy operation completed."), DolphinStatusBar::OperationCompleted); break; case KonqUndoManager::MOVE: - statusBar->setMessage(i18n("Move operation completed."), + statusBar->setMessage(i18nc("@info:status", "Move operation completed."), DolphinStatusBar::OperationCompleted); break; case KonqUndoManager::LINK: - statusBar->setMessage(i18n("Link operation completed."), + statusBar->setMessage(i18nc("@info:status", "Link operation completed."), DolphinStatusBar::OperationCompleted); break; case KonqUndoManager::TRASH: - statusBar->setMessage(i18n("Move to trash operation completed."), + statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."), DolphinStatusBar::OperationCompleted); break; case KonqUndoManager::RENAME: - statusBar->setMessage(i18n("Renaming operation completed."), + statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."), DolphinStatusBar::OperationCompleted); break; case KonqUndoManager::MKDIR: - statusBar->setMessage(i18n("Created folder."), + statusBar->setMessage(i18nc("@info:status", "Created folder."), DolphinStatusBar::OperationCompleted); break; @@ -621,7 +644,7 @@ void DolphinMainWindow::updatePasteAction() return; } - QString text(i18n("Paste")); + QString text(i18nc("@action:inmenu", "Paste")); QClipboard* clipboard = QApplication::clipboard(); const QMimeData* mimeData = clipboard->mimeData(); @@ -629,10 +652,10 @@ void DolphinMainWindow::updatePasteAction() if (!urls.isEmpty()) { pasteAction->setEnabled(true); - pasteAction->setText(i18np("Paste One File", "Paste %1 Files", urls.count())); + pasteAction->setText(i18ncp("@action:inmenu", "Paste One File", "Paste %1 Files", urls.count())); } else { pasteAction->setEnabled(false); - pasteAction->setText(i18n("Paste")); + pasteAction->setText(i18nc("@action:inmenu", "Paste")); } if (pasteAction->isEnabled()) { @@ -717,6 +740,20 @@ void DolphinMainWindow::sortByType() m_activeViewContainer->view()->setSorting(DolphinView::SortByType); } +void DolphinMainWindow::sortByRating() +{ +#ifdef HAVE_NEPOMUK + m_activeViewContainer->view()->setSorting(DolphinView::SortByRating); +#endif +} + +void DolphinMainWindow::sortByTags() +{ +#ifdef HAVE_NEPOMUK + m_activeViewContainer->view()->setSorting(DolphinView::SortByTags); +#endif +} + void DolphinMainWindow::toggleSortOrder() { DolphinView* view = m_activeViewContainer->view(); @@ -758,28 +795,28 @@ void DolphinMainWindow::showDateInfo() void DolphinMainWindow::toggleSplitView() { - if (m_viewContainer[SecondaryIdx] == 0) { - const int newWidth = (m_viewContainer[PrimaryIdx]->width() - m_splitter->handleWidth()) / 2; + if (m_viewContainer[SecondaryView] == 0) { + const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2; // create a secondary view - const DolphinView* view = m_viewContainer[PrimaryIdx]->view(); - m_viewContainer[SecondaryIdx] = new DolphinViewContainer(this, + const DolphinView* view = m_viewContainer[PrimaryView]->view(); + m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, - view->rootUrl(), - view->mode(), - view->showHiddenFiles()); - connectViewSignals(SecondaryIdx); - m_splitter->addWidget(m_viewContainer[SecondaryIdx]); + view->rootUrl()); + connectViewSignals(SecondaryView); + m_splitter->addWidget(m_viewContainer[SecondaryView]); m_splitter->setSizes(QList() << newWidth << newWidth); - m_viewContainer[SecondaryIdx]->view()->reload(); - m_viewContainer[SecondaryIdx]->setActive(false); - m_viewContainer[SecondaryIdx]->show(); + m_viewContainer[SecondaryView]->view()->reload(); + m_viewContainer[SecondaryView]->setActive(false); + m_viewContainer[SecondaryView]->show(); } else { // remove secondary view - m_viewContainer[SecondaryIdx]->close(); - m_viewContainer[SecondaryIdx]->deleteLater(); - m_viewContainer[SecondaryIdx] = 0; + m_viewContainer[SecondaryView]->close(); + m_viewContainer[SecondaryView]->deleteLater(); + m_viewContainer[SecondaryView] = 0; } - setActiveView(m_viewContainer[PrimaryIdx]); + + setActiveViewContainer(m_viewContainer[PrimaryView]); + updateViewActions(); emit activeViewChanged(); } @@ -790,7 +827,8 @@ void DolphinMainWindow::reloadView() } void DolphinMainWindow::stopLoading() -{} +{ +} void DolphinMainWindow::togglePreview() { @@ -892,16 +930,16 @@ void DolphinMainWindow::compareFiles() // - both in the secondary view // - one in the primary view and the other in the secondary // view - Q_ASSERT(m_viewContainer[PrimaryIdx] != 0); + Q_ASSERT(m_viewContainer[PrimaryView] != 0); KUrl urlA; KUrl urlB; - KUrl::List urls = m_viewContainer[PrimaryIdx]->view()->selectedUrls(); + KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls(); switch (urls.count()) { case 0: { - Q_ASSERT(m_viewContainer[SecondaryIdx] != 0); - urls = m_viewContainer[SecondaryIdx]->view()->selectedUrls(); + Q_ASSERT(m_viewContainer[SecondaryView] != 0); + urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); Q_ASSERT(urls.count() == 2); urlA = urls[0]; urlB = urls[1]; @@ -910,8 +948,8 @@ void DolphinMainWindow::compareFiles() case 1: { urlA = urls[0]; - Q_ASSERT(m_viewContainer[SecondaryIdx] != 0); - urls = m_viewContainer[SecondaryIdx]->view()->selectedUrls(); + Q_ASSERT(m_viewContainer[SecondaryView] != 0); + urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); Q_ASSERT(urls.count() == 1); urlB = urls[0]; break; @@ -966,16 +1004,14 @@ void DolphinMainWindow::init() const KUrl& homeUrl = settings.generalSettings()->homeUrl(); setCaption(homeUrl.fileName()); ViewProperties props(homeUrl); - m_viewContainer[PrimaryIdx] = new DolphinViewContainer(this, - m_splitter, - homeUrl, - props.viewMode(), - props.showHiddenFiles()); + m_viewContainer[PrimaryView] = new DolphinViewContainer(this, + m_splitter, + homeUrl); - m_activeViewContainer = m_viewContainer[PrimaryIdx]; - connectViewSignals(PrimaryIdx); - m_viewContainer[PrimaryIdx]->view()->reload(); - m_viewContainer[PrimaryIdx]->show(); + m_activeViewContainer = m_viewContainer[PrimaryView]; + connectViewSignals(PrimaryView); + m_viewContainer[PrimaryView]->view()->reload(); + m_viewContainer[PrimaryView]->show(); setCentralWidget(m_splitter); setupDockWidgets(); @@ -992,25 +1028,51 @@ void DolphinMainWindow::init() updatePasteAction(); updateGoActions(); - loadSettings(); + const bool split = generalSettings->splitView(); + if (split) { + toggleSplitView(); + } + updateSplitAction(split); + updateViewActions(); if (firstRun) { // assure a proper default size if Dolphin runs the first time resize(700, 500); } -#ifdef HAVE_KMETADATA - if (!MetaDataWidget::metaDataAvailable()) - activeViewContainer()->statusBar()->setMessage(i18n("Failed to contact Nepomuk service, annotation and tagging are disabled."), DolphinStatusBar::Error); +#ifdef HAVE_NEPOMUK + if (!MetaDataWidget::metaDataAvailable()) { + DolphinStatusBar* statusBar = activeViewContainer()->statusBar(); + statusBar->setMessage(i18nc("@info:status", + "Failed to contact Nepomuk service, annotation and tagging are disabled."), + DolphinStatusBar::Error); + } #endif emit urlChanged(homeUrl); } -void DolphinMainWindow::loadSettings() +void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view) { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - updateSplitAction(settings->splitView()); + Q_ASSERT(view != 0); + Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView])); + if (m_activeViewContainer == view) { + return; + } + + m_activeViewContainer->setActive(false); + m_activeViewContainer = view; + m_activeViewContainer->setActive(true); + + updateHistory(); + updateEditActions(); updateViewActions(); + updateGoActions(); + + const KUrl& url = m_activeViewContainer->url(); + setCaption(url.fileName()); + + emit activeViewChanged(); + emit urlChanged(url); } void DolphinMainWindow::setupActions() @@ -1018,36 +1080,36 @@ void DolphinMainWindow::setupActions() // setup 'File' menu m_newMenu = new DolphinNewMenu(this); KMenu* menu = m_newMenu->menu(); - menu->setTitle(i18n("Create New")); + menu->setTitle(i18nc("@title:menu", "Create New")); menu->setIcon(KIcon("document-new")); connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); QAction* newWindow = actionCollection()->addAction("new_window"); newWindow->setIcon(KIcon("window-new")); - newWindow->setText(i18n("New &Window")); + newWindow->setText(i18nc("@action:inmenu File", "New &Window")); newWindow->setShortcut(Qt::CTRL | Qt::Key_N); connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow())); QAction* rename = actionCollection()->addAction("rename"); - rename->setText(i18n("Rename...")); + rename->setText(i18nc("@action:inmenu File", "Rename...")); rename->setShortcut(Qt::Key_F2); connect(rename, SIGNAL(triggered()), this, SLOT(rename())); QAction* moveToTrash = actionCollection()->addAction("move_to_trash"); - moveToTrash->setText(i18n("Move to Trash")); + moveToTrash->setText(i18nc("@action:inmenu File", "Move to Trash")); moveToTrash->setIcon(KIcon("edit-trash")); moveToTrash->setShortcut(QKeySequence::Delete); connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash())); QAction* deleteAction = actionCollection()->addAction("delete"); - deleteAction->setText(i18n("Delete")); + deleteAction->setText(i18nc("@action:inmenu File", "Delete")); deleteAction->setShortcut(Qt::SHIFT | Qt::Key_Delete); deleteAction->setIcon(KIcon("edit-delete")); connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems())); QAction* properties = actionCollection()->addAction("properties"); - properties->setText(i18n("Properties")); + properties->setText(i18nc("@action:inmenu File", "Properties")); properties->setShortcut(Qt::ALT | Qt::Key_Return); connect(properties, SIGNAL(triggered()), this, SLOT(properties())); @@ -1063,12 +1125,12 @@ void DolphinMainWindow::setupActions() KStandardAction::paste(this, SLOT(paste()), actionCollection()); QAction* selectAll = actionCollection()->addAction("select_all"); - selectAll->setText(i18n("Select All")); + selectAll->setText(i18nc("@action:inmenu Edit", "Select All")); selectAll->setShortcut(Qt::CTRL + Qt::Key_A); connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); QAction* invertSelection = actionCollection()->addAction("invert_selection"); - invertSelection->setText(i18n("Invert Selection")); + invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection")); invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A); connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection())); @@ -1082,19 +1144,19 @@ void DolphinMainWindow::setupActions() actionCollection()); KToggleAction* iconsView = actionCollection()->add("icons"); - iconsView->setText(i18n("Icons")); + iconsView->setText(i18nc("@action:inmenu View Mode", "Icons")); iconsView->setShortcut(Qt::CTRL | Qt::Key_1); iconsView->setIcon(KIcon("fileview-icon")); connect(iconsView, SIGNAL(triggered()), this, SLOT(setIconsView())); KToggleAction* detailsView = actionCollection()->add("details"); - detailsView->setText(i18n("Details")); + detailsView->setText(i18nc("@action:inmenu View Mode", "Details")); detailsView->setShortcut(Qt::CTRL | Qt::Key_2); detailsView->setIcon(KIcon("fileview-detailed")); connect(detailsView, SIGNAL(triggered()), this, SLOT(setDetailsView())); KToggleAction* columnView = actionCollection()->add("columns"); - columnView->setText(i18n("Columns")); + columnView->setText(i18nc("@action:inmenu View Mode", "Columns")); columnView->setShortcut(Qt::CTRL | Qt::Key_3); columnView->setIcon(KIcon("fileview-column")); connect(columnView, SIGNAL(triggered()), this, SLOT(setColumnView())); @@ -1104,34 +1166,54 @@ void DolphinMainWindow::setupActions() viewModeGroup->addAction(detailsView); viewModeGroup->addAction(columnView); - KToggleAction* sortByName = actionCollection()->add("by_name"); - sortByName->setText(i18n("By Name")); + KToggleAction* sortByName = actionCollection()->add("sort_by_name"); + sortByName->setText(i18nc("@action:inmenu Sort By", "Name")); connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName())); - KToggleAction* sortBySize = actionCollection()->add("by_size"); - sortBySize->setText(i18n("By Size")); + KToggleAction* sortBySize = actionCollection()->add("sort_by_size"); + sortBySize->setText(i18nc("@action:inmenu Sort By", "Size")); connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize())); - KToggleAction* sortByDate = actionCollection()->add("by_date"); - sortByDate->setText(i18n("By Date")); + KToggleAction* sortByDate = actionCollection()->add("sort_by_date"); + sortByDate->setText(i18nc("@action:inmenu Sort By", "Date")); connect(sortByDate, SIGNAL(triggered()), this, SLOT(sortByDate())); - KToggleAction* sortByPermissions = actionCollection()->add("by_permissions"); - sortByPermissions->setText(i18n("By Permissions")); + KToggleAction* sortByPermissions = actionCollection()->add("sort_by_permissions"); + sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions")); connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions())); - KToggleAction* sortByOwner = actionCollection()->add("by_owner"); - sortByOwner->setText(i18n("By Owner")); + KToggleAction* sortByOwner = actionCollection()->add("sort_by_owner"); + sortByOwner->setText(i18nc("@action:inmenu Sort By", "Owner")); connect(sortByOwner, SIGNAL(triggered()), this, SLOT(sortByOwner())); - KToggleAction* sortByGroup = actionCollection()->add("by_group"); - sortByGroup->setText(i18n("By Group")); + KToggleAction* sortByGroup = actionCollection()->add("sort_by_group"); + sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group")); connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup())); - KToggleAction* sortByType = actionCollection()->add("by_type"); - sortByType->setText(i18n("By Type")); + KToggleAction* sortByType = actionCollection()->add("sort_by_type"); + sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); + KToggleAction* sortByRating = actionCollection()->add("sort_by_rating"); + sortByRating->setText(i18nc("@action:inmenu Sort By", "Rating")); + + KToggleAction* sortByTags = actionCollection()->add("sort_by_tags"); + sortByTags->setText(i18nc("@action:inmenu Sort By", "Tags")); + +#ifdef HAVE_NEPOMUK + if (MetaDataWidget::metaDataAvailable()) { + connect(sortByRating, SIGNAL(triggered()), this, SLOT(sortByRating())); + connect(sortByTags, SIGNAL(triggered()), this, SLOT(sortByTags())); + } + else { + sortByRating->setEnabled(false); + sortByTags->setEnabled(false); + } +#else + sortByRating->setEnabled(false); + sortByTags->setEnabled(false); +#endif + QActionGroup* sortGroup = new QActionGroup(this); sortGroup->addAction(sortByName); sortGroup->addAction(sortBySize); @@ -1140,29 +1222,31 @@ void DolphinMainWindow::setupActions() sortGroup->addAction(sortByOwner); sortGroup->addAction(sortByGroup); sortGroup->addAction(sortByType); + sortGroup->addAction(sortByRating); + sortGroup->addAction(sortByTags); KToggleAction* sortDescending = actionCollection()->add("descending"); - sortDescending->setText(i18n("Descending")); + sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); - KToggleAction* sortCategorized = actionCollection()->add("categorized"); - sortCategorized->setText(i18n("Show in Groups")); - connect(sortCategorized, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); + KToggleAction* showInGroups = actionCollection()->add("show_in_groups"); + showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); + connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); KToggleAction* clearInfo = actionCollection()->add("clear_info"); - clearInfo->setText(i18n("No Information")); + clearInfo->setText(i18nc("@action:inmenu Additional information", "No Information")); connect(clearInfo, SIGNAL(triggered()), this, SLOT(clearInfo())); KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); - showMimeInfo->setText(i18n("Type")); + showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(showMimeInfo())); KToggleAction* showSizeInfo = actionCollection()->add("show_size_info"); - showSizeInfo->setText(i18n("Size")); + showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(showSizeInfo())); KToggleAction* showDateInfo = actionCollection()->add("show_date_info"); - showDateInfo->setText(i18n("Date")); + showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date")); connect(showDateInfo, SIGNAL(triggered()), this, SLOT(showDateInfo())); QActionGroup* infoGroup = new QActionGroup(this); @@ -1172,12 +1256,12 @@ void DolphinMainWindow::setupActions() infoGroup->addAction(showDateInfo); KToggleAction* showPreview = actionCollection()->add("show_preview"); - showPreview->setText(i18n("Preview")); + showPreview->setText(i18nc("@action:intoolbar", "Preview")); showPreview->setIcon(KIcon("fileview-preview")); connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview())); KToggleAction* showHiddenFiles = actionCollection()->add("show_hidden_files"); - showHiddenFiles->setText(i18n("Show Hidden Files")); + showHiddenFiles->setText(i18nc("@action:inmenu View", "Show Hidden Files")); showHiddenFiles->setShortcut(Qt::ALT | Qt::Key_Period); connect(showHiddenFiles, SIGNAL(triggered()), this, SLOT(toggleShowHiddenFiles())); @@ -1187,13 +1271,13 @@ void DolphinMainWindow::setupActions() connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView())); QAction* reload = actionCollection()->addAction("reload"); - reload->setText(i18n("Reload")); + reload->setText(i18nc("@action:inmenu View", "Reload")); reload->setShortcut(Qt::Key_F5); reload->setIcon(KIcon("view-refresh")); connect(reload, SIGNAL(triggered()), this, SLOT(reloadView())); QAction* stop = actionCollection()->addAction("stop"); - stop->setText(i18n("Stop")); + stop->setText(i18nc("@action:inmenu View", "Stop")); stop->setIcon(KIcon("process-stop")); connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading())); @@ -1201,17 +1285,17 @@ void DolphinMainWindow::setupActions() // changed, so that the corresponding showFullLocation action is updated. Also // the naming "Show full Location" is currently confusing... KToggleAction* showFullLocation = actionCollection()->add("editable_location"); - showFullLocation->setText(i18n("Show Full Location")); + showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location")); showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L); connect(showFullLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); QAction* editLocation = actionCollection()->addAction("edit_location"); - editLocation->setText(i18n("Edit Location")); + editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location")); editLocation->setShortcut(Qt::Key_F6); connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); QAction* adjustViewProps = actionCollection()->addAction("view_properties"); - adjustViewProps->setText(i18n("Adjust View Properties...")); + adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); // setup 'Go' menu @@ -1222,18 +1306,18 @@ void DolphinMainWindow::setupActions() // setup 'Tools' menu QAction* findFile = actionCollection()->addAction("find_file"); - findFile->setText(i18n("Find File...")); + findFile->setText(i18nc("@action:inmenu Tools", "Find File...")); findFile->setShortcut(Qt::CTRL | Qt::Key_F); findFile->setIcon(KIcon("file-find")); connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); - showFilterBar->setText(i18n("Show Filter Bar")); + showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility())); QAction* compareFiles = actionCollection()->addAction("compare_files"); - compareFiles->setText(i18n("Compare Files")); + compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files")); compareFiles->setIcon(KIcon("kompare")); compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); @@ -1245,13 +1329,13 @@ void DolphinMainWindow::setupActions() void DolphinMainWindow::setupDockWidgets() { // setup "Information" - QDockWidget* infoDock = new QDockWidget(i18n("Information")); + QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information")); infoDock->setObjectName("infoDock"); infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); SidebarPage* infoWidget = new InfoSidebarPage(infoDock); infoDock->setWidget(infoWidget); - infoDock->toggleViewAction()->setText(i18n("Information")); + infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information")); actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, infoDock); @@ -1259,17 +1343,17 @@ void DolphinMainWindow::setupDockWidgets() infoWidget, SLOT(setUrl(KUrl))); connect(this, SIGNAL(selectionChanged(KFileItemList)), infoWidget, SLOT(setSelection(KFileItemList))); - connect(this, SIGNAL(requestItemInfo(KUrl)), - infoWidget, SLOT(requestDelayedItemInfo(KUrl))); + connect(this, SIGNAL(requestItemInfo(KFileItem)), + infoWidget, SLOT(requestDelayedItemInfo(KFileItem))); // setup "Tree View" - QDockWidget* treeViewDock = new QDockWidget(i18n("Folders")); + QDockWidget* treeViewDock = new QDockWidget(i18nc("@title:window", "Folders")); treeViewDock->setObjectName("treeViewDock"); treeViewDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); TreeViewSidebarPage* treeWidget = new TreeViewSidebarPage(treeViewDock); treeViewDock->setWidget(treeWidget); - treeViewDock->toggleViewAction()->setText(i18n("Folders")); + treeViewDock->toggleViewAction()->setText(i18nc("@title:window", "Folders")); actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, treeViewDock); @@ -1283,13 +1367,13 @@ void DolphinMainWindow::setupDockWidgets() this, SLOT(dropUrls(KUrl::List, KUrl))); // setup "Terminal" - QDockWidget* terminalDock = new QDockWidget(i18n("Terminal")); + QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal")); terminalDock->setObjectName("terminalDock"); terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock); terminalDock->setWidget(terminalWidget); - terminalDock->toggleViewAction()->setText(i18n("Terminal")); + terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal")); actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); addDockWidget(Qt::RightDockWidgetArea, terminalDock); @@ -1303,14 +1387,14 @@ void DolphinMainWindow::setupDockWidgets() terminalDock->hide(); } - QDockWidget *placesDock = new QDockWidget(i18n("Places")); + QDockWidget *placesDock = new QDockWidget(i18nc("@title:window", "Places")); placesDock->setObjectName("placesDock"); placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); KFilePlacesView *listView = new KFilePlacesView(placesDock); placesDock->setWidget(listView); listView->setModel(DolphinSettings::instance().placesModel()); - placesDock->toggleViewAction()->setText(i18n("Show Places Panel")); + placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places")); actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); addDockWidget(Qt::LeftDockWidgetArea, placesDock); @@ -1419,7 +1503,7 @@ void DolphinMainWindow::updateViewActions() static_cast(actionCollection()->action("show_hidden_files")); showHiddenFilesAction->setChecked(view->showHiddenFiles()); - updateSplitAction(m_viewContainer[SecondaryIdx] != 0); + updateSplitAction(m_viewContainer[SecondaryView] != 0); KToggleAction* editableLocactionAction = static_cast(actionCollection()->action("editable_location")); @@ -1480,8 +1564,8 @@ void DolphinMainWindow::connectViewSignals(int viewIndex) this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::AdditionalInformation))); connect(view, SIGNAL(selectionChanged(KFileItemList)), this, SLOT(slotSelectionChanged(KFileItemList))); - connect(view, SIGNAL(requestItemInfo(KUrl)), - this, SLOT(slotRequestItemInfo(KUrl))); + connect(view, SIGNAL(requestItemInfo(KFileItem)), + this, SLOT(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); @@ -1496,10 +1580,10 @@ void DolphinMainWindow::updateSplitAction(bool isSplit) { QAction* splitAction = actionCollection()->action("split_view"); if (isSplit) { - splitAction->setText(i18n("Join")); + splitAction->setText(i18nc("@action:intoolbar Join views", "Join")); splitAction->setIcon(KIcon("fileview-join")); } else { - splitAction->setText(i18n("Split")); + splitAction->setText(i18nc("@action:intoolbar Split view", "Split")); splitAction->setIcon(KIcon("fileview-split")); } }