Skip to content

Show warning when pygame is not available #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
Oct 31, 2019
Merged

Show warning when pygame is not available #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions lib/eco/eco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

try:
import __pypy__
print("Warning: PyQt4 is currently not supported in PyPy. Some features thus have been disabled.")
print("Warning: PyQt is currently not supported in PyPy. Some features thus have been disabled.")
except ImportError:
pass

Expand Down Expand Up @@ -611,11 +611,12 @@ def __init__(self):
import pydot
self.ui.actionParse_Tree.triggered.connect(self.showParseView)
self.ui.actionStateGraph.triggered.connect(self.showStateView)
self.ui.actionPvShow.triggered.connect(self.showPygameTree)
except ImportError:
sys.stderr.write("Warning: pydot not installed, so viewing of trees is disabled.\n")
sys.stderr.write("Warning: pydot not installed. Viewing of parse trees/graphs disabled.\n")
self.ui.actionParse_Tree.setEnabled(False)
self.ui.actionPvShow.setEnabled(False)
self.ui.actionStateGraph.setEnabled(False)
self.ui.actionPvShow.triggered.connect(self.showPygameTree)

self.ui.actionSettings.triggered.connect(self.showSettingsView)
self.ui.actionAbout.triggered.connect(self.showAboutView)
Expand Down Expand Up @@ -833,6 +834,14 @@ def contextMenu(self, pos):
self.btReparse([])

def showPygameTree(self):
os.environ['PYGAME_HIDE_SUPPORT_PROMPT'] = "hide"
try:

@ltratt ltratt Oct 31, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This puts more stuff than necessary in the try I think? Could we not do something like:

os.environ[...] = ...
try:
    import pygame
except ImportError:
    ...
    return
self.ui.actionPvShow...

@ptersilie ptersilie Oct 31, 2019

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. The self.ui stuff wasn't needed here so I removed it.

import pygame
except ImportError:
sys.stderr.write("Warning: pygame not installed. Interactive viewing of parse trees disabled.\n")
self.ui.actionPvShow.setEnabled(False)
return

if not self.pgviewer:
editor = self.getEditor()
tree = editor.tm.main_lbox
Expand Down Expand Up @@ -1491,6 +1500,7 @@ def toggle_menu(self, enabled=True):
self.ui.actionParse_Tree.setEnabled(enabled)
except ImportError:
pass
self.ui.actionPvShow.setEnabled(enabled)
self.ui.actionCode_complete.setEnabled(enabled)
self.ui.menuChange_language_box.setEnabled(enabled)
self.ui.actionPreview.setEnabled(enabled)
Expand Down
3 changes: 3 additions & 0 deletions lib/eco/gui/gui.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,9 @@
<property name="text">
<string>TreeView (Pygame)</string>
</property>
<property name="enabled">
<bool>false</bool>
</property>
</action>
<action name="actionAutomatic_language_box_detection">
<property name="checkable">
Expand Down