From 620bd20563ca89c2d38558b95ec3e660b1a96aed Mon Sep 17 00:00:00 2001 From: Nikita Iarychenko Date: Wed, 18 Jun 2025 14:54:40 +0400 Subject: [PATCH] OPENIDE #193 Remove dialog with feedback after jetbrains onboarding (cherry picked from commit 813fc8b73633d8b84103ebff98c8c2d9e71a80ae) (cherry picked from commit 14798d2fd609bd8ea90451f91e22b8689b030bc7) (cherry picked from commit a2451a2f5fd270725a3d43e1dbacd7d89878cf92) (cherry picked from commit 596b8758fa8ea77a8d840fe8cd1c07203979b6e0) --- .../src/training/ui/OnboardingFeedbackForm.kt | 8 ++++++-- .../src/training/ui/views/LearnPanel.kt | 14 +++++++++----- .../src/training/ui/views/ModulesPanel.kt | 7 +++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt index aa83bc5914f7..e1ec6a7dbda7 100644 --- a/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt +++ b/plugins/ide-features-trainer/src/training/ui/OnboardingFeedbackForm.kt @@ -1,4 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// +// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru). +// Any modifications are available on the same license terms as the original source code. package training.ui import com.intellij.icons.AllIcons @@ -113,7 +116,8 @@ fun showOnboardingFeedbackNotification(project: Project?, onboardingFeedbackData showOnboardingLessonFeedbackForm(project, onboardingFeedbackData, true) } }) - notification.notify(project) + // mute notification in OpenIDE + //notification.notify(project) } fun showOnboardingLessonFeedbackForm(project: Project?, diff --git a/plugins/ide-features-trainer/src/training/ui/views/LearnPanel.kt b/plugins/ide-features-trainer/src/training/ui/views/LearnPanel.kt index f2a2ae8f3319..afc7b2b9609e 100644 --- a/plugins/ide-features-trainer/src/training/ui/views/LearnPanel.kt +++ b/plugins/ide-features-trainer/src/training/ui/views/LearnPanel.kt @@ -1,4 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// +// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru). +// Any modifications are available on the same license terms as the original source code. package training.ui.views import com.intellij.icons.AllIcons @@ -236,10 +239,11 @@ internal class LearnPanel(val learnToolWindow: LearnToolWindow) : JPanel() { LessonManager.instance.stopLesson() val langSupport = LangManager.getInstance().getLangSupport() val project = learnToolWindow.project - langSupport?.onboardingFeedbackData?.let { - showOnboardingLessonFeedbackForm(project, it, false) - langSupport.onboardingFeedbackData = null - } + // Hide dialog in OpenIDE + //langSupport?.onboardingFeedbackData?.let { + // showOnboardingLessonFeedbackForm(project, it, false) + // langSupport.onboardingFeedbackData = null + //} if (langSupport != null && isLearningProject(project, langSupport.primaryLanguage)) { CloseProjectWindowHelper().windowClosing(project) diff --git a/plugins/ide-features-trainer/src/training/ui/views/ModulesPanel.kt b/plugins/ide-features-trainer/src/training/ui/views/ModulesPanel.kt index 2b8241465a2c..67a96f70b568 100644 --- a/plugins/ide-features-trainer/src/training/ui/views/ModulesPanel.kt +++ b/plugins/ide-features-trainer/src/training/ui/views/ModulesPanel.kt @@ -1,4 +1,7 @@ -// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. +// +// Modified by Nikita Iarychenko at 2025 as part of the OpenIDE project(https://openide.ru). +// Any modifications are available on the same license terms as the original source code. package training.ui.views import com.intellij.lang.Language @@ -56,7 +59,7 @@ class ModulesPanel(project: Project) : JPanel() { modulesPanel.maximumSize = Dimension(UISettings.getInstance().let { it.panelWidth - (it.westInset + it.eastInset) }, 10000) add(modulesPanel) add(Box.createVerticalGlue()) - addFooter() + //addFooter() } private fun addHeaderPanel() {