mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Use both split view names in tab names
When the tab is a split view, use the name of both views rather than only the active view.
This commit is contained in:
parent
c709386185
commit
86d89c3bd1
|
@ -15,6 +15,7 @@
|
||||||
#include <kio/global.h>
|
#include <kio/global.h>
|
||||||
#include <KIO/CommandLauncherJob>
|
#include <KIO/CommandLauncherJob>
|
||||||
#include <KAcceleratorManager>
|
#include <KAcceleratorManager>
|
||||||
|
#include <KLocalizedString>
|
||||||
|
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
#include <QDropEvent>
|
#include <QDropEvent>
|
||||||
|
@ -496,7 +497,22 @@ QString DolphinTabWidget::tabName(DolphinTabPage* tabPage) const
|
||||||
if (!tabPage) {
|
if (!tabPage) {
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
QString name = tabPage->activeViewContainer()->caption();
|
|
||||||
|
QString name;
|
||||||
|
if (tabPage->splitViewEnabled()) {
|
||||||
|
if (tabPage->primaryViewActive()) {
|
||||||
|
// i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
|
||||||
|
// left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
|
||||||
|
name = i18nc("@title:tab Active primary view | (Inactive secondary view)", "%1 | (%2)", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
|
||||||
|
} else {
|
||||||
|
// i18n: %1 is the primary view and %2 the secondary view. For left to right languages the primary view is on the left so we also want it to be on the
|
||||||
|
// left in the tab name. In right to left languages the primary view would be on the right so the tab name should match.
|
||||||
|
name = i18nc("@title:tab (Inactive primary view) | Active secondary view", "(%1) | %2", tabPage->primaryViewContainer()->caption(), tabPage->secondaryViewContainer()->caption());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
name = tabPage->activeViewContainer()->caption();
|
||||||
|
}
|
||||||
|
|
||||||
// Make sure that a '&' inside the directory name is displayed correctly
|
// Make sure that a '&' inside the directory name is displayed correctly
|
||||||
// and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
|
// and not misinterpreted as a keyboard shortcut in QTabBar::setTabText()
|
||||||
return name.replace('&', QLatin1String("&&"));
|
return name.replace('&', QLatin1String("&&"));
|
||||||
|
|
Loading…
Reference in a new issue