Commit e464b58c authored by Felix Ernst's avatar Felix Ernst 🇺🇦
Browse files

Address Nate's UX feedback: Episode 2

- Make Esc leave selection mode and have it only clear selection
    when already outside selection mode.
- Let translators know that the "More" overflow button should only
    have a short text on it.
- Fix a crash that happened when any code tried to exit selection
    mode even though selection mode had never been enabled to begin
    with.
parent 261b741d
......@@ -379,13 +379,14 @@ void DolphinViewContainer::setSelectionModeEnabled(bool enabled, KActionCollecti
m_view->setSelectionModeEnabled(enabled);
if (!enabled) {
if (!wasEnabled) {
return; // nothing to do here
}
Q_CHECK_PTR(m_selectionModeTopBar); // there is no point in disabling selectionMode when it wasn't even enabled once.
Q_CHECK_PTR(m_selectionModeBottomBar);
m_selectionModeTopBar->setVisible(false, WithAnimation);
m_selectionModeBottomBar->setVisible(false, WithAnimation);
if (wasEnabled) {
Q_EMIT selectionModeChanged(false);
}
Q_EMIT selectionModeChanged(false);
return;
}
......
......@@ -430,10 +430,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event)
}
case Qt::Key_Escape:
if (m_selectionMode && m_selectionManager->selectedItems().count() < 1) {
if (m_selectionMode) {
Q_EMIT selectionModeChangeRequested(false);
}
if (m_selectionBehavior != SingleSelection) {
} else if (m_selectionBehavior != SingleSelection) {
m_selectionManager->clearSelection();
}
m_keyboardManager->cancelSearch();
......
......@@ -291,9 +291,9 @@ void BottomBarContentsContainer::addDuplicateContents()
void BottomBarContentsContainer::addGeneralContents()
{
if (!m_overflowButton) {
// i18n: This button appears in a bar if there isn't enough horizontal space to fit all the other buttons.
// i18n: This button appears in a bar if there isn't enough horizontal space to fit all the other buttons so please keep it short.
// The small button opens a menu that contains the actions that didn't fit on the bar.
m_overflowButton = new QPushButton{QIcon::fromTheme(QStringLiteral("view-more-symbolic")), i18nc("@action", "More"), this};
m_overflowButton = new QPushButton{QIcon::fromTheme(QStringLiteral("view-more-symbolic")), i18nc("@action keep short", "More"), this};
m_overflowButton->setMenu(new QMenu{m_overflowButton});
m_overflowButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding); // Makes sure it has the same height as the labeled buttons.
m_layout->addWidget(m_overflowButton);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment