X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f588a7d48b7cef5351d8b0f030a6ec5e76229976..4102ccb80457eea44ea280f0ace2a419602bc34b:/src/selectionmode/topbar.cpp diff --git a/src/selectionmode/topbar.cpp b/src/selectionmode/topbar.cpp index 5d77a4c00..7ef507910 100644 --- a/src/selectionmode/topbar.cpp +++ b/src/selectionmode/topbar.cpp @@ -10,8 +10,8 @@ #include "backgroundcolorhelper.h" #include +#include #include -#include #include #include @@ -23,14 +23,6 @@ using namespace SelectionMode; TopBar::TopBar(QWidget *parent) : AnimatedHeightWidget{parent} { - setToolTip(KToolTipHelper::whatsThisHintOnly()); - setWhatsThis(xi18nc("@info:whatsthis", - "Selection ModeSelect files or folders to manage or manipulate them." - "Press on a file or folder to select it.Press on an already selected file or folder to deselect it." - "Pressing an empty area does not clear the selection." - "Selection rectangles (created by dragging from an empty area) invert the selection status of items within." - "The available action buttons at the bottom change depending on the current selection.")); - QWidget *contentsContainer = prepareContentsContainer(); BackgroundColorHelper::instance()->controlBackgroundColor(this); @@ -39,8 +31,24 @@ TopBar::TopBar(QWidget *parent) m_shortLabelString = i18nc("@info label above the view explaining the state", "Selection Mode"); m_label = new QLabel(contentsContainer); m_label->setMinimumWidth(0); + m_label->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard | Qt::LinksAccessibleByKeyboard); // for keyboard accessibility BackgroundColorHelper::instance()->controlBackgroundColor(m_label); + m_contextualHelpButton = new KContextualHelpButton{ + xi18nc("@info", + "Selection ModeSelect files or folders to manage or manipulate them." + "Press on a file or folder to select it.Press on an already selected file or folder to deselect it." + "Pressing an empty area does not clear the selection." + "Selection rectangles (created by dragging from an empty area) invert the selection status of items within." + "Moving with arrow keys does not change the selection." + "Pressing %1, %2, or %3 toggles the selection." + "The available action buttons at the bottom change depending on the current selection.", + QKeySequence{Qt::Key_Enter}.toString(QKeySequence::NativeText), + QKeySequence{Qt::Key_Return}.toString(QKeySequence::NativeText), + QKeySequence{Qt::CTRL | Qt::Key_Space}.toString(QKeySequence::NativeText)), + nullptr, + contentsContainer}; + m_closeButton = new QPushButton(QIcon::fromTheme(QStringLiteral("window-close-symbolic")), "", contentsContainer); m_closeButton->setText(i18nc("@action:button", "Exit Selection Mode")); m_closeButton->setFlat(true); @@ -54,6 +62,7 @@ TopBar::TopBar(QWidget *parent) layout->addStretch(); layout->addWidget(m_label); + layout->addWidget(m_contextualHelpButton); layout->addStretch(); layout->addWidget(m_closeButton); } @@ -67,8 +76,8 @@ void TopBar::resizeEvent(QResizeEvent *resizeEvent) void TopBar::updateLabelString() { QFontMetrics fontMetrics = m_label->fontMetrics(); - if (fontMetrics.horizontalAdvance(m_fullLabelString) + m_closeButton->sizeHint().width() + style()->pixelMetric(QStyle::PM_LayoutLeftMargin) * 2 - + style()->pixelMetric(QStyle::PM_LayoutRightMargin) * 2 + if (fontMetrics.horizontalAdvance(m_fullLabelString) + m_contextualHelpButton->sizeHint().width() + m_closeButton->sizeHint().width() + + style()->pixelMetric(QStyle::PM_LayoutLeftMargin) * 2 + style()->pixelMetric(QStyle::PM_LayoutRightMargin) * 2 < width()) { m_label->setText(m_fullLabelString); } else {