feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Utils::setClipboardAndSelection() more often

Browse Source 
Change-Id: I094f07cdb1e5e8c8026bb36d0a486719567641b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2022-06-20 14:21:12 +02:00
parent f7e9623369
commit d1b7e90b7d
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/debugger/watchhandler.cpp
View File

@@ -60,7 +60,6 @@
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QApplication> #include <QApplication>
#include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QFile> #include <QFile>
#include <QFloat16> #include <QFloat16>
@@ -1663,14 +1662,6 @@ static QString removeWatchActionText(QString exp)
return WatchModel::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp)); return WatchModel::tr("Remove Expression Evaluator for \"%1\"").arg(Utils::quoteAmpersands(exp));
} }
static void copyToClipboard(const QString &clipboardText)
{
QClipboard *clipboard = QApplication::clipboard();
if (clipboard->supportsSelection())
clipboard->setText(clipboardText, QClipboard::Selection);
clipboard->setText(clipboardText, QClipboard::Clipboard);
}
void WatchModel::inputNewExpression() void WatchModel::inputNewExpression()
{ {
QDialog dlg; QDialog dlg;
@@ -1788,19 +1779,19 @@ bool WatchModel::contextMenuEvent(const ItemViewEvent &ev)
addAction(this, menu, tr("Copy View Contents to Clipboard"), addAction(this, menu, tr("Copy View Contents to Clipboard"),
true, true,
[this] { copyToClipboard(editorContents()); }); [this] { setClipboardAndSelection(editorContents()); });
addAction(this, menu, addAction(this, menu,
tr("Copy Current Value to Clipboard"), tr("Copy Current Value to Clipboard"),
item, item,
[this, name = item ? item->iname : QString()] { [this, name = item ? item->iname : QString()] {
if (auto item = findItem(name)) if (auto item = findItem(name))
copyToClipboard(item->value); setClipboardAndSelection(item->value);
}); });
// addAction(menu, tr("Copy Selected Rows to Clipboard"), // addAction(menu, tr("Copy Selected Rows to Clipboard"),
// selectionModel()->hasSelection(), // selectionModel()->hasSelection(),
// [this] { copyToClipboard(editorContents(selectionModel()->selectedRows())); }); // [this] { setClipboardAndSelection(editorContents(selectionModel()->selectedRows())); });
addAction(this, menu, tr("Open View Contents in Editor"), addAction(this, menu, tr("Open View Contents in Editor"),
m_engine->debuggerActionsEnabled(), m_engine->debuggerActionsEnabled(),