Merge remote-tracking branch 'origin/develop' into develop

Conflicts: bin/freeze/main.spec
rproepp · Sep 7, 2013 · 5da7914 · 5da7914
2 parents b1171de + 854842b
commit 5da7914
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/bin/freeze/Info.plist b/bin/freeze/Info.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict><key>CFBundleShortVersionString</key>
-<string>0.2.1</string>
+<string>0.4.0</string>
 <key>CFBundleExecutable</key>
 <string>MacOS/spykeviewer</string>
 <key>CFBundleName</key>

diff --git a/bin/freeze/main.spec b/bin/freeze/main.spec
@@ -15,9 +15,9 @@ import spykeviewer
 module_path = os.path.dirname(spykeviewer.__file__)
 viewer_path = os.path.dirname(module_path)
 
+
 def find_version(path):
     try:
-
         f = open(os.path.join(path, 'spykeviewer', '__init__.py'), 'r')
         try:
             for line in f:
@@ -77,5 +77,5 @@ coll = COLLECT(exe, a.binaries, a.zipfiles, a.datas, strip=None,
                upx=False, name=dist_dir)
 
 if platform.system() == 'Darwin':
-    app = BUNDLE(exe, appname='Spyke Viewer',
+    app = BUNDLE(exe, name='Spyke Viewer.app',
         version=find_version(viewer_path))
diff --git a/doc/source/extending.rst b/doc/source/extending.rst
@@ -85,7 +85,9 @@ using ``matplotlib`` for the plot, you first have to import it by adding::
 
     import matplotlib.pyplot as plt
 
-at the top of the plugin file.
+at the top of the plugin file. Note that ``matplotlib`` is already imported
+in the console, but you have to explicitly import everything you need in
+plugins.
 
 Next, replace the code in the ``start`` method by::
 

diff --git a/spykeviewer/ui/main_window.py b/spykeviewer/ui/main_window.py
@@ -203,7 +203,6 @@ def p(x):
 
         # Docks
         self.setCentralWidget(None)
-        self.update_view_menu()
 
         # Finish initialization if we are not a subclass
         if type(self) is MainWindow:
@@ -265,6 +264,7 @@ def update_view_menu(self):
         if hasattr(self, 'menuView'):
             a = self.menuView.menuAction()
             self.mainMenu.removeAction(a)
+            self.menuView.clear()
         self.menuView = self.createPopupMenu()
         self.menuView.setTitle('&View')
         self.mainMenu.insertMenu(self.menuHelp.menuAction(), self.menuView)
@@ -1547,4 +1547,4 @@ def closeEvent(self, event):
         self.fileTreeView.setModel(None)
         del self.file_system_model
         self.pluginsTreeView.setModel(None)
-        del self.plugin_model
+        del self.plugin_model