forked from qt-creator/qt-creator
ed5e6a4999
Add Cmd+Shift+- for decreasing font size on macOS. Do not add Cmd+= for increasing size, because it conflicts with the existing shortcut for "Replace and Find Next". Sprinkle some Backspace shortcuts in addition to Delete for removing items. There are (laptop) keyboards that either do not have a designated Delete key (requiring Fn+Backspace) or where the Delete key is not conveniently located/sized, and there is no benefit in making the distinction in that case anyhow. Fixes: QTCREATORBUG-706 Fixes: QTCREATORBUG-13733 Change-Id: I06274a9810b82800ec6158a883c95d2a7ae2465e Reviewed-by: David Schulz <david.schulz@qt.io>
116 lines
3.9 KiB
C++
116 lines
3.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Author: Andreas Hartmetz, KDAB (andreas.hartmetz@kdab.com)
|
|
** Contact: https://www.qt.io/licensing/
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
** General Public License version 3 as published by the Free Software
|
|
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
** included in the packaging of this file. Please review the following
|
|
** information to ensure the GNU General Public License requirements will
|
|
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "memcheckerrorview.h"
|
|
|
|
#include "suppressiondialog.h"
|
|
#include "valgrindsettings.h"
|
|
|
|
#include "xmlprotocol/error.h"
|
|
#include "xmlprotocol/errorlistmodel.h"
|
|
#include "xmlprotocol/frame.h"
|
|
#include "xmlprotocol/stack.h"
|
|
#include "xmlprotocol/modelhelpers.h"
|
|
#include "xmlprotocol/suppression.h"
|
|
|
|
#include <coreplugin/editormanager/editormanager.h>
|
|
#include <projectexplorer/project.h>
|
|
#include <projectexplorer/projectexplorer.h>
|
|
#include <projectexplorer/session.h>
|
|
#include <utils/qtcassert.h>
|
|
#include <utils/icon.h>
|
|
#include <utils/theme/theme.h>
|
|
|
|
#include <QAction>
|
|
|
|
using namespace Valgrind::XmlProtocol;
|
|
|
|
namespace Valgrind {
|
|
namespace Internal {
|
|
|
|
MemcheckErrorView::MemcheckErrorView(QWidget *parent)
|
|
: Debugger::DetailedErrorView(parent)
|
|
{
|
|
m_suppressAction = new QAction(this);
|
|
m_suppressAction->setText(tr("Suppress Error"));
|
|
const QIcon icon = Utils::Icon({
|
|
{":/utils/images/eye_open.png", Utils::Theme::TextColorNormal},
|
|
{":/valgrind/images/suppressoverlay.png", Utils::Theme::IconsErrorColor}},
|
|
Utils::Icon::Tint | Utils::Icon::PunchEdges).icon();
|
|
m_suppressAction->setIcon(icon);
|
|
m_suppressAction->setShortcuts({QKeySequence::Delete, QKeySequence::Backspace});
|
|
m_suppressAction->setShortcutContext(Qt::WidgetWithChildrenShortcut);
|
|
connect(m_suppressAction, &QAction::triggered, this, &MemcheckErrorView::suppressError);
|
|
addAction(m_suppressAction);
|
|
}
|
|
|
|
MemcheckErrorView::~MemcheckErrorView() = default;
|
|
|
|
void MemcheckErrorView::setDefaultSuppressionFile(const QString &suppFile)
|
|
{
|
|
m_defaultSuppFile = suppFile;
|
|
}
|
|
|
|
QString MemcheckErrorView::defaultSuppressionFile() const
|
|
{
|
|
return m_defaultSuppFile;
|
|
}
|
|
|
|
// slot, can (for now) be invoked either when the settings were modified *or* when the active
|
|
// settings object has changed.
|
|
void MemcheckErrorView::settingsChanged(ValgrindBaseSettings *settings)
|
|
{
|
|
QTC_ASSERT(settings, return);
|
|
m_settings = settings;
|
|
}
|
|
|
|
void MemcheckErrorView::suppressError()
|
|
{
|
|
SuppressionDialog::maybeShow(this);
|
|
}
|
|
|
|
QList<QAction *> MemcheckErrorView::customActions() const
|
|
{
|
|
QList<QAction *> actions;
|
|
const QModelIndexList indizes = selectionModel()->selectedRows();
|
|
QTC_ASSERT(!indizes.isEmpty(), return actions);
|
|
|
|
bool hasErrors = false;
|
|
foreach (const QModelIndex &index, indizes) {
|
|
Error error = model()->data(index, ErrorListModel::ErrorRole).value<Error>();
|
|
if (!error.suppression().isNull()) {
|
|
hasErrors = true;
|
|
break;
|
|
}
|
|
}
|
|
m_suppressAction->setEnabled(hasErrors);
|
|
actions << m_suppressAction;
|
|
return actions;
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Valgrind
|