Skip to content

Commit 9aac437

Browse files
committed
Miscellanous fixes
1 parent 5831a66 commit 9aac437

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

src/robotide/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
from string import Template
3333

3434
errorMessageTemplate = Template("""$reason
35-
You need to install wxPython 2.8.12.1 with unicode support to run RIDE.
36-
wxPython 2.8.12.1 can be downloaded from http://sourceforge.net/projects/wxpython/files/wxPython/2.8.12.1/""")
35+
You need to install wxPython 2.8.12.1 or 3.0.2 or newer with unicode support to run RIDE.
36+
wxPython can be downloaded from http://sourceforge.net/projects/wxpython/files/wxPython/""")
3737
supported_versions = ["2.8", "3.0"]
3838

3939
try:
@@ -105,7 +105,7 @@ def _show_old_wxpython_warning_if_needed(parent=None):
105105
if wx.VERSION >= (2, 8, 12, 1):
106106
return
107107
title = 'Please upgrade your wxPython installation'
108-
message = ('RIDE officially supports wxPython 2.8.12.1. '
108+
message = ('RIDE officially supports wxPython 2.8.12.1, 3.0.2 and newer releases in 3.0 series. '
109109
'Your current version is %s.\n\n'
110110
'Older wxPython versions are known to miss some features used by RIDE. '
111111
'Notice also that wxPython 3.0 is not yet supported.\n\n'

src/robotide/application/application.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,13 @@ def _get_editor(self):
8787
return maybe_editor
8888

8989
def _load_data(self):
90-
path = self._initial_path or self._get_latest_path()
90+
# FIXME: wxPython3 hack
91+
path = None #self._initial_path or self._get_latest_path()
9192
if path:
9293
with self.active_event_loop():
93-
observer = LoadProgressObserver(self.frame)
94-
self._controller.load_data(path, observer)
94+
# FIXME: wxPython3 hack
95+
#observer = LoadProgressObserver(self.frame)
96+
self._controller.load_data(path, None)
9597

9698
def _find_robot_installation(self):
9799
output = utils.run_python_command(

src/robotide/application/pluginconnector.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ class BrokenPlugin(_PluginConnector):
6565

6666
def __init__(self, error, plugin_class):
6767
name = utils.name_from_class(plugin_class, 'Plugin')
68-
doc = 'This plugin is disabled because it failed to load properly.\n' \
69-
+ 'Error: ' + error
68+
doc = 'The plugin is disabled because it failed to load properly.\n' \
69+
+ 'Error: {}'.format(error)
7070
_PluginConnector.__init__(self, name, doc=doc, error=error)
71-
LOG.error("Taking %s plugin into use failed:\n%s" % (name, error))
71+
LOG.error("Taking {} plugin into use failed:\n{}".format(name, error))
7272

7373
def enable_on_startup(self):
7474
pass

src/robotide/ui/pluginmanager.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(self, notebook):
2929
def show(self, plugins):
3030
if not self._tab:
3131
self._tab = _PluginPanel(self._notebook, plugins, self._show_tab)
32-
self._notebook.add_tab(self._tab, 'Manage Plugins')
32+
self._notebook.add_tab(self._tab, 'Manage Plugins', allow_closing=true)
3333
self._show_tab()
3434

3535
def _show_tab(self):

0 commit comments

Comments
 (0)