GIT_SILENT Update Appstream for new release

[dolphin.git] / src / dolphinrecenttabsmenu.cpp

diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index 0a274fed86fdb17e109a13d05dbe45e0080912cb..adc6a8edadec339c933d46acfaad0caa076693c8 100644 (file)
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -15,11 +15,11 @@
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
     KActionMenu(QIcon::fromTheme(QStringLiteral("edit-undo")), i18n("Recently Closed Tabs"), parent)
 {
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :
     KActionMenu(QIcon::fromTheme(QStringLiteral("edit-undo")), i18n("Recently Closed Tabs"), parent)
 {

-    setDelayed(false);
+    setPopupMode(QToolButton::InstantPopup);

     setEnabled(false);
 
     m_clearListAction = new QAction(i18n("Empty Recently Closed Tabs"), this);
     setEnabled(false);
 
     m_clearListAction = new QAction(i18n("Empty Recently Closed Tabs"), this);

-    m_clearListAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-list")));
+    m_clearListAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-history")));

     addAction(m_clearListAction);
 
     addSeparator();
     addAction(m_clearListAction);
 
     addSeparator();


@@ -43,7 +43,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const QUrl& url, const QByteArray&
     } else {
         insertAction(menu()->actions().at(2), action);
     }
     } else {
         insertAction(menu()->actions().at(2), action);
     }

-    emit closedTabsCountChanged(menu()->actions().size() - 2);
+    Q_EMIT closedTabsCountChanged(menu()->actions().size() - 2);

     // Assure that only up to 6 closed tabs are shown in the menu.
     // 8 because of clear action + separator + 6 closed tabs
     if (menu()->actions().size() > 8) {
     // Assure that only up to 6 closed tabs are shown in the menu.
     // 8 because of clear action + separator + 6 closed tabs
     if (menu()->actions().size() > 8) {


@@ -66,17 +66,17 @@ void DolphinRecentTabsMenu::handleAction(QAction* action)
         // action and the separator
         QList<QAction*> actions = menu()->actions();
         const int count = actions.size();
         // action and the separator
         QList<QAction*> actions = menu()->actions();
         const int count = actions.size();

-        for (int i = 2; i < count; ++i) {
+        for (int i = count - 1; i >= 2; i--) {

             removeAction(actions.at(i));
         }
             removeAction(actions.at(i));
         }

-        emit closedTabsCountChanged(0);
+        Q_EMIT closedTabsCountChanged(0);

     } else {
         const QByteArray state = action->data().toByteArray();
         removeAction(action);
         delete action;
         action = nullptr;
     } else {
         const QByteArray state = action->data().toByteArray();
         removeAction(action);
         delete action;
         action = nullptr;

-        emit restoreClosedTab(state);
-        emit closedTabsCountChanged(menu()->actions().size() - 2);
+        Q_EMIT restoreClosedTab(state);
+        Q_EMIT closedTabsCountChanged(menu()->actions().size() - 2);

     }
 
     if (menu()->actions().count() <= 2) {
     }
 
     if (menu()->actions().count() <= 2) {