mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
Merge branch 'release/21.12'
This commit is contained in:
commit
caf49dafa5
|
@ -758,7 +758,7 @@ void DolphinMainWindow::slotAboutToShowBackPopupMenu()
|
|||
int entries = 0;
|
||||
m_backAction->menu()->clear();
|
||||
for (int i = urlNavigator->historyIndex() + 1; i < urlNavigator->historySize() && entries < MaxNumberOfNavigationentries; ++i, ++entries) {
|
||||
QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_backAction->menu());
|
||||
QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_backAction->menu());
|
||||
action->setData(i);
|
||||
m_backAction->menu()->addAction(action);
|
||||
}
|
||||
|
@ -787,7 +787,7 @@ void DolphinMainWindow::slotAboutToShowForwardPopupMenu()
|
|||
int entries = 0;
|
||||
m_forwardAction->menu()->clear();
|
||||
for (int i = urlNavigator->historyIndex() - 1; i >= 0 && entries < MaxNumberOfNavigationentries; --i, ++entries) {
|
||||
QAction* action = new QAction(urlNavigator->locationUrl(i).toString(QUrl::PreferLocalFile), m_forwardAction->menu());
|
||||
QAction* action = new QAction(urlNavigator->locationUrl(i).toDisplayString(QUrl::PreferLocalFile), m_forwardAction->menu());
|
||||
action->setData(i);
|
||||
m_forwardAction->menu()->addAction(action);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue