Merge remote-tracking branch 'origin/8.0'

Change-Id: I1dc664137eeecb7dd69f29af7a08164683d51077
This commit is contained in:
hjk
2022-08-03 17:51:42 +02:00
13 changed files with 129 additions and 12 deletions

View File

@@ -332,6 +332,21 @@ Edit3DAction *Edit3DView::createResetColorAction()
tooltip);
}
Edit3DAction *Edit3DView::createSyncBackgroundColorAction()
{
QString description = QCoreApplication::translate("SyncEdit3DColorAction",
"Use Scene Environment Color");
QString tooltip = QCoreApplication::translate("SyncEdit3DColorAction",
"Sets the 3D Editor to use the Scene Environment "
"color as background color.");
return new Edit3DAction(
QmlDesigner::Constants::EDIT3D_EDIT_SYNC_BACKGROUND_COLOR, View3DActionCommand::SyncBackgroundColor,
description,
{}, true, false, {}, {}, {},
tooltip);
}
void Edit3DView::createEdit3DActions()
{
m_selectionModeAction
@@ -563,6 +578,7 @@ void Edit3DView::createEdit3DActions()
m_backgroundColorActions << createSelectBackgrounColorAction();
m_backgroundColorActions << createGridColorSelectionAction();
m_backgroundColorActions << createSyncBackgroundColorAction();
m_backgroundColorActions << createResetColorAction();
}