#include "dolphindockwidget.h"
#include "dolphincontextmenu.h"
#include "dolphinnewfilemenu.h"
+#include "dolphinrecenttabsmenu.h"
+#include "dolphintabbar.h"
#include "dolphinviewcontainer.h"
+#include "dolphintabpage.h"
#include "panels/folders/folderspanel.h"
#include "panels/places/placespanel.h"
#include "panels/information/informationpanel.h"
#include <KStandardDirs>
#include <kstatusbar.h>
#include <KStandardAction>
-#include <ktabbar.h>
#include <KToggleAction>
#include <KUrlNavigator>
-#include <KUrl>
#include <KUrlComboBox>
#include <KToolInvocation>
const int CurrentDolphinVersion = 200;
};
-/*
- * 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_newFileMenu(0),
m_tabBar(0),
m_activeViewContainer(0),
m_centralWidgetLayout(0),
- m_tabIndex(0),
+ m_tabIndex(-1),
m_viewTab(),
m_actionHandler(0),
m_remoteEncoding(0),
{
setObjectName("Dolphin#");
- m_viewTab.append(ViewTab());
- ViewTab& viewTab = m_viewTab[m_tabIndex];
- viewTab.wasActive = true; // The first opened tab is automatically active
-
connect(&DolphinNewFileMenuObserver::instance(), &DolphinNewFileMenuObserver::errorMessage,
this, &DolphinMainWindow::showErrorMessage);
setAcceptDrops(true);
- viewTab.splitter = new QSplitter(this);
- viewTab.splitter->setChildrenCollapsible(false);
-
setupActions();
- const KUrl homeUrl(generalSettings->homeUrl());
- setUrlAsCaption(homeUrl);
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
connect(m_actionHandler, &DolphinViewActionHandler::actionBeingHandled, this, &DolphinMainWindow::clearStatusBar);
connect(m_actionHandler, &DolphinViewActionHandler::createDirectory, this, &DolphinMainWindow::createDirectory);
- viewTab.primaryView = createViewContainer(homeUrl, viewTab.splitter);
-
- m_activeViewContainer = viewTab.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, &DolphinMainWindow::urlChanged,
m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl);
- m_tabBar = new KTabBar(this);
- m_tabBar->setMovable(true);
- m_tabBar->setTabsClosable(true);
- connect(m_tabBar, &KTabBar::currentChanged,
- this, &DolphinMainWindow::setActiveTab);
- connect(m_tabBar, &KTabBar::tabCloseRequested,
- this, static_cast<void(DolphinMainWindow::*)(int)>(&DolphinMainWindow::closeTab));
- connect(m_tabBar, &KTabBar::contextMenu,
- this, &DolphinMainWindow::openTabContextMenu);
- connect(m_tabBar, &KTabBar::newTabRequest,
- this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewTab));
- connect(m_tabBar, &KTabBar::testCanDecode,
- this, &DolphinMainWindow::slotTestCanDecode);
- connect(m_tabBar, &KTabBar::mouseMiddleClick,
- this, static_cast<void(DolphinMainWindow::*)(int)>(&DolphinMainWindow::closeTab));
- connect(m_tabBar, &KTabBar::tabMoved,
- this, &DolphinMainWindow::slotTabMoved);
- connect(m_tabBar, &KTabBar::receivedDropEvent,
- this, &DolphinMainWindow::tabDropEvent);
+ m_tabBar = new DolphinTabBar(this);
+ connect(m_tabBar, SIGNAL(currentChanged(int)),
+ this, SLOT(setActiveTab(int)));
+ connect(m_tabBar, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(closeTab(int)));
+ connect(m_tabBar, SIGNAL(openNewActivatedTab(int)),
+ this, SLOT(openNewActivatedTab(int)));
+ connect(m_tabBar, SIGNAL(tabMoved(int,int)),
+ this, SLOT(slotTabMoved(int,int)));
+ connect(m_tabBar, SIGNAL(tabDropEvent(int,QDropEvent*)),
+ this, SLOT(tabDropEvent(int,QDropEvent*)));
+ connect(m_tabBar, SIGNAL(tabDetachRequested(int)),
+ this, SLOT(detachTab(int)));
m_tabBar->blockSignals(true); // signals get unblocked after at least 2 tabs are open
+ m_tabBar->hide();
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(viewTab.splitter, 1);
setCentralWidget(centralWidget);
setupDockWidgets();
- emit urlChanged(homeUrl);
setupGUI(Keys | Save | Create | ToolBar);
stateChanged("new_file");
connect(clipboard, &QClipboard::dataChanged,
this, &DolphinMainWindow::updatePasteAction);
- if (generalSettings->splitView()) {
- toggleSplitView();
- }
- updateEditActions();
- updatePasteAction();
- updateViewActions();
- updateGoActions();
-
QAction* showFilterBarAction = actionCollection()->action("show_filter_bar");
showFilterBarAction->setChecked(generalSettings->filterBar());
void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
{
- if (dirs.isEmpty()) {
- return;
- }
-
- if (dirs.count() == 1) {
- m_activeViewContainer->setUrl(dirs.first());
- return;
- }
-
- const int oldOpenTabsCount = m_viewTab.count();
-
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<KUrl>::const_iterator it = dirs.constBegin();
while (it != dirs.constEnd()) {
- openNewTab(*it);
- ++it;
-
+ const KUrl& primaryUrl = *(it++);
if (hasSplitView && (it != dirs.constEnd())) {
- const int tabIndex = m_viewTab.count() - 1;
- m_viewTab[tabIndex].secondaryView->setUrl(*it);
- ++it;
+ const KUrl& secondaryUrl = *(it++);
+ openNewTab(primaryUrl, secondaryUrl);
+ } else {
+ openNewTab(primaryUrl);
}
}
-
- // Remove the previously opened tabs
- for (int i = 0; i < oldOpenTabsCount; ++i) {
- closeTab(0);
- }
}
void DolphinMainWindow::openFiles(const QList<KUrl>& files)
// 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);
- m_viewTab[i].primaryView->view()->markUrlAsCurrent(files.at(0));
- if (m_viewTab[i].secondaryView) {
- m_viewTab[i].secondaryView->view()->markUrlsAsSelected(files);
- m_viewTab[i].secondaryView->view()->markUrlAsCurrent(files.at(0));
- }
+ foreach (DolphinTabPage* tabPage, m_viewTab) {
+ tabPage->markUrlsAsSelected(files);
+ tabPage->markUrlAsCurrent(files.first());
}
}
updateViewActions();
updateGoActions();
setUrlAsCaption(url);
- if (m_viewTab.count() > 1) {
- m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(m_activeViewContainer->url())));
- }
+
const QString iconName = KIO::iconNameForUrl(url);
m_tabBar->setTabIcon(m_tabIndex, QIcon::fromTheme(iconName));
+ m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(view->url())));
+
emit urlChanged(url);
}
}
{
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();
- }
+ const int selectedUrlsCount = m_viewTab.at(m_tabIndex)->selectedItemsCount();
QAction* compareFilesAction = actionCollection()->action("compare_files");
if (selectedUrlsCount == 2) {
}
}
-void DolphinMainWindow::openNewTab(const KUrl& url)
+void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
{
QWidget* focusWidget = QApplication::focusWidget();
- 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(QIcon::fromTheme(KIO::iconNameForUrl(currentUrl)),
- squeezedText(tabName(currentUrl)));
- m_tabBar->blockSignals(false);
- }
+ DolphinTabPage* tabPage = new DolphinTabPage(primaryUrl, secondaryUrl, this);
+ m_viewTab.append(tabPage);
+
+ connect(tabPage, SIGNAL(activeViewChanged()),
+ this, SLOT(activeViewChanged()));
+
+ // The places-selector from the URL navigator should only be shown
+ // if the places dock is invisible
+ QDockWidget* placesDock = findChild<QDockWidget*>("placesDock");
+ const bool placesSelectorVisible = !placesDock || !placesDock->isVisible();
+ tabPage->setPlacesSelectorVisible(placesSelectorVisible);
- m_tabBar->addTab(QIcon::fromTheme(KIO::iconNameForUrl(url)),
- squeezedText(tabName(url)));
+ DolphinViewContainer* primaryContainer = tabPage->primaryViewContainer();
+ connectViewSignals(primaryContainer);
- ViewTab viewTab;
- viewTab.splitter = new QSplitter(this);
- viewTab.splitter->setChildrenCollapsible(false);
- viewTab.primaryView = createViewContainer(url, viewTab.splitter);
- viewTab.primaryView->setActive(false);
- connectViewSignals(viewTab.primaryView);
+ if (tabPage->splitViewEnabled()) {
+ DolphinViewContainer* secondaryContainer = tabPage->secondaryViewContainer();
+ connectViewSignals(secondaryContainer);
+ }
- m_viewTab.append(viewTab);
+ tabPage->hide();
- actionCollection()->action("close_tab")->setEnabled(true);
- actionCollection()->action("activate_prev_tab")->setEnabled(true);
- actionCollection()->action("activate_next_tab")->setEnabled(true);
+ m_tabBar->addTab(QIcon::fromTheme(KIO::iconNameForUrl(primaryUrl)),
+ squeezedText(tabName(primaryUrl)));
- // Provide a split view, if the startup settings are set this way
- if (GeneralSettings::splitView()) {
- const int newTabIndex = m_viewTab.count() - 1;
- createSecondaryView(newTabIndex);
- m_viewTab[newTabIndex].secondaryView->setActive(true);
- m_viewTab[newTabIndex].isPrimaryViewActive = false;
+ if (m_viewTab.count() > 1) {
+ actionCollection()->action("close_tab")->setEnabled(true);
+ actionCollection()->action("activate_prev_tab")->setEnabled(true);
+ actionCollection()->action("activate_next_tab")->setEnabled(true);
+ m_tabBar->show();
+ m_tabBar->blockSignals(false);
}
if (focusWidget) {
}
}
-void DolphinMainWindow::openNewActivatedTab(const KUrl& url)
+void DolphinMainWindow::openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
{
- openNewTab(url);
- m_tabBar->setCurrentIndex(m_viewTab.count() - 1);
+ openNewTab(primaryUrl, secondaryUrl);
+ setActiveTab(m_viewTab.count() - 1);
+}
+
+void DolphinMainWindow::openNewActivatedTab(int index)
+{
+ Q_ASSERT(index >= 0);
+ const DolphinTabPage* tabPage = m_viewTab.at(index);
+ openNewActivatedTab(tabPage->activeViewContainer()->url());
}
void DolphinMainWindow::activateNextTab()
{
if (m_viewTab.count() >= 2) {
const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count();
- m_tabBar->setCurrentIndex(tabIndex);
+ setActiveTab(tabIndex);
}
}
if (tabIndex == -1) {
tabIndex = m_tabBar->count() - 1;
}
- m_tabBar->setCurrentIndex(tabIndex);
+ setActiveTab(tabIndex);
}
}
}
}
-void DolphinMainWindow::toggleActiveView()
-{
- if (!m_viewTab[m_tabIndex].secondaryView) {
- // only one view is available
- return;
- }
-
- Q_ASSERT(m_activeViewContainer);
- Q_ASSERT(m_viewTab[m_tabIndex].primaryView);
-
- 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 (!m_activeViewContainer && m_viewTab.count() > 0) {
+ // If we have no active view container yet, we set the primary view container
+ // of the first tab as active view container.
+ setActiveTab(0);
+ }
+
if (!event->spontaneous()) {
m_activeViewContainer->view()->setFocus();
}
}
switch (result) {
- case KDialog::Yes:
+ case QDialogButtonBox::Yes:
// Quit
break;
- case KDialog::No:
+ case QDialogButtonBox::No:
// Close only the current tab
closeTab();
default:
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());
- }
+ const DolphinTabPage* tabPage = m_viewTab.at(i);
+ group.writeEntry("Tab " % QString::number(i), tabPage->saveState());
}
}
{
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 = 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);
- }
-
- // The right view must be activated before the URL is set. Changing
- // the URL in the right view will emit the right URL navigator's
- // urlChanged(KUrl) signal, which is connected to the changeUrl(KUrl)
- // slot. That slot will change the URL in the left view if it is still
- // active. See https://bugs.kde.org/show_bug.cgi?id=330047.
- setActiveViewContainer(cont);
-
- 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();
- }
+ const QByteArray state = group.readEntry("Tab " % QString::number(i), QByteArray());
+ DolphinTabPage* tabPage = m_viewTab.at(i);
+ tabPage->restoreState(state);
// openNewTab() needs to be called only tabCount - 1 times
if (i != tabCount - 1) {
}
}
-void DolphinMainWindow::restoreClosedTab(QAction* action)
-{
- if (action->data().toBool()) {
- // clear all actions except the "Empty Recently Closed Tabs"
- // action and the separator
- QList<QAction*> 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<ClosedTab>();
- 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::name(KStandardAction::Undo));
void DolphinMainWindow::toggleSplitView()
{
- 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;
-
- 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;
+ DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
+ tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled());
- setActiveViewContainer(m_viewTab[m_tabIndex].primaryView);
+ if (tabPage->splitViewEnabled()) {
+ connectViewSignals(tabPage->secondaryViewContainer());
}
updateViewActions();
void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool visible)
{
- 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);
- }
+ foreach (DolphinTabPage* tabPage, m_viewTab) {
+ // The Places selector in the location bar should be shown if and only if the Places panel is hidden.
+ tabPage->setPlacesSelectorVisible(!visible);
}
}
void DolphinMainWindow::compareFiles()
{
- const DolphinViewContainer* primaryViewContainer = m_viewTab[m_tabIndex].primaryView;
- Q_ASSERT(primaryViewContainer);
- KFileItemList items = primaryViewContainer->view()->selectedItems();
-
- const DolphinViewContainer* secondaryViewContainer = m_viewTab[m_tabIndex].secondaryView;
- if (secondaryViewContainer) {
- items.append(secondaryViewContainer->view()->selectedItems());
- }
-
+ const KFileItemList items = m_viewTab.at(m_tabIndex)->selectedItems();
if (items.count() != 2) {
// The action is disabled in this case, but it could have been triggered
// via D-Bus, see https://bugs.kde.org/show_bug.cgi?id=325517
return;
}
+ m_tabBar->setCurrentIndex(index);
+
// 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);
+ if (m_tabIndex >= 0) {
+ DolphinTabPage* hiddenTabPage = m_viewTab.at(m_tabIndex);
+ hiddenTabPage->hide();
+ m_centralWidgetLayout->removeWidget(hiddenTabPage);
}
- 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();
-
- if (!viewTab.wasActive) {
- viewTab.wasActive = true;
-
- // If the tab has not been activated yet the size of the KItemListView is
- // undefined and results in an unwanted animation. To prevent this a
- // reloading of the directory gets triggered.
- viewTab.primaryView->view()->reload();
- if (viewTab.secondaryView) {
- viewTab.secondaryView->view()->reload();
- }
- }
+ DolphinTabPage* tabPage = m_viewTab.at(index);
+ m_centralWidgetLayout->addWidget(tabPage, 1);
+ tabPage->show();
- setActiveViewContainer(viewTab.isPrimaryViewActive ? viewTab.primaryView :
- viewTab.secondaryView);
+ setActiveViewContainer(tabPage->activeViewContainer());
}
void DolphinMainWindow::closeTab()
// previous tab before closing the tab.
m_tabBar->setCurrentIndex((index > 0) ? index - 1 : 1);
}
- rememberClosedTab(index);
- // delete tab
- m_viewTab[index].primaryView->deleteLater();
- if (m_viewTab[index].secondaryView) {
- m_viewTab[index].secondaryView->deleteLater();
+ DolphinTabPage* tabPage = m_viewTab.at(index);
+
+ if (tabPage->splitViewEnabled()) {
+ emit rememberClosedTab(tabPage->primaryViewContainer()->url(),
+ tabPage->secondaryViewContainer()->url());
+ } else {
+ emit rememberClosedTab(tabPage->primaryViewContainer()->url(), KUrl());
}
- m_viewTab[index].splitter->deleteLater();
- m_viewTab.erase(m_viewTab.begin() + index);
+
+ // delete tab
+ m_viewTab.removeAt(index);
+ tabPage->deleteLater();
m_tabBar->blockSignals(true);
m_tabBar->removeTab(index);
// 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);
+ if (m_viewTab.count() < 2) {
actionCollection()->action("close_tab")->setEnabled(false);
actionCollection()->action("activate_prev_tab")->setEnabled(false);
actionCollection()->action("activate_next_tab")->setEnabled(false);
+ m_tabBar->hide();
} else {
m_tabBar->blockSignals(false);
}
}
-void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
+void DolphinMainWindow::detachTab(int index)
{
- KMenu menu(this);
-
- QAction* newTabAction = menu.addAction(QIcon::fromTheme("tab-new"), i18nc("@action:inmenu", "New Tab"));
- newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
-
- QAction* detachTabAction = menu.addAction(QIcon::fromTheme("tab-detach"), i18nc("@action:inmenu", "Detach Tab"));
-
- QAction* closeOtherTabsAction = menu.addAction(QIcon::fromTheme("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
-
- QAction* closeTabAction = menu.addAction(QIcon::fromTheme("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");
+ Q_ASSERT(index >= 0);
- const ViewTab& tab = m_viewTab[index];
- Q_ASSERT(tab.primaryView);
+ const QString separator(QLatin1Char(' '));
+ QString command = QLatin1String("dolphin");
- command += separator + tab.primaryView->url().url();
- if (tab.secondaryView) {
- command += separator + tab.secondaryView->url().url();
- command += separator + QLatin1String("-split");
- }
+ const DolphinTabPage* tabPage = m_viewTab.at(index);
+ command += separator + tabPage->primaryViewContainer()->url().url();
+ if (tabPage->splitViewEnabled()) {
+ command += separator + tabPage->secondaryViewContainer()->url().url();
+ command += separator + QLatin1String("-split");
+ }
- KRun::runCommand(command, this);
+ 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);
- }
+ closeTab(index);
}
void DolphinMainWindow::slotTabMoved(int from, int to)
m_tabIndex = m_tabBar->currentIndex();
}
-void DolphinMainWindow::slotTestCanDecode(const QDragMoveEvent* event, bool& canDecode)
-{
- canDecode = KUrl::List::canDecode(event->mimeData());
-}
-
void DolphinMainWindow::handleUrl(const KUrl& url)
{
delete m_lastHandleUrlStatJob;
{
const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
if (!urls.isEmpty() && tab != -1) {
- const ViewTab& viewTab = m_viewTab[tab];
- const DolphinView* view = viewTab.isPrimaryViewActive ? viewTab.primaryView->view()
- : viewTab.secondaryView->view();
+ const DolphinView* view = m_viewTab.at(tab)->activeViewContainer()->view();
+
QString error;
DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event, error);
if (!error.isEmpty()) {
}
}
+void DolphinMainWindow::activeViewChanged()
+{
+ const DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
+ setActiveViewContainer(tabPage->activeViewContainer());
+}
+
void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
{
Q_ASSERT(viewContainer);
- Q_ASSERT((viewContainer == m_viewTab[m_tabIndex].primaryView) ||
- (viewContainer == m_viewTab[m_tabIndex].secondaryView));
+ Q_ASSERT((viewContainer == m_viewTab.at(m_tabIndex)->primaryViewContainer()) ||
+ (viewContainer == m_viewTab.at(m_tabIndex)->secondaryViewContainer()));
if (m_activeViewContainer == viewContainer) {
return;
}
- m_activeViewContainer->setActive(false);
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(), &DolphinView::activated, this, &DolphinMainWindow::toggleActiveView);
- m_activeViewContainer->setActive(true);
- connect(m_activeViewContainer->view(), &DolphinView::activated, this, &DolphinMainWindow::toggleActiveView);
-
m_actionHandler->setCurrentView(viewContainer->view());
updateHistory();
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, QIcon::fromTheme(KIO::iconNameForUrl(url)));
- }
+ m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(url)));
+ m_tabBar->setTabIcon(m_tabIndex, QIcon::fromTheme(KIO::iconNameForUrl(url)));
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<QDockWidget*>("placesDock");
- container->urlNavigator()->setPlacesSelectorVisible(!placesDock || !placesDock->isVisible());
-
- return container;
-}
-
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
QAction* split = actionCollection()->addAction("split_view");
split->setShortcut(Qt::Key_F3);
- updateSplitAction();
connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
QAction* reload = actionCollection()->addAction("reload");
// setup 'Go' menu
QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
- connect(backAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
auto backShortcuts = backAction->shortcuts();
backShortcuts.append(QKeySequence(Qt::Key_Backspace));
backAction->setShortcuts(backShortcuts);
- m_recentTabsMenu = new KActionMenu(i18n("Recently Closed Tabs"), this);
- m_recentTabsMenu->setIcon(QIcon::fromTheme("edit-undo"));
- m_recentTabsMenu->setDelayed(false);
- actionCollection()->addAction("closed_tabs", m_recentTabsMenu);
- connect(m_recentTabsMenu->menu(), &QMenu::triggered,
- this, &DolphinMainWindow::restoreClosedTab);
+ DolphinRecentTabsMenu* recentTabsMenu = new DolphinRecentTabsMenu(this);
+ actionCollection()->addAction("closed_tabs", recentTabsMenu);
+ connect(this, SIGNAL(rememberClosedTab(KUrl,KUrl)),
+ recentTabsMenu, SLOT(rememberClosedTab(KUrl,KUrl)));
+ connect(recentTabsMenu, SIGNAL(restoreClosedTab(KUrl,KUrl)),
+ this, SLOT(openNewActivatedTab(KUrl,KUrl)));
- QAction* action = new QAction(i18n("Empty Recently Closed Tabs"), m_recentTabsMenu);
- action->setIcon(QIcon::fromTheme("edit-clear-list"));
- action->setData(QVariant::fromValue(true));
- m_recentTabsMenu->addAction(action);
- m_recentTabsMenu->addSeparator();
- m_recentTabsMenu->setEnabled(false);
-
- QAction* forwardAction = KStandardAction::forward(this, SLOT(goForward()), actionCollection());
- connect(forwardAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goForward));
-
- QAction* upAction = KStandardAction::up(this, SLOT(goUp()), actionCollection());
- connect(upAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goUp));
-
- QAction* homeAction = KStandardAction::home(this, SLOT(goHome()), actionCollection());
- connect(homeAction, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goHome));
+ KStandardAction::forward(this, SLOT(goForward()), actionCollection());
+ KStandardAction::up(this, SLOT(goUp()), actionCollection());
+ KStandardAction::home(this, SLOT(goHome()), actionCollection());
// setup 'Tools' menu
QAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
foldersPanel, &FoldersPanel::setUrl);
connect(foldersPanel, &FoldersPanel::folderActivated,
this, &DolphinMainWindow::changeUrl);
- connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
- this, static_cast<void(DolphinMainWindow::*)(const KUrl&)>(&DolphinMainWindow::openNewTab));
+ connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)),
+ this, SLOT(openNewTab(KUrl)));
connect(foldersPanel, &FoldersPanel::errorMessage,
this, &DolphinMainWindow::slotPanelErrorMessage);
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
connect(placesPanel, &PlacesPanel::placeActivated,
this, &DolphinMainWindow::slotPlaceActivated);
- connect(placesPanel, &PlacesPanel::placeMiddleClicked,
- this, static_cast<void(DolphinMainWindow::*)(const KUrl&)>(&DolphinMainWindow::openNewTab));
+ connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)),
+ this, SLOT(openNewTab(KUrl)));
connect(placesPanel, &PlacesPanel::errorMessage,
this, &DolphinMainWindow::slotPanelErrorMessage);
connect(this, &DolphinMainWindow::urlChanged,
return true;
}
-void DolphinMainWindow::rememberClosedTab(int index)
-{
- QMenu* tabsMenu = m_recentTabsMenu->menu();
-
- const QString primaryPath = m_viewTab[index].primaryView->url().path();
- const QString iconName = KIO::iconNameForUrl(primaryPath);
-
- QAction* action = new QAction(squeezedText(primaryPath), tabsMenu);
-
- ClosedTab closedTab;
- closedTab.primaryUrl = m_viewTab[index].primaryView->url();
-
- 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(QIcon::fromTheme(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::refreshViews()
{
- 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->readSettings();
- if (m_viewTab[i].secondaryView) {
- m_viewTab[i].secondaryView->readSettings();
- }
+ foreach (DolphinTabPage* tabPage, m_viewTab) {
+ tabPage->refreshViews();
}
- setActiveViewContainer(activeViewContainer);
-
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();
- }
+ m_viewTab.at(m_tabIndex)->setSplitViewEnabled(splitView);
+ updateSplitAction();
}
emit settingsChanged();
connect(container, &DolphinViewContainer::writeStateChanged,
this, &DolphinMainWindow::slotWriteStateChanged);
- DolphinView* view = container->view();
+ const DolphinView* view = container->view();
connect(view, &DolphinView::selectionChanged,
this, &DolphinMainWindow::slotSelectionChanged);
connect(view, &DolphinView::requestItemInfo,
this, &DolphinMainWindow::slotRequestItemInfo);
- connect(view, &DolphinView::activated,
- this, &DolphinMainWindow::toggleActiveView);
- connect(view, &DolphinView::tabRequested,
- this, static_cast<void(DolphinMainWindow::*)(const KUrl&)>(&DolphinMainWindow::openNewTab));
+ connect(view, SIGNAL(tabRequested(KUrl)),
+ this, SLOT(openNewTab(KUrl)));
connect(view, &DolphinView::requestContextMenu,
this, &DolphinMainWindow::openContextMenu);
connect(view, &DolphinView::directoryLoadingStarted,
this, &DolphinMainWindow::updateHistory);
connect(navigator, &KUrlNavigator::editableStateChanged,
this, &DolphinMainWindow::slotEditableStateChanged);
- connect(navigator, &KUrlNavigator::tabRequested,
- this, static_cast<void(DolphinMainWindow::*)(const KUrl&)>(&DolphinMainWindow::openNewTab));
+ connect(navigator, SIGNAL(tabRequested(KUrl)),
+ this, SLOT(openNewTab(KUrl)));
}
void DolphinMainWindow::updateSplitAction()
{
QAction* splitAction = actionCollection()->action("split_view");
- 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(QIcon::fromTheme("view-right-close"));
- } else {
+ const DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
+ if (tabPage->splitViewEnabled()) {
+ if (tabPage->primaryViewActive()) {
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
splitAction->setToolTip(i18nc("@info", "Close left view"));
- splitAction->setIcon(QIcon::fromTheme("view-left-close"));
+ splitAction->setIcon(KIcon("view-left-close"));
+ } else {
+ 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 Split view", "Split"));
return installed;
}
-void DolphinMainWindow::createSecondaryView(int tabIndex)
-{
- ViewTab& viewTab = m_viewTab[tabIndex];
-
- QSplitter* splitter = viewTab.splitter;
- const int newWidth = (viewTab.primaryView->width() - splitter->handleWidth()) / 2;
-
- const DolphinView* view = viewTab.primaryView->view();
- // The final parent of the new view container will be set by adding it
- // to the splitter. However, we must make sure that the DolphinMainWindow
- // is a parent of the view container already when it is constructed
- // because this enables the container's KFileItemModel to assign its
- // dir lister to the right main window. The dir lister can then cache
- // authentication data.
- viewTab.secondaryView = createViewContainer(view->url(), this);
- splitter->addWidget(viewTab.secondaryView);
- splitter->setSizes(QList<int>() << newWidth << newWidth);
-
- connectViewSignals(viewTab.secondaryView);
- viewTab.secondaryView->setActive(false);
- viewTab.secondaryView->resize(newWidth, viewTab.primaryView->height());
- viewTab.secondaryView->show();
-}
-
-QString DolphinMainWindow::tabProperty(const QString& property, int tabIndex) const
-{
- return "Tab " + QString::number(tabIndex) + ' ' + property;
-}
-
void DolphinMainWindow::setUrlAsCaption(const KUrl& url)
{
QString caption;
}
}
-#include "dolphinmainwindow.moc"
projects / dolphin.git / blobdiff