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

QmlDesigner: Use correct icons for formatting operations

Browse Source 
Change-Id: Ic3f18361e46970a176a2494b0557665c20a87f16
Reviewed-by: Pekka Kaikkonen <pekka.kaikkonen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-05-26 13:17:49 +02:00
parent c2bc7b8d3c
commit 003ab51c3d
1 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -27,8 +27,8 @@
#include "changestyleaction.h"
#include "designeractionmanagerview.h"
#include "modelnodecontextmenu_helper.h"
#include "formatoperation.h"
#include "modelnodecontextmenu_helper.h"
#include "qmldesignerconstants.h"
#include "rewritingexception.h"
#include <bindingproperty.h>
@@ -36,6 +36,7 @@
#include <nodelistproperty.h>
#include <nodemetainfo.h>
#include <nodeproperty.h>
#include <theme.h>
#include <formeditortoolbutton.h>
@@ -46,11 +47,11 @@
#include <listmodeleditor/listmodeleditordialog.h>
#include <listmodeleditor/listmodeleditormodel.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/icore.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h>
#include <utils/stylehelper.h>
#include <utils/utilsicons.h>
#include <QGraphicsLinearLayout>
@@ -992,40 +993,55 @@ void DesignerActionManager::createDefaultDesignerActions()
addDesignerAction(new SeperatorDesignerAction(editCategory, 220));
addDesignerAction(new ModelNodeAction(
resetPositionCommandId,
resetPositionDisplayName,
Utils::Icon({{":/utils/images/pan.png", Utils::Theme::IconsBaseColor},
{":/utils/images/iconoverlay_reset.png", Utils::Theme::IconsStopToolBarColor}}).icon(),
resetPositionTooltip,
editCategory,
QKeySequence("Ctrl+d"),
200,
&resetPosition,
&selectionNotEmptyAndHasXorYProperty));
addDesignerAction(
new ModelNodeAction(resetPositionCommandId,
resetPositionDisplayName,
Utils::Icon({{":/utils/images/pan.png", Utils::Theme::IconsBaseColor},
{":/utils/images/iconoverlay_reset.png",
Utils::Theme::IconsStopToolBarColor}})
.icon(),
resetPositionTooltip,
editCategory,
QKeySequence("Ctrl+d"),
200,
&resetPosition,
&selectionNotEmptyAndHasXorYProperty));
addDesignerAction(new ModelNodeAction(
copyFormatCommandId,
copyFormatDisplayName,
Utils::Icon({{":/qmldesigner/icon/designeractions/images/raise.png", Utils::Theme::IconsBaseColor}}).icon(),
copyFormatTooltip,
editCategory,
QKeySequence(),
120,
&copyFormat,
&propertiesCopyable));
const QString fontName = "qtds_propertyIconFont.ttf";
const QColor iconColorNormal(Theme::getColor(Theme::IconsBaseColor));
const QIcon pasteIcon = Utils::StyleHelper::getIconFromIconFont(fontName,
Theme::getIconUnicode(
Theme::Icon::pasteStyle),
28,
28,
iconColorNormal);
addDesignerAction(new ModelNodeAction(
applyFormatCommandId,
applyFormatDisplayName,
Utils::Icon({{":/qmldesigner/icon/designeractions/images/lower.png", Utils::Theme::IconsBaseColor}}).icon(),
applyFormatTooltip,
editCategory,
QKeySequence(),
120,
&applyFormat,
&propertiesApplyable));
const QIcon copyIcon = Utils::StyleHelper::getIconFromIconFont(fontName,
Theme::getIconUnicode(
Theme::Icon::copyStyle),
28,
28,
iconColorNormal);
addDesignerAction(new ModelNodeAction(copyFormatCommandId,
copyFormatDisplayName,
copyIcon,
copyFormatTooltip,
editCategory,
QKeySequence(),
120,
&copyFormat,
&propertiesCopyable));
addDesignerAction(new ModelNodeAction(applyFormatCommandId,
applyFormatDisplayName,
pasteIcon,
applyFormatTooltip,
editCategory,
QKeySequence(),
120,
&applyFormat,
&propertiesApplyable));
addDesignerAction(new ModelNodeAction(
resetSizeCommandId,