***************************************************************************/
#include "dolphinmainwindow.h"
+#include "dolphinviewactionhandler.h"
+#include "dolphindropcontroller.h"
#include <config-nepomuk.h>
#include "dolphinapplication.h"
+#include "dolphinfileplacesview.h"
#include "dolphinnewmenu.h"
#include "dolphinsettings.h"
#include "dolphinsettingsdialog.h"
#include "mainwindowadaptor.h"
#include "terminalsidebarpage.h"
#include "treeviewsidebarpage.h"
-#include "kurlnavigator.h"
#include "viewpropertiesdialog.h"
#include "viewproperties.h"
-#include "kfileplacesmodel.h"
-#include "kfileplacesview.h"
#include "dolphin_generalsettings.h"
#include "dolphin_iconsmodesettings.h"
#include <kdesktopfile.h>
#include <kdeversion.h>
#include <kfiledialog.h>
+#include <kfileplacesmodel.h>
#include <kglobal.h>
#include <kicon.h>
#include <kiconloader.h>
#include <kmenu.h>
#include <kmenubar.h>
#include <kmessagebox.h>
+#include <kurlnavigator.h>
#include <konqmimedata.h>
-#include <konq_operations.h>
#include <kpropertiesdialog.h>
#include <kprotocolinfo.h>
#include <ktoggleaction.h>
#include <kstatusbar.h>
#include <kstandardaction.h>
#include <kurl.h>
+#include <kurlcombobox.h>
-#include <QtGui/QKeyEvent>
-#include <QtGui/QClipboard>
-#include <QtGui/QSplitter>
-#include <QtGui/QDockWidget>
+#include <QKeyEvent>
+#include <QClipboard>
+#include <QLineEdit>
+#include <QSplitter>
+#include <QDockWidget>
DolphinMainWindow::DolphinMainWindow(int id) :
KXmlGuiWindow(0),
void DolphinMainWindow::dropUrls(const KUrl::List& urls,
const KUrl& destination)
{
- kDebug() << "Source" << urls;
- kDebug() << "Destination:" << destination;
-
- Qt::DropAction action = Qt::CopyAction;
-
- Qt::KeyboardModifiers modifier = QApplication::keyboardModifiers();
- const bool shiftPressed = modifier & Qt::ShiftModifier;
- const bool controlPressed = modifier & Qt::ControlModifier;
- if (shiftPressed && controlPressed) {
- // shortcut for 'Link Here' is used
- action = Qt::LinkAction;
- } else if (shiftPressed) {
- // shortcut for 'Move Here' is used
- action = Qt::MoveAction;
- } else if (controlPressed) {
- // shortcut for 'Copy Here' is used
- action = Qt::CopyAction;
- } else {
- // open a context menu which offers the following actions:
- // - Move Here
- // - Copy Here
- // - Link Here
- // - Cancel
-
- KMenu popup(this);
-
- QString seq = QKeySequence(Qt::ShiftModifier).toString();
- seq.chop(1); // chop superfluous '+'
- QAction* moveAction = popup.addAction(KIcon("go-jump"),
- i18nc("@action:inmenu",
- "&Move Here\t<shortcut>%1</shortcut>", seq));
-
- seq = QKeySequence(Qt::ControlModifier).toString();
- seq.chop(1);
- QAction* copyAction = popup.addAction(KIcon("edit-copy"),
- i18nc("@action:inmenu",
- "&Copy Here\t<shortcut>%1</shortcut>", seq));
-
- seq = QKeySequence(Qt::ControlModifier + Qt::ShiftModifier).toString();
- seq.chop(1);
- QAction* linkAction = popup.addAction(KIcon("insert-link"),
- i18nc("@action:inmenu",
- "&Link Here\t<shortcut>%1</shortcut>", seq));
-
- popup.addSeparator();
- popup.addAction(KIcon("process-stop"), i18nc("@action:inmenu", "Cancel"));
-
- QAction* activatedAction = popup.exec(QCursor::pos());
- if (activatedAction == moveAction) {
- action = Qt::MoveAction;
- } else if (activatedAction == copyAction) {
- action = Qt::CopyAction;
- } else if (activatedAction == linkAction) {
- action = Qt::LinkAction;
- } else {
- return;
- }
- }
-
- switch (action) {
- case Qt::MoveAction:
- KonqOperations::copy(this, KonqOperations::MOVE, urls, destination);
- m_undoCommandTypes.append(KonqFileUndoManager::MOVE);
- break;
-
- case Qt::CopyAction:
- KonqOperations::copy(this, KonqOperations::COPY, urls, destination);
- m_undoCommandTypes.append(KonqFileUndoManager::COPY);
- break;
-
- case Qt::LinkAction:
- KonqOperations::copy(this, KonqOperations::LINK, urls, destination);
- m_undoCommandTypes.append(KonqFileUndoManager::LINK);
- break;
-
- default:
- break;
- }
+ DolphinDropController dropController(this);
+ connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)),
+ this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType)));
+ dropController.dropUrls(urls, destination);
}
void DolphinMainWindow::changeUrl(const KUrl& url)
updateViewActions();
}
-void DolphinMainWindow::slotShowPreviewChanged()
-{
- // It is not enough to update the 'Show Preview' action, also
- // the 'Zoom In' and 'Zoom Out' actions must be adapted.
- updateViewActions();
-}
-
-void DolphinMainWindow::slotShowHiddenFilesChanged()
-{
- KToggleAction* showHiddenFilesAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- const DolphinView* view = m_activeViewContainer->view();
- showHiddenFilesAction->setChecked(view->showHiddenFiles());
-}
-
-void DolphinMainWindow::slotCategorizedSortingChanged()
-{
- KToggleAction* showInGroupsAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_in_groups"));
- const DolphinView* view = m_activeViewContainer->view();
- showInGroupsAction->setChecked(view->categorizedSorting());
- showInGroupsAction->setEnabled(view->supportsCategorizedSorting());
-}
-
void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting)
{
QAction* action = 0;
}
if (action != 0) {
- KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
- toggleAction->setChecked(true);
+ action->setChecked(true);
}
}
-void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order)
-{
- KToggleAction* descending = static_cast<KToggleAction*>(actionCollection()->action("descending"));
- const bool sortDescending = (order == Qt::DescendingOrder);
- descending->setChecked(sortDescending);
-}
-
-void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list)
+void DolphinMainWindow::slotEditableStateChanged(bool editable)
{
- QAction* showSizeInfo = actionCollection()->action("show_size_info");
- QAction* showDateInfo = actionCollection()->action("show_date_info");
- QAction* showPermissionsInfo = actionCollection()->action("show_permissions_info");
- QAction* showOwnerInfo = actionCollection()->action("show_owner_info");
- QAction* showGroupInfo = actionCollection()->action("show_group_info");
- QAction* showMimeInfo = actionCollection()->action("show_mime_info");
-
- showSizeInfo->setChecked(false);
- showDateInfo->setChecked(false);
- showPermissionsInfo->setChecked(false);
- showOwnerInfo->setChecked(false);
- showGroupInfo->setChecked(false);
- showMimeInfo->setChecked(false);
-
- const DolphinView* view = m_activeViewContainer->view();
-
- const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
- const bool enable = (view->mode() == DolphinView::DetailsView) ||
- ((view->mode() == DolphinView::IconsView) && settings->showAdditionalInfo());
-
- showSizeInfo->setEnabled(enable);
- showDateInfo->setEnabled(enable);
- showPermissionsInfo->setEnabled(enable);
- showOwnerInfo->setEnabled(enable);
- showGroupInfo->setEnabled(enable);
- showMimeInfo->setEnabled(enable);
-
- foreach (KFileItemDelegate::Information info, list) {
- switch (info) {
- case KFileItemDelegate::Size:
- showSizeInfo->setChecked(true);
- break;
- case KFileItemDelegate::ModificationTime:
- showDateInfo->setChecked(true);
- break;
- case KFileItemDelegate::Permissions:
- showPermissionsInfo->setChecked(true);
- break;
- case KFileItemDelegate::Owner:
- showOwnerInfo->setChecked(true);
- break;
- case KFileItemDelegate::OwnerAndGroup:
- showGroupInfo->setChecked(true);
- break;
- case KFileItemDelegate::FriendlyMimeType:
- showMimeInfo->setChecked(true);
- break;
- default:
- break;
- }
- }
+ KToggleAction* editableLocationAction =
+ static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+ editableLocationAction->setChecked(editable);
}
void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection)
}
QAction* compareFilesAction = actionCollection()->action("compare_files");
- compareFilesAction->setEnabled(selectedUrlsCount == 2);
+ if (selectedUrlsCount == 2) {
+ const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty();
+ compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled);
+ } else {
+ compareFilesAction->setEnabled(false);
+ }
m_activeViewContainer->updateStatusBar();
void DolphinMainWindow::updateFilterBarAction(bool show)
{
- KToggleAction* showFilterBarAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
+ QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
showFilterBarAction->setChecked(show);
}
m_newMenu->setPopupFiles(activeViewContainer()->url());
}
-void DolphinMainWindow::rename()
-{
- clearStatusBar();
- m_activeViewContainer->view()->renameSelectedItems();
-}
-
-void DolphinMainWindow::moveToTrash()
-{
- clearStatusBar();
-
- DolphinView* view = m_activeViewContainer->view();
-
- if (QApplication::keyboardModifiers() & Qt::ShiftModifier) {
- view->deleteSelectedItems();
- } else {
- view->trashSelectedItems();
- }
-}
-
-void DolphinMainWindow::deleteItems()
-{
- clearStatusBar();
- m_activeViewContainer->view()->deleteSelectedItems();
-}
-
void DolphinMainWindow::properties()
{
const KFileItemList list = m_activeViewContainer->view()->selectedItems();
void DolphinMainWindow::slotUndoAvailable(bool available)
{
- QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
+ QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
if (undoAction != 0) {
undoAction->setEnabled(available);
}
void DolphinMainWindow::slotUndoTextChanged(const QString& text)
{
- QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo));
+ QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
if (undoAction != 0) {
undoAction->setText(text);
}
void DolphinMainWindow::updatePasteAction()
{
- QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste));
+ QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste));
if (pasteAction == 0) {
return;
}
void DolphinMainWindow::selectAll()
{
clearStatusBar();
- m_activeViewContainer->view()->selectAll();
+
+ // if the URL navigator is editable and focused, select the whole
+ // URL instead of all items of the view
+
+ KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
+ QLineEdit* lineEdit = urlNavigator->editor()->lineEdit();
+ const bool selectUrl = urlNavigator->isUrlEditable() &&
+ lineEdit->hasFocus();
+ if (selectUrl) {
+ lineEdit->selectAll();
+ } else {
+ m_activeViewContainer->view()->selectAll();
+ }
}
void DolphinMainWindow::invertSelection()
#endif
}
-void DolphinMainWindow::toggleSortOrder()
-{
- DolphinView* view = m_activeViewContainer->view();
- const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ?
- Qt::DescendingOrder :
- Qt::AscendingOrder;
- view->setSortOrder(order);
-}
-
-void DolphinMainWindow::toggleSortCategorization()
-{
- DolphinView* view = m_activeViewContainer->view();
- const bool categorizedSorting = view->categorizedSorting();
- view->setCategorizedSorting(!categorizedSorting);
-}
-
-void DolphinMainWindow::toggleSizeInfo()
-{
- toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size);
-}
-
-void DolphinMainWindow::toggleDateInfo()
-{
- toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime);
-}
-
-void DolphinMainWindow::togglePermissionsInfo()
-{
- toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions);
-}
-
-void DolphinMainWindow::toggleOwnerInfo()
-{
- toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner);
-}
-
-void DolphinMainWindow::toggleGroupInfo()
-{
- toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup);
-}
-
-void DolphinMainWindow::toggleMimeInfo()
-{
- toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType);
-}
-
void DolphinMainWindow::toggleSplitView()
{
if (m_viewContainer[SecondaryView] == 0) {
setActiveViewContainer(m_viewContainer[PrimaryView]);
updateViewActions();
- emit activeViewChanged();
+ emit activeViewChanged(); // TODO unused; remove?
}
void DolphinMainWindow::reloadView()
{
}
-void DolphinMainWindow::togglePreview()
+void DolphinMainWindow::toggleFilterBarVisibility(bool show)
{
- clearStatusBar();
-
- const KToggleAction* showPreviewAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
- const bool show = showPreviewAction->isChecked();
- m_activeViewContainer->view()->setShowPreview(show);
-}
-
-void DolphinMainWindow::toggleShowHiddenFiles()
-{
- clearStatusBar();
-
- const KToggleAction* showHiddenFilesAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- const bool show = showHiddenFilesAction->isChecked();
- m_activeViewContainer->view()->setShowHiddenFiles(show);
-}
-
-void DolphinMainWindow::toggleFilterBarVisibility()
-{
- const KToggleAction* showFilterBarAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
- const bool show = showFilterBarAction->isChecked();
m_activeViewContainer->showFilterBar(show);
}
-void DolphinMainWindow::zoomIn()
-{
- m_activeViewContainer->view()->zoomIn();
- updateViewActions();
-}
-
-void DolphinMainWindow::zoomOut()
-{
- m_activeViewContainer->view()->zoomOut();
- updateViewActions();
-}
-
void DolphinMainWindow::toggleEditLocation()
{
clearStatusBar();
- KToggleAction* action = static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
-
- bool editOrBrowse = action->isChecked();
+ QAction* action = actionCollection()->action("editable_location");
KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
- urlNavigator->setUrlEditable(editOrBrowse);
+ urlNavigator->setUrlEditable(action->isChecked());
}
void DolphinMainWindow::editLocation()
const KUrl& homeUrl = settings.generalSettings()->homeUrl();
setCaption(homeUrl.fileName());
+ m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
+ connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar()));
ViewProperties props(homeUrl);
m_viewContainer[PrimaryView] = new DolphinViewContainer(this,
m_splitter,
m_activeViewContainer = m_viewContainer[PrimaryView];
connectViewSignals(PrimaryView);
- m_viewContainer[PrimaryView]->view()->reload();
+ DolphinView* view = m_viewContainer[PrimaryView]->view();
+ view->reload();
m_viewContainer[PrimaryView]->show();
+ m_actionHandler->setCurrentView(view);
setCentralWidget(m_splitter);
setupDockWidgets();
emit urlChanged(homeUrl);
}
-void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
+void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
{
- Q_ASSERT(view != 0);
- Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView]));
- if (m_activeViewContainer == view) {
+ Q_ASSERT(viewContainer != 0);
+ Q_ASSERT((viewContainer == m_viewContainer[PrimaryView]) || (viewContainer == m_viewContainer[SecondaryView]));
+ if (m_activeViewContainer == viewContainer) {
return;
}
m_activeViewContainer->setActive(false);
- m_activeViewContainer = view;
+ m_activeViewContainer = viewContainer;
m_activeViewContainer->setActive(true);
updateHistory();
const KUrl& url = m_activeViewContainer->url();
setCaption(url.fileName());
- emit activeViewChanged();
+ m_actionHandler->setCurrentView(viewContainer->view());
+
+ emit activeViewChanged(); // TODO unused; remove?
emit urlChanged(url);
}
newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
connect(newWindow, SIGNAL(triggered()), this, SLOT(openNewMainWindow()));
- KAction* rename = DolphinView::createRenameAction(actionCollection());
- connect(rename, SIGNAL(triggered()), this, SLOT(rename()));
-
- KAction* moveToTrash = DolphinView::createMoveToTrashAction(actionCollection());
- connect(moveToTrash, SIGNAL(triggered()), this, SLOT(moveToTrash()));
-
- KAction* deleteAction = DolphinView::createDeleteAction(actionCollection());
- connect(deleteAction, SIGNAL(triggered()), this, SLOT(deleteItems()));
-
KAction* properties = actionCollection()->addAction("properties");
properties->setText(i18nc("@action:inmenu File", "Properties"));
properties->setShortcut(Qt::ALT | Qt::Key_Return);
SLOT(undo()),
actionCollection());
- //Need to remove shift+del from cut action, else the shortcut for deletejob
- //doesn't work
+ // need to remove shift+del from cut action, else the shortcut for deletejob
+ // doesn't work
KAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
KShortcut cutShortcut = cut->shortcut();
cutShortcut.remove(Qt::SHIFT + Qt::Key_Delete, KShortcut::KeepEmpty);
connect(invertSelection, SIGNAL(triggered()), this, SLOT(invertSelection()));
// setup 'View' menu
- KStandardAction::zoomIn(this,
- SLOT(zoomIn()),
- actionCollection());
-
- KStandardAction::zoomOut(this,
- SLOT(zoomOut()),
- actionCollection());
-
KToggleAction* iconsView = DolphinView::iconsModeAction(actionCollection());
KToggleAction* detailsView = DolphinView::detailsModeAction(actionCollection());
viewModeGroup->addAction(columnView);
connect(viewModeGroup, SIGNAL(triggered(QAction*)), this, SLOT(setViewMode(QAction*)));
+ //QActionGroup* sortActionGroup = DolphinView::createSortActionGroup(actionCollection());
+ //connect(sortActionGroup, SIGNAL(triggered(QAction*)), this, SLOT(sortActionGroupTriggered(QAction*)));
+
+ // TODO use a QActionGroup
+
KToggleAction* sortByName = actionCollection()->add<KToggleAction>("sort_by_name");
sortByName->setText(i18nc("@action:inmenu Sort By", "Name"));
connect(sortByName, SIGNAL(triggered()), this, SLOT(sortByName()));
//sortGroup->addAction(sortByRating);
//sortGroup->addAction(sortByTags);
- KToggleAction* sortDescending = actionCollection()->add<KToggleAction>("descending");
- sortDescending->setText(i18nc("@action:inmenu Sort", "Descending"));
- connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder()));
-
- KToggleAction* showInGroups = actionCollection()->add<KToggleAction>("show_in_groups");
- showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups"));
- connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization()));
-
- KToggleAction* showSizeInfo = actionCollection()->add<KToggleAction>("show_size_info");
- showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size"));
- connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo()));
-
- KToggleAction* showDateInfo = actionCollection()->add<KToggleAction>("show_date_info");
- showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date"));
- connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo()));
-
- KToggleAction* showPermissionsInfo = actionCollection()->add<KToggleAction>("show_permissions_info");
- showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions"));
- connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo()));
-
- KToggleAction* showOwnerInfo = actionCollection()->add<KToggleAction>("show_owner_info");
- showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner"));
- connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo()));
-
- KToggleAction* showGroupInfo = actionCollection()->add<KToggleAction>("show_group_info");
- showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group"));
- connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo()));
-
- KToggleAction* showMimeInfo = actionCollection()->add<KToggleAction>("show_mime_info");
- showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type"));
- connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo()));
-
- KToggleAction* showPreview = actionCollection()->add<KToggleAction>("show_preview");
- showPreview->setText(i18nc("@action:intoolbar", "Preview"));
- showPreview->setIcon(KIcon("fileview-preview"));
- connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview()));
-
- KToggleAction* showHiddenFiles = actionCollection()->add<KToggleAction>("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()));
-
KAction* split = actionCollection()->addAction("split_view");
- split->setShortcut(Qt::Key_F10);
+ split->setShortcut(Qt::Key_F3);
updateSplitAction();
connect(split, SIGNAL(triggered()), this, SLOT(toggleSplitView()));
stop->setIcon(KIcon("process-stop"));
connect(stop, SIGNAL(triggered()), this, SLOT(stopLoading()));
- // TODO: the URL navigator must emit a signal if the editable state has been
- // changed, so that the corresponding showFullLocation action is updated. Also
- // the naming "Show full Location" is currently confusing...
+ // TODO: the naming "Show full Location" is currently confusing...
KToggleAction* showFullLocation = actionCollection()->add<KToggleAction>("editable_location");
showFullLocation->setText(i18nc("@action:inmenu Navigation Bar", "Show Full Location"));
showFullLocation->setShortcut(Qt::CTRL | Qt::Key_L);
KToggleAction* showFilterBar = actionCollection()->add<KToggleAction>("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()));
+ connect(showFilterBar, SIGNAL(triggered(bool)), this, SLOT(toggleFilterBarVisibility(bool)));
KAction* compareFiles = actionCollection()->addAction("compare_files");
compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files"));
SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock);
terminalDock->setWidget(terminalWidget);
+ connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide()));
+
terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal"));
terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4);
actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction());
QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places"));
placesDock->setObjectName("placesDock");
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
- KFilePlacesView* placesView = new KFilePlacesView(placesDock);
+
+ DolphinFilePlacesView* placesView = new DolphinFilePlacesView(placesDock);
placesDock->setWidget(placesView);
placesView->setModel(DolphinSettings::instance().placesModel());
placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
void DolphinMainWindow::updateViewActions()
{
- const DolphinView* view = m_activeViewContainer->view();
- QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn));
- if (zoomInAction != 0) {
- zoomInAction->setEnabled(view->isZoomInPossible());
- }
-
- QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut));
- if (zoomOutAction != 0) {
- zoomOutAction->setEnabled(view->isZoomOutPossible());
- }
+ m_actionHandler->updateViewActions();
+ const DolphinView* view = m_activeViewContainer->view();
QAction* action = actionCollection()->action(view->currentViewModeActionName());
if (action != 0) {
- KToggleAction* toggleAction = static_cast<KToggleAction*>(action);
- toggleAction->setChecked(true);
+ action->setChecked(true);
}
slotSortingChanged(view->sorting());
- slotSortOrderChanged(view->sortOrder());
- slotCategorizedSortingChanged();
- slotAdditionalInfoChanged(view->additionalInfo());
- KToggleAction* showFilterBarAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_filter_bar"));
+ QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible());
- KToggleAction* showPreviewAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_preview"));
- showPreviewAction->setChecked(view->showPreview());
-
- KToggleAction* showHiddenFilesAction =
- static_cast<KToggleAction*>(actionCollection()->action("show_hidden_files"));
- showHiddenFilesAction->setChecked(view->showHiddenFiles());
-
updateSplitAction();
- KToggleAction* editableLocactionAction =
- static_cast<KToggleAction*>(actionCollection()->action("editable_location"));
+ QAction* editableLocactionAction = actionCollection()->action("editable_location");
const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
editableLocactionAction->setChecked(urlNavigator->isUrlEditable());
}
void DolphinMainWindow::updateGoActions()
{
- QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up));
+ QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
const KUrl& currentUrl = m_activeViewContainer->url();
goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
}
DolphinView* view = container->view();
connect(view, SIGNAL(modeChanged()),
this, SLOT(slotViewModeChanged()));
- connect(view, SIGNAL(showPreviewChanged()),
- this, SLOT(slotShowPreviewChanged()));
- connect(view, SIGNAL(showHiddenFilesChanged()),
- this, SLOT(slotShowHiddenFilesChanged()));
- connect(view, SIGNAL(categorizedSortingChanged()),
- this, SLOT(slotCategorizedSortingChanged()));
connect(view, SIGNAL(sortingChanged(DolphinView::Sorting)),
this, SLOT(slotSortingChanged(DolphinView::Sorting)));
- connect(view, SIGNAL(sortOrderChanged(Qt::SortOrder)),
- this, SLOT(slotSortOrderChanged(Qt::SortOrder)));
- connect(view, SIGNAL(additionalInfoChanged(KFileItemDelegate::InformationList)),
- this, SLOT(slotAdditionalInfoChanged(KFileItemDelegate::InformationList)));
connect(view, SIGNAL(selectionChanged(KFileItemList)),
this, SLOT(slotSelectionChanged(KFileItemList)));
connect(view, SIGNAL(requestItemInfo(KFileItem)),
this, SLOT(changeUrl(const KUrl&)));
connect(navigator, SIGNAL(historyChanged()),
this, SLOT(slotHistoryChanged()));
+ connect(navigator, SIGNAL(editableStateChanged(bool)),
+ this, SLOT(slotEditableStateChanged(bool)));
}
void DolphinMainWindow::updateSplitAction()
if (m_viewContainer[SecondaryView] != 0) {
if (m_activeViewContainer == m_viewContainer[PrimaryView]) {
splitAction->setText(i18nc("@action:intoolbar Close right view", "Close"));
- splitAction->setIcon(KIcon("fileview-close-right"));
+ splitAction->setIcon(KIcon("view-right-close"));
} else {
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
- splitAction->setIcon(KIcon("fileview-close-left"));
+ splitAction->setIcon(KIcon("view-left-close"));
}
} else {
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
- splitAction->setIcon(KIcon("fileview-split"));
- }
-}
-
-void DolphinMainWindow::toggleAdditionalInfo(const char* actionName,
- KFileItemDelegate::Information info)
-{
- clearStatusBar();
-
- DolphinView* view = m_activeViewContainer->view();
- KFileItemDelegate::InformationList list = view->additionalInfo();
-
- const bool show = actionCollection()->action(actionName)->isChecked();
-
- const int index = list.indexOf(info);
- const bool containsInfo = (index >= 0);
- if (show && !containsInfo) {
- list.append(info);
- view->setAdditionalInfo(list);
- } else if (!show && containsInfo) {
- list.removeAt(index);
- view->setAdditionalInfo(list);
- Q_ASSERT(list.indexOf(info) < 0);
+ splitAction->setIcon(KIcon("view-right-new"));
}
}
projects / dolphin.git / blobdiff