diff --git a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt index 12bf1027974c..22f8e6b49441 100644 --- a/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt +++ b/java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt @@ -201,7 +201,7 @@ class JavaOnboardingTourLesson : KLesson("java.onboarding", JavaLessonsBundle.me LessonUtil.returnToWelcomeScreenRemark())) .yesText(JavaLessonsBundle.message("java.onboarding.finish.exit")) .noText(JavaLessonsBundle.message("java.onboarding.finish.modules")) - .icon(FeaturesTrainerIcons.Img.PluginIcon) + .icon(FeaturesTrainerIcons.PluginIcon) .show(project) when (result) { diff --git a/plugins/ide-features-trainer/res/META-INF/plugin.xml b/plugins/ide-features-trainer/res/META-INF/plugin.xml index 60e2807670eb..58deaa223aa3 100644 --- a/plugins/ide-features-trainer/res/META-INF/plugin.xml +++ b/plugins/ide-features-trainer/res/META-INF/plugin.xml @@ -70,7 +70,7 @@ @@ -99,7 +99,7 @@ - + diff --git a/plugins/ide-features-trainer/res/learnProjects/.idea/icon.png b/plugins/ide-features-trainer/res/learnProjects/.idea/icon.png deleted file mode 100644 index 369569a5749f..000000000000 Binary files a/plugins/ide-features-trainer/res/learnProjects/.idea/icon.png and /dev/null differ diff --git a/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java b/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java index dc50b16141a6..4e67cc0add97 100644 --- a/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java +++ b/plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java @@ -14,30 +14,17 @@ public final class FeaturesTrainerIcons { private static @NotNull Icon load(@NotNull String path, int cacheKey, int flags) { return IconManager.getInstance().loadRasterizedIcon(path, FeaturesTrainerIcons.class.getClassLoader(), cacheKey, flags); } - - public static final class Img { - /** 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); - } - - public static final class LearnProjects { - public static final class Idea { - /** 72x72 */ public static final @NotNull Icon Icon = load("learnProjects/.idea/icon.png", 0, 0); - } - } - - public static final class METAINF { - /** 40x40 */ public static final @NotNull Icon PluginIcon = load("META-INF/pluginIcon.svg", -1525812347, 0); - } + /** 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/actions/RestartLessonAction.kt b/plugins/ide-features-trainer/src/training/actions/RestartLessonAction.kt index 766606c54b36..be83d6760d53 100644 --- a/plugins/ide-features-trainer/src/training/actions/RestartLessonAction.kt +++ b/plugins/ide-features-trainer/src/training/actions/RestartLessonAction.kt @@ -11,7 +11,7 @@ import training.statistic.LessonStartingWay import training.statistic.StatisticBase import training.ui.LearningUiManager -private class RestartLessonAction : AnAction(FeaturesTrainerIcons.Img.ResetLesson) { +private class RestartLessonAction : AnAction(FeaturesTrainerIcons.ResetLesson) { override fun actionPerformed(e: AnActionEvent) { val activeToolWindow = LearningUiManager.activeToolWindow ?: return val lesson = LessonManager.instance.currentLesson ?: return diff --git a/plugins/ide-features-trainer/src/training/learn/lesson/general/assistance/LocalHistoryLesson.kt b/plugins/ide-features-trainer/src/training/learn/lesson/general/assistance/LocalHistoryLesson.kt index 90570a4544a0..fab37160274c 100644 --- a/plugins/ide-features-trainer/src/training/learn/lesson/general/assistance/LocalHistoryLesson.kt +++ b/plugins/ide-features-trainer/src/training/learn/lesson/general/assistance/LocalHistoryLesson.kt @@ -149,7 +149,7 @@ class LocalHistoryLesson : KLesson("CodeAssistance.LocalHistory", LessonsBundle. LessonsBundle.message("recent.files.dialog.title"), CommonBundle.message("button.ok"), LearnBundle.message("learn.stop.lesson"), - FeaturesTrainerIcons.Img.PluginIcon + FeaturesTrainerIcons.PluginIcon ) if (userDecision != Messages.OK) { LessonManager.instance.stopLesson() diff --git a/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/RecentFilesLesson.kt b/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/RecentFilesLesson.kt index 1d79850b4cb4..78378031eb1a 100644 --- a/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/RecentFilesLesson.kt +++ b/plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/RecentFilesLesson.kt @@ -62,7 +62,7 @@ abstract class RecentFilesLesson : KLesson("Recent Files and Locations", Lessons LessonsBundle.message("recent.files.dialog.title"), CommonBundle.message("button.ok"), LearnBundle.message("learn.stop.lesson"), - FeaturesTrainerIcons.Img.PluginIcon + FeaturesTrainerIcons.PluginIcon ) if (userDecision != Messages.OK) { LessonManager.instance.stopLesson() diff --git a/plugins/ide-features-trainer/src/training/statistic/LearnProjectStateListener.kt b/plugins/ide-features-trainer/src/training/statistic/LearnProjectStateListener.kt index a7c7af0d1d23..f176b23f3a40 100644 --- a/plugins/ide-features-trainer/src/training/statistic/LearnProjectStateListener.kt +++ b/plugins/ide-features-trainer/src/training/statistic/LearnProjectStateListener.kt @@ -114,7 +114,7 @@ private fun notifyAboutNewLessons(project: Project, newLessons: List) { val previousOpenedVersion = CourseManager.instance.previousOpenedVersion StatisticBase.logNewLessonsNotification(newLessonsCount, previousOpenedVersion) val notification = iftNotificationGroup.createNotification(LearnBundle.message("notification.about.new.lessons"), NotificationType.INFORMATION) - notification.icon = FeaturesTrainerIcons.Img.FeatureTrainer + notification.icon = FeaturesTrainerIcons.FeatureTrainer notification.addAction(object : NotificationAction(LearnBundle.message("notification.show.new.lessons")) { override fun actionPerformed(e: AnActionEvent, notification: Notification) { diff --git a/plugins/ide-features-trainer/src/training/ui/IftTipAndTrickPromoter.kt b/plugins/ide-features-trainer/src/training/ui/IftTipAndTrickPromoter.kt index 1305cf22ffff..5c1b0a4ce20c 100644 --- a/plugins/ide-features-trainer/src/training/ui/IftTipAndTrickPromoter.kt +++ b/plugins/ide-features-trainer/src/training/ui/IftTipAndTrickPromoter.kt @@ -48,7 +48,7 @@ class IftTipAndTrickPromoter : TipAndTrickPromotionFactory { container.background = UISettings.getInstance().shortcutBackgroundColor val promotionLabel = JLabel(LearnBundle.message("tip.and.trick.promotion.label")) - promotionLabel.icon = FeaturesTrainerIcons.Img.FeatureTrainerBanner + promotionLabel.icon = FeaturesTrainerIcons.FeatureTrainerBanner promotionLabel.iconTextGap = JBUI.scale(6) container.add(Box.createRigidArea(JBDimension(12, 28))) container.add(promotionLabel) diff --git a/plugins/ide-features-trainer/src/training/ui/LessonMessagePane.kt b/plugins/ide-features-trainer/src/training/ui/LessonMessagePane.kt index 9dc0d7a7da63..454efbfb186f 100644 --- a/plugins/ide-features-trainer/src/training/ui/LessonMessagePane.kt +++ b/plugins/ide-features-trainer/src/training/ui/LessonMessagePane.kt @@ -263,7 +263,7 @@ internal class LessonMessagePane(private val panelMode: Boolean = true) : Styled continue } val icon = if (lessonMessage.state == MessageState.PASSED) { - FeaturesTrainerIcons.Img.GreenCheckmark + FeaturesTrainerIcons.GreenCheckmark } else if (!LessonManager.instance.lessonIsRunning()) { AllIcons.General.Information diff --git a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt index e07920fe5c80..5a03bb17e250 100644 --- a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt +++ b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt @@ -307,8 +307,8 @@ private fun showSystemData(project: Project?, private fun createLikenessPanel(): Pair FeedbackLikenessAnswer> { val votePanel = NonOpaquePanel() - val likeIcon = getLikenessIcon(FeaturesTrainerIcons.Img.Like) - val dislikeIcon = getLikenessIcon(FeaturesTrainerIcons.Img.Dislike) + val likeIcon = getLikenessIcon(FeaturesTrainerIcons.Like) + val dislikeIcon = getLikenessIcon(FeaturesTrainerIcons.Dislike) votePanel.layout = BoxLayout(votePanel, BoxLayout.X_AXIS) val likeAnswer = FeedbackOption(likeIcon) votePanel.add(likeAnswer) diff --git a/plugins/ide-features-trainer/src/training/ui/views/LearningItems.kt b/plugins/ide-features-trainer/src/training/ui/views/LearningItems.kt index 1df7e736299d..b18047ccf60e 100644 --- a/plugins/ide-features-trainer/src/training/ui/views/LearningItems.kt +++ b/plugins/ide-features-trainer/src/training/ui/views/LearningItems.kt @@ -72,7 +72,7 @@ class LearningItems(private val project: Project) : JPanel() { result.layout = BoxLayout(result, BoxLayout.X_AXIS) result.alignmentX = LEFT_ALIGNMENT result.border = EmptyBorder(JBUI.scale(7), JBUI.scale(7), JBUI.scale(6), JBUI.scale(7)) - val checkmarkIconLabel = createLabelIcon(if (lesson.passed) FeaturesTrainerIcons.Img.GreenCheckmark else EmptyIcon.ICON_16) + val checkmarkIconLabel = createLabelIcon(if (lesson.passed) FeaturesTrainerIcons.GreenCheckmark else EmptyIcon.ICON_16) result.add(createLabelIcon(EmptyIcon.ICON_16)) result.add(scaledRigid(UISettings.getInstance().expandAndModuleGap, 0)) result.add(checkmarkIconLabel) diff --git a/plugins/ide-features-trainer/src/training/ui/welcomeScreen/IFTInteractiveCourse.kt b/plugins/ide-features-trainer/src/training/ui/welcomeScreen/IFTInteractiveCourse.kt index b00d3b91bc5b..3d17a79f4a42 100644 --- a/plugins/ide-features-trainer/src/training/ui/welcomeScreen/IFTInteractiveCourse.kt +++ b/plugins/ide-features-trainer/src/training/ui/welcomeScreen/IFTInteractiveCourse.kt @@ -42,7 +42,7 @@ private class IFTInteractiveCourseData : InteractiveCourseData { } override fun getIcon(): Icon { - return FeaturesTrainerIcons.Img.PluginIcon + return FeaturesTrainerIcons.PluginIcon } override fun getActionButtonName(): String { diff --git a/plugins/ide-features-trainer/src/training/ui/welcomeScreen/OnboardingLessonPromoter.kt b/plugins/ide-features-trainer/src/training/ui/welcomeScreen/OnboardingLessonPromoter.kt index caf43fae2161..fed5f40e19da 100644 --- a/plugins/ide-features-trainer/src/training/ui/welcomeScreen/OnboardingLessonPromoter.kt +++ b/plugins/ide-features-trainer/src/training/ui/welcomeScreen/OnboardingLessonPromoter.kt @@ -36,7 +36,7 @@ open class OnboardingLessonPromoter(@NonNls private val lessonId: String, @Nls private val lessonName: String, @NonNls private val languageName: String) : BannerStartPagePromoter() { override val promoImage: Icon - get() = FeaturesTrainerIcons.Img.PluginIcon + get() = FeaturesTrainerIcons.PluginIcon override fun getPromotion(isEmptyState: Boolean): JPanel? { scheduleOnboardingFeedback() diff --git a/plugins/ide-features-trainer/testSrc/training/simple/MessageFactoryTest.kt b/plugins/ide-features-trainer/testSrc/training/simple/MessageFactoryTest.kt index 05d15f72d0b2..701507bbc0ab 100644 --- a/plugins/ide-features-trainer/testSrc/training/simple/MessageFactoryTest.kt +++ b/plugins/ide-features-trainer/testSrc/training/simple/MessageFactoryTest.kt @@ -85,7 +85,7 @@ class MessageFactoryTest : BasePlatformTestCase() { } fun testIconIdx() { - val icon = FeaturesTrainerIcons.Img.PluginIcon + val icon = FeaturesTrainerIcons.PluginIcon val index = LearningUiManager.getIconIndex(icon) val parts: List = convertOneParagraph("Press $index") @@ -95,7 +95,7 @@ class MessageFactoryTest : BasePlatformTestCase() { } fun testIllustration() { - val icon = FeaturesTrainerIcons.Img.PluginIcon + val icon = FeaturesTrainerIcons.PluginIcon val index = LearningUiManager.getIconIndex(icon) val parts: List = convertOneParagraph("$index") diff --git a/python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTourLesson.kt b/python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTourLesson.kt index 8e860caba03d..49de3e4e87ad 100644 --- a/python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTourLesson.kt +++ b/python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTourLesson.kt @@ -192,7 +192,7 @@ class PythonOnboardingTourLesson : LessonUtil.returnToWelcomeScreenRemark())) .yesText(PythonLessonsBundle.message("python.onboarding.finish.exit")) .noText(PythonLessonsBundle.message("python.onboarding.finish.modules")) - .icon(FeaturesTrainerIcons.Img.PluginIcon) + .icon(FeaturesTrainerIcons.PluginIcon) .show(project) when (result) {