Revert "Merge pull request #1575 from robotframework/HelioGuilherme66-improvements"

This reverts commit 48a712c, reversing
changes made to c843738.

Author: yanne

src/robotide/__init__.py

@@ -32,30 +32,31 @@
 from string import Template
 
 errorMessageTemplate = Template("""$reason
-You need to install wxPython 2.8.12.1 or 3.0.2 or newer with unicode support \
-to run RIDE. wxPython can be downloaded from \
-http://sourceforge.net/projects/wxpython/files/wxPython/""")
-supported_versions = ["2.8", "3.0"]
+You need to install wxPython 2.8.12.1 with unicode support to run RIDE.
+wxPython 2.8.12.1 can be downloaded from http://sourceforge.net/projects/wxpython/files/wxPython/2.8.12.1/""")
+supported_versions = ["2.8"]
 
 try:
     import wxversion
     from wxversion import VersionError
+    if sys.platform == 'darwin':
+        supported_versions.append("2.9")
     wxversion.select(supported_versions)
     import wx
 except ImportError as e:
-    if "no appropriate 64-bit architecture" in "{0}".format(e).lower() and \
+    if "no appropriate 64-bit architecture" in e.message.lower() and \
        sys.platform == 'darwin':
-        print("python should be executed in 32-bit mode with wxPython on OSX.")
+        print "python should be executed in 32-bit mode with wxPython on OSX."
     else:
-        print(errorMessageTemplate.substitute(reason="wxPython not found."))
+        print errorMessageTemplate.substitute(reason="wxPython not found.")
     sys.exit(1)
 except VersionError:
-    print(errorMessageTemplate.substitute(reason="Wrong wxPython version."))
+    print errorMessageTemplate.substitute(reason="Wrong wxPython version.")
     sys.exit(1)
 
 if "ansi" in wx.PlatformInfo:
-    print(errorMessageTemplate.substitute(reason="wxPython with ansi encoding \
-is not supported"))
+    print errorMessageTemplate.substitute(
+        reason="wxPython with ansi encoding is not supported")
     sys.exit(1)
 
 
@@ -66,7 +67,7 @@
 def main(*args):
     noupdatecheck, debug_console, inpath = _parse_args(args)
     if len(args) > 3 or '--help' in args:
-        print(__doc__)
+        print __doc__
         sys.exit()
     try:
         _run(inpath, not noupdatecheck, debug_console)
@@ -81,7 +82,7 @@ def _parse_args(args):
         return False, False, None
     noupdatecheck = '--noupdatecheck' in args
     debug_console = '--debugconsole' in args
-    inpath = args[-1] if args[-1] not in ['--noupdatecheck', '--debugconsole']\
+    inpath = args[-1] if args[-1] not in ['--noupdatecheck', '--debugconsole'] \
         else None
     return noupdatecheck, debug_console, inpath
 
@@ -106,17 +107,19 @@ def _show_old_wxpython_warning_if_needed(parent=None):
     if wx.VERSION >= (2, 8, 12, 1):
         return
     title = 'Please upgrade your wxPython installation'
-    message = ("RIDE officially supports wxPython 2.8.12.1, 3.0.2 and newer \
-releases in 3.0 series. Your current version is {0}.\n\n \
-Older wxPython versions are known to miss some features used by RIDE.\n \
-wxPython 2.8.12.1 packages can be found from\n \
-http://sourceforge.net/projects/wxpython/files/wxPython/2.8.12.1/.".format(
-        wx.VERSION_STRING))
+    message = ('RIDE officially supports wxPython 2.8.12.1. '
+               'Your current version is %s.\n\n'
+               'Older wxPython versions are known to miss some features used by RIDE. '
+               'Notice also that wxPython 3.0 is not yet supported.\n\n'
+               'wxPython 2.8.12.1 packages can be found from\n'
+               'http://sourceforge.net/projects/wxpython/files/wxPython/2.8.12.1/.'
+               % wx.VERSION_STRING)
     style = wx.ICON_EXCLAMATION
     if not parent:
-        _ = wx.App()
-        parent = wx.Frame(None, size=(0, 0))
+        _ = wx.PySimpleApp()
+        parent = wx.Frame(None, size=(0,0))
     wx.MessageDialog(parent, message, title, style).ShowModal()
 
+
 if __name__ == '__main__':
     main(sys.argv[1:])

src/robotide/application/application.py

@@ -88,12 +88,10 @@ def _get_editor(self):
 
     def _load_data(self):
         path = self._initial_path or self._get_latest_path()
-        # FIXME: Loading suite on startuup causes segfault in OSX.
-        if path and not context.IS_MAC:
+        if path:
             with self.active_event_loop():
