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

Designer: Fix the mapping between buttons and edit mode

Browse Source 
The tool buttons for switching the edit mode e.g. between "edit",
"signals/slots", and "buddy" hardcoded the index of the corresponding
tool in designer. The index in designer depends on the load order of
(static) plugins, that has changed in qtbase
2f226336a2aeb477b7ba339b6c3a63abb69746c3 (Qt 6.5.1 and later).

Instead of relying on the index/plugin load order, try to find the right
tool by class name (still falling back to the index otherwise).

It would be nicer if the tools had actual IDs though, but that change
would need to go into Designer first.

Fixes: QTCREATORBUG-30017
Change-Id: I17caea6289574db2b1c8934e80d865a142b74725
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2023-12-07 16:48:23 +01:00
parent a20e2d29fc
commit d39a10bdd2
1 changed files with 104 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
src/plugins/designer/formeditor.cpp
View File

@@ -32,14 +32,15 @@
#include <utils/stringutils.h>
#include <utils/theme/theme.h>
#include <QDesignerFormEditorPluginInterface>
#include <QDesignerFormEditorInterface>
#include <QDesignerComponents>
#include <QDesignerFormWindowManagerInterface>
#include <QDesignerWidgetBoxInterface>
#include <abstractobjectinspector.h>
#include <QDesignerPropertyEditorInterface>
#include <QDesignerActionEditorInterface>
#include <QDesignerComponents>
#include <QDesignerFormEditorInterface>
#include <QDesignerFormEditorPluginInterface>
#include <QDesignerFormWindowManagerInterface>
#include <QDesignerFormWindowToolInterface>
#include <QDesignerPropertyEditorInterface>
#include <QDesignerWidgetBoxInterface>
#include <QAction>
#include <QActionGroup>
@@ -128,6 +129,13 @@ public:
}
};
class ToolData
{
public:
int index;
QByteArray className;
};
// FormEditorData
class FormEditorData : public QObject
@@ -136,8 +144,8 @@ public:
FormEditorData();
~FormEditorData();
void activateEditMode(int id);
void toolChanged(int);
void activateEditMode(const ToolData &toolData);
void toolChanged(QDesignerFormWindowInterface *form, int);
void print();
void setPreviewMenuEnabled(bool e);
void updateShortcut(Command *command);
@@ -165,6 +173,7 @@ public:
const QString &actionName,
Id id,
int toolNumber,
const QByteArray &toolClassName,
const QString &iconName = QString(),
const QString &keySequence = QString());
Command *addToolAction(QAction *a,
@@ -531,30 +540,53 @@ void FormEditorData::setupActions()
m_actionGroupEditMode = new QActionGroup(this);
m_actionGroupEditMode->setExclusive(true);
QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, this,
[this](QAction *a) { activateEditMode(a->data().toInt()); });
QObject::connect(m_actionGroupEditMode, &QActionGroup::triggered, this, [this](QAction *a) {
activateEditMode(a->data().value<ToolData>());
});
medit->addSeparator(m_contexts, Core::Constants::G_EDIT_OTHER);
m_toolActionIds.push_back("FormEditor.WidgetEditor");
createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
Tr::tr("Edit Widgets"), m_toolActionIds.back(),
EditModeWidgetEditor, "widgettool.png", Tr::tr("F3"));
createEditModeAction(m_actionGroupEditMode,
m_contexts,
medit,
Tr::tr("Edit Widgets"),
m_toolActionIds.back(),
EditModeWidgetEditor,
"qdesigner_internal::WidgetEditorTool",
"widgettool.png",
Tr::tr("F3"));
m_toolActionIds.push_back("FormEditor.SignalsSlotsEditor");
createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
Tr::tr("Edit Signals/Slots"), m_toolActionIds.back(),
EditModeSignalsSlotEditor, "signalslottool.png", Tr::tr("F4"));
createEditModeAction(m_actionGroupEditMode,
m_contexts,
medit,
Tr::tr("Edit Signals/Slots"),
m_toolActionIds.back(),
EditModeSignalsSlotEditor,
"qdesigner_internal::SignalSlotEditorTool",
"signalslottool.png",
Tr::tr("F4"));
m_toolActionIds.push_back("FormEditor.BuddyEditor");
createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
Tr::tr("Edit Buddies"), m_toolActionIds.back(),
EditModeBuddyEditor, "buddytool.png");
createEditModeAction(m_actionGroupEditMode,
m_contexts,
medit,
Tr::tr("Edit Buddies"),
m_toolActionIds.back(),
EditModeBuddyEditor,
"qdesigner_internal::BuddyEditorTool",
"buddytool.png");
m_toolActionIds.push_back("FormEditor.TabOrderEditor");
createEditModeAction(m_actionGroupEditMode, m_contexts, medit,
Tr::tr("Edit Tab Order"), m_toolActionIds.back(),
EditModeTabOrderEditor, "tabordertool.png");
createEditModeAction(m_actionGroupEditMode,
m_contexts,
medit,
Tr::tr("Edit Tab Order"),
m_toolActionIds.back(),
EditModeTabOrderEditor,
"qdesigner_internal::TabOrderEditorTool",
"tabordertool.png");
//tool actions
m_toolActionIds.push_back("FormEditor.LayoutHorizontally");
@@ -724,13 +756,14 @@ void FormEditorData::bindShortcut(Command *command, QAction *action)
// Create an action to activate a designer tool
QAction *FormEditorData::createEditModeAction(QActionGroup *ag,
const Context &context,
ActionContainer *medit,
const QString &actionName,
Id id,
int toolNumber,
const QString &iconName,
const QString &keySequence)
const Context &context,
ActionContainer *medit,
const QString &actionName,
Id id,
int toolNumber,
const QByteArray &toolClassName,
const QString &iconName,
const QString &keySequence)
{
auto rc = new QAction(actionName, ag);
rc->setCheckable(true);
@@ -742,7 +775,7 @@ QAction *FormEditorData::createEditModeAction(QActionGroup *ag,
command->setDefaultKeySequence(QKeySequence(keySequence));
bindShortcut(command, rc);
medit->addAction(command, Core::Constants::G_EDIT_OTHER);
rc->setData(toolNumber);
rc->setData(QVariant::fromValue(ToolData{toolNumber, toolClassName}));
ag->addAction(rc);
return rc;
}
@@ -770,8 +803,9 @@ IEditor *FormEditorData::createEditor()
QDesignerFormWindowInterface *form = m_fwm->createFormWindow(nullptr);
QTC_ASSERT(form, return nullptr);
form->setPalette(Theme::initialPalette());
connect(form, &QDesignerFormWindowInterface::toolChanged,
this, &FormEditorData::toolChanged);
connect(form, &QDesignerFormWindowInterface::toolChanged, this, [this, form](int index) {
toolChanged(form, index);
});
auto widgetHost = new SharedTools::WidgetHost( /* parent */ nullptr, form);
FormWindowEditor *formWindowEditor = m_xmlEditorFactory->create(form);
@@ -824,26 +858,48 @@ void FormEditorData::updateShortcut(Command *command)
a->setShortcut(command->action()->shortcut());
}
void FormEditorData::activateEditMode(int id)
static void setTool(QDesignerFormWindowInterface *formWindow, const ToolData &toolData)
{
if (const int count = m_fwm->formWindowCount())
for (int i = 0; i < count; i++)
m_fwm->formWindow(i)->setCurrentTool(id);
// check for tool action with correct object name,
// otherwise fall back to index
if (!toolData.className.isEmpty()) {
const int toolCount = formWindow->toolCount();
for (int tool = 0; tool < toolCount; ++tool) {
if (formWindow->tool(tool)->metaObject()->className() == toolData.className) {
formWindow->setCurrentTool(tool);
return;
}
}
}
formWindow->setCurrentTool(toolData.index);
}
void FormEditorData::toolChanged(int t)
void FormEditorData::activateEditMode(const ToolData &toolData)
{
typedef QList<QAction *> ActionList;
if (const QAction *currentAction = m_actionGroupEditMode->checkedAction())
if (currentAction->data().toInt() == t)
if (const int count = m_fwm->formWindowCount()) {
for (int i = 0; i < count; i++)
setTool(m_fwm->formWindow(i), toolData);
}
}
void FormEditorData::toolChanged(QDesignerFormWindowInterface *form, int t)
{
// check for action with correct object name,
// otherwise fall back to index
QDesignerFormWindowToolInterface *tool = form->tool(t);
const QList<QAction *> actions = m_actionGroupEditMode->actions();
QAction *candidateByIndex = nullptr;
for (QAction *action : actions) {
const auto toolData = action->data().value<ToolData>();
if (!toolData.className.isEmpty() && toolData.className == tool->metaObject()->className()) {
action->setChecked(true);
return;
const ActionList actions = m_actionGroupEditMode->actions();
const ActionList::const_iterator cend = actions.constEnd();
for (ActionList::const_iterator it = actions.constBegin(); it != cend; ++it)
if ( (*it)->data().toInt() == t) {
(*it)->setChecked(true);
break;
}
if (toolData.index == t)
candidateByIndex = action;
}
if (candidateByIndex)
candidateByIndex->setChecked(true);
}
void FormEditorData::print()
@@ -933,3 +989,5 @@ void addPluginPath(const QString &pluginPath)
} // namespace Internal
} // namespace Designer
Q_DECLARE_METATYPE(Designer::Internal::ToolData)