diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/student.png b/python/educational-python/resources/icons/com/jetbrains/edu/student.png deleted file mode 100644 index fdbc396340ca..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/student.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/student@2x.png b/python/educational-python/resources/icons/com/jetbrains/edu/student@2x.png deleted file mode 100644 index 82d8f440584e..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/student@2x.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/student@2x_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/student@2x_dark.png deleted file mode 100644 index a7ca5d9581fe..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/student@2x_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover.png b/python/educational-python/resources/icons/com/jetbrains/edu/studentHover.png deleted file mode 100644 index 64a0ff68766f..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x.png b/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x.png deleted file mode 100644 index b60140a4bbd8..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x_dark.png deleted file mode 100644 index 4d8207a2656d..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover@2x_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/studentHover_dark.png deleted file mode 100644 index b5385bad9a50..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/studentHover_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/student_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/student_dark.png deleted file mode 100644 index 4efad501f167..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/student_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacher.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacher.png deleted file mode 100644 index 28da147975cb..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacher.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x.png deleted file mode 100644 index 394058469d47..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x_dark.png deleted file mode 100644 index cb19d80c3212..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacher@2x_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover.png deleted file mode 100644 index f69ee7b81849..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x.png deleted file mode 100644 index 2ee14a703210..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x_dark.png deleted file mode 100644 index ce43e8255fc0..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover@2x_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover_dark.png deleted file mode 100644 index 549874805389..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacherHover_dark.png and /dev/null differ diff --git a/python/educational-python/resources/icons/com/jetbrains/edu/teacher_dark.png b/python/educational-python/resources/icons/com/jetbrains/edu/teacher_dark.png deleted file mode 100644 index 71aeb7440711..000000000000 Binary files a/python/educational-python/resources/icons/com/jetbrains/edu/teacher_dark.png and /dev/null differ diff --git a/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java b/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java deleted file mode 100644 index 5c8f2bcedf10..000000000000 --- a/python/educational-python/src/com/jetbrains/python/edu/CustomizeEduStepPanel.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.jetbrains.python.edu; - -import com.intellij.ide.util.PropertiesComponent; -import com.intellij.openapi.ui.VerticalFlowLayout; -import com.intellij.util.ui.JBUI; -import icons.PythonEducationalIcons; - -import javax.swing.*; -import java.awt.*; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; - -public class CustomizeEduStepPanel extends JPanel { - static final String COURSE_CREATOR_ENABLED = "Edu.CourseCreator.Enabled"; - private final JLabel myStudent; - - public CustomizeEduStepPanel() { - final FlowLayout layout = new FlowLayout(); - layout.setHgap(20); - setLayout(layout); - int iconSize = JBUI.scale(180); - final JPanel studentPanel = new JPanel(new VerticalFlowLayout()); - final JLabel teacher = new JLabel(PythonEducationalIcons.Teacher); - myStudent = new JLabel(PythonEducationalIcons.StudentHover); - myStudent.setPreferredSize(new Dimension(iconSize, iconSize)); - myStudent.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - PropertiesComponent.getInstance().setValue(COURSE_CREATOR_ENABLED, false); - myStudent.setIcon(PythonEducationalIcons.StudentHover); - teacher.setIcon(PythonEducationalIcons.Teacher); - } - }); - studentPanel.add(myStudent); - studentPanel.add(new JLabel("Student", SwingConstants.CENTER)); - add(studentPanel); - - teacher.setPreferredSize(new Dimension(iconSize, iconSize)); - final JPanel teacherPanel = new JPanel(new VerticalFlowLayout()); - teacherPanel.add(teacher); - teacherPanel.add(new JLabel("Teacher", SwingConstants.CENTER)); - teacher.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent e) { - PropertiesComponent.getInstance().setValue(COURSE_CREATOR_ENABLED, true); - myStudent.setIcon(PythonEducationalIcons.Student); - teacher.setIcon(PythonEducationalIcons.TeacherHover); - } - }); - add(teacherPanel); - } - - public JComponent getStudentButton() { - return myStudent; - } -} diff --git a/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java b/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java index 7c9f24dc94d5..3311bb5eb04a 100644 --- a/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java +++ b/python/educational-python/src/com/jetbrains/python/edu/PyCharmEduInitialConfigurator.java @@ -56,7 +56,6 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerListener; import com.intellij.openapi.project.ex.ProjectManagerEx; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Ref; @@ -213,7 +212,6 @@ public class PyCharmEduInitialConfigurator { @Override public void appFrameCreated(String[] commandLineArgs, @NotNull Ref willOpenProject) { if (!propertiesComponent.isValueSet(CONFIGURED_V3)) { - showInitialConfigurationDialog(); propertiesComponent.setValue(CONFIGURED_V3, "true"); } } @@ -411,12 +409,4 @@ public class PyCharmEduInitialConfigurator { } } } - private static void showInitialConfigurationDialog() { - DialogBuilder dialog = new DialogBuilder(); - final CustomizeEduStepPanel panel = new CustomizeEduStepPanel(); - dialog.setPreferredFocusComponent(panel.getStudentButton()); - dialog.title("Are you Student or Teacher?").centerPanel(panel); - dialog.addOkAction().setText("Start using Pycharm Edu"); - dialog.show(); - } }