-                # FIXME: wxPython3 hack
-                # observer = LoadProgressObserver(self.frame)
-                self._controller.load_data(path, None)
+                observer = LoadProgressObserver(self.frame)
+                self._controller.load_data(path, observer)
 
     def _find_robot_installation(self):
         output = utils.run_python_command(

src/robotide/application/pluginconnector.py

@@ -65,10 +65,10 @@ class BrokenPlugin(_PluginConnector):
 
     def __init__(self, error, plugin_class):
         name = utils.name_from_class(plugin_class, 'Plugin')
-        doc = 'The plugin is disabled because it failed to load properly.\n' \
-              + 'Error: {}'.format(error)
+        doc = 'This plugin is disabled because it failed to load properly.\n' \
+               + 'Error: ' + error
         _PluginConnector.__init__(self, name, doc=doc, error=error)
-        LOG.error("Taking {} plugin into use failed:\n{}".format(name, error))
+        LOG.error("Taking %s plugin into use failed:\n%s" % (name, error))
 
     def enable_on_startup(self):
         pass

src/robotide/editor/grid.py

@@ -36,7 +36,6 @@ def __init__(self, parent, num_rows, num_cols, popup_creator=None,
         self.SetDefaultRenderer(grid.GridCellAutoWrapStringRenderer())
         self._clipboard_handler = ClipboardHandler(self)
         self._history = _GridState()
-        self.SetColMinimalAcceptableWidth(70)
         self.CreateGrid(num_rows, num_cols)
         self._popup_creator = popup_creator or PopupCreator()
         self.settings = settings

src/robotide/log/log.py

@@ -40,7 +40,7 @@ def __init__(self, app):
         self._log = []
         self._window = None
         self._path = os.path.join(
-            tempfile.gettempdir(), '{0}-ride.log'.format(uuid.uuid4()))
+            tempfile.gettempdir(), '{}-ride.log'.format(uuid.uuid4()))
         self._outfile = None
         self._remove_old_log_files()
         atexit.register(self._close)
@@ -56,7 +56,7 @@ def _remove_old_log_files(self):
             try:
                 os.remove(fname)
             except OSError or IOError as e:
-                sys.stderr.write("{0}".format(e))
+                sys.stderr.write("{}".format(e))
 
     @property
     def _logfile(self):
@@ -103,36 +103,33 @@ def OnViewLog(self, event):
             self.notebook.show_tab(self._window)
 
 
-class _LogWindow(wx.Panel):
+class _LogWindow(wx.TextCtrl):
 
     def __init__(self, notebook, log):
-        wx.Panel.__init__(self, notebook)
-        self._output = wx.TextCtrl(self, style=wx.TE_READONLY | wx.TE_MULTILINE)
+        wx.TextCtrl.__init__(
+            self, notebook, style=wx.TE_READONLY | wx.TE_MULTILINE)
         self._log = log
+        self._create_ui()
         self._add_to_notebook(notebook)
         self.SetFont(widgets.Font().fixed_log)
-        self.Bind(wx.EVT_SIZE, self.OnSize)
 
     def _create_ui(self):
-        self.SetSizer(widgets.VerticalSizer())
-        self.Sizer.add_expanding(self._output)
+        sizer = wx.BoxSizer(wx.VERTICAL)
+        sizer.Add(self)
+        self.SetSizer(sizer)
 
     def _add_to_notebook(self, notebook):
-        notebook.add_tab(self, 'RIDE Log', allow_closing=True)
+        notebook.add_tab(self, 'Log', allow_closing=True)
         notebook.show_tab(self)
-        self._output.SetSize(self.Size)
 
     def close(self, notebook):
         notebook.delete_tab(self)
 
     def update_log(self):
-        self._output.SetValue(self._decode_log(self._log))
+        self.SetValue(self._decode_log(self._log))
 
     def _decode_log(self, log):
         result = ''
         for msg in log:
             result += _message_to_string(msg)
         return result
-
-    def OnSize(self, evt):
-        self._output.SetSize(self.Size)

src/robotide/preferences/saving.py

@@ -24,7 +24,7 @@ class SavingPreferences(widgets.PreferencesPanel):
     def __init__(self, settings, *args, **kwargs):
         super(SavingPreferences, self).__init__(*args, **kwargs)
         self._settings = settings
-        self.SetSizer(wx.FlexGridSizer(cols=2))
+        self.SetSizer(wx.FlexGridSizer(rows=7, cols=2))
         for editor in self._create_editors(settings):
             self._add_editor(editor)
 

src/robotide/preferences/settings.cfg

@@ -20,10 +20,10 @@ library xml directories = []
 txt number of spaces = 4
 txt format separator = 'space'
 line separator = 'native'
-default file format = 'robot'
+default file format = 'txt'
 
 [Text Edit]
-font size = 9
+font size = 8
 argument = '#bb8844'
 comment = 'black'
 error = 'black'
@@ -38,7 +38,7 @@ tc_kw_name = '#aaaaaa'
 variable = '#008080'
 
 [Grid]
-font size = 9
+font size = 8
 fixed font = False
 col size = 170
 max col size = 300

src/robotide/publish/__init__.py

@@ -119,11 +119,6 @@ def important_action(self):
 
 import os
 
-from robotide.context import WX_VERSION
-if WX_VERSION > '3.0':
-    from wx.lib.pubsub import setuparg1
-elif WX_VERSION > '2.9':
-    from wx.lib.pubsub import setupv1
 from messages import *
 from publisher import PUBLISHER
 

src/robotide/publish/messages.py

@@ -12,12 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-try:
-    from wx.lib.pubsub import Publisher
-    WxPublisher = Publisher()
-except ImportError:
-    from wx.lib.pubsub import pub
-    WxPublisher = pub.getDefaultPublisher()
 import inspect
 import sys
 import traceback

src/robotide/publish/publisher.py

@@ -12,13 +12,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-try:
-    from wx.lib.pubsub import Publisher
-    WxPublisher = Publisher()
-except ImportError:
-    from wx.lib.pubsub import pub
-    WxPublisher = pub.getDefaultPublisher()
-
 
 class Publisher(object):
 
@@ -74,7 +67,6 @@ class _ListenerWrapper(object):
     def __init__(self, listener, topic):
         self.listener = listener
         self.topic = self._get_topic(topic)
-        WxPublisher.subscribe(self, self.topic)
 
     def _get_topic(self, topic):
         if not isinstance(topic, basestring):
@@ -88,7 +80,7 @@ def listens(self, topic):
         return self._get_topic(topic).startswith(self.topic)
 
     def unsubscribe(self):
-        WxPublisher.unsubscribe(self, self.topic)
+        pass
 
     def __call__(self, data):
         from messages import RideLogException