diff --git a/plugins/ide-features-trainer/res/img/dislike.svg b/platform/icons/src/ide/dislike.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislike.svg rename to platform/icons/src/ide/dislike.svg diff --git a/plugins/ide-features-trainer/res/img/dislikeDimmed.svg b/platform/icons/src/ide/dislikeDimmed.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislikeDimmed.svg rename to platform/icons/src/ide/dislikeDimmed.svg diff --git a/plugins/ide-features-trainer/res/img/dislikeDimmed_dark.svg b/platform/icons/src/ide/dislikeDimmed_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislikeDimmed_dark.svg rename to platform/icons/src/ide/dislikeDimmed_dark.svg diff --git a/plugins/ide-features-trainer/res/img/dislikeSelected.svg b/platform/icons/src/ide/dislikeSelected.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislikeSelected.svg rename to platform/icons/src/ide/dislikeSelected.svg diff --git a/plugins/ide-features-trainer/res/img/dislikeSelected_dark.svg b/platform/icons/src/ide/dislikeSelected_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislikeSelected_dark.svg rename to platform/icons/src/ide/dislikeSelected_dark.svg diff --git a/plugins/ide-features-trainer/res/img/dislike_dark.svg b/platform/icons/src/ide/dislike_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/dislike_dark.svg rename to platform/icons/src/ide/dislike_dark.svg diff --git a/plugins/ide-features-trainer/res/img/like.svg b/platform/icons/src/ide/like.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/like.svg rename to platform/icons/src/ide/like.svg diff --git a/plugins/ide-features-trainer/res/img/likeDimmed.svg b/platform/icons/src/ide/likeDimmed.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/likeDimmed.svg rename to platform/icons/src/ide/likeDimmed.svg diff --git a/plugins/ide-features-trainer/res/img/likeDimmed_dark.svg b/platform/icons/src/ide/likeDimmed_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/likeDimmed_dark.svg rename to platform/icons/src/ide/likeDimmed_dark.svg diff --git a/plugins/ide-features-trainer/res/img/likeSelected.svg b/platform/icons/src/ide/likeSelected.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/likeSelected.svg rename to platform/icons/src/ide/likeSelected.svg diff --git a/plugins/ide-features-trainer/res/img/likeSelected_dark.svg b/platform/icons/src/ide/likeSelected_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/likeSelected_dark.svg rename to platform/icons/src/ide/likeSelected_dark.svg diff --git a/plugins/ide-features-trainer/res/img/like_dark.svg b/platform/icons/src/ide/like_dark.svg similarity index 100% rename from plugins/ide-features-trainer/res/img/like_dark.svg rename to platform/icons/src/ide/like_dark.svg diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index f79353634dd9..99c7cddb172c 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -597,6 +597,9 @@ public class AllIcons { public static final class Ide { /** 16x16 */ public static final @NotNull Icon ConfigFile = load("ide/configFile.svg", -170575912, 2); + /** 20x20 */ public static final @NotNull Icon Dislike = load("ide/dislike.svg", 1759391914, 2); + /** 20x20 */ public static final @NotNull Icon DislikeDimmed = load("ide/dislikeDimmed.svg", 585883274, 2); + /** 20x20 */ public static final @NotNull Icon DislikeSelected = load("ide/dislikeSelected.svg", -924234289, 2); /** 6x6 */ public static final @NotNull Icon ErrorPoint = load("ide/errorPoint.svg", 1899475559, 2); /** 14x14 */ public static final @NotNull Icon External_link_arrow = load("ide/external_link_arrow.svg", 425782437, 0); /** 16x16 */ public static final @NotNull Icon FatalErrorRead = load("ide/fatalError-read.svg", -716280782, 2); @@ -611,6 +614,9 @@ public class AllIcons { /** 16x16 */ public static final @NotNull Icon HectorOn = load("ide/hectorOn.svg", 1056820765, 2); /** 16x16 */ public static final @NotNull Icon HectorSyntax = load("ide/hectorSyntax.svg", 1917397148, 2); /** 16x16 */ public static final @NotNull Icon IncomingChangesOn = load("ide/incomingChangesOn.svg", 682827200, 2); + /** 20x20 */ public static final @NotNull Icon Like = load("ide/like.svg", -637362778, 2); + /** 20x20 */ public static final @NotNull Icon LikeDimmed = load("ide/likeDimmed.svg", 1182004021, 2); + /** 20x20 */ public static final @NotNull Icon LikeSelected = load("ide/likeSelected.svg", 1328910833, 2); /** 12x12 */ public static final @NotNull Icon Link = load("ide/link.svg", 1119728065, 2); /** 16x16 */ public static final @NotNull Icon LocalScope = load("ide/localScope.svg", -1788752276, 0); /** 16x16 */ public static final @NotNull Icon LocalScopeAction = load("ide/localScopeAction.svg", -1396890428, 2); diff --git a/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java b/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java index 4e67cc0add97..46deabbdcc6d 100644 --- a/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java +++ b/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java @@ -15,16 +15,10 @@ public final class FeaturesTrainerIcons { return IconManager.getInstance().loadRasterizedIcon(path, FeaturesTrainerIcons.class.getClassLoader(), cacheKey, flags); } /** 16x16 */ public static final @NotNull Icon Checkmark = load("img/checkmark.svg", 20507421, 2); - /** 20x20 */ public static final @NotNull Icon Dislike = load("img/dislike.svg", 1759391914, 2); - /** 20x20 */ public static final @NotNull Icon DislikeDimmed = load("img/dislikeDimmed.svg", 585883274, 2); - /** 20x20 */ public static final @NotNull Icon DislikeSelected = load("img/dislikeSelected.svg", -924234289, 2); /** 16x16 */ public static final @NotNull Icon FeatureTrainer = load("img/featureTrainer.svg", -702544516, 2); /** 16x16 */ public static final @NotNull Icon FeatureTrainerBanner = load("img/featureTrainerBanner.svg", -1484196788, 2); /** 13x13 */ public static final @NotNull Icon FeatureTrainerToolWindow = load("img/featureTrainerToolWindow.svg", -1207567605, 2); /** 16x16 */ public static final @NotNull Icon GreenCheckmark = load("img/greenCheckmark.svg", 1470976909, 2); - /** 20x20 */ public static final @NotNull Icon Like = load("img/like.svg", -637362778, 2); - /** 20x20 */ public static final @NotNull Icon LikeDimmed = load("img/likeDimmed.svg", 1182004021, 2); - /** 20x20 */ public static final @NotNull Icon LikeSelected = load("img/likeSelected.svg", 1328910833, 2); /** 40x40 */ public static final @NotNull Icon PluginIcon = load("img/pluginIcon.svg", -1525812347, 0); /** 16x16 */ public static final @NotNull Icon ResetLesson = load("img/resetLesson.svg", 98607716, 2); } diff --git a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt index 5a03bb17e250..40c43451bbec 100644 --- a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt +++ b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt @@ -7,6 +7,7 @@ import com.intellij.feedback.common.dialog.COMMON_FEEDBACK_SYSTEM_INFO_VERSION import com.intellij.feedback.common.dialog.CommonFeedbackSystemInfoData import com.intellij.feedback.common.dialog.showFeedbackSystemInfoDialog import com.intellij.feedback.common.submitGeneralFeedback +import com.intellij.icons.AllIcons import com.intellij.ide.RecentProjectsManagerBase import com.intellij.internal.statistic.local.ActionsLocalSummary import com.intellij.notification.Notification @@ -36,7 +37,6 @@ import com.intellij.util.ui.* import kotlinx.serialization.encodeToString import kotlinx.serialization.json.* import org.jetbrains.annotations.Nls -import training.FeaturesTrainerIcons import training.dsl.LessonUtil import training.lang.LangSupport import training.learn.LearnBundle @@ -307,8 +307,8 @@ private fun showSystemData(project: Project?, private fun createLikenessPanel(): Pair FeedbackLikenessAnswer> { val votePanel = NonOpaquePanel() - val likeIcon = getLikenessIcon(FeaturesTrainerIcons.Like) - val dislikeIcon = getLikenessIcon(FeaturesTrainerIcons.Dislike) + val likeIcon = getLikenessIcon(AllIcons.Ide.Like) + val dislikeIcon = getLikenessIcon(AllIcons.Ide.Dislike) votePanel.layout = BoxLayout(votePanel, BoxLayout.X_AXIS) val likeAnswer = FeedbackOption(likeIcon) votePanel.add(likeAnswer)