Merge remote-tracking branch 'origin/master'

platform/platform-api/src/com/intellij/openapi/ui/LabeledComponent.java

@@ -181,7 +181,7 @@ public class LabeledComponent<Comp extends JComponent> extends JPanel implements
     }
 
     public static TextWithMnemonic fromTextWithMnemonic(String textWithMnemonic) {
-      int mnemonicIndex = textWithMnemonic.indexOf('&');
+      int mnemonicIndex = UIUtil.getDisplayMnemonicIndex(textWithMnemonic);
       if (mnemonicIndex == -1) {
         return new TextWithMnemonic(textWithMnemonic, -1);
       }

python/educational-core/course-creator/resources/META-INF/plugin.xml

@@ -20,7 +20,7 @@
   -->
   <depends>com.intellij.modules.platform</depends>
   <depends>com.jetbrains.edu.core</depends>
-  <depends>com.jetbrains.edu.student</depends>
+  <depends>com.jetbrains.edu.interactivelearning</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <projectService serviceImplementation="com.jetbrains.edu.coursecreator.CCProjectService"/>

python/educational-core/student/resources/META-INF/plugin.xml

@@ -1,6 +1,6 @@
 <!--suppress XmlUnboundNsPrefix -->
 <idea-plugin version="2">
-  <id>com.jetbrains.edu.student</id>
+  <id>com.jetbrains.edu.interactivelearning</id>
   <name>Educational plugin core</name>
   <version>2.0.4</version>
   <idea-version since-build="143.403"/>

python/educational-python/build/plugin-list.txt

@@ -4,8 +4,8 @@ remote-servers-git
 github
 IntelliLang
 IntelliLang-python
-student
-student-python
+interactive-learning
+interactive-learning-python
 course-creator
 course-creator-python
 hg4idea

python/educational-python/build/pycharm_edu_build.gant

@@ -224,10 +224,10 @@ public layoutEducational(String classesPath, Set usedJars) {
 
 private layoutPlugins(layouts) {
   dir("plugins") {
-    layouts.layoutPlugin("student")
-    layouts.layoutPlugin("student-python") {
+    layouts.layoutPlugin("interactive-learning")
+    layouts.layoutPlugin("interactive-learning-python") {
       dir("courses") {
-        fileset(dir: "$pythonEduHome/student-python/resources/courses")
+        fileset(dir: "$pythonEduHome/interactive-learning-python/resources/courses")
       }
     }
     layouts.layoutPlugin("course-creator")

python/educational-python/student-python/resources/META-INF/plugin.xml

@@ -1,6 +1,6 @@
 <!--suppress XmlUnboundNsPrefix -->
 <idea-plugin version="2">
-  <id>com.jetbrains.python.edu.student.python</id>
+  <id>com.jetbrains.python.edu.interactivelearning.python</id>
   <name>Educational plugin for PyCharm</name>
   <version>2.0.4</version>
   <idea-version since-build="143.403"/>
@@ -17,7 +17,7 @@
 
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.python</depends>
-  <depends>com.jetbrains.edu.student</depends>
+  <depends>com.jetbrains.edu.interactivelearning</depends>
   <depends>com.jetbrains.edu.core</depends>
   <depends>com.jetbrains.python.edu.core</depends>