From 6336bb71baade89a221fe6705f0a94101f5a38ea Mon Sep 17 00:00:00 2001 From: Alexey Varfolomeev Date: Fri, 20 Aug 2021 08:25:16 +0400 Subject: [PATCH] No symbolic icons --- src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml | 4 ++-- src/kcmkwin/kwinrules/package/contents/ui/RulesList.qml | 4 ++-- src/kcmkwin/kwinrules/rulesmodel.cpp | 8 ++++---- src/useractions.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml b/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml index 6b85d19bd8..49ab2e15e5 100644 --- a/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml +++ b/src/kcmkwin/kwinrules/package/contents/ui/RulesEditor.qml @@ -83,7 +83,7 @@ ScrollViewKCM { footer: RowLayout { QQC2.Button { text: checked ? i18n("Close") : i18n("Add Property...") - icon.name: checked ? "dialog-close" : "list-add-symbolic" + icon.name: checked ? "dialog-close" : "list-add" checkable: true checked: propertySheet.sheetOpen onToggled: { @@ -214,7 +214,7 @@ ScrollViewKCM { } } QQC2.ToolButton { - icon.name: (model.enabled) ? "dialog-ok-apply" : "list-add-symbolic" + icon.name: (model.enabled) ? "dialog-ok-apply" : "list-add" opacity: propertyDelegate.hovered ? 1 : 0 onClicked: propertyDelegate.clicked() Layout.preferredWidth: implicitWidth diff --git a/src/kcmkwin/kwinrules/package/contents/ui/RulesList.qml b/src/kcmkwin/kwinrules/package/contents/ui/RulesList.qml index c88740eb68..5792ada95d 100644 --- a/src/kcmkwin/kwinrules/package/contents/ui/RulesList.qml +++ b/src/kcmkwin/kwinrules/package/contents/ui/RulesList.qml @@ -70,7 +70,7 @@ ScrollViewKCM { text: i18n("Select the rules to export") actions: [ Kirigami.Action { - iconName: "object-select-symbolic" + iconName: "dialog-ok-apply" text: checked ? i18n("Unselect All") : i18n("Select All") checkable: true checked: selectedIndexes.length === ruleBookView.count @@ -97,7 +97,7 @@ ScrollViewKCM { footer: RowLayout { QQC2.Button { text: i18n("Add New...") - icon.name: "list-add-symbolic" + icon.name: "list-add" enabled: !exportInfo.visible onClicked: { kcm.createRule(); diff --git a/src/kcmkwin/kwinrules/rulesmodel.cpp b/src/kcmkwin/kwinrules/rulesmodel.cpp index 2b18c90363..19a42b6168 100644 --- a/src/kcmkwin/kwinrules/rulesmodel.cpp +++ b/src/kcmkwin/kwinrules/rulesmodel.cpp @@ -420,7 +420,7 @@ void RulesModel::populateRuleList() auto size = addRule(new RuleItem(QLatin1String("size"), RulePolicy::SetRule, RuleItem::Size, i18n("Size"), i18n("Size & Position"), - QIcon::fromTheme("image-resize-symbolic"))); + QIcon::fromTheme("transform-scale"))); size->setFlag(RuleItem::AffectsWarning); addRule(new RuleItem(QLatin1String("maximizehoriz"), @@ -500,12 +500,12 @@ void RulesModel::populateRuleList() addRule(new RuleItem(QLatin1String("minsize"), RulePolicy::ForceRule, RuleItem::Size, i18n("Minimum Size"), i18n("Size & Position"), - QIcon::fromTheme("image-resize-symbolic"))); + QIcon::fromTheme("transform-scale"))); addRule(new RuleItem(QLatin1String("maxsize"), RulePolicy::ForceRule, RuleItem::Size, i18n("Maximum Size"), i18n("Size & Position"), - QIcon::fromTheme("image-resize-symbolic"))); + QIcon::fromTheme("transform-scale"))); addRule(new RuleItem(QLatin1String("strictgeometry"), RulePolicy::ForceRule, RuleItem::Boolean, @@ -721,7 +721,7 @@ QList RulesModel::windowTypesModelData() const { NET::Splash, i18n("Splash Screen") , QIcon::fromTheme("embosstool") }, { NET::Desktop, i18n("Desktop") , QIcon::fromTheme("desktop") }, // { NET::Override, i18n("Unmanaged Window") }, deprecated - { NET::TopMenu, i18n("Standalone Menubar"), QIcon::fromTheme("open-menu-symbolic") }, + { NET::TopMenu, i18n("Standalone Menubar"), QIcon::fromTheme("application-menu") }, { NET::OnScreenDisplay, i18n("On Screen Display"), QIcon::fromTheme("osd-duplicate") } }; return modelData; diff --git a/src/useractions.cpp b/src/useractions.cpp index f042a7c085..450beac31f 100644 --- a/src/useractions.cpp +++ b/src/useractions.cpp @@ -338,7 +338,7 @@ void UserActionsMenu::init() action = m_menu->addMenu(advancedMenu); action->setText(i18n("&More Actions")); - action->setIcon(QIcon::fromTheme(QStringLiteral("view-more-symbolic"))); + action->setIcon(QIcon::fromTheme(QStringLiteral("overflow-menu"))); m_closeOperation = m_menu->addAction(i18n("&Close")); m_closeOperation->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));