Fix getting item data in scripts

hluk · Dec 24, 2023 · cee11de · cee11de
1 parent d6f597a
commit cee11de
Show file tree

Hide file tree

Showing 12 changed files with 433 additions and 467 deletions.
diff --git a/plugins/itemsync/tests/itemsynctests.cpp b/plugins/itemsync/tests/itemsynctests.cpp
@@ -791,6 +791,7 @@ void ItemSyncTests::saveLargeItem()
         RUN(args << "getItem(0)[mimeText].length", "100000\n");
         RUN(args << "getItem(0)['application/x-copyq-test-data'].left(26)", "abcdefghijklmnopqrstuvwxyz");
         RUN(args << "getItem(0)['application/x-copyq-test-data'].length", "260000\n");
+        RUN(args << "ItemSelection().selectAll().itemAtIndex(0)[mimeText].length", "100000\n");
         RUN("unload" << tab, tab + "\n");
     }
 

diff --git a/src/gui/clipboardbrowser.cpp b/src/gui/clipboardbrowser.cpp
@@ -484,6 +484,9 @@ void ClipboardBrowser::connectModelAndDelegate()
     // delegate for rendering and editing items
     setItemDelegate(&d);
 
+    connect( &m, &QAbstractItemModel::rowsAboutToBeRemoved,
+             this, &ClipboardBrowser::itemsAboutToBeRemoved );
+
     // Delegate receives model signals first to update internal item list.
     connect( &m, &QAbstractItemModel::rowsInserted,
              &d, &ItemDelegate::rowsInserted );

diff --git a/src/gui/clipboardbrowser.h b/src/gui/clipboardbrowser.h
@@ -222,6 +222,8 @@ class ClipboardBrowser final : public QListView
         using QListView::verticalOffset;
 
     signals:
+        void itemsAboutToBeRemoved(const QModelIndex &parent, int first, int last);
+
         /** Show list request. */
         void requestShow(const ClipboardBrowser *self);
         /** Request clipboard change. */

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -416,8 +416,12 @@ void clearActions(QToolBar *toolBar)
 {
     for (QAction *action : toolBar->actions()) {
         // Omit removing action from other menus.
-        if (action->parent() == toolBar)
-            delete action;
+        if (action->parent() == toolBar) {
+            action->setVisible(false);
+            action->setDisabled(true);
+            action->setShortcuts({});
+            action->deleteLater();
+        }
     }
 
     deleteSubMenus(toolBar);
@@ -1281,7 +1285,7 @@ void MainWindow::onBrowserCreated(ClipboardBrowser *browser)
             createDataMap(mimeCurrentTab, browser->tabName()));
     }
 
-    connect( browser->model(), &QAbstractItemModel::rowsAboutToBeRemoved,
+    connect( browser, &ClipboardBrowser::itemsAboutToBeRemoved,
              browser, [this, browser](const QModelIndex &, int first, int last) {
                  if (isScriptOverridden(ScriptOverrides::OnItemsRemoved))
                     runItemHandlerScript(QStringLiteral("onItemsRemoved()"), browser, first, last);
@@ -2469,7 +2473,10 @@ void MainWindow::runEventHandlerScript(const QString &script, const QVariantMap
         log("Event handler maximum recursion reached", LogWarning);
 
     const auto action = runScript(script, data);
+    const bool hasUpdatesEnabled = updatesEnabled();
+    setUpdatesEnabled(false);
     action->waitForFinished();
+    setUpdatesEnabled(hasUpdatesEnabled);
     ++m_maxEventHandlerScripts;
 }
 

diff --git a/src/gui/traymenu.cpp b/src/gui/traymenu.cpp
@@ -152,7 +152,10 @@ void TrayMenu::clearClipboardItems()
     m_clipboardActions = {};
     for (QAction *action : actions) {
         removeAction(action);
-        delete action;
+        action->setVisible(false);
+        action->setDisabled(true);
+        action->setShortcuts({});
+        action->deleteLater();
     }
 
     m_clipboardItemActionCount = 0;
@@ -168,7 +171,10 @@ void TrayMenu::clearCustomActions()
     m_customActions = {};
     for (QAction *action : actions) {
         removeAction(action);
-        delete action;
+        action->setVisible(false);
+        action->setDisabled(true);
+        action->setShortcuts({});
+        action->deleteLater();
     }
 }