Mercurial Repositories > eric / file diff

--- a/Project/ProjectSourcesBrowser.py	Mon Apr 21 19:23:08 2014 +0200
+++ b/Project/ProjectSourcesBrowser.py	Wed Apr 23 21:30:14 2014 +0200
@@ -105,12 +105,11 @@
         ProjectBaseBrowser._createPopupMenus(self)
         self.sourceMenuActions = {}
         
-        if self.project.pdata["PROGLANGUAGE"][0] in \
-                ["Python", "Python2", "Python3"]:
+        if self.project.isPythonProject():
             self.__createPythonPopupMenus()
-        elif self.project.pdata["PROGLANGUAGE"][0] == "Ruby":
+        elif self.project.isRubyProject():
             self.__createRubyPopupMenus()
-        elif self.project.pdata["PROGLANGUAGE"][0] == "JavaScript":
+        elif self.project.isJavaScriptProject():
             self.__createJavaScriptPopupMenus()
         
     def __createPythonPopupMenus(self):
@@ -361,8 +360,6 @@
         self.attributeMenu.addMenu(self.gotoMenu)
         self.attributeMenu.addSeparator()
         self.attributeMenu.addAction(
-            self.tr('New package...'), self.__addNewPackage)
-        self.attributeMenu.addAction(
             self.tr('Add source files...'), self.project.addSourceFiles)
         self.attributeMenu.addAction(
             self.tr('Add source directory...'), self.project.addSourceDir)
@@ -621,8 +618,7 @@
                         itm = self.model().item(index)
                         if isinstance(itm, ProjectBrowserFileItem):
                             fn = itm.fileName()
-                            if self.project.pdata["PROGLANGUAGE"][0] in \
-                               ["Python", "Python2", "Python3"]:
+                            if self.project.isPythonProject():
                                 if fn.endswith('.ptl'):
                                     for act in self.sourceMenuActions.values():
                                         act.setEnabled(False)
@@ -640,6 +636,15 @@
                                     self.unittestAction.setEnabled(False)
                                     self.checksMenu.menuAction().setEnabled(
                                         False)
+                                elif fn.endswith('.js'):  # entry for mixed
+                                                          # mode programs
+                                    for act in self.sourceMenuActions.values():
+                                        act.setEnabled(False)
+                                    self.unittestAction.setEnabled(False)
+                                    self.checksMenu.menuAction().setEnabled(
+                                        False)
+                                    self.graphicsMenu.menuAction().setEnabled(
+                                        False)
                                 else:  # assume the source file is a
                                        # Python file
                                     for act in self.sourceMenuActions.values():