Merge remote-tracking branch 'origin/master'

python/resources/idea/PythonApplicationInfo.xml

@@ -8,7 +8,7 @@
   <names product="PyCharm" fullname="PyCharm" script="charm"/>
   <install-over minbuild="0" maxbuild="0" version="1.x"/>
 
-  <welcome-screen caption-url="/welcomeCaption.png" slogan-url="/developSlogan.png"/>
+  <welcome-screen logo-url="/pycharm_welcomeScreen.png" caption-url="/welcomeCaption.png" slogan-url="/developSlogan.png"/>
 
   <update-urls logo-url="/Logo_welcomeScreen.png"
                check="http://www.jetbrains.com/updates/updates.xml"

python/src/com/jetbrains/python/ui/IdeaDialog.java

@@ -47,7 +47,7 @@ public abstract  class IdeaDialog extends DialogWrapper {
         field.getDocument().addDocumentListener(new MyDocumentListener());
     }
 
-    protected void addUpdater(JCheckBox check) {
+    protected void addUpdater(JToggleButton check) {
         check.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {
                 updateOkButton();