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

ModelEditor: Remove multiline text from action text

Browse Source 
It is supposed to be shown in the tool tip, so set the tool tip instead.

Fixes: QTCREATORBUG-29174
Change-Id: Ib2572b71dfccf18276e63fadb7dbe386949b0275
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2024-03-07 13:22:19 +01:00
parent 22f41fb751
commit da9afa8cc7
2 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/plugins/modeleditor/actionhandler.cpp
View File

@@ -7,12 +7,13 @@
#include "modeleditor_constants.h"
#include "modeleditortr.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h>
#include <utils/icon.h>
#include <utils/stringutils.h>
#include <utils/utilsicons.h>
#include <QAction>
@@ -161,11 +162,17 @@ void ActionHandler::createActions()
QKeySequence(), QIcon(":/modelinglib/48x48/class.png"));
registerCommand(Constants::ACTION_ADD_CANVAS_DIAGRAM, nullptr, Core::Context(), Tr::tr("Add Canvas Diagram"),
QKeySequence(), QIcon(":/modelinglib/48x48/canvas-diagram.png"));
d->synchronizeBrowserAction = registerCommand(
Constants::ACTION_SYNC_BROWSER, nullptr, Core::Context(),
Tr::tr("Synchronize Browser and Diagram") + "<br><i><small>"
+ Tr::tr("Press && Hold for Options") + "</small></i>", QKeySequence(),
Utils::Icons::LINK_TOOLBAR.icon())->action();
d->synchronizeBrowserAction
= registerCommand(
Constants::ACTION_SYNC_BROWSER,
nullptr,
Core::Context(),
Tr::tr("Synchronize Browser and Diagram"),
QKeySequence(),
Utils::Icons::LINK_TOOLBAR.icon(),
Tr::tr("Synchronize Browser and Diagram") + "<br><i><small>"
+ Utils::stripAccelerator(Tr::tr("Press && Hold for Options")) + "</small></i>")
->action();
d->synchronizeBrowserAction->setCheckable(true);
auto editPropertiesAction = new QAction(Tr::tr("Edit Element Properties"),
@@ -205,13 +212,20 @@ std::function<void()> invokeOnCurrentModelEditor(void (ModelEditor::*function)()
};
}
Core::Command *ActionHandler::registerCommand(const Utils::Id &id, void (ModelEditor::*function)(),
const Core::Context &context, const QString &title,
const QKeySequence &keySequence, const QIcon &icon)
Core::Command *ActionHandler::registerCommand(
const Utils::Id &id,
void (ModelEditor::*function)(),
const Core::Context &context,
const QString &title,
const QKeySequence &keySequence,
const QIcon &icon,
const QString &toolTip)
{
auto action = new QAction(title, this);
if (!icon.isNull())
action->setIcon(icon);
if (!toolTip.isEmpty())
action->setToolTip(toolTip);
Core::Command *command = Core::ActionManager::registerAction(action, id, context, /*scriptable=*/true);
if (!keySequence.isEmpty())
command->setDefaultKeySequence(keySequence);

12
src/plugins/modeleditor/actionhandler.h
View File

@@ -56,10 +56,14 @@ private:
void onEditProperties();
void onEditItem();
Core::Command *registerCommand(const Utils::Id &id, void (ModelEditor::*function)(),
const Core::Context &context, const QString &title = QString(),
const QKeySequence &keySequence = QKeySequence(),
const QIcon &icon = QIcon());
Core::Command *registerCommand(
const Utils::Id &id,
void (ModelEditor::*function)(),
const Core::Context &context,
const QString &title = QString(),
const QKeySequence &keySequence = QKeySequence(),
const QIcon &icon = QIcon(),
const QString &toolTip = {});
private:
ActionHandlerPrivate *d;