From cf154644ac81f945bbb2fb8bc9830c3a367a2470 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 23 Feb 2024 20:29:36 +0100 Subject: Qt Designer: Use more theme icons Pick-to: 6.7 Change-Id: I55957a16d354becfb59bd560458db6b9d1eb51a7 Reviewed-by: Qt CI Bot Reviewed-by: Jarek Kobus --- .../src/components/propertyeditor/pixmapeditor.cpp | 6 ++++-- src/designer/src/lib/shared/codedialog.cpp | 6 ++++-- .../src/lib/shared/previewconfigurationwidget.cpp | 3 ++- src/designer/src/lib/shared/richtexteditor.cpp | 24 ++++++++++++++-------- 4 files changed, 26 insertions(+), 13 deletions(-) (limited to 'src/designer') diff --git a/src/designer/src/components/propertyeditor/pixmapeditor.cpp b/src/designer/src/components/propertyeditor/pixmapeditor.cpp index db18b7389..19f5a428a 100644 --- a/src/designer/src/components/propertyeditor/pixmapeditor.cpp +++ b/src/designer/src/components/propertyeditor/pixmapeditor.cpp @@ -70,8 +70,10 @@ PixmapEditor::PixmapEditor(QDesignerFormEditorInterface *core, QWidget *parent) m_resourceAction(new QAction(tr("Choose Resource..."), this)), m_fileAction(new QAction(tr("Choose File..."), this)), m_themeAction(new QAction(tr("Set Icon From Theme..."), this)), - m_copyAction(new QAction(createIconSet(u"editcopy.png"_s), tr("Copy Path"), this)), - m_pasteAction(new QAction(createIconSet(u"editpaste.png"_s), tr("Paste Path"), this)), + m_copyAction(new QAction(createIconSet(QIcon::ThemeIcon::EditCopy, "editcopy.png"_L1), + tr("Copy Path"), this)), + m_pasteAction(new QAction(createIconSet(QIcon::ThemeIcon::EditPaste, "editpaste.png"_L1), + tr("Paste Path"), this)), m_layout(new QHBoxLayout(this)), m_pixmapCache(nullptr) { diff --git a/src/designer/src/lib/shared/codedialog.cpp b/src/designer/src/lib/shared/codedialog.cpp index 639cd7da8..ad460922d 100644 --- a/src/designer/src/lib/shared/codedialog.cpp +++ b/src/designer/src/lib/shared/codedialog.cpp @@ -59,12 +59,14 @@ CodeDialog::CodeDialog(QWidget *parent) : // Edit tool bar QToolBar *toolBar = new QToolBar; - const QIcon saveIcon = createIconSet(u"filesave.png"_s); + const QIcon saveIcon = createIconSet(QIcon::ThemeIcon::DocumentSave, + "filesave.png"_L1); QAction *saveAction = toolBar->addAction(saveIcon, tr("Save...")); connect(saveAction, &QAction::triggered, this, &CodeDialog::slotSaveAs); #if QT_CONFIG(clipboard) - const QIcon copyIcon = createIconSet(u"editcopy.png"_s); + const QIcon copyIcon = createIconSet(QIcon::ThemeIcon::EditCopy, + "editcopy.png"_L1); QAction *copyAction = toolBar->addAction(copyIcon, tr("Copy All")); connect(copyAction, &QAction::triggered, this, &CodeDialog::copyAll); #endif diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index 67e6442ca..49a654856 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -109,7 +109,8 @@ PreviewConfigurationWidget::PreviewConfigurationWidgetPrivate::PreviewConfigurat QObject::connect(m_ui.m_appStyleSheetClearButton, &QAbstractButton::clicked, m_ui.m_appStyleSheetLineEdit, &qdesigner_internal::TextPropertyEditor::clear); - m_ui.m_skinRemoveButton->setIcon(qdesigner_internal::createIconSet(u"editdelete.png"_s)); + m_ui.m_skinRemoveButton->setIcon(qdesigner_internal::createIconSet(QIcon::ThemeIcon::EditDelete, + "editdelete.png"_L1)); // skins: find default skins (resources) m_ui.m_skinRemoveButton->setEnabled(false); Skins skins = defaultSkins(); diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index a7bff1d74..e6b414149 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -407,19 +407,22 @@ RichTextEditorToolBar::RichTextEditorToolBar(QDesignerFormEditorInterface *core, // Bold, italic and underline buttons m_bold_action = createCheckableAction( - createIconSet(u"textbold.png"_s), tr("Bold"), this); + createIconSet(QIcon::ThemeIcon::FormatTextBold, + "textbold.png"_L1), tr("Bold"), this); connect(m_bold_action, &QAction::triggered, editor, &RichTextEditor::setFontBold); m_bold_action->setShortcut(tr("CTRL+B")); addAction(m_bold_action); m_italic_action = createCheckableAction( - createIconSet(u"textitalic.png"_s), tr("Italic"), this); + createIconSet(QIcon::ThemeIcon::FormatTextItalic, + "textitalic.png"_L1), tr("Italic"), this); connect(m_italic_action, &QAction::triggered, editor, &RichTextEditor::setFontItalic); m_italic_action->setShortcut(tr("CTRL+I")); addAction(m_italic_action); m_underline_action = createCheckableAction( - createIconSet(u"textunder.png"_s), tr("Underline"), this); + createIconSet(QIcon::ThemeIcon::FormatTextUnderline, + "textunder.png"_L1), tr("Underline"), this); connect(m_underline_action, &QAction::triggered, editor, &RichTextEditor::setFontUnderline); m_underline_action->setShortcut(tr("CTRL+U")); addAction(m_underline_action); @@ -433,23 +436,28 @@ RichTextEditorToolBar::RichTextEditorToolBar(QDesignerFormEditorInterface *core, this, &RichTextEditorToolBar::alignmentActionTriggered); m_align_left_action = createCheckableAction( - createIconSet(u"textleft.png"_s), tr("Left Align"), alignment_group); + createIconSet(QIcon::ThemeIcon::FormatJustifyLeft, + "textleft.png"_L1), tr("Left Align"), alignment_group); addAction(m_align_left_action); m_align_center_action = createCheckableAction( - createIconSet(u"textcenter.png"_s), tr("Center"), alignment_group); + createIconSet(QIcon::ThemeIcon::FormatJustifyCenter, + "textcenter.png"_L1), tr("Center"), alignment_group); addAction(m_align_center_action); m_align_right_action = createCheckableAction( - createIconSet(u"textright.png"_s), tr("Right Align"), alignment_group); + createIconSet(QIcon::ThemeIcon::FormatJustifyRight, + "textright.png"_L1), tr("Right Align"), alignment_group); addAction(m_align_right_action); m_align_justify_action = createCheckableAction( - createIconSet(u"textjustify.png"_s), tr("Justify"), alignment_group); + createIconSet(QIcon::ThemeIcon::FormatJustifyFill, + "textjustify.png"_L1), tr("Justify"), alignment_group); addAction(m_align_justify_action); m_layoutDirectionAction = createCheckableAction( - createIconSet(u"righttoleft.png"_s), tr("Right to Left")); + createIconSet(QIcon::ThemeIcon::FormatTextDirectionRtl, + "righttoleft.png"_L1), tr("Right to Left")); connect(m_layoutDirectionAction, &QAction::triggered, this, &RichTextEditorToolBar::layoutDirectionChanged); addAction(m_layoutDirectionAction); -- cgit v1.2.3