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

QmlDesigner: Modify icons for 3d toolbar

Browse Source 
Task-number: QDS-9082
Change-Id: Ib4536db2f353c5eba1b9eb18743f92372d5296d7
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Ali Kianian
2023-02-21 13:03:39 +02:00
parent 1b82f7c164
commit e46fe19768
4 changed files with 93 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/qmldesigner/components/edit3d/edit3dactions.cpp
View File

@@ -49,8 +49,7 @@ Edit3DAction::Edit3DAction(const QByteArray &menuId,
const QKeySequence &key,
bool checkable,
bool checked,
const QIcon &iconOff,
const QIcon &iconOn,
const QIcon &icon,
Edit3DView *view,
SelectionContextOperation selectionAction,
const QString &toolTip)
@@ -68,17 +67,7 @@ Edit3DAction::Edit3DAction(const QByteArray &menuId,
if (!toolTip.isEmpty())
action()->setToolTip(toolTip);
if (checkable) {
QIcon onOffIcon;
const auto onAvail = iconOn.availableSizes(); // Assume both icons have same sizes available
for (const auto &size : onAvail) {
onOffIcon.addPixmap(iconOn.pixmap(size), QIcon::Normal, QIcon::On);
onOffIcon.addPixmap(iconOff.pixmap(size), QIcon::Normal, QIcon::Off);
}
action()->setIcon(onOffIcon);
} else {
action()->setIcon(iconOff);
}
action()->setIcon(icon);
}
Edit3DAction::Edit3DAction(const QByteArray &menuId,
@@ -118,11 +107,10 @@ Edit3DCameraAction::Edit3DCameraAction(const QByteArray &menuId,
const QKeySequence &key,
bool checkable,
bool checked,
const QIcon &iconOff,
const QIcon &iconOn,
const QIcon &icon,
Edit3DView *view,
SelectionContextOperation selectionAction)
: Edit3DAction(menuId, type, description, key, checkable, checked, iconOff, iconOn, view, selectionAction)
: Edit3DAction(menuId, type, description, key, checkable, checked, icon, view, selectionAction)
{
}

6
src/plugins/qmldesigner/components/edit3d/edit3dactions.h
View File

@@ -50,8 +50,7 @@ public:
const QKeySequence &key,
bool checkable,
bool checked,
const QIcon &iconOff,
const QIcon &iconOn,
const QIcon &icon,
Edit3DView *view,
SelectionContextOperation selectionAction = nullptr,
const QString &toolTip = {});
@@ -98,8 +97,7 @@ public:
const QKeySequence &key,
bool checkable,
bool checked,
const QIcon &iconOff,
const QIcon &iconOn,
const QIcon &icon,
Edit3DView *view,
SelectionContextOperation selectionAction = nullptr);

