#include "dolphinmainwindow.h"
-#include "dolphinapplication.h"
+#include "global.h"
#include "dolphindockwidget.h"
#include "dolphincontextmenu.h"
#include "dolphinnewfilemenu.h"
#include "dolphinrecenttabsmenu.h"
-#include "dolphintabbar.h"
+#include "dolphintabwidget.h"
#include "dolphinviewcontainer.h"
#include "dolphintabpage.h"
#include "panels/folders/folderspanel.h"
#include "dolphin_generalsettings.h"
-#include <KAcceleratorManager>
#include <KActionCollection>
#include <KActionMenu>
#include <KConfig>
-#include <KDesktopFile>
-#include <kdeversion.h>
#include <kdualaction.h>
-#include <KFileDialog>
-#include <KGlobal>
-#include <KDialog>
#include <KJobWidgets>
-#include <KLineEdit>
+#include <QLineEdit>
#include <KToolBar>
-#include <KIconLoader>
-#include <KIO/NetAccess>
#include <KIO/JobUiDelegate>
-#include <KInputDialog>
-#include <KLocale>
+#include <KLocalizedString>
#include <KProtocolManager>
-#include <KMenu>
-#include <KMenuBar>
+#include <QMenu>
#include <KMessageBox>
#include <KFileItemListProperties>
-#include <konqmimedata.h>
-#include <KProtocolInfo>
#include <KRun>
#include <KShell>
-#include <KStandardDirs>
-#include <kstatusbar.h>
#include <KStandardAction>
#include <KToggleAction>
#include <KUrlNavigator>
-#include <KUrlComboBox>
#include <KToolInvocation>
+#include <KUrlComboBox>
-#include <QDesktopWidget>
-#include <QDBusMessage>
-#include <QKeyEvent>
+#include <QApplication>
+#include <QMenuBar>
#include <QClipboard>
#include <QToolButton>
-#include <QSplitter>
#include <QTimer>
+#include <QStandardPaths>
#include <QPushButton>
+#include <QCloseEvent>
+#include <QShowEvent>
+#include <QDialog>
namespace {
// Used for GeneralSettings::version() to determine whether
DolphinMainWindow::DolphinMainWindow() :
KXmlGuiWindow(0),
m_newFileMenu(0),
- m_tabBar(0),
+ m_tabWidget(0),
m_activeViewContainer(0),
- m_centralWidgetLayout(0),
- m_tabIndex(-1),
- m_viewTab(),
m_actionHandler(0),
m_remoteEncoding(0),
m_settingsDialog(),
setAcceptDrops(true);
+ m_tabWidget = new DolphinTabWidget(this);
+ connect(m_tabWidget, SIGNAL(activeViewChanged(DolphinViewContainer*)),
+ this, SLOT(activeViewChanged(DolphinViewContainer*)));
+ connect(m_tabWidget, SIGNAL(tabCountChanged(int)),
+ this, SLOT(tabCountChanged(int)));
+ connect(m_tabWidget, SIGNAL(currentUrlChanged(QUrl)),
+ this, SLOT(setUrlAsCaption(QUrl)));
+ setCentralWidget(m_tabWidget);
+
setupActions();
m_actionHandler = new DolphinViewActionHandler(actionCollection(), this);
connect(this, &DolphinMainWindow::urlChanged,
m_remoteEncoding, &DolphinRemoteEncoding::slotAboutToOpenUrl);
- 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);
-
- setCentralWidget(centralWidget);
setupDockWidgets();
setupGUI(Keys | Save | Create | ToolBar);
{
}
-void DolphinMainWindow::openDirectories(const QList<KUrl>& dirs)
+void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
{
- 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()) {
- const KUrl& primaryUrl = *(it++);
- if (hasSplitView && (it != dirs.constEnd())) {
- const KUrl& secondaryUrl = *(it++);
- openNewTab(primaryUrl, secondaryUrl);
- } else {
- openNewTab(primaryUrl);
- }
- }
+ m_tabWidget->openDirectories(dirs, splitView);
}
-void DolphinMainWindow::openFiles(const QList<KUrl>& files)
+void DolphinMainWindow::openFiles(const QList<QUrl>& files, bool splitView)
{
- 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<KUrl> 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.
- foreach (DolphinTabPage* tabPage, m_viewTab) {
- tabPage->markUrlsAsSelected(files);
- tabPage->markUrlAsCurrent(files.first());
- }
+ m_tabWidget->openFiles(files, splitView);
}
void DolphinMainWindow::showCommand(CommandType command)
m_activeViewContainer->view()->pasteIntoFolder();
}
-void DolphinMainWindow::changeUrl(const KUrl& url)
+void DolphinMainWindow::changeUrl(const QUrl &url)
{
if (!KProtocolManager::supportsListing(url)) {
// The URL navigator only checks for validity, not
return;
}
- DolphinViewContainer* view = activeViewContainer();
- if (view) {
- view->setUrl(url);
- updateEditActions();
- updatePasteAction();
- updateViewActions();
- updateGoActions();
- setUrlAsCaption(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);
- }
+ m_activeViewContainer->setUrl(url);
+ updateEditActions();
+ updatePasteAction();
+ updateViewActions();
+ updateGoActions();
+
+ emit urlChanged(url);
}
-void DolphinMainWindow::slotTerminalDirectoryChanged(const KUrl& url)
+void DolphinMainWindow::slotTerminalDirectoryChanged(const QUrl& url)
{
m_activeViewContainer->setAutoGrabFocus(false);
changeUrl(url);
{
updateEditActions();
- const int selectedUrlsCount = m_viewTab.at(m_tabIndex)->selectedItemsCount();
+ const int selectedUrlsCount = m_tabWidget->currentTabPage()->selectedItemsCount();
QAction* compareFilesAction = actionCollection()->action("compare_files");
if (selectedUrlsCount == 2) {
emit selectionChanged(selection);
}
-void DolphinMainWindow::slotRequestItemInfo(const KFileItem& item)
-{
- emit requestItemInfo(item);
-}
-
void DolphinMainWindow::updateHistory()
{
const KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
void DolphinMainWindow::openNewMainWindow()
{
- KRun::run("dolphin %u", KUrl::List(), this);
-}
-
-void DolphinMainWindow::openNewTab()
-{
- const bool isUrlEditable = m_activeViewContainer->urlNavigator()->isUrlEditable();
-
- 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::openNewTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
-{
- QWidget* focusWidget = QApplication::focusWidget();
-
- 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);
-
- DolphinViewContainer* primaryContainer = tabPage->primaryViewContainer();
- connectViewSignals(primaryContainer);
-
- if (tabPage->splitViewEnabled()) {
- DolphinViewContainer* secondaryContainer = tabPage->secondaryViewContainer();
- connectViewSignals(secondaryContainer);
- }
-
- tabPage->hide();
-
- m_tabBar->addTab(QIcon::fromTheme(KIO::iconNameForUrl(primaryUrl)),
- squeezedText(tabName(primaryUrl)));
-
- 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) {
- // 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::openNewActivatedTab(const KUrl& primaryUrl, const KUrl& secondaryUrl)
-{
- openNewTab(primaryUrl, secondaryUrl);
- setActiveTab(m_viewTab.count() - 1);
+ KRun::run("dolphin %u", QList<QUrl>(), this);
}
-void DolphinMainWindow::openNewActivatedTab(int index)
+void DolphinMainWindow::openNewActivatedTab()
{
- Q_ASSERT(index >= 0);
- const DolphinTabPage* tabPage = m_viewTab.at(index);
- openNewActivatedTab(tabPage->activeViewContainer()->url());
+ m_tabWidget->openNewActivatedTab();
}
-void DolphinMainWindow::activateNextTab()
+void DolphinMainWindow::openNewTab(const QUrl& url)
{
- if (m_viewTab.count() >= 2) {
- const int tabIndex = (m_tabBar->currentIndex() + 1) % m_tabBar->count();
- setActiveTab(tabIndex);
- }
-}
-
-void DolphinMainWindow::activatePrevTab()
-{
- if (m_viewTab.count() >= 2) {
- int tabIndex = m_tabBar->currentIndex() - 1;
- if (tabIndex == -1) {
- tabIndex = m_tabBar->count() - 1;
- }
- setActiveTab(tabIndex);
- }
+ m_tabWidget->openNewTab(url);
}
void DolphinMainWindow::openInNewTab()
openNewTab(m_activeViewContainer->url());
} else {
foreach (const KFileItem& item, list) {
- const KUrl& url = DolphinView::openItemAsFolderUrl(item);
+ const QUrl& url = DolphinView::openItemAsFolderUrl(item);
if (!url.isEmpty()) {
openNewTab(url);
}
void DolphinMainWindow::openInNewWindow()
{
- KUrl newWindowUrl;
+ QUrl newWindowUrl;
const KFileItemList list = m_activeViewContainer->view()->selectedItems();
if (list.isEmpty()) {
}
if (!newWindowUrl.isEmpty()) {
- KRun::run("dolphin %u", QList<QUrl>() << newWindowUrl, this);
+ KRun::run("dolphin %u", {newWindowUrl}, this);
}
}
{
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();
}
// 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<DolphinApplication*>(qApp);
- if (application && application->sessionSaving()) {
+ if (qApp->isSessionRestored()) {
closedByUser = false;
}
- if (m_viewTab.count() > 1 && GeneralSettings::confirmClosingMultipleTabs() && closedByUser) {
+ if (m_tabWidget->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
+ // QDialogButtonBox::Yes -> Quit
+ // QDialogButtonBox::No -> Close only the current tab
+ // QDialogButtonBox::Cancel -> do nothing
QDialog *dialog = new QDialog(this, Qt::Dialog);
dialog->setWindowTitle(i18nc("@title:window", "Confirmation"));
dialog->setModal(true);
break;
case QDialogButtonBox::No:
// Close only the current tab
- closeTab();
+ m_tabWidget->closeTab();
default:
event->ignore();
return;
}
GeneralSettings::setVersion(CurrentDolphinVersion);
- GeneralSettings::self()->writeConfig();
+ GeneralSettings::self()->save();
KXmlGuiWindow::closeEvent(event);
}
void DolphinMainWindow::saveProperties(KConfigGroup& group)
{
- 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 DolphinTabPage* tabPage = m_viewTab.at(i);
- group.writeEntry("Tab " % QString::number(i), tabPage->saveState());
- }
+ m_tabWidget->saveProperties(group);
}
void DolphinMainWindow::readProperties(const KConfigGroup& group)
{
- const int tabCount = group.readEntry("Tab Count", 1);
- for (int i = 0; i < tabCount; ++i) {
- 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) {
- openNewTab();
- }
- }
-
- const int index = group.readEntry("Active Tab Index", 0);
- m_tabBar->setCurrentIndex(index);
+ m_tabWidget->readProperties(group);
}
void DolphinMainWindow::updateNewMenu()
pasteAction->setText(pasteInfo.second);
}
+void DolphinMainWindow::slotDirectoryLoadingCompleted()
+{
+ updatePasteAction();
+}
+
void DolphinMainWindow::selectAll()
{
clearStatusBar();
void DolphinMainWindow::toggleSplitView()
{
- DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
+ DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
tabPage->setSplitViewEnabled(!tabPage->splitViewEnabled());
- if (tabPage->splitViewEnabled()) {
- connectViewSignals(tabPage->secondaryViewContainer());
- }
-
updateViewActions();
}
GeneralSettings::setLockPanels(newLockState);
}
-void DolphinMainWindow::slotPlacesPanelVisibilityChanged(bool 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::goBack()
{
KUrlNavigator* urlNavigator = m_activeViewContainer->urlNavigator();
void DolphinMainWindow::goBack(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goBack().
- if (buttons == Qt::MidButton) {
+ if (buttons == Qt::MiddleButton) {
KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
const int index = urlNavigator->historyIndex() + 1;
openNewTab(urlNavigator->locationUrl(index));
void DolphinMainWindow::goForward(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goForward().
- if (buttons == Qt::MidButton) {
+ if (buttons == Qt::MiddleButton) {
KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator();
const int index = urlNavigator->historyIndex() - 1;
openNewTab(urlNavigator->locationUrl(index));
void DolphinMainWindow::goUp(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goUp().
- if (buttons == Qt::MidButton) {
- openNewTab(activeViewContainer()->url().upUrl());
+ if (buttons == Qt::MiddleButton) {
+ openNewTab(KIO::upUrl(activeViewContainer()->url()));
}
}
void DolphinMainWindow::goHome(Qt::MouseButtons buttons)
{
// The default case (left button pressed) is handled in goHome().
- if (buttons == Qt::MidButton) {
- openNewTab(GeneralSettings::self()->homeUrl());
+ if (buttons == Qt::MiddleButton) {
+ openNewTab(Dolphin::homeUrl());
}
}
void DolphinMainWindow::compareFiles()
{
- const KFileItemList items = m_viewTab.at(m_tabIndex)->selectedItems();
+ const KFileItemList items = m_tabWidget->currentTabPage()->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;
}
- KUrl urlA = items.at(0).url();
- KUrl urlB = items.at(1).url();
+ QUrl urlA = items.at(0).url();
+ QUrl urlB = items.at(1).url();
QString command("kompare -c \"");
- command.append(urlA.pathOrUrl());
+ command.append(urlA.toDisplayString(QUrl::PreferLocalFile));
command.append("\" \"");
- command.append(urlB.pathOrUrl());
+ command.append(urlB.toDisplayString(QUrl::PreferLocalFile));
command.append('\"');
KRun::runCommand(command, "Kompare", "kompare", this);
}
// 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);
+ KIO::StatJob* statJob = KIO::mostLocalUrl(m_activeViewContainer->url());
+ KJobWidgets::setWindow(statJob, this);
+ statJob->exec();
+ QUrl url = statJob->mostLocalUrl();
//If the URL is local after the above conversion, set the directory.
if (url.isLocalFile()) {
DolphinViewContainer* container = activeViewContainer();
container->view()->writeSettings();
- const KUrl url = container->url();
+ const QUrl url = container->url();
DolphinSettingsDialog* settingsDialog = new DolphinSettingsDialog(url, this);
connect(settingsDialog, &DolphinSettingsDialog::settingsChanged, this, &DolphinMainWindow::refreshViews);
settingsDialog->setAttribute(Qt::WA_DeleteOnClose);
}
}
-void DolphinMainWindow::setActiveTab(int index)
-{
- Q_ASSERT(index >= 0);
- Q_ASSERT(index < m_viewTab.count());
- if (index == m_tabIndex) {
- return;
- }
-
- m_tabBar->setCurrentIndex(index);
-
- // hide current tab content
- if (m_tabIndex >= 0) {
- DolphinTabPage* hiddenTabPage = m_viewTab.at(m_tabIndex);
- hiddenTabPage->hide();
- m_centralWidgetLayout->removeWidget(hiddenTabPage);
- }
-
- // show active tab content
- m_tabIndex = index;
-
- DolphinTabPage* tabPage = m_viewTab.at(index);
- m_centralWidgetLayout->addWidget(tabPage, 1);
- tabPage->show();
-
- setActiveViewContainer(tabPage->activeViewContainer());
-}
-
-void DolphinMainWindow::closeTab()
-{
- closeTab(m_tabBar->currentIndex());
-}
-
-void DolphinMainWindow::closeTab(int index)
-{
- Q_ASSERT(index >= 0);
- Q_ASSERT(index < m_viewTab.count());
- if (m_viewTab.count() == 1) {
- // the last tab may never get closed
- return;
- }
-
- 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);
- }
-
- DolphinTabPage* tabPage = m_viewTab.at(index);
-
- if (tabPage->splitViewEnabled()) {
- emit rememberClosedTab(tabPage->primaryViewContainer()->url(),
- tabPage->secondaryViewContainer()->url());
- } else {
- emit rememberClosedTab(tabPage->primaryViewContainer()->url(), KUrl());
- }
-
- // delete tab
- m_viewTab.removeAt(index);
- tabPage->deleteLater();
-
- m_tabBar->blockSignals(true);
- m_tabBar->removeTab(index);
-
- if (m_tabIndex > index) {
- m_tabIndex--;
- Q_ASSERT(m_tabIndex >= 0);
- }
-
- // if only one tab is left, also remove the tab entry so that
- // closing the last tab is not possible
- 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::detachTab(int index)
-{
- Q_ASSERT(index >= 0);
-
- const QString separator(QLatin1Char(' '));
- QString command = QLatin1String("dolphin");
-
- 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);
-
- closeTab(index);
-}
-
-void DolphinMainWindow::slotTabMoved(int from, int to)
-{
- m_viewTab.move(from, to);
- m_tabIndex = m_tabBar->currentIndex();
-}
-
-void DolphinMainWindow::handleUrl(const KUrl& url)
+void DolphinMainWindow::handleUrl(const QUrl& url)
{
delete m_lastHandleUrlStatJob;
m_lastHandleUrlStatJob = 0;
{
m_lastHandleUrlStatJob = 0;
const KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
- const KUrl url = static_cast<KIO::StatJob*>(job)->url();
+ const QUrl url = static_cast<KIO::StatJob*>(job)->url();
if (entry.isDir()) {
activeViewContainer()->setUrl(url);
} else {
}
}
-void DolphinMainWindow::tabDropEvent(int tab, QDropEvent* event)
-{
- const KUrl::List urls = KUrl::List::fromMimeData(event->mimeData());
- if (!urls.isEmpty() && tab != -1) {
- const DolphinView* view = m_viewTab.at(tab)->activeViewContainer()->view();
-
- QString error;
- DragAndDropHelper::dropUrls(view->rootItem(), view->url(), event, error);
- if (!error.isEmpty()) {
- activeViewContainer()->showMessage(error, DolphinViewContainer::Error);
- }
- }
-}
-
void DolphinMainWindow::slotWriteStateChanged(bool isFolderWritable)
{
newFileMenu()->setEnabled(isFolderWritable);
void DolphinMainWindow::openContextMenu(const QPoint& pos,
const KFileItem& item,
- const KUrl& url,
+ const QUrl& url,
const QList<QAction*>& customActions)
{
- QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
+ QPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
contextMenu.data()->setCustomActions(customActions);
const DolphinContextMenu::Command command = contextMenu.data()->open();
switch (command) {
+ case DolphinContextMenu::OpenParentFolder:
+ changeUrl(KIO::upUrl(item.url()));
+ break;
+
case DolphinContextMenu::OpenParentFolderInNewWindow: {
- KRun::run("dolphin %u", QList<QUrl>() << KIO::upUrl(item.url()), this);
+ KRun::run("dolphin %u", {KIO::upUrl(item.url())}, this);
break;
}
break;
}
- delete contextMenu.data();
+ // Delete the menu, unless it has been deleted in its own nested event loop already.
+ if (contextMenu) {
+ contextMenu->deleteLater();
+ }
}
void DolphinMainWindow::updateControlMenu()
{
- KMenu* menu = qobject_cast<KMenu*>(sender());
+ QMenu* menu = qobject_cast<QMenu*>(sender());
Q_ASSERT(menu);
- // All actions get cleared by KMenu::clear(). The sub-menus are deleted
+ // All actions get cleared by QMenu::clear(). The sub-menus are deleted
// by connecting to the aboutToHide() signal from the parent-menu.
menu->clear();
}
addActionToMenu(ac->action("panels"), menu);
- KMenu* locationBarMenu = new KMenu(i18nc("@action:inmenu", "Location Bar"), menu);
+ QMenu* locationBarMenu = new QMenu(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, &KMenu::aboutToHide, goMenu, &KMenu::deleteLater);
+ QMenu* goMenu = new QMenu(i18nc("@action:inmenu", "Go"), menu);
+ connect(menu, &QMenu::aboutToHide, goMenu, &QMenu::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)));
menu->addMenu(goMenu);
// Add "Tool" menu
- KMenu* toolsMenu = new KMenu(i18nc("@action:inmenu", "Tools"), menu);
- connect(menu, &KMenu::aboutToHide, toolsMenu, &KMenu::deleteLater);
+ QMenu* toolsMenu = new QMenu(i18nc("@action:inmenu", "Tools"), menu);
+ connect(menu, &QMenu::aboutToHide, toolsMenu, &QMenu::deleteLater);
toolsMenu->addAction(ac->action("show_filter_bar"));
toolsMenu->addAction(ac->action("compare_files"));
toolsMenu->addAction(ac->action("open_terminal"));
addActionToMenu(ac->action(KStandardAction::name(KStandardAction::Preferences)), menu);
// Add "Help" menu
- KMenu* helpMenu = new KMenu(i18nc("@action:inmenu", "Help"), menu);
- connect(menu, &KMenu::aboutToHide, helpMenu, &KMenu::deleteLater);
+ QMenu* helpMenu = new QMenu(i18nc("@action:inmenu", "Help"), menu);
+ connect(menu, &QMenu::aboutToHide, helpMenu, &QMenu::deleteLater);
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::HelpContents)));
helpMenu->addAction(ac->action(KStandardAction::name(KStandardAction::WhatsThis)));
helpMenu->addSeparator();
m_updateToolBarTimer->start();
}
-void DolphinMainWindow::slotPanelErrorMessage(const QString& error)
-{
- activeViewContainer()->showMessage(error, DolphinViewContainer::Error);
-}
-
-void DolphinMainWindow::slotPlaceActivated(const KUrl& url)
+void DolphinMainWindow::slotPlaceActivated(const QUrl& url)
{
DolphinViewContainer* view = activeViewContainer();
}
}
-void DolphinMainWindow::activeViewChanged()
-{
- const DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
- setActiveViewContainer(tabPage->activeViewContainer());
-}
-
void DolphinMainWindow::closedTabsCountChanged(unsigned int count)
{
actionCollection()->action("undo_close_tab")->setEnabled(count > 0);
}
-void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContainer)
+void DolphinMainWindow::activeViewChanged(DolphinViewContainer* viewContainer)
{
+ DolphinViewContainer* oldViewContainer = m_activeViewContainer;
Q_ASSERT(viewContainer);
- Q_ASSERT((viewContainer == m_viewTab.at(m_tabIndex)->primaryViewContainer()) ||
- (viewContainer == m_viewTab.at(m_tabIndex)->secondaryViewContainer()));
- if (m_activeViewContainer == viewContainer) {
- return;
- }
m_activeViewContainer = viewContainer;
+
+ if (oldViewContainer) {
+ // Disconnect all signals between the old view container (container,
+ // view and url navigator) and main window.
+ oldViewContainer->disconnect(this);
+ oldViewContainer->view()->disconnect(this);
+ oldViewContainer->urlNavigator()->disconnect(this);
+ }
+
+ connectViewSignals(viewContainer);
+
m_actionHandler->setCurrentView(viewContainer->view());
updateHistory();
updateViewActions();
updateGoActions();
- const KUrl url = m_activeViewContainer->url();
- setUrlAsCaption(url);
- m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(url)));
- m_tabBar->setTabIcon(m_tabIndex, QIcon::fromTheme(KIO::iconNameForUrl(url)));
-
+ const QUrl url = viewContainer->url();
emit urlChanged(url);
}
+void DolphinMainWindow::tabCountChanged(int count)
+{
+ const bool enableTabActions = (count > 1);
+ actionCollection()->action("close_tab")->setEnabled(enableTabActions);
+ actionCollection()->action("activate_next_tab")->setEnabled(enableTabActions);
+ actionCollection()->action("activate_prev_tab")->setEnabled(enableTabActions);
+}
+
+void DolphinMainWindow::setUrlAsCaption(const QUrl& url)
+{
+ QString caption;
+ if (!url.isLocalFile()) {
+ caption.append(url.scheme() + " - ");
+ if (!url.host().isEmpty()) {
+ caption.append(url.host() + " - ");
+ }
+ }
+
+ QString fileName = url.adjusted(QUrl::StripTrailingSlash).fileName();
+ if (fileName.isEmpty()) {
+ fileName = '/';
+ }
+
+ caption.append(fileName);
+
+ setWindowTitle(caption);
+}
+
void DolphinMainWindow::setupActions()
{
// setup 'File' menu
QAction* newWindow = actionCollection()->addAction("new_window");
newWindow->setIcon(QIcon::fromTheme("window-new"));
newWindow->setText(i18nc("@action:inmenu File", "New &Window"));
- newWindow->setShortcut(Qt::CTRL | Qt::Key_N);
+ actionCollection()->setDefaultShortcut(newWindow, Qt::CTRL | Qt::Key_N);
connect(newWindow, &QAction::triggered, this, &DolphinMainWindow::openNewMainWindow);
QAction* newTab = actionCollection()->addAction("new_tab");
newTab->setIcon(QIcon::fromTheme("tab-new"));
newTab->setText(i18nc("@action:inmenu File", "New Tab"));
- newTab->setShortcuts(QList<QKeySequence>() << QKeySequence(Qt::CTRL | Qt::Key_T) << QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_N));
- connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewTab));
+ actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL | Qt::Key_T, Qt::CTRL | Qt::SHIFT | Qt::Key_N});
+ connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab));
QAction* closeTab = actionCollection()->addAction("close_tab");
closeTab->setIcon(QIcon::fromTheme("tab-close"));
closeTab->setText(i18nc("@action:inmenu File", "Close Tab"));
- closeTab->setShortcut(Qt::CTRL | Qt::Key_W);
+ actionCollection()->setDefaultShortcut(closeTab, Qt::CTRL | Qt::Key_W);
closeTab->setEnabled(false);
- connect(closeTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::closeTab));
+ connect(closeTab, &QAction::triggered, m_tabWidget, static_cast<void(DolphinTabWidget::*)()>(&DolphinTabWidget::closeTab));
KStandardAction::quit(this, SLOT(quit()), actionCollection());
QAction* cut = KStandardAction::cut(this, SLOT(cut()), actionCollection());
auto cutShortcuts = cut->shortcuts();
cutShortcuts.removeAll(QKeySequence(Qt::SHIFT | Qt::Key_Delete));
- cut->setShortcuts(cutShortcuts);
+ actionCollection()->setDefaultShortcuts(cut, cutShortcuts);
KStandardAction::copy(this, SLOT(copy()), actionCollection());
QAction* paste = KStandardAction::paste(this, SLOT(paste()), actionCollection());
// The text of the paste-action is modified dynamically by Dolphin
QAction* selectAll = actionCollection()->addAction("select_all");
selectAll->setText(i18nc("@action:inmenu Edit", "Select All"));
- selectAll->setShortcut(Qt::CTRL | Qt::Key_A);
+ actionCollection()->setDefaultShortcut(selectAll, Qt::CTRL | Qt::Key_A);
connect(selectAll, &QAction::triggered, this, &DolphinMainWindow::selectAll);
QAction* invertSelection = actionCollection()->addAction("invert_selection");
invertSelection->setText(i18nc("@action:inmenu Edit", "Invert Selection"));
- invertSelection->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_A);
+ actionCollection()->setDefaultShortcut(invertSelection, Qt::CTRL | Qt::SHIFT | Qt::Key_A);
connect(invertSelection, &QAction::triggered, this, &DolphinMainWindow::invertSelection);
// setup 'View' menu
// (note that most of it is set up in DolphinViewActionHandler)
QAction* split = actionCollection()->addAction("split_view");
- split->setShortcut(Qt::Key_F3);
+ actionCollection()->setDefaultShortcut(split, Qt::Key_F3);
connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
QAction* reload = actionCollection()->addAction("reload");
reload->setText(i18nc("@action:inmenu View", "Reload"));
- reload->setShortcut(Qt::Key_F5);
+ actionCollection()->setDefaultShortcut(reload, Qt::Key_F5);
reload->setIcon(QIcon::fromTheme("view-refresh"));
connect(reload, &QAction::triggered, this, &DolphinMainWindow::reloadView);
KToggleAction* editableLocation = actionCollection()->add<KToggleAction>("editable_location");
editableLocation->setText(i18nc("@action:inmenu Navigation Bar", "Editable Location"));
- editableLocation->setShortcut(Qt::Key_F6);
+ actionCollection()->setDefaultShortcut(editableLocation, Qt::Key_F6);
connect(editableLocation, &KToggleAction::triggered, this, &DolphinMainWindow::toggleEditLocation);
QAction* replaceLocation = actionCollection()->addAction("replace_location");
replaceLocation->setText(i18nc("@action:inmenu Navigation Bar", "Replace Location"));
- replaceLocation->setShortcut(Qt::CTRL | Qt::Key_L);
+ actionCollection()->setDefaultShortcut(replaceLocation, Qt::CTRL | Qt::Key_L);
connect(replaceLocation, &QAction::triggered, this, &DolphinMainWindow::replaceLocation);
// setup 'Go' menu
QAction* backAction = KStandardAction::back(this, SLOT(goBack()), actionCollection());
auto backShortcuts = backAction->shortcuts();
backShortcuts.append(QKeySequence(Qt::Key_Backspace));
- backAction->setShortcuts(backShortcuts);
+ actionCollection()->setDefaultShortcuts(backAction, backShortcuts);
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)));
+ connect(m_tabWidget, SIGNAL(rememberClosedTab(QUrl,QByteArray)),
+ recentTabsMenu, SLOT(rememberClosedTab(QUrl,QByteArray)));
+ connect(recentTabsMenu, SIGNAL(restoreClosedTab(QByteArray)),
+ m_tabWidget, SLOT(restoreClosedTab(QByteArray)));
connect(recentTabsMenu, SIGNAL(closedTabsCountChanged(uint)),
this, SLOT(closedTabsCountChanged(uint)));
QAction* undoCloseTab = actionCollection()->addAction("undo_close_tab");
undoCloseTab->setText(i18nc("@action:inmenu File", "Undo close tab"));
- undoCloseTab->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_T);
+ actionCollection()->setDefaultShortcut(undoCloseTab, Qt::CTRL | Qt::SHIFT | Qt::Key_T);
undoCloseTab->setIcon(QIcon::fromTheme("edit-undo"));
undoCloseTab->setEnabled(false);
connect(undoCloseTab, SIGNAL(triggered()), recentTabsMenu, SLOT(undoCloseTab()));
+ auto undoAction = actionCollection()->action(KStandardAction::name(KStandardAction::Undo));
+ undoAction->setEnabled(false); // undo should be disabled by default
+
KStandardAction::forward(this, SLOT(goForward()), actionCollection());
KStandardAction::up(this, SLOT(goUp()), actionCollection());
KStandardAction::home(this, SLOT(goHome()), actionCollection());
QAction* showFilterBar = actionCollection()->addAction("show_filter_bar");
showFilterBar->setText(i18nc("@action:inmenu Tools", "Show Filter Bar"));
showFilterBar->setIcon(QIcon::fromTheme("view-filter"));
- showFilterBar->setShortcut(Qt::CTRL | Qt::Key_I);
+ actionCollection()->setDefaultShortcut(showFilterBar, Qt::CTRL | Qt::Key_I);
connect(showFilterBar, &QAction::triggered, this, &DolphinMainWindow::showFilterBar);
QAction* compareFiles = actionCollection()->addAction("compare_files");
QAction* openTerminal = actionCollection()->addAction("open_terminal");
openTerminal->setText(i18nc("@action:inmenu Tools", "Open Terminal"));
openTerminal->setIcon(QIcon::fromTheme("utilities-terminal"));
- openTerminal->setShortcut(Qt::SHIFT | Qt::Key_F4);
+ actionCollection()->setDefaultShortcut(openTerminal, Qt::SHIFT | Qt::Key_F4);
connect(openTerminal, &QAction::triggered, this, &DolphinMainWindow::openTerminal);
// setup 'Settings' menu
KStandardAction::preferences(this, SLOT(editSettings()), actionCollection());
// not in menu actions
- QList<QKeySequence> nextTabKeys;
- nextTabKeys.append(KStandardShortcut::tabNext().first()); //TODO: is this correct
+ QList<QKeySequence> nextTabKeys = KStandardShortcut::tabNext();
nextTabKeys.append(QKeySequence(Qt::CTRL | Qt::Key_Tab));
- QList<QKeySequence> prevTabKeys;
- prevTabKeys.append(KStandardShortcut::tabPrev().first()); //TODO: is this correct
+ QList<QKeySequence> prevTabKeys = KStandardShortcut::tabPrev();
prevTabKeys.append(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_Tab));
QAction* activateNextTab = actionCollection()->addAction("activate_next_tab");
activateNextTab->setIconText(i18nc("@action:inmenu", "Next Tab"));
activateNextTab->setText(i18nc("@action:inmenu", "Activate Next Tab"));
activateNextTab->setEnabled(false);
- connect(activateNextTab, &QAction::triggered, this, &DolphinMainWindow::activateNextTab);
- activateNextTab->setShortcuts(QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
+ connect(activateNextTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activateNextTab);
+ actionCollection()->setDefaultShortcuts(activateNextTab, QApplication::isRightToLeft() ? prevTabKeys : nextTabKeys);
QAction* activatePrevTab = actionCollection()->addAction("activate_prev_tab");
activatePrevTab->setIconText(i18nc("@action:inmenu", "Previous Tab"));
activatePrevTab->setText(i18nc("@action:inmenu", "Activate Previous Tab"));
activatePrevTab->setEnabled(false);
- connect(activatePrevTab, &QAction::triggered, this, &DolphinMainWindow::activatePrevTab);
- activatePrevTab->setShortcuts(QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
+ connect(activatePrevTab, &QAction::triggered, m_tabWidget, &DolphinTabWidget::activatePrevTab);
+ actionCollection()->setDefaultShortcuts(activatePrevTab, QApplication::isRightToLeft() ? nextTabKeys : prevTabKeys);
// for context menu
QAction* openInNewTab = actionCollection()->addAction("open_in_new_tab");
infoDock->setObjectName("infoDock");
infoDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
InformationPanel* infoPanel = new InformationPanel(infoDock);
- infoPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ infoPanel->setCustomContextMenuActions({lockLayoutAction});
connect(infoPanel, &InformationPanel::urlActivated, this, &DolphinMainWindow::handleUrl);
infoDock->setWidget(infoPanel);
foldersDock->setObjectName("foldersDock");
foldersDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
FoldersPanel* foldersPanel = new FoldersPanel(foldersDock);
- foldersPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ foldersPanel->setCustomContextMenuActions({lockLayoutAction});
foldersDock->setWidget(foldersPanel);
QAction* foldersAction = foldersDock->toggleViewAction();
foldersPanel, &FoldersPanel::setUrl);
connect(foldersPanel, &FoldersPanel::folderActivated,
this, &DolphinMainWindow::changeUrl);
- connect(foldersPanel, SIGNAL(folderMiddleClicked(KUrl)),
- this, SLOT(openNewTab(KUrl)));
+ connect(foldersPanel, &FoldersPanel::folderMiddleClicked,
+ this, &DolphinMainWindow::openNewTab);
connect(foldersPanel, &FoldersPanel::errorMessage,
- this, &DolphinMainWindow::slotPanelErrorMessage);
+ this, &DolphinMainWindow::showErrorMessage);
// Setup "Terminal"
#ifndef Q_OS_WIN
terminalDock->setObjectName("terminalDock");
terminalDock->setAllowedAreas(Qt::TopDockWidgetArea | Qt::BottomDockWidgetArea);
TerminalPanel* terminalPanel = new TerminalPanel(terminalDock);
- terminalPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ terminalPanel->setCustomContextMenuActions({lockLayoutAction});
terminalDock->setWidget(terminalPanel);
connect(terminalPanel, &TerminalPanel::hideTerminalPanel, terminalDock, &DolphinDockWidget::hide);
placesDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
PlacesPanel* placesPanel = new PlacesPanel(placesDock);
- placesPanel->setCustomContextMenuActions(QList<QAction*>() << lockLayoutAction);
+ placesPanel->setCustomContextMenuActions({lockLayoutAction});
placesDock->setWidget(placesPanel);
QAction* placesAction = placesDock->toggleViewAction();
addDockWidget(Qt::LeftDockWidgetArea, placesDock);
connect(placesPanel, &PlacesPanel::placeActivated,
this, &DolphinMainWindow::slotPlaceActivated);
- connect(placesPanel, SIGNAL(placeMiddleClicked(KUrl)),
- this, SLOT(openNewTab(KUrl)));
+ connect(placesPanel, SIGNAL(placeMiddleClicked(QUrl)),
+ this, SLOT(openNewTab(QUrl)));
connect(placesPanel, &PlacesPanel::errorMessage,
- this, &DolphinMainWindow::slotPanelErrorMessage);
+ this, &DolphinMainWindow::showErrorMessage);
connect(this, &DolphinMainWindow::urlChanged,
placesPanel, &PlacesPanel::setUrl);
connect(placesDock, &DolphinDockWidget::visibilityChanged,
- this, &DolphinMainWindow::slotPlacesPanelVisibilityChanged);
+ m_tabWidget, &DolphinTabWidget::slotPlacesPanelVisibilityChanged);
connect(this, &DolphinMainWindow::settingsChanged,
placesPanel, &PlacesPanel::readSettings);
+ m_tabWidget->slotPlacesPanelVisibilityChanged(placesPanel->isVisible());
+
// Add actions into the "Panels" menu
KActionMenu* panelsMenu = new KActionMenu(i18nc("@action:inmenu View", "Panels"), this);
actionCollection()->addAction("panels", panelsMenu);
void DolphinMainWindow::updateGoActions()
{
QAction* goUpAction = actionCollection()->action(KStandardAction::name(KStandardAction::Up));
- const KUrl currentUrl = m_activeViewContainer->url();
- goUpAction->setEnabled(currentUrl.upUrl() != currentUrl);
+ const QUrl currentUrl = m_activeViewContainer->url();
+ goUpAction->setEnabled(KIO::upUrl(currentUrl) != currentUrl);
}
void DolphinMainWindow::createControlButton()
Q_ASSERT(!m_controlButton);
m_controlButton = new QToolButton(this);
- m_controlButton->setIcon(QIcon::fromTheme("applications-system"));
+ m_controlButton->setIcon(QIcon::fromTheme("application-menu"));
m_controlButton->setText(i18nc("@action", "Control"));
m_controlButton->setPopupMode(QToolButton::InstantPopup);
m_controlButton->setToolButtonStyle(toolBar()->toolButtonStyle());
- KMenu* controlMenu = new KMenu(m_controlButton);
- connect(controlMenu, &KMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu);
+ QMenu* controlMenu = new QMenu(m_controlButton);
+ connect(controlMenu, &QMenu::aboutToShow, this, &DolphinMainWindow::updateControlMenu);
m_controlButton->setMenu(controlMenu);
m_updateToolBarTimer = 0;
}
-bool DolphinMainWindow::addActionToMenu(QAction* action, KMenu* menu)
+bool DolphinMainWindow::addActionToMenu(QAction* action, QMenu* menu)
{
Q_ASSERT(action);
Q_ASSERT(menu);
void DolphinMainWindow::refreshViews()
{
- foreach (DolphinTabPage* tabPage, m_viewTab) {
- tabPage->refreshViews();
- }
+ m_tabWidget->refreshViews();
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();
- m_viewTab.at(m_tabIndex)->setSplitViewEnabled(splitView);
+ m_tabWidget->currentTabPage()->setSplitViewEnabled(splitView);
updateSplitAction();
}
connect(view, &DolphinView::selectionChanged,
this, &DolphinMainWindow::slotSelectionChanged);
connect(view, &DolphinView::requestItemInfo,
- this, &DolphinMainWindow::slotRequestItemInfo);
- connect(view, SIGNAL(tabRequested(KUrl)),
- this, SLOT(openNewTab(KUrl)));
+ this, &DolphinMainWindow::requestItemInfo);
+ connect(view, &DolphinView::tabRequested,
+ this, &DolphinMainWindow::openNewTab);
connect(view, &DolphinView::requestContextMenu,
this, &DolphinMainWindow::openContextMenu);
connect(view, &DolphinView::directoryLoadingStarted,
this, &DolphinMainWindow::enableStopAction);
connect(view, &DolphinView::directoryLoadingCompleted,
this, &DolphinMainWindow::disableStopAction);
+ connect(view, &DolphinView::directoryLoadingCompleted,
+ this, &DolphinMainWindow::slotDirectoryLoadingCompleted);
connect(view, &DolphinView::goBackRequested,
this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::goBack));
connect(view, &DolphinView::goForwardRequested,
this, &DolphinMainWindow::updateHistory);
connect(navigator, &KUrlNavigator::editableStateChanged,
this, &DolphinMainWindow::slotEditableStateChanged);
- connect(navigator, SIGNAL(tabRequested(KUrl)),
- this, SLOT(openNewTab(KUrl)));
+ connect(navigator, &KUrlNavigator::tabRequested,
+ this, &DolphinMainWindow::openNewTab);
}
void DolphinMainWindow::updateSplitAction()
{
QAction* splitAction = actionCollection()->action("split_view");
- const DolphinTabPage* tabPage = m_viewTab.at(m_tabIndex);
+ const DolphinTabPage* tabPage = m_tabWidget->currentTabPage();
if (tabPage->splitViewEnabled()) {
if (tabPage->primaryViewActive()) {
splitAction->setText(i18nc("@action:intoolbar Close left view", "Close"));
splitAction->setToolTip(i18nc("@info", "Close left view"));
- splitAction->setIcon(KIcon("view-left-close"));
+ splitAction->setIcon(QIcon::fromTheme("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"));
+ splitAction->setIcon(QIcon::fromTheme("view-right-close"));
}
} else {
splitAction->setText(i18nc("@action:intoolbar Split view", "Split"));
}
}
-QString DolphinMainWindow::tabName(const KUrl& url) const
-{
- 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;
-}
-
bool DolphinMainWindow::isKompareInstalled() const
{
static bool initialized = false;
if (!initialized) {
// TODO: maybe replace this approach later by using a menu
// plugin like kdiff3plugin.cpp
- installed = !KGlobal::dirs()->findExe("kompare").isEmpty();
+ installed = !QStandardPaths::findExecutable(QStringLiteral("kompare")).isEmpty();
initialized = true;
}
return installed;
}
-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::createPanelAction(const QIcon& icon,
const QKeySequence& shortcut,
QAction* dockAction,
panelAction->setChecked(dockAction->isChecked());
panelAction->setText(dockAction->text());
panelAction->setIcon(icon);
- panelAction->setShortcut(shortcut);
+ actionCollection()->setDefaultShortcut(panelAction, shortcut);
connect(panelAction, &QAction::triggered, dockAction, &QAction::trigger);
connect(dockAction, &QAction::toggled, panelAction, &QAction::setChecked);
projects / dolphin.git / blobdiff