MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[IFT] Remove unused icon and regenerate FeaturesTrainerIcons class

Browse Source 
IJ-CR-94315

GitOrigin-RevId: cb0b8119f504d082b1466c3b4ca41eeb71ee550a
This commit is contained in:
Alexey Merkulov
2022-08-17 20:34:15 +00:00
committed by intellij-monorepo-bot
parent 126a22060e
commit c3a34a3b17
16 changed files with 30 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-features-trainer/src/com/intellij/java/ift/lesson/essential/JavaOnboardingTourLesson.kt
+1 -1
View File
@@ -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) {
plugins/ide-features-trainer/res/META-INF/plugin.xml
+2 -2
View File
@@ -70,7 +70,7 @@
<applicationService serviceImplementation="training.learn.lesson.LessonStateBase"/>
<toolWindow id="Learn"
canCloseContents="true"
icon="training.FeaturesTrainerIcons.Img.FeatureTrainerToolWindow"
icon="training.FeaturesTrainerIcons.FeatureTrainerToolWindow"
factoryClass="training.ui.LearnToolWindowFactory"
/>
@@ -99,7 +99,7 @@
<!-- Help -->
<group id="LearnGroup">
<separator/>
<action id="ShowLearnPanel" class="training.actions.OpenLearnPanel" icon="training.FeaturesTrainerIcons.Img.FeatureTrainerToolWindow"/>
<action id="ShowLearnPanel" class="training.actions.OpenLearnPanel" icon="training.FeaturesTrainerIcons.FeatureTrainerToolWindow"/>
<separator/>
<add-to-group group-id="HelpMenu" relative-to-action="HelpTopics" anchor="after"/>
</group>
plugins/ide-features-trainer/res/learnProjects/.idea/icon.png
Generated
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 782 B

plugins/ide-features-trainer/src/training/FeaturesTrainerIcons.java
+13 -26
View File
@@ -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);
}
plugins/ide-features-trainer/src/training/actions/RestartLessonAction.kt
+1 -1
View File
@@ -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
plugins/ide-features-trainer/src/training/learn/lesson/general/assistance/LocalHistoryLesson.kt
+1 -1
View File
@@ -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()
plugins/ide-features-trainer/src/training/learn/lesson/general/navigation/RecentFilesLesson.kt
+1 -1
View File
@@ -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()
plugins/ide-features-trainer/src/training/statistic/LearnProjectStateListener.kt
+1 -1
View File
@@ -114,7 +114,7 @@ private fun notifyAboutNewLessons(project: Project, newLessons: List<Lesson>) {
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) {
plugins/ide-features-trainer/src/training/ui/IftTipAndTrickPromoter.kt
+1 -1
View File
@@ -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)
plugins/ide-features-trainer/src/training/ui/LessonMessagePane.kt
+1 -1
View File
@@ -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
plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt
+2 -2
View File
@@ -307,8 +307,8 @@ private fun showSystemData(project: Project?,
private fun createLikenessPanel(): Pair<NonOpaquePanel, () -> 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)
plugins/ide-features-trainer/src/training/ui/views/LearningItems.kt
+1 -1
View File
@@ -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)
plugins/ide-features-trainer/src/training/ui/welcomeScreen/IFTInteractiveCourse.kt
+1 -1
View File
@@ -42,7 +42,7 @@ private class IFTInteractiveCourseData : InteractiveCourseData {
}
override fun getIcon(): Icon {
return FeaturesTrainerIcons.Img.PluginIcon
return FeaturesTrainerIcons.PluginIcon
}
override fun getActionButtonName(): String {
plugins/ide-features-trainer/src/training/ui/welcomeScreen/OnboardingLessonPromoter.kt
+1 -1
View File
@@ -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()
plugins/ide-features-trainer/testSrc/training/simple/MessageFactoryTest.kt
+2 -2
View File
@@ -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<TextPart> = convertOneParagraph("Press <icon_idx>$index</icon_idx>")
@@ -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<TextPart> = convertOneParagraph("<illustration>$index</illustration>")
python/python-features-trainer/src/com/jetbrains/python/ift/lesson/essensial/PythonOnboardingTourLesson.kt
+1 -1
View File
@@ -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) {