170
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -37,6 +37,25 @@ static inline QIcon contextIcon (const DesignerIcons::IconId &iconId) {
return DesignerActionManager::instance().contextIcon(iconId);
};
static QIcon toolbarIcon (const Theme::Icon &iconOffId, const Theme::Icon &iconnOnId) {
QIcon iconOff = Theme::iconFromName(iconOffId);
QIcon iconOn= Theme::iconFromName(iconnOnId,
Theme::getColor(Theme::Color::DStextSelectedTextColor));
QIcon retIcon;
const auto onAvail = iconOff.availableSizes(); // Assume both icons have same sizes available
for (const auto &size : onAvail) {
retIcon.addPixmap(iconOff.pixmap(size), QIcon::Normal, QIcon::Off);
retIcon.addPixmap(iconOn.pixmap(size), QIcon::Normal, QIcon::On);
}
return retIcon;
};
static inline QIcon toolbarIcon (const Theme::Icon &iconOffId) {
return toolbarIcon(iconOffId, iconOffId);
};
Edit3DView::Edit3DView(ExternalDependenciesInterface &externalDependencies)
: AbstractView{externalDependencies}
{
@@ -374,7 +393,6 @@ Edit3DAction *Edit3DView::createSelectBackgroundColorAction(QAction *syncBackgro
false,
false,
{},
{},
this,
operation,
tooltip);
@@ -401,7 +419,6 @@ Edit3DAction *Edit3DView::createGridColorSelectionAction()
false,
false,
{},
{},
this,
operation,
tooltip);
@@ -436,7 +453,6 @@ Edit3DAction *Edit3DView::createResetColorAction(QAction *syncBackgroundColorAct
false,
false,
{},
{},
this,
operation,
tooltip);
@@ -457,7 +473,6 @@ Edit3DAction *Edit3DView::createSyncBackgroundColorAction()
true,
false,
{},
{},
this,
{},
tooltip);
@@ -485,15 +500,14 @@ Edit3DAction *Edit3DView::createSeekerSliderAction()
void Edit3DView::createEdit3DActions()
{
m_selectionModeAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_SELECTION_MODE,
View3DActionType::SelectionModeToggle,
QCoreApplication::translate("SelectionModeToggleAction", "Toggle Group/Single Selection Mode"),
QKeySequence(Qt::Key_Q),
true,
false,
Theme::iconFromName(Theme::Icon::selectOutline_medium),
Theme::iconFromName(Theme::Icon::selectFill_medium), //s_selection
this);
QmlDesigner::Constants::EDIT3D_SELECTION_MODE,
View3DActionType::SelectionModeToggle,
QCoreApplication::translate("SelectionModeToggleAction", "Toggle Group/Single Selection Mode"),
QKeySequence(Qt::Key_Q),
true,
false,
toolbarIcon(Theme::selectOutline_medium, Theme::selectFill_medium),
this);
m_moveToolAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_MOVE_TOOL,
View3DActionType::MoveTool,
@@ -502,8 +516,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_W),
true,
true,
Theme::iconFromName(Theme::Icon::move_medium),
Theme::iconFromName(Theme::Icon::move_medium),
toolbarIcon(Theme::move_medium),
this);
m_rotateToolAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_ROTATE_TOOL,
@@ -513,8 +526,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_E),
true,
false,
Theme::iconFromName(Theme::Icon::roatate_medium),
Theme::iconFromName(Theme::Icon::roatate_medium),
toolbarIcon(Theme::roatate_medium),
this);
m_scaleToolAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_SCALE_TOOL,
@@ -524,8 +536,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_R),
true,
false,
Theme::iconFromName(Theme::Icon::scale_medium),
Theme::iconFromName(Theme::Icon::scale_medium),
toolbarIcon(Theme::scale_medium),
this);
m_fitAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_FIT_SELECTED,
@@ -535,8 +546,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_F),
false,
false,
Theme::iconFromName(Theme::Icon::fitToView_medium),
{},
toolbarIcon(Theme::fitToView_medium),
this);
m_alignCamerasAction = new Edit3DCameraAction(
@@ -546,8 +556,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(),
false,
false,
Theme::iconFromName(Theme::Icon::alignToCam_medium),
{},
toolbarIcon(Theme::alignToCam_medium),
this);
m_alignViewAction = new Edit3DCameraAction(
@@ -557,8 +566,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(),
false,
false,
Theme::iconFromName(Theme::Icon::alignToView_medium),
{},
toolbarIcon(Theme::alignToView_medium),
this);
m_cameraModeAction = new Edit3DAction(
@@ -569,8 +577,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_T),
true,
false,
Theme::iconFromName(Theme::Icon::orthCam_small),
Theme::iconFromName(Theme::Icon::perspectiveCam_small),
toolbarIcon(Theme::orthCam_small, Theme::perspectiveCam_small),
this);
m_orientationModeAction = new Edit3DAction(
@@ -580,20 +587,19 @@ void Edit3DView::createEdit3DActions()
QKeySequence(Qt::Key_Y),
true,
false,
Theme::iconFromName(Theme::Icon::localOrient_medium),
Theme::iconFromName(Theme::Icon::globalOrient_medium),
toolbarIcon(Theme::localOrient_medium),
this);
m_editLightAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_EDIT_LIGHT,
View3DActionType::EditLightToggle,
QCoreApplication::translate("EditLightToggleAction",
"Toggle Edit Light On/Off"),
QKeySequence(Qt::Key_U),
true,
false,
Theme::iconFromName(Theme::Icon::editLightOff_medium),
Theme::iconFromName(Theme::Icon::editLightOn_medium),
this);
m_editLightAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_EDIT_LIGHT,
View3DActionType::EditLightToggle,
QCoreApplication::translate("EditLightToggleAction",
"Toggle Edit Light On/Off"),
QKeySequence(Qt::Key_U),
true,
false,
toolbarIcon(Theme::editLightOff_medium, Theme::editLightOn_medium),
this);
m_showGridAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_EDIT_SHOW_GRID,
@@ -603,7 +609,6 @@ void Edit3DView::createEdit3DActions()
true,
true,
{},
{},
this,
nullptr,
QCoreApplication::translate("ShowGridAction", "Toggle the visibility of the helper grid."));
@@ -616,7 +621,6 @@ void Edit3DView::createEdit3DActions()
true,
true,
{},
{},
this,
nullptr,
QCoreApplication::translate("ShowSelectionBoxAction",
@@ -630,7 +634,6 @@ void Edit3DView::createEdit3DActions()
true,
true,
{},
{},
this,
nullptr,
QCoreApplication::translate(
@@ -645,7 +648,6 @@ void Edit3DView::createEdit3DActions()
true,
false,
{},
{},
this,
nullptr,
QCoreApplication::translate(
@@ -662,7 +664,6 @@ void Edit3DView::createEdit3DActions()
true,
false,
{},
{},
this,
nullptr,
QCoreApplication::translate(
@@ -696,51 +697,48 @@ void Edit3DView::createEdit3DActions()
};
m_particleViewModeAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_PARTICLE_MODE,
View3DActionType::Edit3DParticleModeToggle,
QCoreApplication::translate("ParticleViewModeAction", "Toggle particle animation On/Off"),
QKeySequence(Qt::Key_V),
true,
false,
Theme::iconFromName(Theme::Icon::particleAnimation_medium),
Theme::iconFromName(Theme::Icon::particleAnimation_medium),
this,
particlesTrigger);
QmlDesigner::Constants::EDIT3D_PARTICLE_MODE,
View3DActionType::Edit3DParticleModeToggle,
QCoreApplication::translate("ParticleViewModeAction", "Toggle particle animation On/Off"),
QKeySequence(Qt::Key_V),
true,
false,
toolbarIcon(Theme::particleAnimation_medium),
this,
particlesTrigger);
particlemode = false;
m_particlesPlayAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_PARTICLES_PLAY,
View3DActionType::ParticlesPlay,
QCoreApplication::translate("ParticlesPlayAction", "Play Particles"),
QKeySequence(Qt::Key_Comma),
true,
true,
Theme::iconFromName(Theme::Icon::playOutline_medium), //Icons::EDIT3D_PARTICLE_PLAY.icon(),
Theme::iconFromName(Theme::Icon::pause), // Icons::EDIT3D_PARTICLE_PAUSE.icon(),
this,
particlesPlayTrigger);
QmlDesigner::Constants::EDIT3D_PARTICLES_PLAY,
View3DActionType::ParticlesPlay,
QCoreApplication::translate("ParticlesPlayAction", "Play Particles"),
QKeySequence(Qt::Key_Comma),
true,
true,
toolbarIcon(Theme::playOutline_medium, Theme::pause), // Icons::EDIT3D_PARTICLE_PLAY.icon(), Icons::EDIT3D_PARTICLE_PAUSE.icon(),
this,
particlesPlayTrigger);
m_particlesRestartAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_PARTICLES_RESTART,
View3DActionType::ParticlesRestart,
QCoreApplication::translate("ParticlesRestartAction", "Restart Particles"),
QKeySequence(Qt::Key_Slash),
false,
false,
Theme::iconFromName(Theme::Icon::restartParticles_medium),
Theme::iconFromName(Theme::Icon::restartParticles_medium),
this);
QmlDesigner::Constants::EDIT3D_PARTICLES_RESTART,
View3DActionType::ParticlesRestart,
QCoreApplication::translate("ParticlesRestartAction", "Restart Particles"),
QKeySequence(Qt::Key_Slash),
false,
false,
toolbarIcon(Theme::restartParticles_medium),
this);
m_particlesPlayAction->action()->setEnabled(particlemode);
m_particlesRestartAction->action()->setEnabled(particlemode);
m_resetAction = new Edit3DAction(QmlDesigner::Constants::EDIT3D_RESET_VIEW,
View3DActionType::Empty,
QCoreApplication::translate("ResetView", "Reset View"),
QKeySequence(Qt::Key_P),
false,
false,
Theme::iconFromName(Theme::Icon::resetView_small),
{},
this,
resetTrigger);
m_resetAction = new Edit3DAction(
QmlDesigner::Constants::EDIT3D_RESET_VIEW,
View3DActionType::Empty,
QCoreApplication::translate("ResetView", "Reset View"),
QKeySequence(Qt::Key_P),
false,
false,
toolbarIcon(Theme::reload_medium),
this,
resetTrigger);
SelectionContextOperation visibilityTogglesTrigger = [this](const SelectionContext &) {
if (!edit3DWidget()->visibilityTogglesMenu())
@@ -766,8 +764,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(),
false,
false,
Theme::iconFromName(Theme::Icon::invisible_medium),
Theme::iconFromName(Theme::Icon::visible_medium),
toolbarIcon(Theme::invisible_medium, Theme::visible_medium),
this,
visibilityTogglesTrigger);
@@ -795,8 +792,7 @@ void Edit3DView::createEdit3DActions()
QKeySequence(),
false,
false,
Theme::iconFromName(Theme::Icon::colorSelection_medium),
{},
toolbarIcon(Theme::colorSelection_medium),
this,
backgroundColorActionsTrigger);

4
src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp
View File

@@ -70,6 +70,10 @@ Edit3DWidget::Edit3DWidget(Edit3DView *view)
{
setAcceptDrops(true);
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
sheet += Utils::FileReader::fetchQrc(":/qmldesigner/scrollbar.css");
setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(sheet)));
Core::Context context(Constants::C_QMLEDITOR3D);
m_context = new Core::IContext(this);
m_context->setContext(context);