#include "trash/dolphintrash.h"
#include <KLocalizedString>
+#include <KNotificationJobUiDelegate>
+#include <KService>
#include <KXMLGUIFactory>
#include <KXmlGuiWindow>
+#include <KIO/ApplicationLauncherJob>
+
#include <QApplication>
#include <QDomDocument>
#include <QHBoxLayout>
#include <QPushButton>
-#include <QSplitter>
+#include <QToolBar>
#include <limits>
QWidgetAction{parent},
m_splitter{new QSplitter(Qt::Horizontal)},
m_adjustSpacingTimer{new QTimer(this)},
- m_globalXOfSplitter{INT_MIN},
- m_globalXOfPrimary{INT_MIN},
- m_widthOfPrimary{INT_MIN},
- m_globalXOfSecondary{INT_MIN},
- m_widthOfSecondary{INT_MIN}
+ m_viewGeometriesHelper{m_splitter.get(), this}
{
updateText();
setIcon(QIcon::fromTheme(QStringLiteral("dialog-scripts")));
m_splitter->setChildrenCollapsible(false);
- setDefaultWidget(m_splitter.get());
m_splitter->addWidget(createNavigatorWidget(Primary));
this, &DolphinNavigatorsWidgetAction::adjustSpacing);
}
-bool DolphinNavigatorsWidgetAction::addToToolbarAndSave(KXmlGuiWindow *mainWindow)
+void DolphinNavigatorsWidgetAction::adjustSpacing()
{
- const QString rawXml = KXMLGUIFactory::readConfigFile(mainWindow->xmlFile());
- QDomDocument domDocument;
- if (rawXml.isEmpty() || !domDocument.setContent(rawXml) || domDocument.isNull()) {
- return false;
+ m_previousWindowWidth = parentWidget()->window()->width();
+ auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
+ const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
+ const QList<int> splitterSizes = {widthOfSplitterPrimary,
+ m_splitter->width() - widthOfSplitterPrimary};
+ m_splitter->setSizes(splitterSizes);
+
+ // primary side of m_splitter
+ int leadingSpacing = viewGeometries.globalXOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
+ if (leadingSpacing < 0) {
+ leadingSpacing = 0;
}
- QDomNode toolbar = domDocument.elementsByTagName(QStringLiteral("ToolBar")).at(0);
- if (toolbar.isNull()) {
- return false;
+ int trailingSpacing = (viewGeometries.globalXOfNavigatorsWidget + m_splitter->width())
+ - (viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary);
+ if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()
+ || networkFolderButton(Primary)->isVisible()
+ ) {
+ trailingSpacing = 0;
+ }
+ const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing;
+ const int widthNeededForUrlNavigator = primaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator;
+ if (widthNeededForUrlNavigator > 0) {
+ trailingSpacing -= widthNeededForUrlNavigator;
+ if (trailingSpacing < 0) {
+ leadingSpacing += trailingSpacing;
+ trailingSpacing = 0;
+ }
+ if (leadingSpacing < 0) {
+ leadingSpacing = 0;
+ }
}
+ spacing(Primary, Leading)->setMinimumWidth(leadingSpacing);
+ spacing(Primary, Trailing)->setFixedWidth(trailingSpacing);
- QDomElement urlNavigatorElement = domDocument.createElement(QStringLiteral("Action"));
- urlNavigatorElement.setAttribute(QStringLiteral("name"), QStringLiteral("url_navigators"));
+ // secondary side of m_splitter
+ if (viewGeometries.globalXOfSecondary == INT_MIN) {
+ Q_ASSERT(viewGeometries.widthOfSecondary == INT_MIN);
+ return;
+ }
+ spacing(Primary, Trailing)->setFixedWidth(0);
- QDomNode position = toolbar.firstChildElement(QStringLiteral("Spacer"));
- if (position.isNull()) {
- toolbar.appendChild(urlNavigatorElement);
+ trailingSpacing = (viewGeometries.globalXOfNavigatorsWidget + m_splitter->width())
+ - (viewGeometries.globalXOfSecondary + viewGeometries.widthOfSecondary);
+ if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()
+ || networkFolderButton(Secondary)->isVisible()
+ ) {
+ trailingSpacing = 0;
} else {
- toolbar.replaceChild(urlNavigatorElement, position);
+ const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing;
+ const int widthNeededForUrlNavigator2 = secondaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator2;
+ if (widthNeededForUrlNavigator2 > 0) {
+ trailingSpacing -= widthNeededForUrlNavigator2;
+ if (trailingSpacing < 0) {
+ trailingSpacing = 0;
+ }
+ }
}
-
- KXMLGUIFactory::saveConfigFile(domDocument, mainWindow->xmlFile());
- mainWindow->reloadXML();
- mainWindow->createGUI();
- return true;
+ spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing);
}
void DolphinNavigatorsWidgetAction::createSecondaryUrlNavigator()
updateText();
}
-void DolphinNavigatorsWidgetAction::followViewContainerGeometry(
- int globalXOfPrimary, int widthOfPrimary)
+void DolphinNavigatorsWidgetAction::followViewContainersGeometry(QWidget *primaryViewContainer,
+ QWidget *secondaryViewContainer)
{
- followViewContainersGeometry(globalXOfPrimary, widthOfPrimary, INT_MIN, INT_MIN);
+ m_viewGeometriesHelper.setViewContainers(primaryViewContainer, secondaryViewContainer);
+ adjustSpacing();
}
-void DolphinNavigatorsWidgetAction::followViewContainersGeometry(
- int globalXOfPrimary, int widthOfPrimary,
- int globalXOfSecondary, int widthOfSecondary)
+bool DolphinNavigatorsWidgetAction::isInToolbar() const
{
- if (QApplication::layoutDirection() == Qt::LeftToRight) {
- m_globalXOfSplitter = m_splitter->mapToGlobal(QPoint(0,0)).x();
- m_globalXOfPrimary = globalXOfPrimary;
- m_globalXOfSecondary = globalXOfSecondary;
- } else {
- // When the direction is reversed, globalX does not change.
- // For the adjustSpacing() code to work we need globalX to measure from right to left
- // and to measure up to the rightmost point of a widget instead of the leftmost.
- m_globalXOfSplitter = (-1) * (m_splitter->mapToGlobal(QPoint(0,0)).x() + m_splitter->width());
- m_globalXOfPrimary = (-1) * (globalXOfPrimary + widthOfPrimary);
- m_globalXOfSecondary = (globalXOfSecondary == INT_MIN) ? INT_MIN :
- (-1) * (globalXOfSecondary + widthOfSecondary);
- }
- m_widthOfPrimary = widthOfPrimary;
- m_widthOfSecondary = widthOfSecondary;
- adjustSpacing();
+ return qobject_cast<QToolBar *>(m_splitter->parentWidget());
}
DolphinUrlNavigator* DolphinNavigatorsWidgetAction::primaryUrlNavigator() const
updateText();
}
-void DolphinNavigatorsWidgetAction::adjustSpacing()
+QWidget *DolphinNavigatorsWidgetAction::createWidget(QWidget *parent)
{
- Q_ASSERT(m_globalXOfSplitter != INT_MIN);
- Q_ASSERT(m_globalXOfPrimary != INT_MIN);
- Q_ASSERT(m_widthOfPrimary != INT_MIN);
- const int widthOfSplitterPrimary = m_globalXOfPrimary + m_widthOfPrimary - m_globalXOfSplitter;
- const QList<int> splitterSizes = {widthOfSplitterPrimary,
- m_splitter->width() - widthOfSplitterPrimary};
- m_splitter->setSizes(splitterSizes);
-
- // primary side of m_splitter
- int leadingSpacing = m_globalXOfPrimary - m_globalXOfSplitter;
- if (leadingSpacing < 0) {
- leadingSpacing = 0;
- }
- int trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
- - (m_globalXOfPrimary + m_widthOfPrimary);
- if (trailingSpacing < 0 || emptyTrashButton(Primary)->isVisible()) {
- trailingSpacing = 0;
- }
- const int widthLeftForUrlNavigator = m_splitter->widget(0)->width() - leadingSpacing - trailingSpacing;
- const int widthNeededForUrlNavigator = primaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator;
- if (widthNeededForUrlNavigator > 0) {
- trailingSpacing -= widthNeededForUrlNavigator;
- if (trailingSpacing < 0) {
- leadingSpacing += trailingSpacing;
- trailingSpacing = 0;
+ QWidget *oldParent = m_splitter->parentWidget();
+ if (oldParent && oldParent->layout()) {
+ oldParent->layout()->removeWidget(m_splitter.get());
+ QGridLayout *layout = qobject_cast<QGridLayout *>(oldParent->layout());
+ if (qobject_cast<QToolBar *>(parent) && layout) {
+ // in DolphinTabPage::insertNavigatorsWidget the minimumHeight of this row was
+ // set to fit the m_splitter. Since we are now removing it again, the
+ // minimumHeight can be reset to 0.
+ layout->setRowMinimumHeight(0, 0);
}
- if (leadingSpacing < 0) {
- leadingSpacing = 0;
- }
- }
- spacing(Primary, Leading)->setMinimumWidth(leadingSpacing);
- spacing(Primary, Trailing)->setFixedWidth(trailingSpacing);
-
- // secondary side of m_splitter
- if (m_globalXOfSecondary == INT_MIN) {
- Q_ASSERT(m_widthOfSecondary == INT_MIN);
- return;
}
- spacing(Primary, Trailing)->setFixedWidth(0);
+ m_splitter->setParent(parent);
+ return m_splitter.get();
+}
- trailingSpacing = (m_globalXOfSplitter + m_splitter->width())
- - (m_globalXOfSecondary + m_widthOfSecondary);
- if (trailingSpacing < 0 || emptyTrashButton(Secondary)->isVisible()) {
- trailingSpacing = 0;
- } else {
- const int widthLeftForUrlNavigator2 = m_splitter->widget(1)->width() - trailingSpacing;
- const int widthNeededForUrlNavigator2 = secondaryUrlNavigator()->sizeHint().width() - widthLeftForUrlNavigator2;
- if (widthNeededForUrlNavigator2 > 0) {
- trailingSpacing -= widthNeededForUrlNavigator2;
- if (trailingSpacing < 0) {
- trailingSpacing = 0;
- }
- }
- }
- spacing(Secondary, Trailing)->setMinimumWidth(trailingSpacing);
+void DolphinNavigatorsWidgetAction::deleteWidget(QWidget *widget)
+{
+ Q_UNUSED(widget)
+ m_splitter->setParent(nullptr);
}
QWidget *DolphinNavigatorsWidgetAction::createNavigatorWidget(Side side) const
auto emptyTrashButton = newEmptyTrashButton(urlNavigator, navigatorWidget);
layout->addWidget(emptyTrashButton);
- connect(urlNavigator, &KUrlNavigator::urlChanged, this, [this]() {
+ auto networkFolderButton = newNetworkFolderButton(urlNavigator, navigatorWidget);
+ layout->addWidget(networkFolderButton);
+
+ connect(urlNavigator, &KUrlNavigator::urlChanged, this, [urlNavigator, this]() {
+ // Update URL navigator to show a server URL entry placeholder text if we
+ // just loaded the remote:/ page, to make it easier for users to figure out
+ // that they can enter arbitrary remote URLs. See bug 414670
+ if (urlNavigator->locationUrl().scheme() == QLatin1String("remote")) {
+ if (!urlNavigator->isUrlEditable()) {
+ urlNavigator->setUrlEditable(true);
+ }
+ urlNavigator->clearText();
+ urlNavigator->setPlaceholderText(i18n("Enter server URL (e.g. smb://[ip address])"));
+ } else {
+ urlNavigator->setPlaceholderText(QString());
+ }
+
// We have to wait for DolphinUrlNavigator::sizeHint() to update which
// happens a little bit later than when urlChanged is emitted.
this->m_adjustSpacingTimer->start();
- });
+ }, Qt::QueuedConnection);
auto trailingSpacing = new QWidget{navigatorWidget};
layout->addWidget(trailingSpacing);
{
auto emptyTrashButton = new QPushButton(QIcon::fromTheme(QStringLiteral("user-trash")),
i18nc("@action:button", "Empty Trash"), parent);
+ emptyTrashButton->setToolTip(i18n("Empties Trash to create free space"));
+
emptyTrashButton->setFlat(true);
connect(emptyTrashButton, &QPushButton::clicked,
this, [parent]() { Trash::empty(parent); });
return emptyTrashButton;
}
+QPushButton *DolphinNavigatorsWidgetAction::networkFolderButton(DolphinNavigatorsWidgetAction::Side side)
+{
+ int sideIndex = (side == Primary ? 0 : 1);
+ if (side == Primary) {
+ return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget());
+ }
+ return static_cast<QPushButton *>(m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget());
+}
+
+QPushButton *DolphinNavigatorsWidgetAction::newNetworkFolderButton(const DolphinUrlNavigator *urlNavigator, QWidget *parent) const
+{
+ auto networkFolderButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-add")),
+ i18nc("@action:button", "Add Network Folder"), parent);
+ networkFolderButton->setFlat(true);
+ KService::Ptr service = KService::serviceByDesktopName(QStringLiteral("org.kde.knetattach"));
+ connect(networkFolderButton, &QPushButton::clicked,
+ this, [networkFolderButton, service]() {
+ auto *job = new KIO::ApplicationLauncherJob(service, networkFolderButton);
+ auto *delegate = new KNotificationJobUiDelegate;
+ delegate->setAutoErrorHandlingEnabled(true);
+ job->setUiDelegate(delegate);
+ job->start();
+ });
+ networkFolderButton->hide();
+ connect(urlNavigator, &KUrlNavigator::urlChanged, this, [networkFolderButton, urlNavigator, service]() {
+ networkFolderButton->setVisible(service && urlNavigator->locationUrl().scheme() == QLatin1String("remote"));
+ });
+ return networkFolderButton;
+}
+
QWidget *DolphinNavigatorsWidgetAction::spacing(Side side, Position position) const
{
int sideIndex = (side == Primary ? 0 : 1);
return m_splitter->widget(sideIndex)->layout()->itemAt(0)->widget();
}
if (side == Primary) {
- return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
+ return m_splitter->widget(sideIndex)->layout()->itemAt(4)->widget();
}
- return m_splitter->widget(sideIndex)->layout()->itemAt(2)->widget();
+ return m_splitter->widget(sideIndex)->layout()->itemAt(3)->widget();
}
void DolphinNavigatorsWidgetAction::updateText()
{
const int urlNavigatorsAmount = m_splitter->count() > 1 && m_splitter->widget(1)->isVisible() ?
2 : 1;
- setText(i18ncp("@action:inmenu", "Url Navigator", "Url Navigators", urlNavigatorsAmount));
+ setText(i18ncp("@action:inmenu", "Location Bar", "Location Bars", urlNavigatorsAmount));
+}
+
+DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper
+ (QWidget *navigatorsWidget, DolphinNavigatorsWidgetAction *navigatorsWidgetAction) :
+ m_navigatorsWidget{navigatorsWidget},
+ m_navigatorsWidgetAction{navigatorsWidgetAction}
+{
+ Q_CHECK_PTR(navigatorsWidget);
+ Q_CHECK_PTR(navigatorsWidgetAction);
+}
+
+bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
+{
+ if (event->type() == QEvent::Resize) {
+ if (m_navigatorsWidgetAction->parentWidget()->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) {
+ // The window is being resized which means not all widgets have gotten their new sizes yet.
+ // Let's wait a bit so the sizes of the navigatorsWidget and the viewContainers have all
+ // had a chance to be updated.
+ m_navigatorsWidgetAction->m_adjustSpacingTimer->start();
+ } else {
+ m_navigatorsWidgetAction->adjustSpacing();
+ // We could always use the m_adjustSpacingTimer instead of calling adjustSpacing() directly
+ // here but then the navigatorsWidget doesn't fluently align with the viewContainers when
+ // the DolphinTabPage::m_expandViewAnimation is animating.
+ }
+ return false;
+ }
+ return QObject::eventFilter(watched, event);
+}
+
+void DolphinNavigatorsWidgetAction::ViewGeometriesHelper::setViewContainers(QWidget *primaryViewContainer,
+ QWidget *secondaryViewContainer)
+{
+ Q_CHECK_PTR(primaryViewContainer);
+ if (m_primaryViewContainer) {
+ m_primaryViewContainer->removeEventFilter(this);
+ }
+ primaryViewContainer->installEventFilter(this);
+ m_primaryViewContainer = primaryViewContainer;
+
+ // It is not possible to resize the secondaryViewContainer without simultaneously
+ // resizing the primaryViewContainer so we don't have to installEventFilter() here.
+ m_secondaryViewContainer = secondaryViewContainer;
+}
+
+DolphinNavigatorsWidgetAction::ViewGeometriesHelper::Geometries
+ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::viewGeometries()
+{
+ Q_ASSERT(m_primaryViewContainer);
+ Geometries geometries;
+
+ // width
+ geometries.widthOfPrimary = m_primaryViewContainer->width();
+ if (m_secondaryViewContainer) {
+ geometries.widthOfSecondary = m_secondaryViewContainer->width();
+ } else {
+ geometries.widthOfSecondary = INT_MIN;
+ }
+
+ // globalX
+ if (QApplication::layoutDirection() == Qt::LeftToRight) {
+ geometries.globalXOfNavigatorsWidget = m_navigatorsWidget->mapToGlobal(QPoint(0,0)).x();
+ geometries.globalXOfPrimary = m_primaryViewContainer->mapToGlobal(QPoint(0,0)).x();
+ geometries.globalXOfSecondary = !m_secondaryViewContainer ? INT_MIN :
+ m_secondaryViewContainer->mapToGlobal(QPoint(0,0)).x();
+ } else {
+ // When the direction is reversed, globalX does not change.
+ // For the adjustSpacing() code to work we need globalX to measure from right to left
+ // and to measure up to the rightmost point of a widget instead of the leftmost.
+ geometries.globalXOfNavigatorsWidget =
+ (-1) * (m_navigatorsWidget->mapToGlobal(QPoint(0,0)).x() + m_navigatorsWidget->width());
+ geometries.globalXOfPrimary =
+ (-1) * (m_primaryViewContainer->mapToGlobal(QPoint(0,0)).x() + geometries.widthOfPrimary);
+ geometries.globalXOfSecondary = !m_secondaryViewContainer ? INT_MIN :
+ (-1) * (m_secondaryViewContainer->mapToGlobal(QPoint(0,0)).x() + geometries.widthOfSecondary);
+ }
+ return geometries;
}
projects / dolphin.git / blobdiff