X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fb00dfe15f2beb5f28d85ec56b49ba00a54ec126..603ec47b8b1221c8fdf5ff2eaaae0a6a9fcc4880:/src/dolphinmainwindow.cpp diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index 2048de1a5..9324cdb21 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006 by Peter Penz * + * Copyright (C) 2006 by Peter Penz * * Copyright (C) 2006 by Stefan Monov * * Copyright (C) 2006 by Cvetoslav Ludmiloff * * * @@ -20,448 +20,721 @@ ***************************************************************************/ #include "dolphinmainwindow.h" -#include "dolphindropcontroller.h" #include #include "dolphinapplication.h" -#include "dolphinnewmenu.h" -#include "dolphinsettings.h" -#include "dolphinsettingsdialog.h" -#include "dolphinstatusbar.h" +#include "dolphindockwidget.h" +#include "dolphincontextmenu.h" +#include "dolphinnewfilemenu.h" #include "dolphinviewcontainer.h" -#include "infosidebarpage.h" -#include "metadatawidget.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" +#ifdef HAVE_NEPOMUK + #include "panels/search/searchpanel.h" + #include +#endif +#include "panels/folders/folderspanel.h" +#include "panels/places/placespanel.h" +#include "panels/information/informationpanel.h" +#include "search/dolphinsearchbox.h" +#include "search/dolphinsearchinformation.h" +#include "settings/dolphinsettings.h" +#include "settings/dolphinsettingsdialog.h" +#include "statusbar/dolphinstatusbar.h" +#include "views/dolphinviewactionhandler.h" +#include "views/dolphinremoteencoding.h" +#include "views/draganddrophelper.h" +#include "views/viewproperties.h" + +#ifndef Q_OS_WIN +#include "panels/terminal/terminalpanel.h" +#endif #include "dolphin_generalsettings.h" #include "dolphin_iconsmodesettings.h" - -#include -#include -#include -#include +#include "dolphin_searchsettings.h" + +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include - +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include -#include +#include #include -#include -DolphinMainWindow::DolphinMainWindow(int id) : +/* + * Menu shown when pressing the configure-button in the toolbar. + */ +class ToolBarMenu : public KMenu +{ +public: + ToolBarMenu(QWidget* parent); + virtual ~ToolBarMenu(); +protected: + virtual void showEvent(QShowEvent* event); +}; + +/* + * Remembers the tab configuration if a tab has been closed. + * Each closed tab can be restored by the menu + * "Go -> Recently Closed Tabs". + */ +struct ClosedTab +{ + KUrl primaryUrl; + KUrl secondaryUrl; + bool isSplit; +}; +Q_DECLARE_METATYPE(ClosedTab) + +DolphinMainWindow::DolphinMainWindow() : KXmlGuiWindow(0), - m_newMenu(0), - m_showMenuBar(0), - m_splitter(0), + m_newFileMenu(0), + m_tabBar(0), m_activeViewContainer(0), - m_id(id) -{ - setObjectName("Dolphin"); - m_viewContainer[PrimaryView] = 0; - m_viewContainer[SecondaryView] = 0; - - new MainWindowAdaptor(this); - QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this); - - KonqFileUndoManager::incRef(); - - KonqFileUndoManager* undoManager = KonqFileUndoManager::self(); - undoManager->setUiInterface(new UndoUiInterface(this)); + m_centralWidgetLayout(0), + m_tabIndex(0), + m_viewTab(), + m_actionHandler(0), + m_remoteEncoding(0), + m_settingsDialog(), + m_toolBarSpacer(0), + m_openToolBarMenuButton(0), + m_updateToolBarTimer(0), + m_lastHandleUrlStatJob(0), + m_searchDockIsTemporaryVisible(false) +{ + // Workaround for a X11-issue in combination with KModifierInfo + // (see DolphinContextMenu::initializeModifierKeyInfo() for + // more information): + DolphinContextMenu::initializeModifierKeyInfo(); + + setObjectName("Dolphin#"); + + m_viewTab.append(ViewTab()); + + KIO::FileUndoManager* undoManager = KIO::FileUndoManager::self(); + undoManager->setUiInterface(new UndoUiInterface()); connect(undoManager, SIGNAL(undoAvailable(bool)), this, SLOT(slotUndoAvailable(bool))); connect(undoManager, SIGNAL(undoTextChanged(const QString&)), this, SLOT(slotUndoTextChanged(const QString&))); + connect(undoManager, SIGNAL(jobRecordingStarted(CommandType)), + this, SLOT(clearStatusBar())); + connect(undoManager, SIGNAL(jobRecordingFinished(CommandType)), + this, SLOT(showCommand(CommandType))); connect(DolphinSettings::instance().placesModel(), SIGNAL(errorMessage(const QString&)), - this, SLOT(slotHandlePlacesError(const QString&))); + this, SLOT(showErrorMessage(const QString&))); + connect(&DragAndDropHelper::instance(), SIGNAL(errorMessage(const QString&)), + this, SLOT(showErrorMessage(const QString&))); + + const DolphinSettings& settings = DolphinSettings::instance(); + + GeneralSettings* generalSettings = settings.generalSettings(); + const bool firstRun = generalSettings->firstRun(); + if (firstRun) { + generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); + } + + setAcceptDrops(true); + + m_viewTab[m_tabIndex].splitter = new QSplitter(this); + m_viewTab[m_tabIndex].splitter->setChildrenCollapsible(false); + + setupActions(); + + const KUrl homeUrl(generalSettings->homeUrl()); + setUrlAsCaption(homeUrl); + m_actionHandler = new DolphinViewActionHandler(actionCollection(), this); + connect(m_actionHandler, SIGNAL(actionBeingHandled()), SLOT(clearStatusBar())); + connect(m_actionHandler, SIGNAL(createDirectory()), SLOT(createDirectory())); + + m_viewTab[m_tabIndex].primaryView = createViewContainer(homeUrl, m_viewTab[m_tabIndex].splitter); + + m_activeViewContainer = m_viewTab[m_tabIndex].primaryView; + connectViewSignals(m_activeViewContainer); + DolphinView* view = m_activeViewContainer->view(); + m_activeViewContainer->show(); + m_actionHandler->setCurrentView(view); + + m_remoteEncoding = new DolphinRemoteEncoding(this, m_actionHandler); + connect(this, SIGNAL(urlChanged(const KUrl&)), + m_remoteEncoding, SLOT(slotAboutToOpenUrl())); + + m_tabBar = new KTabBar(this); + m_tabBar->setMovable(true); + m_tabBar->setTabsClosable(true); + connect(m_tabBar, SIGNAL(currentChanged(int)), + this, SLOT(setActiveTab(int))); + connect(m_tabBar, SIGNAL(tabCloseRequested(int)), + this, SLOT(closeTab(int))); + connect(m_tabBar, SIGNAL(contextMenu(int, const QPoint&)), + this, SLOT(openTabContextMenu(int, const QPoint&))); + connect(m_tabBar, SIGNAL(newTabRequest()), + this, SLOT(openNewTab())); + connect(m_tabBar, SIGNAL(testCanDecode(const QDragMoveEvent*, bool&)), + this, SLOT(slotTestCanDecode(const QDragMoveEvent*, bool&))); + connect(m_tabBar, SIGNAL(mouseMiddleClick(int)), + this, SLOT(closeTab(int))); + connect(m_tabBar, SIGNAL(tabMoved(int, int)), + this, SLOT(slotTabMoved(int, int))); + connect(m_tabBar, SIGNAL(receivedDropEvent(int, QDropEvent*)), + this, SLOT(tabDropEvent(int, QDropEvent*))); + + m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open + + QWidget* centralWidget = new QWidget(this); + m_centralWidgetLayout = new QVBoxLayout(centralWidget); + m_centralWidgetLayout->setSpacing(0); + m_centralWidgetLayout->setMargin(0); + m_centralWidgetLayout->addWidget(m_tabBar); + m_centralWidgetLayout->addWidget(m_viewTab[m_tabIndex].splitter, 1); + + setCentralWidget(centralWidget); + setupDockWidgets(); + emit urlChanged(homeUrl); + + setupGUI(Keys | Save | Create | ToolBar); + stateChanged("new_file"); + + QClipboard* clipboard = QApplication::clipboard(); + connect(clipboard, SIGNAL(dataChanged()), + this, SLOT(updatePasteAction())); + + if (generalSettings->splitView()) { + toggleSplitView(); + } + updateEditActions(); + updateViewActions(); + updateGoActions(); + + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(generalSettings->filterBar()); + + if (firstRun) { + menuBar()->setVisible(false); + // Assure a proper default size if Dolphin runs the first time + resize(750, 500); + } + + const bool showMenu = !menuBar()->isHidden(); + QAction* showMenuBarAction = actionCollection()->action(KStandardAction::name(KStandardAction::ShowMenubar)); + showMenuBarAction->setChecked(showMenu); // workaround for bug #171080 + if (!showMenu) { + createToolBarMenuButton(); + } } DolphinMainWindow::~DolphinMainWindow() { - KonqFileUndoManager::decRef(); - DolphinApplication::app()->removeMainWindow(this); } -void DolphinMainWindow::toggleViews() +void DolphinMainWindow::openDirectories(const QList& dirs) { - if (m_viewContainer[SecondaryView] == 0) { + if (dirs.isEmpty()) { + return; + } + + if (dirs.count() == 1) { + m_activeViewContainer->setUrl(dirs.first()); return; } - // move secondary view from the last position of the splitter - // to the first position - m_splitter->insertWidget(0, m_viewContainer[SecondaryView]); + const int oldOpenTabsCount = m_viewTab.count(); + + const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); + const bool hasSplitView = generalSettings->splitView(); + + // Open each directory inside a new tab. If the "split view" option has been enabled, + // always show two directories within one tab. + QList::const_iterator it = dirs.begin(); + while (it != dirs.end()) { + openNewTab(*it); + ++it; - DolphinViewContainer* container = m_viewContainer[PrimaryView]; - m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView]; - m_viewContainer[SecondaryView] = container; + if (hasSplitView && (it != dirs.end())) { + const int tabIndex = m_viewTab.count() - 1; + m_viewTab[tabIndex].secondaryView->setUrl(*it); + ++it; + } + } + + // Remove the previously opened tabs + for (int i = 0; i < oldOpenTabsCount; ++i) { + closeTab(0); + } } -void DolphinMainWindow::slotDoingOperation(KonqFileUndoManager::CommandType commandType) +void DolphinMainWindow::openFiles(const QList& files) { - clearStatusBar(); - m_undoCommandTypes.append(commandType); + if (files.isEmpty()) { + return; + } + + // Get all distinct directories from 'files' and open a tab + // for each directory. If the "split view" option is enabled, two + // directories are shown inside one tab (see openDirectories()). + QList dirs; + foreach (const KUrl& url, files) { + const KUrl dir(url.directory()); + if (!dirs.contains(dir)) { + dirs.append(dir); + } + } + + openDirectories(dirs); + + // Select the files. Although the files can be split between several + // tabs, there is no need to split 'files' accordingly, as + // the DolphinView will just ignore invalid selections. + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + m_viewTab[i].primaryView->view()->markUrlsAsSelected(files); + if (m_viewTab[i].secondaryView) { + m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files); + } + } } -void DolphinMainWindow::refreshViews() +void DolphinMainWindow::showCommand(CommandType command) { - Q_ASSERT(m_viewContainer[PrimaryView] != 0); + DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); + switch (command) { + case KIO::FileUndoManager::Copy: + statusBar->setMessage(i18nc("@info:status", "Successfully copied."), + DolphinStatusBar::OperationCompleted); + break; + case KIO::FileUndoManager::Move: + statusBar->setMessage(i18nc("@info:status", "Successfully moved."), + DolphinStatusBar::OperationCompleted); + break; + case KIO::FileUndoManager::Link: + statusBar->setMessage(i18nc("@info:status", "Successfully linked."), + DolphinStatusBar::OperationCompleted); + break; + case KIO::FileUndoManager::Trash: + statusBar->setMessage(i18nc("@info:status", "Successfully moved to trash."), + DolphinStatusBar::OperationCompleted); + break; + case KIO::FileUndoManager::Rename: + statusBar->setMessage(i18nc("@info:status", "Successfully renamed."), + DolphinStatusBar::OperationCompleted); + break; - // remember the current active view, as because of - // the refreshing the active view might change to - // the secondary view - DolphinViewContainer* activeViewContainer = m_activeViewContainer; + case KIO::FileUndoManager::Mkdir: + statusBar->setMessage(i18nc("@info:status", "Created folder."), + DolphinStatusBar::OperationCompleted); + break; - m_viewContainer[PrimaryView]->view()->refresh(); - if (m_viewContainer[SecondaryView] != 0) { - m_viewContainer[SecondaryView]->view()->refresh(); + default: + break; } - - setActiveViewContainer(activeViewContainer); } -void DolphinMainWindow::dropUrls(const KUrl::List& urls, - const KUrl& destination) +void DolphinMainWindow::pasteIntoFolder() { - DolphinDropController dropController(this); - connect(&dropController, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), - this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType))); - dropController.dropUrls(urls, destination); + m_activeViewContainer->view()->pasteIntoFolder(); } void DolphinMainWindow::changeUrl(const KUrl& url) { + if (!KProtocolManager::supportsListing(url)) { + // The URL navigator only checks for validity, not + // if the URL can be listed. An error message is + // shown due to DolphinViewContainer::restoreView(). + return; + } + DolphinViewContainer* view = activeViewContainer(); - if (view != 0) { + if (view) { view->setUrl(url); updateEditActions(); updateViewActions(); updateGoActions(); - setCaption(url.fileName()); + setUrlAsCaption(url); + if (m_viewTab.count() > 1) { + m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url()))); + } + const QString iconName = KMimeType::iconNameForUrl(url); + m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName)); emit urlChanged(url); } } -void DolphinMainWindow::changeSelection(const KFileItemList& selection) +void DolphinMainWindow::slotEditableStateChanged(bool editable) { - activeViewContainer()->view()->changeSelection(selection); + KToggleAction* editableLocationAction = + static_cast(actionCollection()->action("editable_location")); + editableLocationAction->setChecked(editable); } -void DolphinMainWindow::slotViewModeChanged() +void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) { - updateViewActions(); + updateEditActions(); + + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + int selectedUrlsCount = m_viewTab[m_tabIndex].primaryView->view()->selectedItemsCount(); + if (m_viewTab[m_tabIndex].secondaryView) { + selectedUrlsCount += m_viewTab[m_tabIndex].secondaryView->view()->selectedItemsCount(); + } + + QAction* compareFilesAction = actionCollection()->action("compare_files"); + if (selectedUrlsCount == 2) { + compareFilesAction->setEnabled(isKompareInstalled()); + } else { + compareFilesAction->setEnabled(false); + } + + emit selectionChanged(selection); } -void DolphinMainWindow::slotShowPreviewChanged() +void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) { - // It is not enough to update the 'Show Preview' action, also - // the 'Zoom In' and 'Zoom Out' actions must be adapted. - updateViewActions(); + emit requestItemInfo(item); +} + +void DolphinMainWindow::updateHistory() +{ + const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + const int index = urlNavigator->historyIndex(); + + QAction* backAction = actionCollection()->action("go_back"); + backAction->setToolTip(i18nc("@info", "Go back")); + if (backAction) { + backAction->setEnabled(index < urlNavigator->historySize() - 1); + } + + QAction* forwardAction = actionCollection()->action("go_forward"); + forwardAction->setToolTip(i18nc("@info", "Go forward")); + if (forwardAction) { + forwardAction->setEnabled(index > 0); + } } -void DolphinMainWindow::slotShowHiddenFilesChanged() +void DolphinMainWindow::updateFilterBarAction(bool show) { - KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - const DolphinView* view = m_activeViewContainer->view(); - showHiddenFilesAction->setChecked(view->showHiddenFiles()); + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(show); } -void DolphinMainWindow::slotCategorizedSortingChanged() +void DolphinMainWindow::openNewMainWindow() { - KToggleAction* showInGroupsAction = - static_cast(actionCollection()->action("show_in_groups")); - const DolphinView* view = m_activeViewContainer->view(); - showInGroupsAction->setChecked(view->categorizedSorting()); - showInGroupsAction->setEnabled(view->supportsCategorizedSorting()); + KRun::run("dolphin", KUrl::List(), this); } -void DolphinMainWindow::slotSortingChanged(DolphinView::Sorting sorting) +void DolphinMainWindow::openNewTab() { - QAction* action = 0; - switch (sorting) { - case DolphinView::SortByName: - action = actionCollection()->action("sort_by_name"); - break; - case DolphinView::SortBySize: - action = actionCollection()->action("sort_by_size"); - break; - case DolphinView::SortByDate: - action = actionCollection()->action("sort_by_date"); - break; - case DolphinView::SortByPermissions: - action = actionCollection()->action("sort_by_permissions"); - break; - case DolphinView::SortByOwner: - action = actionCollection()->action("sort_by_owner"); - break; - case DolphinView::SortByGroup: - action = actionCollection()->action("sort_by_group"); - break; - case DolphinView::SortByType: - 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; - } + const bool isUrlEditable = m_activeViewContainer->urlNavigator()->isUrlEditable(); - if (action != 0) { - KToggleAction* toggleAction = static_cast(action); - toggleAction->setChecked(true); - } -} - -void DolphinMainWindow::slotSortOrderChanged(Qt::SortOrder order) -{ - KToggleAction* descending = static_cast(actionCollection()->action("descending")); - const bool sortDescending = (order == Qt::DescendingOrder); - descending->setChecked(sortDescending); -} - -void DolphinMainWindow::slotAdditionalInfoChanged(KFileItemDelegate::InformationList list) -{ - 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 bool enable = (view->mode() == DolphinView::DetailsView) || - (view->mode() == DolphinView::IconsView); - - 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; - } + openNewTab(m_activeViewContainer->url()); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + + // The URL navigator of the new tab should have the same editable state + // as the current tab + KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); + navigator->setUrlEditable(isUrlEditable); + + if (isUrlEditable) { + // If a new tab is opened and the URL is editable, assure that + // the user can edit the URL without manually setting the focus + navigator->setFocus(); } } -void DolphinMainWindow::slotSelectionChanged(const KFileItemList& selection) +void DolphinMainWindow::openNewTab(const KUrl& url) { - updateEditActions(); + QWidget* focusWidget = QApplication::focusWidget(); - 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(); + if (m_viewTab.count() == 1) { + // Only one view is open currently and hence no tab is shown at + // all. Before creating a tab for 'url', provide a tab for the current URL. + const KUrl currentUrl = m_activeViewContainer->url(); + m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(currentUrl)), + squeezedText(tabName(currentUrl))); + m_tabBar->blockSignals(false); } - QAction* compareFilesAction = actionCollection()->action("compare_files"); - if (selectedUrlsCount == 2) { - const bool kompareInstalled = !KGlobal::dirs()->findExe("kompare").isEmpty(); - compareFilesAction->setEnabled(selectedUrlsCount == 2 && kompareInstalled); - } else { - compareFilesAction->setEnabled(false); - } + m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(url)), + squeezedText(tabName(url))); - m_activeViewContainer->updateStatusBar(); + ViewTab viewTab; + viewTab.splitter = new QSplitter(this); + viewTab.splitter->setChildrenCollapsible(false); + viewTab.primaryView = createViewContainer(url, viewTab.splitter); + viewTab.primaryView->setActive(false); + connectViewSignals(viewTab.primaryView); - emit selectionChanged(selection); + m_viewTab.append(viewTab); + + actionCollection()->action("close_tab")->setEnabled(true); + + // provide a split view, if the startup settings are set this way + const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); + if (generalSettings->splitView()) { + const int tabIndex = m_viewTab.count() - 1; + createSecondaryView(tabIndex); + m_viewTab[tabIndex].secondaryView->setActive(true); + m_viewTab[tabIndex].isPrimaryViewActive = false; + } + + if (focusWidget) { + // The DolphinViewContainer grabbed the keyboard focus. As the tab is opened + // in background, assure that the previous focused widget gets the focus back. + focusWidget->setFocus(); + } } -void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item) +void DolphinMainWindow::activateNextTab() { - emit requestItemInfo(item); + if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { + return; + } + + const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count(); + m_tabBar->setCurrentIndex(tabIndex); } -void DolphinMainWindow::slotHistoryChanged() +void DolphinMainWindow::activatePrevTab() { - updateHistory(); + if ((m_viewTab.count() == 1) || (m_tabBar->count() < 2)) { + return; + } + + int tabIndex = m_tabBar->currentIndex() - 1; + if (tabIndex == -1) { + tabIndex = m_tabBar->count() - 1; + } + m_tabBar->setCurrentIndex(tabIndex); } -void DolphinMainWindow::updateFilterBarAction(bool show) +void DolphinMainWindow::openInNewTab() { - KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); - showFilterBarAction->setChecked(show); + const KFileItemList list = m_activeViewContainer->view()->selectedItems(); + if (list.isEmpty()) { + openNewTab(m_activeViewContainer->url()); + } else if ((list.count() == 1) && list[0].isDir()) { + openNewTab(list[0].url()); + } } -void DolphinMainWindow::openNewMainWindow() +void DolphinMainWindow::openInNewWindow() { - DolphinApplication::app()->createMainWindow()->show(); + KUrl newWindowUrl; + + const KFileItemList list = m_activeViewContainer->view()->selectedItems(); + if (list.isEmpty()) { + newWindowUrl = m_activeViewContainer->url(); + } else if ((list.count() == 1) && list[0].isDir()) { + newWindowUrl = list[0].url(); + } + + if (!newWindowUrl.isEmpty()) { + KRun::run("dolphin", KUrl::List() << newWindowUrl, this); + } } void DolphinMainWindow::toggleActiveView() { - if (m_viewContainer[SecondaryView] == 0) { + if (!m_viewTab[m_tabIndex].secondaryView) { // only one view is available return; } - Q_ASSERT(m_activeViewContainer != 0); - Q_ASSERT(m_viewContainer[PrimaryView] != 0); + Q_ASSERT(m_activeViewContainer); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); - DolphinViewContainer* left = m_viewContainer[PrimaryView]; - DolphinViewContainer* right = m_viewContainer[SecondaryView]; + DolphinViewContainer* left = m_viewTab[m_tabIndex].primaryView; + DolphinViewContainer* right = m_viewTab[m_tabIndex].secondaryView; setActiveViewContainer(m_activeViewContainer == right ? left : right); } +void DolphinMainWindow::showEvent(QShowEvent* event) +{ + KXmlGuiWindow::showEvent(event); + if (!event->spontaneous()) { + m_activeViewContainer->view()->setFocus(); + } +} + void DolphinMainWindow::closeEvent(QCloseEvent* event) { DolphinSettings& settings = DolphinSettings::instance(); GeneralSettings* generalSettings = settings.generalSettings(); + + // Find out if Dolphin is closed directly by the user or + // by the session manager because the session is closed + bool closedByUser = true; + DolphinApplication *application = qobject_cast(qApp); + if (application && application->sessionSaving()) { + closedByUser = false; + } + + if ((m_viewTab.count() > 1) && generalSettings->confirmClosingMultipleTabs() && closedByUser) { + // Ask the user if he really wants to quit and close all tabs. + // Open a confirmation dialog with 3 buttons: + // KDialog::Yes -> Quit + // KDialog::No -> Close only the current tab + // KDialog::Cancel -> do nothing + KDialog *dialog = new KDialog(this, Qt::Dialog); + dialog->setCaption(i18nc("@title:window", "Confirmation")); + dialog->setButtons(KDialog::Yes | KDialog::No | KDialog::Cancel); + dialog->setModal(true); + dialog->setButtonGuiItem(KDialog::Yes, KStandardGuiItem::quit()); + dialog->setButtonGuiItem(KDialog::No, KGuiItem(i18n("C&lose Current Tab"), KIcon("tab-close"))); + dialog->setButtonGuiItem(KDialog::Cancel, KStandardGuiItem::cancel()); + dialog->setDefaultButton(KDialog::Yes); + + bool doNotAskAgainCheckboxResult = false; + + const int result = KMessageBox::createKMessageBox(dialog, + QMessageBox::Warning, + i18n("You have multiple tabs open in this window, are you sure you want to quit?"), + QStringList(), + i18n("Do not ask again"), + &doNotAskAgainCheckboxResult, + KMessageBox::Notify); + + if (doNotAskAgainCheckboxResult) { + generalSettings->setConfirmClosingMultipleTabs(false); + } + + switch (result) { + case KDialog::Yes: + // Quit + break; + case KDialog::No: + // Close only the current tab + closeTab(); + default: + event->ignore(); + return; + } + } + generalSettings->setFirstRun(false); settings.save(); + if (m_searchDockIsTemporaryVisible) { + QDockWidget* searchDock = findChild("searchDock"); + if (searchDock) { + searchDock->hide(); + } + m_searchDockIsTemporaryVisible = false; + } + KXmlGuiWindow::closeEvent(event); } void DolphinMainWindow::saveProperties(KConfigGroup& group) { - DolphinViewContainer* cont = m_viewContainer[PrimaryView]; - group.writeEntry("Primary Url", cont->url().url()); - group.writeEntry("Primary Editable Url", cont->isUrlEditable()); - - cont = m_viewContainer[SecondaryView]; - if (cont != 0) { - group.writeEntry("Secondary Url", cont->url().url()); - group.writeEntry("Secondary Editable Url", cont->isUrlEditable()); + const int tabCount = m_viewTab.count(); + group.writeEntry("Tab Count", tabCount); + group.writeEntry("Active Tab Index", m_tabBar->currentIndex()); + + for (int i = 0; i < tabCount; ++i) { + const DolphinViewContainer* cont = m_viewTab[i].primaryView; + group.writeEntry(tabProperty("Primary URL", i), cont->url().url()); + group.writeEntry(tabProperty("Primary Editable", i), + cont->urlNavigator()->isUrlEditable()); + + cont = m_viewTab[i].secondaryView; + if (cont) { + group.writeEntry(tabProperty("Secondary URL", i), cont->url().url()); + group.writeEntry(tabProperty("Secondary Editable", i), + cont->urlNavigator()->isUrlEditable()); + } } } void DolphinMainWindow::readProperties(const KConfigGroup& group) { - DolphinViewContainer* cont = m_viewContainer[PrimaryView]; + const int tabCount = group.readEntry("Tab Count", 1); + for (int i = 0; i < tabCount; ++i) { + DolphinViewContainer* cont = m_viewTab[i].primaryView; + + cont->setUrl(group.readEntry(tabProperty("Primary URL", i))); + const bool editable = group.readEntry(tabProperty("Primary Editable", i), false); + cont->urlNavigator()->setUrlEditable(editable); - cont->setUrl(group.readEntry("Primary Url")); - bool editable = group.readEntry("Primary Editable Url", false); - cont->urlNavigator()->setUrlEditable(editable); + cont = m_viewTab[i].secondaryView; + const QString secondaryUrl = group.readEntry(tabProperty("Secondary URL", i)); + if (!secondaryUrl.isEmpty()) { + if (!cont) { + // a secondary view should be shown, but no one is available + // currently -> create a new view + toggleSplitView(); + cont = m_viewTab[i].secondaryView; + Q_ASSERT(cont); + } - cont = m_viewContainer[SecondaryView]; - const QString secondaryUrl = group.readEntry("Secondary Url"); - if (!secondaryUrl.isEmpty()) { - if (cont == 0) { - // a secondary view should be shown, but no one is available - // currently -> create a new view + cont->setUrl(secondaryUrl); + const bool editable = group.readEntry(tabProperty("Secondary Editable", i), false); + cont->urlNavigator()->setUrlEditable(editable); + } else if (cont) { + // no secondary view should be shown, but the default setting shows + // one already -> close the view toggleSplitView(); - cont = m_viewContainer[SecondaryView]; - Q_ASSERT(cont != 0); } - cont->setUrl(secondaryUrl); - bool editable = group.readEntry("Secondary Editable Url", false); - cont->urlNavigator()->setUrlEditable(editable); - } else if (cont != 0) { - // no secondary view should be shown, but the default setting shows - // one already -> close the view - toggleSplitView(); + // openNewTab() needs to be called only tabCount - 1 times + if (i != tabCount - 1) { + openNewTab(); + } } -} -void DolphinMainWindow::updateNewMenu() -{ - m_newMenu->slotCheckUpToDate(); - m_newMenu->setPopupFiles(activeViewContainer()->url()); + const int index = group.readEntry("Active Tab Index", 0); + m_tabBar->setCurrentIndex(index); } -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() +void DolphinMainWindow::updateNewMenu() { - clearStatusBar(); - m_activeViewContainer->view()->deleteSelectedItems(); + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles()); + m_newFileMenu->checkUpToDate(); + m_newFileMenu->setPopupFiles(activeViewContainer()->url()); } -void DolphinMainWindow::properties() +void DolphinMainWindow::createDirectory() { - const KFileItemList list = m_activeViewContainer->view()->selectedItems(); - - KPropertiesDialog *dialog = new KPropertiesDialog(list, this); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - dialog->raise(); - dialog->activateWindow(); + m_newFileMenu->setViewShowsHiddenFiles(activeViewContainer()->view()->showHiddenFiles()); + m_newFileMenu->setPopupFiles(activeViewContainer()->url()); + m_newFileMenu->createDirectory(); } void DolphinMainWindow::quit() @@ -469,7 +742,7 @@ void DolphinMainWindow::quit() close(); } -void DolphinMainWindow::slotHandlePlacesError(const QString &message) +void DolphinMainWindow::showErrorMessage(const QString& message) { if (!message.isEmpty()) { DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); @@ -479,52 +752,45 @@ void DolphinMainWindow::slotHandlePlacesError(const QString &message) void DolphinMainWindow::slotUndoAvailable(bool available) { - QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); - if (undoAction != 0) { + QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); + if (undoAction) { undoAction->setEnabled(available); } +} - if (available && (m_undoCommandTypes.count() > 0)) { - const KonqFileUndoManager::CommandType command = m_undoCommandTypes.takeFirst(); - DolphinStatusBar* statusBar = m_activeViewContainer->statusBar(); - switch (command) { - case KonqFileUndoManager::COPY: - statusBar->setMessage(i18nc("@info:status", "Copy operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqFileUndoManager::MOVE: - statusBar->setMessage(i18nc("@info:status", "Move operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqFileUndoManager::LINK: - statusBar->setMessage(i18nc("@info:status", "Link operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqFileUndoManager::TRASH: - statusBar->setMessage(i18nc("@info:status", "Move to trash operation completed."), - DolphinStatusBar::OperationCompleted); - break; - case KonqFileUndoManager::RENAME: - statusBar->setMessage(i18nc("@info:status", "Renaming operation completed."), - DolphinStatusBar::OperationCompleted); - break; - - case KonqFileUndoManager::MKDIR: - statusBar->setMessage(i18nc("@info:status", "Created folder."), - DolphinStatusBar::OperationCompleted); - break; - - default: - break; +void DolphinMainWindow::restoreClosedTab(QAction* action) +{ + if (action->data().toBool()) { + // clear all actions except the "Empty Recently Closed Tabs" + // action and the separator + QList actions = m_recentTabsMenu->menu()->actions(); + const int count = actions.size(); + for (int i = 2; i < count; ++i) { + m_recentTabsMenu->menu()->removeAction(actions.at(i)); + } + } else { + const ClosedTab closedTab = action->data().value(); + openNewTab(closedTab.primaryUrl); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + + if (closedTab.isSplit) { + // create secondary view + toggleSplitView(); + m_viewTab[m_tabIndex].secondaryView->setUrl(closedTab.secondaryUrl); } + m_recentTabsMenu->removeAction(action); + } + + if (m_recentTabsMenu->menu()->actions().count() == 2) { + m_recentTabsMenu->setEnabled(false); } } void DolphinMainWindow::slotUndoTextChanged(const QString& text) { - QAction* undoAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Undo)); - if (undoAction != 0) { + QAction* undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo)); + if (undoAction) { undoAction->setText(text); } } @@ -532,7 +798,8 @@ void DolphinMainWindow::slotUndoTextChanged(const QString& text) void DolphinMainWindow::undo() { clearStatusBar(); - KonqFileUndoManager::self()->undo(); + KIO::FileUndoManager::self()->uiInterface()->setParentWidget(this); + KIO::FileUndoManager::self()->undo(); } void DolphinMainWindow::cut() @@ -550,13 +817,29 @@ void DolphinMainWindow::paste() m_activeViewContainer->view()->paste(); } -void DolphinMainWindow::updatePasteAction() +void DolphinMainWindow::find() { - QAction* pasteAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Paste)); - if (pasteAction == 0) { + m_activeViewContainer->setSearchModeEnabled(true); +} + +void DolphinMainWindow::slotSearchLocationChanged() +{ + QDockWidget* searchDock = findChild("searchDock"); + if (!searchDock) { return; } + SearchPanel* searchPanel = qobject_cast(searchDock->widget()); + if (searchPanel) { + searchPanel->setSearchLocation(SearchSettings::location() == QLatin1String("FromHere") + ? SearchPanel::FromCurrentDir + : SearchPanel::Everywhere); + } +} + +void DolphinMainWindow::updatePasteAction() +{ + QAction* pasteAction = actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); QPair pasteInfo = m_activeViewContainer->view()->pasteInfo(); pasteAction->setEnabled(pasteInfo.first); pasteAction->setText(pasteInfo.second); @@ -570,7 +853,7 @@ void DolphinMainWindow::selectAll() // URL instead of all items of the view KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); + QLineEdit* lineEdit = urlNavigator->editor()->lineEdit(); // krazy:exclude=qclasses const bool selectUrl = urlNavigator->isUrlEditable() && lineEdit->hasFocus(); if (selectUrl) { @@ -586,401 +869,702 @@ void DolphinMainWindow::invertSelection() m_activeViewContainer->view()->invertSelection(); } -void DolphinMainWindow::setViewMode(QAction* action) +void DolphinMainWindow::toggleSplitView() { - const DolphinView::Mode mode = action->data().value(); - m_activeViewContainer->view()->setMode(mode); -} + if (!m_viewTab[m_tabIndex].secondaryView) { + createSecondaryView(m_tabIndex); + setActiveViewContainer(m_viewTab[m_tabIndex].secondaryView); + } else if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { + // remove secondary view + m_viewTab[m_tabIndex].secondaryView->close(); + m_viewTab[m_tabIndex].secondaryView->deleteLater(); + m_viewTab[m_tabIndex].secondaryView = 0; -void DolphinMainWindow::sortByName() -{ - m_activeViewContainer->view()->setSorting(DolphinView::SortByName); + setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); + } else { + // The primary view is active and should be closed. Hence from a users point of view + // the content of the secondary view should be moved to the primary view. + // From an implementation point of view it is more efficient to close + // the primary view and exchange the internal pointers afterwards. + + m_viewTab[m_tabIndex].primaryView->close(); + m_viewTab[m_tabIndex].primaryView->deleteLater(); + m_viewTab[m_tabIndex].primaryView = m_viewTab[m_tabIndex].secondaryView; + m_viewTab[m_tabIndex].secondaryView = 0; + + setActiveViewContainer(m_viewTab[m_tabIndex].primaryView); + } + + updateViewActions(); } -void DolphinMainWindow::sortBySize() +void DolphinMainWindow::reloadView() { - m_activeViewContainer->view()->setSorting(DolphinView::SortBySize); + clearStatusBar(); + m_activeViewContainer->view()->reload(); } -void DolphinMainWindow::sortByDate() +void DolphinMainWindow::stopLoading() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByDate); + m_activeViewContainer->view()->stopLoading(); } -void DolphinMainWindow::sortByPermissions() +void DolphinMainWindow::enableStopAction() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByPermissions); + actionCollection()->action("stop")->setEnabled(true); } -void DolphinMainWindow::sortByOwner() +void DolphinMainWindow::disableStopAction() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByOwner); + actionCollection()->action("stop")->setEnabled(false); } -void DolphinMainWindow::sortByGroup() +void DolphinMainWindow::showFilterBar() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByGroup); + m_activeViewContainer->setFilterBarVisible(true); } -void DolphinMainWindow::sortByType() +void DolphinMainWindow::toggleEditLocation() { - m_activeViewContainer->view()->setSorting(DolphinView::SortByType); + clearStatusBar(); + + QAction* action = actionCollection()->action("editable_location"); + KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + urlNavigator->setUrlEditable(action->isChecked()); } -void DolphinMainWindow::sortByRating() +void DolphinMainWindow::replaceLocation() { -#ifdef HAVE_NEPOMUK - m_activeViewContainer->view()->setSorting(DolphinView::SortByRating); -#endif + KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); + navigator->setUrlEditable(true); + navigator->setFocus(); + + // select the whole text of the combo box editor + QLineEdit* lineEdit = navigator->editor()->lineEdit(); // krazy:exclude=qclasses + lineEdit->selectAll(); } -void DolphinMainWindow::sortByTags() +void DolphinMainWindow::togglePanelLockState() { -#ifdef HAVE_NEPOMUK - m_activeViewContainer->view()->setSorting(DolphinView::SortByTags); -#endif + GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); + + const bool newLockState = !generalSettings->lockPanels(); + foreach (QObject* child, children()) { + DolphinDockWidget* dock = qobject_cast(child); + if (dock) { + dock->setLocked(newLockState); + } + } + + generalSettings->setLockPanels(newLockState); } -void DolphinMainWindow::toggleSortOrder() +void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible) { - DolphinView* view = m_activeViewContainer->view(); - const Qt::SortOrder order = (view->sortOrder() == Qt::AscendingOrder) ? - Qt::DescendingOrder : - Qt::AscendingOrder; - view->setSortOrder(order); + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + ViewTab& tab = m_viewTab[i]; + Q_ASSERT(tab.primaryView); + tab.primaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + if (tab.secondaryView) { + tab.secondaryView->urlNavigator()->setPlacesSelectorVisible(!visible); + } + } } -void DolphinMainWindow::toggleSortCategorization() +void DolphinMainWindow::goBack() { - DolphinView* view = m_activeViewContainer->view(); - const bool categorizedSorting = view->categorizedSorting(); - view->setCategorizedSorting(!categorizedSorting); + KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + urlNavigator->goBack(); + + if (urlNavigator->locationState().isEmpty()) { + // An empty location state indicates a redirection URL, + // which must be skipped too + urlNavigator->goBack(); + } } -void DolphinMainWindow::toggleSizeInfo() +void DolphinMainWindow::goForward() { - toggleAdditionalInfo("show_size_info", KFileItemDelegate::Size); + m_activeViewContainer->urlNavigator()->goForward(); } -void DolphinMainWindow::toggleDateInfo() +void DolphinMainWindow::goUp() { - toggleAdditionalInfo("show_date_info", KFileItemDelegate::ModificationTime); + m_activeViewContainer->urlNavigator()->goUp(); } -void DolphinMainWindow::togglePermissionsInfo() +void DolphinMainWindow::goHome() { - toggleAdditionalInfo("show_permissions_info", KFileItemDelegate::Permissions); + m_activeViewContainer->urlNavigator()->goHome(); } -void DolphinMainWindow::toggleOwnerInfo() +void DolphinMainWindow::goBack(Qt::MouseButtons buttons) { - toggleAdditionalInfo("show_owner_info", KFileItemDelegate::Owner); + // The default case (left button pressed) is handled in goBack(). + if (buttons == Qt::MidButton) { + KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); + const int index = urlNavigator->historyIndex() + 1; + openNewTab(urlNavigator->locationUrl(index)); + } } -void DolphinMainWindow::toggleGroupInfo() +void DolphinMainWindow::goForward(Qt::MouseButtons buttons) { - toggleAdditionalInfo("show_group_info", KFileItemDelegate::OwnerAndGroup); + // The default case (left button pressed) is handled in goForward(). + if (buttons == Qt::MidButton) { + KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); + const int index = urlNavigator->historyIndex() - 1; + openNewTab(urlNavigator->locationUrl(index)); + } } -void DolphinMainWindow::toggleMimeInfo() +void DolphinMainWindow::goUp(Qt::MouseButtons buttons) { - toggleAdditionalInfo("show_mime_info", KFileItemDelegate::FriendlyMimeType); + // The default case (left button pressed) is handled in goUp(). + if (buttons == Qt::MidButton) { + openNewTab(activeViewContainer()->url().upUrl()); + } } -void DolphinMainWindow::toggleSplitView() +void DolphinMainWindow::compareFiles() { - if (m_viewContainer[SecondaryView] == 0) { - // create a secondary view - const int newWidth = (m_viewContainer[PrimaryView]->width() - m_splitter->handleWidth()) / 2; - - const DolphinView* view = m_viewContainer[PrimaryView]->view(); - m_viewContainer[SecondaryView] = new DolphinViewContainer(this, 0, view->rootUrl()); - connectViewSignals(SecondaryView); - m_splitter->addWidget(m_viewContainer[SecondaryView]); - m_splitter->setSizes(QList() << newWidth << newWidth); - m_viewContainer[SecondaryView]->view()->reload(); - m_viewContainer[SecondaryView]->setActive(false); - m_viewContainer[SecondaryView]->show(); - } else if (m_activeViewContainer == m_viewContainer[PrimaryView]) { - // remove secondary view - m_viewContainer[SecondaryView]->close(); - m_viewContainer[SecondaryView]->deleteLater(); - m_viewContainer[SecondaryView] = 0; - } else { - // The secondary view is active, hence from a users point of view - // the content of the secondary view should be moved to the primary view. - // From an implementation point of view it is more efficient to close - // the primary view and exchange the internal pointers afterwards. - m_viewContainer[PrimaryView]->close(); - m_viewContainer[PrimaryView]->deleteLater(); - m_viewContainer[PrimaryView] = m_viewContainer[SecondaryView]; - m_viewContainer[SecondaryView] = 0; + // The method is only invoked if exactly 2 files have + // been selected. The selected files may be: + // - both in the primary view + // - both in the secondary view + // - one in the primary view and the other in the secondary + // view + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + + KUrl urlA; + KUrl urlB; + + KFileItemList items = m_viewTab[m_tabIndex].primaryView->view()->selectedItems(); + + switch (items.count()) { + case 0: { + Q_ASSERT(m_viewTab[m_tabIndex].secondaryView); + items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems(); + Q_ASSERT(items.count() == 2); + urlA = items[0].url(); + urlB = items[1].url(); + break; } - setActiveViewContainer(m_viewContainer[PrimaryView]); - updateViewActions(); - emit activeViewChanged(); -} + case 1: { + urlA = items[0].url(); + Q_ASSERT(m_viewTab[m_tabIndex].secondaryView); + items = m_viewTab[m_tabIndex].secondaryView->view()->selectedItems(); + Q_ASSERT(items.count() == 1); + urlB = items[0].url(); + break; + } -void DolphinMainWindow::reloadView() -{ - clearStatusBar(); - m_activeViewContainer->view()->reload(); + case 2: { + urlA = items[0].url(); + urlB = items[1].url(); + break; + } + + default: { + // may not happen: compareFiles may only get invoked if 2 + // files are selected + Q_ASSERT(false); + } + } + + QString command("kompare -c \""); + command.append(urlA.pathOrUrl()); + command.append("\" \""); + command.append(urlB.pathOrUrl()); + command.append('\"'); + KRun::runCommand(command, "Kompare", "kompare", this); } -void DolphinMainWindow::stopLoading() +void DolphinMainWindow::toggleShowMenuBar() { + const bool visible = menuBar()->isVisible(); + menuBar()->setVisible(!visible); + if (visible) { + createToolBarMenuButton(); + } else { + deleteToolBarMenuButton(); + } } -void DolphinMainWindow::togglePreview() +void DolphinMainWindow::openTerminal() { - clearStatusBar(); + QString dir(QDir::homePath()); - const KToggleAction* showPreviewAction = - static_cast(actionCollection()->action("show_preview")); - const bool show = showPreviewAction->isChecked(); - m_activeViewContainer->view()->setShowPreview(show); -} + // If the given directory is not local, it can still be the URL of an + // ioslave using UDS_LOCAL_PATH which to be converted first. + KUrl url = KIO::NetAccess::mostLocalUrl(m_activeViewContainer->url(), this); -void DolphinMainWindow::toggleShowHiddenFiles() -{ - clearStatusBar(); + //If the URL is local after the above conversion, set the directory. + if (url.isLocalFile()) { + dir = url.toLocalFile(); + } - const KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - const bool show = showHiddenFilesAction->isChecked(); - m_activeViewContainer->view()->setShowHiddenFiles(show); + KToolInvocation::invokeTerminal(QString(), dir); } -void DolphinMainWindow::toggleFilterBarVisibility() +void DolphinMainWindow::editSettings() { - const KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); - const bool show = showFilterBarAction->isChecked(); - m_activeViewContainer->showFilterBar(show); + if (!m_settingsDialog) { + const KUrl url = activeViewContainer()->url(); + DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this); + connect(settingsDialog, SIGNAL(settingsChanged()), this, SLOT(refreshViews())); + settingsDialog->setAttribute(Qt::WA_DeleteOnClose); + settingsDialog->show(); + m_settingsDialog = settingsDialog; + } else { + m_settingsDialog.data()->raise(); + } } -void DolphinMainWindow::zoomIn() +void DolphinMainWindow::setActiveTab(int index) { - m_activeViewContainer->view()->zoomIn(); - updateViewActions(); + Q_ASSERT(index >= 0); + Q_ASSERT(index < m_viewTab.count()); + if (index == m_tabIndex) { + return; + } + + // hide current tab content + ViewTab& hiddenTab = m_viewTab[m_tabIndex]; + hiddenTab.isPrimaryViewActive = hiddenTab.primaryView->isActive(); + hiddenTab.primaryView->setActive(false); + if (hiddenTab.secondaryView) { + hiddenTab.secondaryView->setActive(false); + } + QSplitter* splitter = m_viewTab[m_tabIndex].splitter; + splitter->hide(); + m_centralWidgetLayout->removeWidget(splitter); + + // show active tab content + m_tabIndex = index; + + ViewTab& viewTab = m_viewTab[index]; + m_centralWidgetLayout->addWidget(viewTab.splitter, 1); + viewTab.primaryView->show(); + if (viewTab.secondaryView) { + viewTab.secondaryView->show(); + } + viewTab.splitter->show(); + + setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView : + viewTab.secondaryView); } -void DolphinMainWindow::zoomOut() +void DolphinMainWindow::closeTab() { - m_activeViewContainer->view()->zoomOut(); - updateViewActions(); + closeTab(m_tabBar->currentIndex()); } -void DolphinMainWindow::toggleEditLocation() +void DolphinMainWindow::closeTab(int index) { - clearStatusBar(); + Q_ASSERT(index >= 0); + Q_ASSERT(index < m_viewTab.count()); + if (m_viewTab.count() == 1) { + // the last tab may never get closed + return; + } - KToggleAction* action = static_cast(actionCollection()->action("editable_location")); + if (index == m_tabIndex) { + // The tab that should be closed is the active tab. Activate the + // previous tab before closing the tab. + m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1); + } + rememberClosedTab(index); - bool editOrBrowse = action->isChecked(); - KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - urlNavigator->setUrlEditable(editOrBrowse); -} + // delete tab + m_viewTab[index].primaryView->deleteLater(); + if (m_viewTab[index].secondaryView) { + m_viewTab[index].secondaryView->deleteLater(); + } + m_viewTab[index].splitter->deleteLater(); + m_viewTab.erase(m_viewTab.begin() + index); -void DolphinMainWindow::editLocation() -{ - KUrlNavigator* navigator = m_activeViewContainer->urlNavigator(); - navigator->setUrlEditable(true); - navigator->setFocus(); -} + m_tabBar->blockSignals(true); + m_tabBar->removeTab(index); -void DolphinMainWindow::adjustViewProperties() -{ - clearStatusBar(); - ViewPropertiesDialog dlg(m_activeViewContainer->view()); - dlg.exec(); -} + if (m_tabIndex > index) { + m_tabIndex--; + Q_ASSERT(m_tabIndex >= 0); + } -void DolphinMainWindow::goBack() -{ - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goBack(); + // if only one tab is left, also remove the tab entry so that + // closing the last tab is not possible + if (m_viewTab.count() == 1) { + m_tabBar->removeTab(0); + actionCollection()->action("close_tab")->setEnabled(false); + } else { + m_tabBar->blockSignals(false); + } } -void DolphinMainWindow::goForward() +void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goForward(); + KMenu menu(this); + + QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab")); + newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut()); + + QAction* detachTabAction = menu.addAction(KIcon("tab-detach"), i18nc("@action:inmenu", "Detach Tab")); + + QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs")); + + QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab")); + closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut()); + QAction* selectedAction = menu.exec(pos); + if (selectedAction == newTabAction) { + const ViewTab& tab = m_viewTab[index]; + Q_ASSERT(tab.primaryView); + const KUrl url = tab.secondaryView && tab.secondaryView->isActive() ? + tab.secondaryView->url() : tab.primaryView->url(); + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + } else if (selectedAction == detachTabAction) { + const QString separator(QLatin1Char(' ')); + QString command = QLatin1String("dolphin"); + + const ViewTab& tab = m_viewTab[index]; + Q_ASSERT(tab.primaryView); + + command += separator + tab.primaryView->url().url(); + if (tab.secondaryView) { + command += separator + tab.secondaryView->url().url(); + command += separator + QLatin1String("-split"); + } + + KRun::runCommand(command, this); + + closeTab(index); + } else if (selectedAction == closeOtherTabsAction) { + const int count = m_tabBar->count(); + for (int i = 0; i < index; ++i) { + closeTab(0); + } + for (int i = index + 1; i < count; ++i) { + closeTab(1); + } + } else if (selectedAction == closeTabAction) { + closeTab(index); + } } -void DolphinMainWindow::goUp() +void DolphinMainWindow::slotTabMoved(int from, int to) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goUp(); + m_viewTab.move(from, to); + m_tabIndex = m_tabBar->currentIndex(); } -void DolphinMainWindow::goHome() +void DolphinMainWindow::handlePlacesClick(const KUrl& url, Qt::MouseButtons buttons) { - clearStatusBar(); - m_activeViewContainer->urlNavigator()->goHome(); + if (buttons & Qt::MidButton) { + openNewTab(url); + m_tabBar->setCurrentIndex(m_viewTab.count() - 1); + } else { + changeUrl(url); + } } -void DolphinMainWindow::findFile() +void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode) { - KRun::run("kfind", m_activeViewContainer->url(), this); + canDecode = KUrl::List::canDecode(event->mimeData()); } -void DolphinMainWindow::compareFiles() +void DolphinMainWindow::handleUrl(const KUrl& url) { - // The method is only invoked if exactly 2 files have - // been selected. The selected files may be: - // - both in the primary view - // - both in the secondary view - // - one in the primary view and the other in the secondary - // view - Q_ASSERT(m_viewContainer[PrimaryView] != 0); + delete m_lastHandleUrlStatJob; + m_lastHandleUrlStatJob = 0; - KUrl urlA; - KUrl urlB; - KUrl::List urls = m_viewContainer[PrimaryView]->view()->selectedUrls(); + if (url.isLocalFile() && QFileInfo(url.toLocalFile()).isDir()) { + activeViewContainer()->setUrl(url); + } else if (KProtocolManager::supportsListing(url)) { + // stat the URL to see if it is a dir or not + m_lastHandleUrlStatJob = KIO::stat(url, KIO::HideProgressInfo); + connect(m_lastHandleUrlStatJob, SIGNAL(result(KJob*)), + this, SLOT(slotHandleUrlStatFinished(KJob*))); - switch (urls.count()) { - case 0: { - Q_ASSERT(m_viewContainer[SecondaryView] != 0); - urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); - Q_ASSERT(urls.count() == 2); - urlA = urls[0]; - urlB = urls[1]; - break; + } else { + new KRun(url, this); + } +} + +void DolphinMainWindow::slotHandleUrlStatFinished(KJob* job) +{ + m_lastHandleUrlStatJob = 0; + const KIO::UDSEntry entry = static_cast(job)->statResult(); + const KUrl url = static_cast(job)->url(); + if (entry.isDir()) { + activeViewContainer()->setUrl(url); + } else { + new KRun(url, this); } +} - case 1: { - urlA = urls[0]; - Q_ASSERT(m_viewContainer[SecondaryView] != 0); - urls = m_viewContainer[SecondaryView]->view()->selectedUrls(); - Q_ASSERT(urls.count() == 1); - urlB = urls[0]; - break; +void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event) +{ + const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData()); + if (!urls.isEmpty() && tab != -1) { + const ViewTab& viewTab = m_viewTab[tab]; + const KUrl destPath = viewTab.isPrimaryViewActive ? viewTab.primaryView->url() : viewTab.secondaryView->url(); + DragAndDropHelper::instance().dropUrls(KFileItem(), destPath, event, m_tabBar); } +} - case 2: { - urlA = urls[0]; - urlB = urls[1]; - break; +void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable) +{ + newFileMenu()->setEnabled(isFolderWritable); +} + +void DolphinMainWindow::slotSearchModeChanged(bool enabled) +{ +#ifdef HAVE_NEPOMUK + const DolphinSearchInformation& searchInfo = DolphinSearchInformation::instance(); + if (!searchInfo.isIndexingEnabled()) { + return; } - default: { - // may not happen: compareFiles may only get invoked if 2 - // files are selected - Q_ASSERT(false); + QDockWidget* searchDock = findChild("searchDock"); + if (!searchDock) { + return; } + + if (enabled) { + if (!searchDock->isVisible()) { + m_searchDockIsTemporaryVisible = true; + } + searchDock->show(); + } else { + if (searchDock->isVisible() && m_searchDockIsTemporaryVisible) { + searchDock->hide(); + } + m_searchDockIsTemporaryVisible = false; } - QString command("kompare -c \""); - command.append(urlA.pathOrUrl()); - command.append("\" \""); - command.append(urlB.pathOrUrl()); - command.append('\"'); - KRun::runCommand(command, "Kompare", "kompare", this); + SearchPanel* searchPanel = qobject_cast(searchDock->widget()); + if (!searchPanel) { + return; + } + if (enabled) { + SearchPanel::SearchLocation searchLocation = SearchPanel::Everywhere; + const KUrl url = m_activeViewContainer->url(); + const bool isSearchUrl = (url.protocol() == QLatin1String("nepomuksearch")); + if ((SearchSettings::location() == QLatin1String("FromHere") && !isSearchUrl)) { + searchLocation = SearchPanel::FromCurrentDir; + } + searchPanel->setSearchLocation(searchLocation); + } else { + searchPanel->setSearchLocation(SearchPanel::Everywhere); + } +#else + Q_UNUSED(enabled); +#endif } -void DolphinMainWindow::toggleShowMenuBar() +void DolphinMainWindow::openContextMenu(const KFileItem& item, + const KUrl& url, + const QList& customActions) { - const bool visible = menuBar()->isVisible(); - menuBar()->setVisible(!visible); -} + QPointer contextMenu = new DolphinContextMenu(this, item, url); + contextMenu->setCustomActions(customActions); + const DolphinContextMenu::Command command = contextMenu->open(); -void DolphinMainWindow::editSettings() -{ - DolphinSettingsDialog dialog(this); - dialog.exec(); -} + switch (command) { + case DolphinContextMenu::OpenParentFolderInNewWindow: { + KRun::run("dolphin", KUrl::List() << item.url().upUrl(), this); + break; + } -void DolphinMainWindow::init() -{ - // Check whether Dolphin runs the first time. If yes then - // a proper default window size is given at the end of DolphinMainWindow::init(). - GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - const bool firstRun = generalSettings->firstRun(); - if (firstRun) { - generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime()); + case DolphinContextMenu::OpenParentFolderInNewTab: + openNewTab(item.url().upUrl()); + break; + + case DolphinContextMenu::None: + default: + break; } - setAcceptDrops(true); + delete contextMenu; +} - m_splitter = new QSplitter(this); +void DolphinMainWindow::updateToolBarMenu() +{ + KMenu* menu = qobject_cast(sender()); + Q_ASSERT(menu); - DolphinSettings& settings = DolphinSettings::instance(); + // All actions get cleared by KMenu::clear(). The sub-menus are deleted + // by connecting to the aboutToHide() signal from the parent-menu. + menu->clear(); - setupActions(); + const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); - const KUrl& homeUrl = settings.generalSettings()->homeUrl(); - setCaption(homeUrl.fileName()); - ViewProperties props(homeUrl); - m_viewContainer[PrimaryView] = new DolphinViewContainer(this, - m_splitter, - homeUrl); + KActionCollection* ac = actionCollection(); - m_activeViewContainer = m_viewContainer[PrimaryView]; - connectViewSignals(PrimaryView); - m_viewContainer[PrimaryView]->view()->reload(); - m_viewContainer[PrimaryView]->show(); + // Add "Edit" actions + bool added = addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Undo)), menu) | + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Find)), menu) | + addActionToMenu(ac->action("select_all"), menu) | + addActionToMenu(ac->action("invert_selection"), menu); - setCentralWidget(m_splitter); - setupDockWidgets(); + if (added) { + menu->addSeparator(); + } - setupGUI(Keys | Save | Create | ToolBar); - createGUI(); + // Add "View" actions + if (!generalSettings->showZoomSlider()) { + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomIn)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ZoomOut)), menu); + menu->addSeparator(); + } - stateChanged("new_file"); - setAutoSaveSettings(); + added = addActionToMenu(ac->action("view_mode"), menu) | + addActionToMenu(ac->action("sort"), menu) | + addActionToMenu(ac->action("additional_info"), menu) | + addActionToMenu(ac->action("show_preview"), menu) | + addActionToMenu(ac->action("show_in_groups"), menu) | + addActionToMenu(ac->action("show_hidden_files"), menu); - QClipboard* clipboard = QApplication::clipboard(); - connect(clipboard, SIGNAL(dataChanged()), - this, SLOT(updatePasteAction())); - updatePasteAction(); - updateGoActions(); + if (added) { + menu->addSeparator(); + } - if (generalSettings->splitView()) { - toggleSplitView(); + added = addActionToMenu(ac->action("split_view"), menu) | + addActionToMenu(ac->action("reload"), menu) | + addActionToMenu(ac->action("view_properties"), menu); + if (added) { + menu->addSeparator(); } - updateViewActions(); - if (firstRun) { - // assure a proper default size if Dolphin runs the first time - resize(700, 500); + addActionToMenu(ac->action("panels"), menu); + KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu); + locationBarMenu->addAction(ac->action("editable_location")); + locationBarMenu->addAction(ac->action("replace_location")); + menu->addMenu(locationBarMenu); + + menu->addSeparator(); + + // Add "Go" menu + KMenu* goMenu = new KMenu(i18nc("@action:inmenu", "Go"), menu); + connect(menu, SIGNAL(aboutToHide()), goMenu, SLOT(deleteLater())); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Back))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Forward))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Up))); + goMenu->addAction(ac->action(KStandardAction::name(KStandardAction::Home))); + goMenu->addAction(ac->action("closed_tabs")); + menu->addMenu(goMenu); + + // Add "Tool" menu + KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu); + connect(menu, SIGNAL(aboutToHide()), toolsMenu, SLOT(deleteLater())); + toolsMenu->addAction(ac->action("show_filter_bar")); + toolsMenu->addAction(ac->action("compare_files")); + toolsMenu->addAction(ac->action("open_terminal")); + toolsMenu->addAction(ac->action("change_remote_encoding")); + menu->addMenu(toolsMenu); + + // Add "Settings" menu entries + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::KeyBindings)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ConfigureToolbars)), menu); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu); + + // Add "Help" menu + KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu); + connect(menu, SIGNAL(aboutToHide()), helpMenu, SLOT(deleteLater())); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutApp))); + helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::AboutKDE))); + menu->addMenu(helpMenu); + + menu->addSeparator(); + addActionToMenu(ac->action(KStandardAction::name(KStandardAction::ShowMenubar)), menu); +} + +void DolphinMainWindow::updateToolBar() +{ + if (!menuBar()->isVisible()) { + createToolBarMenuButton(); } +} - emit urlChanged(homeUrl); +void DolphinMainWindow::slotToolBarSpacerDeleted() +{ + m_toolBarSpacer = 0; + m_updateToolBarTimer->start(); +} + +void DolphinMainWindow::slotToolBarMenuButtonDeleted() +{ + m_openToolBarMenuButton = 0; + m_updateToolBarTimer->start(); } -void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view) +void DolphinMainWindow::slotToolBarIconSizeChanged(const QSize& iconSize) { - Q_ASSERT(view != 0); - Q_ASSERT((view == m_viewContainer[PrimaryView]) || (view == m_viewContainer[SecondaryView])); - if (m_activeViewContainer == view) { + if (m_openToolBarMenuButton) { + m_openToolBarMenuButton->setIconSize(iconSize); + } +} + +void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer) +{ + Q_ASSERT(viewContainer); + Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) || + (viewContainer == m_viewTab[m_tabIndex].secondaryView)); + if (m_activeViewContainer == viewContainer) { return; } m_activeViewContainer->setActive(false); - m_activeViewContainer = view; + m_activeViewContainer = viewContainer; + + // Activating the view container might trigger a recursive setActiveViewContainer() call + // inside DolphinMainWindow::toggleActiveView() when having a split view. Temporary + // disconnect the activated() signal in this case: + disconnect(m_activeViewContainer->view(), SIGNAL(activated()), this, SLOT(toggleActiveView())); m_activeViewContainer->setActive(true); + connect(m_activeViewContainer->view(), SIGNAL(activated()), this, SLOT(toggleActiveView())); + + m_actionHandler->setCurrentView(viewContainer->view()); updateHistory(); updateEditActions(); updateViewActions(); updateGoActions(); - const KUrl& url = m_activeViewContainer->url(); - setCaption(url.fileName()); + const KUrl url = m_activeViewContainer->url(); + setUrlAsCaption(url); + if (m_viewTab.count() > 1) { + m_tabBar->setTabText(m_tabIndex, tabName(url)); + m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url))); + } - emit activeViewChanged(); emit urlChanged(url); } +DolphinViewContainer* DolphinMainWindow::createViewContainer(const KUrl& url, QWidget* parent) +{ + DolphinViewContainer* container = new DolphinViewContainer(url, parent); + + // The places-selector from the URL navigator should only be shown + // if the places dock is invisible + QDockWidget* placesDock = findChild("placesDock"); + container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible()); + + return container; +} + void DolphinMainWindow::setupActions() { // setup 'File' menu - m_newMenu = new DolphinNewMenu(this); - KMenu* menu = m_newMenu->menu(); - menu->setTitle(i18nc("@title:menu", "Create New")); + 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")); connect(menu, SIGNAL(aboutToShow()), this, SLOT(updateNewMenu())); @@ -991,19 +1575,18 @@ void DolphinMainWindow::setupActions() 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* newTab = actionCollection()->addAction("new_tab"); + newTab->setIcon(KIcon("tab-new")); + newTab->setText(i18nc("@action:inmenu File", "New Tab")); + newTab->setShortcut(KShortcut(Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N)); + connect(newTab, SIGNAL(triggered()), this, SLOT(openNewTab())); - 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); - connect(properties, SIGNAL(triggered()), this, SLOT(properties())); + KAction* closeTab = actionCollection()->addAction("close_tab"); + closeTab->setIcon(KIcon("tab-close")); + closeTab->setText(i18nc("@action:inmenu File", "Close Tab")); + closeTab->setShortcut(Qt::CTRL | Qt::Key_W); + closeTab->setEnabled(false); + connect(closeTab, SIGNAL(triggered()), this, SLOT(closeTab())); KStandardAction::quit(this, SLOT(quit()), actionCollection()); @@ -1012,18 +1595,24 @@ void DolphinMainWindow::setupActions() 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); + cutShortcut.remove(Qt::SHIFT | Qt::Key_Delete, KShortcut::KeepEmpty); cut->setShortcut(cutShortcut); KStandardAction::copy(this, SLOT(copy()), actionCollection()); - KStandardAction::paste(this, SLOT(paste()), actionCollection()); + KAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection()); + // The text of the paste-action is modified dynamically by Dolphin + // (e. g. to "Paste One Folder"). To prevent that the size of the toolbar changes + // due to the long text, the text "Paste" is used: + paste->setIconText(i18nc("@action:inmenu Edit", "Paste")); + + KStandardAction::find(this, SLOT(find()), actionCollection()); KAction* selectAll = actionCollection()->addAction("select_all"); selectAll->setText(i18nc("@action:inmenu Edit", "Select All")); - selectAll->setShortcut(Qt::CTRL + Qt::Key_A); + selectAll->setShortcut(Qt::CTRL | Qt::Key_A); connect(selectAll, SIGNAL(triggered()), this, SLOT(selectAll())); KAction* invertSelection = actionCollection()->addAction("invert_selection"); @@ -1032,131 +1621,7 @@ void DolphinMainWindow::setupActions() 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()); - KToggleAction* columnView = DolphinView::columnsModeAction(actionCollection()); - - QActionGroup* viewModeGroup = new QActionGroup(this); - viewModeGroup->addAction(iconsView); - viewModeGroup->addAction(detailsView); - viewModeGroup->addAction(columnView); - connect(viewModeGroup, SIGNAL(triggered(QAction*)), this, SLOT(setViewMode(QAction*))); - - 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("sort_by_size"); - sortBySize->setText(i18nc("@action:inmenu Sort By", "Size")); - connect(sortBySize, SIGNAL(triggered()), this, SLOT(sortBySize())); - - 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("sort_by_permissions"); - sortByPermissions->setText(i18nc("@action:inmenu Sort By", "Permissions")); - connect(sortByPermissions, SIGNAL(triggered()), this, SLOT(sortByPermissions())); - - 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("sort_by_group"); - sortByGroup->setText(i18nc("@action:inmenu Sort By", "Group")); - connect(sortByGroup, SIGNAL(triggered()), this, SLOT(sortByGroup())); - - KToggleAction* sortByType = actionCollection()->add("sort_by_type"); - sortByType->setText(i18nc("@action:inmenu Sort By", "Type")); - connect(sortByType, SIGNAL(triggered()), this, SLOT(sortByType())); - - // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance - // is too slow currently (Nepomuk will support caching in future releases). - // - // 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); - sortGroup->addAction(sortByDate); - sortGroup->addAction(sortByPermissions); - sortGroup->addAction(sortByOwner); - sortGroup->addAction(sortByGroup); - sortGroup->addAction(sortByType); - - // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance - // is too slow currently (Nepomuk will support caching in future releases). - //sortGroup->addAction(sortByRating); - //sortGroup->addAction(sortByTags); - - KToggleAction* sortDescending = actionCollection()->add("descending"); - sortDescending->setText(i18nc("@action:inmenu Sort", "Descending")); - connect(sortDescending, SIGNAL(triggered()), this, SLOT(toggleSortOrder())); - - KToggleAction* showInGroups = actionCollection()->add("show_in_groups"); - showInGroups->setText(i18nc("@action:inmenu View", "Show in Groups")); - connect(showInGroups, SIGNAL(triggered()), this, SLOT(toggleSortCategorization())); - - KToggleAction* showSizeInfo = actionCollection()->add("show_size_info"); - showSizeInfo->setText(i18nc("@action:inmenu Additional information", "Size")); - connect(showSizeInfo, SIGNAL(triggered()), this, SLOT(toggleSizeInfo())); - - KToggleAction* showDateInfo = actionCollection()->add("show_date_info"); - showDateInfo->setText(i18nc("@action:inmenu Additional information", "Date")); - connect(showDateInfo, SIGNAL(triggered()), this, SLOT(toggleDateInfo())); - - KToggleAction* showPermissionsInfo = actionCollection()->add("show_permissions_info"); - showPermissionsInfo->setText(i18nc("@action:inmenu Additional information", "Permissions")); - connect(showPermissionsInfo, SIGNAL(triggered()), this, SLOT(togglePermissionsInfo())); - - KToggleAction* showOwnerInfo = actionCollection()->add("show_owner_info"); - showOwnerInfo->setText(i18nc("@action:inmenu Additional information", "Owner")); - connect(showOwnerInfo, SIGNAL(triggered()), this, SLOT(toggleOwnerInfo())); - - KToggleAction* showGroupInfo = actionCollection()->add("show_group_info"); - showGroupInfo->setText(i18nc("@action:inmenu Additional information", "Group")); - connect(showGroupInfo, SIGNAL(triggered()), this, SLOT(toggleGroupInfo())); - - KToggleAction* showMimeInfo = actionCollection()->add("show_mime_info"); - showMimeInfo->setText(i18nc("@action:inmenu Additional information", "Type")); - connect(showMimeInfo, SIGNAL(triggered()), this, SLOT(toggleMimeInfo())); - - KToggleAction* showPreview = actionCollection()->add("show_preview"); - showPreview->setText(i18nc("@action:intoolbar", "Preview")); - showPreview->setIcon(KIcon("view-preview")); - connect(showPreview, SIGNAL(triggered()), this, SLOT(togglePreview())); - - KToggleAction* showHiddenFiles = actionCollection()->add("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())); + // (note that most of it is set up in DolphinViewActionHandler) KAction* split = actionCollection()->addAction("split_view"); split->setShortcut(Qt::Key_F3); @@ -1171,47 +1636,54 @@ void DolphinMainWindow::setupActions() KAction* stop = actionCollection()->addAction("stop"); stop->setText(i18nc("@action:inmenu View", "Stop")); + stop->setToolTip(i18nc("@info", "Stop loading")); 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... - KToggleAction* showFullLocation = actionCollection()->add("editable_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())); - - KAction* editLocation = actionCollection()->addAction("edit_location"); - editLocation->setText(i18nc("@action:inmenu Navigation Bar", "Edit Location")); - editLocation->setShortcut(Qt::Key_F6); - connect(editLocation, SIGNAL(triggered()), this, SLOT(editLocation())); + KToggleAction* editableLocation = actionCollection()->add("editable_location"); + editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location")); + editableLocation->setShortcut(Qt::CTRL | Qt::Key_L); + connect(editableLocation, SIGNAL(triggered()), this, SLOT(toggleEditLocation())); - KAction* adjustViewProps = actionCollection()->addAction("view_properties"); - adjustViewProps->setText(i18nc("@action:inmenu View", "Adjust View Properties...")); - connect(adjustViewProps, SIGNAL(triggered()), this, SLOT(adjustViewProperties())); + KAction* replaceLocation = actionCollection()->addAction("replace_location"); + replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location")); + replaceLocation->setShortcut(Qt::Key_F6); + connect(replaceLocation, SIGNAL(triggered()), this, SLOT(replaceLocation())); // setup 'Go' menu KAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection()); + connect(backAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goBack(Qt::MouseButtons))); KShortcut backShortcut = backAction->shortcut(); backShortcut.setAlternate(Qt::Key_Backspace); backAction->setShortcut(backShortcut); - KStandardAction::forward(this, SLOT(goForward()), actionCollection()); - KStandardAction::up(this, SLOT(goUp()), actionCollection()); + m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this); + m_recentTabsMenu->setIcon(KIcon("edit-undo")); + actionCollection()->addAction("closed_tabs", m_recentTabsMenu); + connect(m_recentTabsMenu->menu(), SIGNAL(triggered(QAction *)), + this, SLOT(restoreClosedTab(QAction *))); + + QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu); + action->setIcon(KIcon("edit-clear-list")); + action->setData(QVariant::fromValue(true)); + m_recentTabsMenu->addAction(action); + m_recentTabsMenu->addSeparator(); + m_recentTabsMenu->setEnabled(false); + + KAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection()); + connect(forwardAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goForward(Qt::MouseButtons))); + + KAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection()); + connect(upAction, SIGNAL(triggered(Qt::MouseButtons, Qt::KeyboardModifiers)), this, SLOT(goUp(Qt::MouseButtons))); + KStandardAction::home(this, SLOT(goHome()), actionCollection()); // setup 'Tools' menu - QAction* findFile = actionCollection()->addAction("find_file"); - findFile->setText(i18nc("@action:inmenu Tools", "Find File...")); - findFile->setShortcut(Qt::CTRL | Qt::Key_F); - findFile->setIcon(KIcon("edit-find")); - connect(findFile, SIGNAL(triggered()), this, SLOT(findFile())); - - KToggleAction* showFilterBar = actionCollection()->add("show_filter_bar"); + KAction* showFilterBar = actionCollection()->addAction("show_filter_bar"); showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar")); + showFilterBar->setIcon(KIcon("view-filter")); showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I); - connect(showFilterBar, SIGNAL(triggered()), this, SLOT(toggleFilterBarVisibility())); + connect(showFilterBar, SIGNAL(triggered()), this, SLOT(showFilterBar())); KAction* compareFiles = actionCollection()->addAction("compare_files"); compareFiles->setText(i18nc("@action:inmenu Tools", "Compare Files")); @@ -1219,110 +1691,203 @@ void DolphinMainWindow::setupActions() compareFiles->setEnabled(false); connect(compareFiles, SIGNAL(triggered()), this, SLOT(compareFiles())); + KAction* openTerminal = actionCollection()->addAction("open_terminal"); + openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal")); + openTerminal->setIcon(KIcon("utilities-terminal")); + openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4); + connect(openTerminal, SIGNAL(triggered()), this, SLOT(openTerminal())); + // setup 'Settings' menu - m_showMenuBar = KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); + KStandardAction::showMenubar(this, SLOT(toggleShowMenuBar()), actionCollection()); KStandardAction::preferences(this, SLOT(editSettings()), actionCollection()); + + // not in menu actions + QList nextTabKeys; + nextTabKeys.append(KStandardShortcut::tabNext().primary()); + nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab)); + + QList prevTabKeys; + prevTabKeys.append(KStandardShortcut::tabPrev().primary()); + prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab)); + + KAction* activateNextTab = actionCollection()->addAction("activate_next_tab"); + activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab")); + connect(activateNextTab, SIGNAL(triggered()), SLOT(activateNextTab())); + activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys); + + KAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab"); + activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab")); + connect(activatePrevTab, SIGNAL(triggered()), SLOT(activatePrevTab())); + activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys); + + // for context menu + KAction* openInNewTab = actionCollection()->addAction("open_in_new_tab"); + openInNewTab->setText(i18nc("@action:inmenu", "Open in New Tab")); + openInNewTab->setIcon(KIcon("tab-new")); + connect(openInNewTab, SIGNAL(triggered()), this, SLOT(openInNewTab())); + + KAction* openInNewWindow = actionCollection()->addAction("open_in_new_window"); + openInNewWindow->setText(i18nc("@action:inmenu", "Open in New Window")); + openInNewWindow->setIcon(KIcon("window-new")); + connect(openInNewWindow, SIGNAL(triggered()), this, SLOT(openInNewWindow())); } void DolphinMainWindow::setupDockWidgets() { - // setup "Information" - QDockWidget* infoDock = new QDockWidget(i18nc("@title:window", "Information")); + const bool lock = DolphinSettings::instance().generalSettings()->lockPanels(); + + KDualAction* lockLayoutAction = actionCollection()->add("lock_panels"); + lockLayoutAction->setActiveText(i18nc("@action:inmenu Panels", "Unlock Panels")); + lockLayoutAction->setActiveIcon(KIcon("object-unlocked")); + lockLayoutAction->setInactiveText(i18nc("@action:inmenu Panels", "Lock Panels")); + lockLayoutAction->setInactiveIcon(KIcon("object-locked")); + lockLayoutAction->setActive(lock); + connect(lockLayoutAction, SIGNAL(triggered()), this, SLOT(togglePanelLockState())); + + // Setup "Information" + DolphinDockWidget* infoDock = new DolphinDockWidget(i18nc("@title:window", "Information")); + infoDock->setLocked(lock); infoDock->setObjectName("infoDock"); infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - SidebarPage* infoWidget = new InfoSidebarPage(infoDock); - infoDock->setWidget(infoWidget); + Panel* infoPanel = new InformationPanel(infoDock); + infoPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + connect(infoPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl))); + infoDock->setWidget(infoPanel); - infoDock->toggleViewAction()->setText(i18nc("@title:window", "Information")); - infoDock->toggleViewAction()->setShortcut(Qt::Key_F11); - actionCollection()->addAction("show_info_panel", infoDock->toggleViewAction()); + QAction* infoAction = infoDock->toggleViewAction(); + infoAction->setIcon(KIcon("dialog-information")); + infoAction->setShortcut(Qt::Key_F11); + addActionCloneToCollection(infoAction, "show_information_panel"); addDockWidget(Qt::RightDockWidgetArea, infoDock); connect(this, SIGNAL(urlChanged(KUrl)), - infoWidget, SLOT(setUrl(KUrl))); + infoPanel, SLOT(setUrl(KUrl))); connect(this, SIGNAL(selectionChanged(KFileItemList)), - infoWidget, SLOT(setSelection(KFileItemList))); + infoPanel, SLOT(setSelection(KFileItemList))); connect(this, SIGNAL(requestItemInfo(KFileItem)), - infoWidget, SLOT(requestDelayedItemInfo(KFileItem))); - - // setup "Tree View" - 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(i18nc("@title:window", "Folders")); - treeViewDock->toggleViewAction()->setShortcut(Qt::Key_F7); - actionCollection()->addAction("show_folders_panel", treeViewDock->toggleViewAction()); - - addDockWidget(Qt::LeftDockWidgetArea, treeViewDock); + infoPanel, SLOT(requestDelayedItemInfo(KFileItem))); + + // Setup "Folders" + DolphinDockWidget* foldersDock = new DolphinDockWidget(i18nc("@title:window", "Folders")); + foldersDock->setLocked(lock); + foldersDock->setObjectName("foldersDock"); + foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + FoldersPanel* foldersPanel = new FoldersPanel(foldersDock); + foldersPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + foldersDock->setWidget(foldersPanel); + + QAction* foldersAction = foldersDock->toggleViewAction(); + foldersAction->setShortcut(Qt::Key_F7); + foldersAction->setIcon(KIcon("folder")); + addActionCloneToCollection(foldersAction, "show_folders_panel"); + + addDockWidget(Qt::LeftDockWidgetArea, foldersDock); connect(this, SIGNAL(urlChanged(KUrl)), - treeWidget, SLOT(setUrl(KUrl))); - connect(treeWidget, SIGNAL(changeUrl(KUrl)), - this, SLOT(changeUrl(KUrl))); - connect(treeWidget, SIGNAL(changeSelection(KFileItemList)), - this, SLOT(changeSelection(KFileItemList))); - connect(treeWidget, SIGNAL(urlsDropped(KUrl::List, KUrl)), - this, SLOT(dropUrls(KUrl::List, KUrl))); - - // setup "Terminal" - QDockWidget* terminalDock = new QDockWidget(i18nc("@title:window", "Terminal")); + foldersPanel, SLOT(setUrl(KUrl))); + connect(foldersPanel, SIGNAL(changeUrl(KUrl, Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); + + // Setup "Terminal" +#ifndef Q_OS_WIN + DolphinDockWidget* terminalDock = new DolphinDockWidget(i18nc("@title:window Shell terminal", "Terminal")); + terminalDock->setLocked(lock); terminalDock->setObjectName("terminalDock"); terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea); - SidebarPage* terminalWidget = new TerminalSidebarPage(terminalDock); - terminalDock->setWidget(terminalWidget); + Panel* terminalPanel = new TerminalPanel(terminalDock); + terminalPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + terminalDock->setWidget(terminalPanel); - connect(terminalWidget, SIGNAL(hideTerminalSidebarPage()), terminalDock, SLOT(hide())); + connect(terminalPanel, SIGNAL(hideTerminalPanel()), terminalDock, SLOT(hide())); + connect(terminalDock, SIGNAL(visibilityChanged(bool)), + terminalPanel, SLOT(visibilityChanged(bool))); - terminalDock->toggleViewAction()->setText(i18nc("@title:window", "Terminal")); - terminalDock->toggleViewAction()->setShortcut(Qt::Key_F4); - actionCollection()->addAction("show_terminal_panel", terminalDock->toggleViewAction()); + QAction* terminalAction = terminalDock->toggleViewAction(); + terminalAction->setShortcut(Qt::Key_F4); + terminalAction->setIcon(KIcon("utilities-terminal")); + addActionCloneToCollection(terminalAction, "show_terminal_panel"); addDockWidget(Qt::BottomDockWidgetArea, terminalDock); connect(this, SIGNAL(urlChanged(KUrl)), - terminalWidget, SLOT(setUrl(KUrl))); + terminalPanel, SLOT(setUrl(KUrl))); +#endif + + // Setup "Search" +#ifdef HAVE_NEPOMUK + DolphinDockWidget* searchDock = new DolphinDockWidget(i18nc("@title:window", "Search")); + searchDock->setLocked(lock); + searchDock->setObjectName("searchDock"); + searchDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); + Panel* searchPanel = new SearchPanel(searchDock); + searchPanel->setCustomContextMenuActions(QList() << lockLayoutAction); + connect(searchPanel, SIGNAL(urlActivated(KUrl)), this, SLOT(handleUrl(KUrl))); + searchDock->setWidget(searchPanel); + + QAction* searchAction = searchDock->toggleViewAction(); + searchAction->setShortcut(Qt::Key_F12); + searchAction->setIcon(KIcon("system-search")); + addActionCloneToCollection(searchAction, "show_search_panel"); + addDockWidget(Qt::RightDockWidgetArea, searchDock); + connect(this, SIGNAL(urlChanged(KUrl)), + searchPanel, SLOT(setUrl(KUrl))); +#endif const bool firstRun = DolphinSettings::instance().generalSettings()->firstRun(); if (firstRun) { infoDock->hide(); - treeViewDock->hide(); + foldersDock->hide(); +#ifndef Q_OS_WIN terminalDock->hide(); +#endif +#ifdef HAVE_NEPOMUK + searchDock->hide(); +#endif } - QDockWidget* placesDock = new QDockWidget(i18nc("@title:window", "Places")); + // Setup "Places" + DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places")); + placesDock->setLocked(lock); placesDock->setObjectName("placesDock"); placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - KFilePlacesView* placesView = new KFilePlacesView(placesDock); - placesDock->setWidget(placesView); - placesView->setModel(DolphinSettings::instance().placesModel()); - placesView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - placesDock->toggleViewAction()->setText(i18nc("@title:window", "Places")); - placesDock->toggleViewAction()->setShortcut(Qt::Key_F9); - actionCollection()->addAction("show_places_panel", placesDock->toggleViewAction()); + PlacesPanel* placesPanel = new PlacesPanel(placesDock); + QAction* separator = new QAction(placesPanel); + separator->setSeparator(true); + QList placesActions; + placesActions.append(separator); + placesActions.append(lockLayoutAction); + placesPanel->addActions(placesActions); + placesPanel->setModel(DolphinSettings::instance().placesModel()); + placesPanel->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + placesDock->setWidget(placesPanel); + + QAction* placesAction = placesDock->toggleViewAction(); + placesAction->setShortcut(Qt::Key_F9); + placesAction->setIcon(KIcon("bookmarks")); + addActionCloneToCollection(placesAction, "show_places_panel"); addDockWidget(Qt::LeftDockWidgetArea, placesDock); - connect(placesView, SIGNAL(urlChanged(KUrl)), - this, SLOT(changeUrl(KUrl))); + connect(placesPanel, SIGNAL(urlChanged(KUrl, Qt::MouseButtons)), + this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons))); connect(this, SIGNAL(urlChanged(KUrl)), - placesView, SLOT(setUrl(KUrl))); -} - -void DolphinMainWindow::updateHistory() -{ - const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - const int index = urlNavigator->historyIndex(); - - QAction* backAction = actionCollection()->action("go_back"); - if (backAction != 0) { - backAction->setEnabled(index < urlNavigator->historySize() - 1); - } - - QAction* forwardAction = actionCollection()->action("go_forward"); - if (forwardAction != 0) { - forwardAction->setEnabled(index > 0); - } + placesPanel, SLOT(setUrl(KUrl))); + connect(placesDock, SIGNAL(visibilityChanged(bool)), + this, SLOT(slotPlacesPanelVisibilityChanged(bool))); + + // Add actions into the "Panels" menu + KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this); + actionCollection()->addAction("panels", panelsMenu); + panelsMenu->setDelayed(false); + panelsMenu->addAction(placesAction); + panelsMenu->addAction(infoAction); + panelsMenu->addAction(foldersAction); +#ifndef Q_OS_WIN + panelsMenu->addAction(terminalAction); +#endif +#ifdef HAVE_NEPOMUK + panelsMenu->addAction(searchAction); +#endif + panelsMenu->addSeparator(); + panelsMenu->addAction(lockLayoutAction); } void DolphinMainWindow::updateEditActions() @@ -1333,79 +1898,178 @@ void DolphinMainWindow::updateEditActions() } else { stateChanged("has_selection"); - QAction* renameAction = actionCollection()->action("rename"); - if (renameAction != 0) { - renameAction->setEnabled(true); - } - - bool enableMoveToTrash = true; + KActionCollection* col = actionCollection(); + QAction* renameAction = col->action("rename"); + QAction* moveToTrashAction = col->action("move_to_trash"); + QAction* deleteAction = col->action("delete"); + QAction* cutAction = col->action(KStandardAction::name(KStandardAction::Cut)); + QAction* deleteWithTrashShortcut = col->action("delete_shortcut"); // see DolphinViewActionHandler - KFileItemList::const_iterator it = list.begin(); - const KFileItemList::const_iterator end = list.end(); - while (it != end) { - const KUrl& url = (*it).url(); - // only enable the 'Move to Trash' action for local files - if (!url.isLocalFile()) { - enableMoveToTrash = false; - } - ++it; - } + KFileItemListProperties capabilities(list); + const bool enableMoveToTrash = capabilities.isLocal() && capabilities.supportsMoving(); - QAction* moveToTrashAction = actionCollection()->action("move_to_trash"); + renameAction->setEnabled(capabilities.supportsMoving()); moveToTrashAction->setEnabled(enableMoveToTrash); + deleteAction->setEnabled(capabilities.supportsDeleting()); + deleteWithTrashShortcut->setEnabled(capabilities.supportsDeleting() && !enableMoveToTrash); + cutAction->setEnabled(capabilities.supportsMoving()); } updatePasteAction(); } void DolphinMainWindow::updateViewActions() { - const DolphinView* view = m_activeViewContainer->view(); - QAction* zoomInAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomIn)); - if (zoomInAction != 0) { - zoomInAction->setEnabled(view->isZoomInPossible()); - } + m_actionHandler->updateViewActions(); + + QAction* showFilterBarAction = actionCollection()->action("show_filter_bar"); + showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible()); + + updateSplitAction(); + + QAction* editableLocactionAction = actionCollection()->action("editable_location"); + const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); + editableLocactionAction->setChecked(urlNavigator->isUrlEditable()); +} + +void DolphinMainWindow::updateGoActions() +{ + QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up)); + const KUrl currentUrl = m_activeViewContainer->url(); + goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); +} - QAction* zoomOutAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::ZoomOut)); - if (zoomOutAction != 0) { - zoomOutAction->setEnabled(view->isZoomOutPossible()); +void DolphinMainWindow::createToolBarMenuButton() +{ + if (m_toolBarSpacer && m_openToolBarMenuButton) { + return; } + Q_ASSERT(!m_toolBarSpacer); + Q_ASSERT(!m_openToolBarMenuButton); + + m_toolBarSpacer = new QWidget(this); + m_toolBarSpacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); + + m_openToolBarMenuButton = new QToolButton(this); + m_openToolBarMenuButton->setIcon(KIcon("configure")); + m_openToolBarMenuButton->setPopupMode(QToolButton::InstantPopup); + m_openToolBarMenuButton->setToolTip(i18nc("@info:tooltip", "Configure and control Dolphin")); + + KMenu* toolBarMenu = new ToolBarMenu(m_openToolBarMenuButton); + connect(toolBarMenu, SIGNAL(aboutToShow()), this, SLOT(updateToolBarMenu())); + + m_openToolBarMenuButton->setMenu(toolBarMenu); + + toolBar()->addWidget(m_toolBarSpacer); + toolBar()->addWidget(m_openToolBarMenuButton); + connect(toolBar(), SIGNAL(iconSizeChanged(QSize)), this, SLOT(slotToolBarIconSizeChanged(QSize))); + + // The added widgets are owned by the toolbar and may get deleted when e.g. the toolbar + // gets edited. In this case we must add them again. The adding is done asynchronously by + // m_updateToolBarTimer. + connect(m_toolBarSpacer, SIGNAL(destroyed()), this, SLOT(slotToolBarSpacerDeleted())); + connect(m_openToolBarMenuButton, SIGNAL(destroyed()), this, SLOT(slotToolBarMenuButtonDeleted())); + m_updateToolBarTimer = new QTimer(this); + m_updateToolBarTimer->setInterval(500); + connect(m_updateToolBarTimer, SIGNAL(timeout()), this, SLOT(updateToolBar())); +} + +void DolphinMainWindow::deleteToolBarMenuButton() +{ + delete m_toolBarSpacer; + m_toolBarSpacer = 0; + + delete m_openToolBarMenuButton; + m_openToolBarMenuButton = 0; + + delete m_updateToolBarTimer; + m_updateToolBarTimer = 0; +} + +bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu) +{ + Q_ASSERT(action); + Q_ASSERT(menu); - QAction* action = actionCollection()->action(view->currentViewModeActionName()); - if (action != 0) { - KToggleAction* toggleAction = static_cast(action); - toggleAction->setChecked(true); + const KToolBar* toolBarWidget = toolBar(); + foreach (const QWidget* widget, action->associatedWidgets()) { + if (widget == toolBarWidget) { + return false; + } } - slotSortingChanged(view->sorting()); - slotSortOrderChanged(view->sortOrder()); - slotCategorizedSortingChanged(); - slotAdditionalInfoChanged(view->additionalInfo()); + menu->addAction(action); + return true; +} - KToggleAction* showFilterBarAction = - static_cast(actionCollection()->action("show_filter_bar")); - showFilterBarAction->setChecked(m_activeViewContainer->isFilterBarVisible()); +void DolphinMainWindow::rememberClosedTab(int index) +{ + KMenu* tabsMenu = m_recentTabsMenu->menu(); - KToggleAction* showPreviewAction = - static_cast(actionCollection()->action("show_preview")); - showPreviewAction->setChecked(view->showPreview()); + const QString primaryPath = m_viewTab[index].primaryView->url().path(); + const QString iconName = KMimeType::iconNameForUrl(primaryPath); - KToggleAction* showHiddenFilesAction = - static_cast(actionCollection()->action("show_hidden_files")); - showHiddenFilesAction->setChecked(view->showHiddenFiles()); + QAction* action = new QAction(squeezedText(primaryPath), tabsMenu); - updateSplitAction(); + ClosedTab closedTab; + closedTab.primaryUrl = m_viewTab[index].primaryView->url(); - KToggleAction* editableLocactionAction = - static_cast(actionCollection()->action("editable_location")); - const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator(); - editableLocactionAction->setChecked(urlNavigator->isUrlEditable()); + if (m_viewTab[index].secondaryView) { + closedTab.secondaryUrl = m_viewTab[index].secondaryView->url(); + closedTab.isSplit = true; + } else { + closedTab.isSplit = false; + } + + action->setData(QVariant::fromValue(closedTab)); + action->setIcon(KIcon(iconName)); + + // add the closed tab menu entry after the separator and + // "Empty Recently Closed Tabs" entry + if (tabsMenu->actions().size() == 2) { + tabsMenu->addAction(action); + } else { + tabsMenu->insertAction(tabsMenu->actions().at(2), action); + } + + // assure that only up to 8 closed tabs are shown in the menu + if (tabsMenu->actions().size() > 8) { + tabsMenu->removeAction(tabsMenu->actions().last()); + } + actionCollection()->action("closed_tabs")->setEnabled(true); + KAcceleratorManager::manage(tabsMenu); } -void DolphinMainWindow::updateGoActions() +void DolphinMainWindow::refreshViews() { - QAction* goUpAction = actionCollection()->action(KStandardAction::stdName(KStandardAction::Up)); - const KUrl& currentUrl = m_activeViewContainer->url(); - goUpAction->setEnabled(currentUrl.upUrl() != currentUrl); + Q_ASSERT(m_viewTab[m_tabIndex].primaryView); + + // remember the current active view, as because of + // the refreshing the active view might change to + // the secondary view + DolphinViewContainer* activeViewContainer = m_activeViewContainer; + + const int tabCount = m_viewTab.count(); + for (int i = 0; i < tabCount; ++i) { + m_viewTab[i].primaryView->refresh(); + if (m_viewTab[i].secondaryView) { + m_viewTab[i].secondaryView->refresh(); + } + } + + setActiveViewContainer(activeViewContainer); + + const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings(); + if (generalSettings->modifiedStartupSettings()) { + // The startup settings have been changed by the user (see bug #254947). + // Synchronize the split-view setting with the active view: + const bool splitView = generalSettings->splitView(); + const ViewTab& activeTab = m_viewTab[m_tabIndex]; + const bool toggle = ( splitView && !activeTab.secondaryView) + || (!splitView && activeTab.secondaryView); + if (toggle) { + toggleSplitView(); + } + } } void DolphinMainWindow::clearStatusBar() @@ -1413,87 +2077,149 @@ void DolphinMainWindow::clearStatusBar() m_activeViewContainer->statusBar()->clear(); } -void DolphinMainWindow::connectViewSignals(int viewIndex) +void DolphinMainWindow::connectViewSignals(DolphinViewContainer* container) { - DolphinViewContainer* container = m_viewContainer[viewIndex]; connect(container, SIGNAL(showFilterBarChanged(bool)), this, SLOT(updateFilterBarAction(bool))); + connect(container, SIGNAL(writeStateChanged(bool)), + this, SLOT(slotWriteStateChanged(bool))); + connect(container, SIGNAL(searchModeChanged(bool)), + this, SLOT(slotSearchModeChanged(bool))); + + const DolphinSearchBox* searchBox = container->searchBox(); + connect(searchBox, SIGNAL(searchLocationChanged(SearchLocation)), + this, SLOT(slotSearchLocationChanged())); 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(slotRequestItemInfo(KFileItem))); connect(view, SIGNAL(activated()), this, SLOT(toggleActiveView())); - connect(view, SIGNAL(doingOperation(KonqFileUndoManager::CommandType)), - this, SLOT(slotDoingOperation(KonqFileUndoManager::CommandType))); + connect(view, SIGNAL(tabRequested(const KUrl&)), + this, SLOT(openNewTab(const KUrl&))); + connect(view, SIGNAL(requestContextMenu(KFileItem, const KUrl&, const QList&)), + this, SLOT(openContextMenu(KFileItem, const KUrl&, const QList&))); + connect(view, SIGNAL(startedPathLoading(KUrl)), + this, SLOT(enableStopAction())); + connect(view, SIGNAL(finishedPathLoading(KUrl)), + this, SLOT(disableStopAction())); const KUrlNavigator* navigator = container->urlNavigator(); connect(navigator, SIGNAL(urlChanged(const KUrl&)), this, SLOT(changeUrl(const KUrl&))); connect(navigator, SIGNAL(historyChanged()), - this, SLOT(slotHistoryChanged())); + this, SLOT(updateHistory())); + connect(navigator, SIGNAL(editableStateChanged(bool)), + this, SLOT(slotEditableStateChanged(bool))); + connect(navigator, SIGNAL(tabRequested(const KUrl&)), + this, SLOT(openNewTab(KUrl))); } void DolphinMainWindow::updateSplitAction() { QAction* splitAction = actionCollection()->action("split_view"); - if (m_viewContainer[SecondaryView] != 0) { - if (m_activeViewContainer == m_viewContainer[PrimaryView]) { + if (m_viewTab[m_tabIndex].secondaryView) { + if (m_activeViewContainer == m_viewTab[m_tabIndex].secondaryView) { splitAction->setText(i18nc("@action:intoolbar Close right view", "Close")); + splitAction->setToolTip(i18nc("@info", "Close right view")); splitAction->setIcon(KIcon("view-right-close")); } else { splitAction->setText(i18nc("@action:intoolbar Close left view", "Close")); + splitAction->setToolTip(i18nc("@info", "Close left view")); splitAction->setIcon(KIcon("view-left-close")); } } else { splitAction->setText(i18nc("@action:intoolbar Split view", "Split")); + splitAction->setToolTip(i18nc("@info", "Split view")); splitAction->setIcon(KIcon("view-right-new")); } } -void DolphinMainWindow::toggleAdditionalInfo(const char* actionName, - KFileItemDelegate::Information info) +QString DolphinMainWindow::tabName(const KUrl& url) const { - clearStatusBar(); + QString name; + if (url.equals(KUrl("file:///"))) { + name = '/'; + } else { + name = url.fileName(); + if (name.isEmpty()) { + name = url.protocol(); + } else { + // Make sure that a '&' inside the directory name is displayed correctly + // and not misinterpreted as a keyboard shortcut in QTabBar::setTabText() + name.replace('&', "&&"); + } + } + return name; +} - DolphinView* view = m_activeViewContainer->view(); - KFileItemDelegate::InformationList list = view->additionalInfo(); +bool DolphinMainWindow::isKompareInstalled() const +{ + static bool initialized = false; + static bool installed = false; + if (!initialized) { + // TODO: maybe replace this approach later by using a menu + // plugin like kdiff3plugin.cpp + installed = !KGlobal::dirs()->findExe("kompare").isEmpty(); + initialized = true; + } + return installed; +} + +void DolphinMainWindow::createSecondaryView(int tabIndex) +{ + QSplitter* splitter = m_viewTab[tabIndex].splitter; + const int newWidth = (m_viewTab[tabIndex].primaryView->width() - splitter->handleWidth()) / 2; + + const DolphinView* view = m_viewTab[tabIndex].primaryView->view(); + m_viewTab[tabIndex].secondaryView = createViewContainer(view->rootUrl(), 0); + splitter->addWidget(m_viewTab[tabIndex].secondaryView); + splitter->setSizes(QList() << newWidth << newWidth); + connectViewSignals(m_viewTab[tabIndex].secondaryView); + m_viewTab[tabIndex].secondaryView->setActive(false); + m_viewTab[tabIndex].secondaryView->show(); +} - const bool show = actionCollection()->action(actionName)->isChecked(); +QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const +{ + return "Tab " + QString::number(tabIndex) + ' ' + property; +} - 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); +void DolphinMainWindow::setUrlAsCaption(const KUrl& url) +{ + QString caption; + if (!url.isLocalFile()) { + caption.append(url.protocol() + " - "); + if (url.hasHost()) { + caption.append(url.host() + " - "); + } } + + const QString fileName = url.fileName().isEmpty() ? "/" : url.fileName(); + caption.append(fileName); + + setCaption(caption); +} + +QString DolphinMainWindow::squeezedText(const QString& text) const +{ + const QFontMetrics fm = fontMetrics(); + return fm.elidedText(text, Qt::ElideMiddle, fm.maxWidth() * 10); +} + +void DolphinMainWindow::addActionCloneToCollection(QAction* action, const QString& actionName) +{ + KAction* actionClone = actionCollection()->addAction(actionName); + actionClone->setText(action->text()); + actionClone->setIcon(action->icon()); + connect(actionClone, SIGNAL(triggered()), action, SLOT(trigger())); } -DolphinMainWindow::UndoUiInterface::UndoUiInterface(DolphinMainWindow* mainWin) : - KonqFileUndoManager::UiInterface(mainWin), - m_mainWin(mainWin) +DolphinMainWindow::UndoUiInterface::UndoUiInterface() : + KIO::FileUndoManager::UiInterface() { - Q_ASSERT(m_mainWin != 0); } DolphinMainWindow::UndoUiInterface::~UndoUiInterface() @@ -1502,8 +2228,56 @@ DolphinMainWindow::UndoUiInterface::~UndoUiInterface() void DolphinMainWindow::UndoUiInterface::jobError(KIO::Job* job) { - DolphinStatusBar* statusBar = m_mainWin->activeViewContainer()->statusBar(); - statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); + DolphinMainWindow* mainWin= qobject_cast(parentWidget()); + if (mainWin) { + DolphinStatusBar* statusBar = mainWin->activeViewContainer()->statusBar(); + statusBar->setMessage(job->errorString(), DolphinStatusBar::Error); + } else { + KIO::FileUndoManager::UiInterface::jobError(job); + } +} + +ToolBarMenu::ToolBarMenu(QWidget* parent) : + KMenu(parent) +{ +} + +ToolBarMenu::~ToolBarMenu() +{ +} + +void ToolBarMenu::showEvent(QShowEvent* event) +{ + KMenu::showEvent(event); + + // Adjust the position of the menu to be shown within the + // Dolphin window to reduce the cases that sub-menus might overlap + // the right screen border. + QPoint pos; + QWidget* button = parentWidget(); + if (layoutDirection() == Qt::RightToLeft) { + pos = button->mapToGlobal(QPoint(0, button->height())); + } else { + pos = button->mapToGlobal(QPoint(button->width(), button->height())); + pos.rx() -= width(); + } + + // Assure that the menu is not shown outside the screen boundaries and + // that it does not overlap with the parent button. + const QRect screen = QApplication::desktop()->screenGeometry(QCursor::pos()); + if (pos.x() < 0) { + pos.rx() = 0; + } else if (pos.x() + width() >= screen.width()) { + pos.rx() = screen.width() - width(); + } + + if (pos.y() < 0) { + pos.ry() = 0; + } else if (pos.y() + height() >= screen.height()) { + pos.ry() = button->mapToGlobal(QPoint(0, 0)).y() - height(); + } + + move(pos); } #include "dolphinmainwindow.moc"