Merge pull request #1863 from HelioGuilherme66/pre_release_win

Cell Sizes fixes

Author: HelioGuilherme66

src/robotide/contrib/testrunner/testrunner.py

@@ -63,7 +63,6 @@
 
 ATEXIT_LOCK = threading.RLock()
 
-
 # Solution from https://stackoverflow.com/questions/10009753/python-dealing-with-mixed-encoding-files
 def mixed_decoder(unicodeError):
     errStr = unicodeError[1]
@@ -296,7 +295,7 @@ def _write_argfile(argfile, args):
             f = codecs.open(argfile, "wb")
             for item in args:
                 if is_unicode(item):
-                    enc_arg = item.encode(encoding.OUTPUT_ENCODING)
+                    enc_arg = item.encode(encoding.CONSOLE_ENCODING)  # DEBUG .OUTPUT_ENCODING)
                 else:
                     enc_arg = item
                 f.write(enc_arg+"\n")

src/robotide/contrib/testrunner/testrunnerplugin.py

@@ -488,8 +488,9 @@ def _format_command(self, argv):
         """
         result = []
         for arg in argv:
-            # if PY2 and is_unicode(arg):
-            #    arg = arg.encode(encoding.OUTPUT_ENCODING)  # DEBUG "utf-8")
+            if PY2 and is_unicode(arg):
+                arg = arg.encode(encoding.CONSOLE_ENCODING)  # DEBUG "utf-8")
+                # print("DEBUG: PY2 unicode args %s" % arg)
             if "'" in arg or " " in arg or "&" in arg:
                 # for windows, if there are spaces we need to use
                 # double quotes. Single quotes cause problems
@@ -521,14 +522,20 @@ def _AppendText(self, textctrl, string, source="stdout"):
         try:
             if PY2:
                 # textctrl.AppendText(string.encode(encoding.OUTPUT_ENCODING)) # DEBUG encoding.CONSOLE_ENCODING))  # DEBUG 'utf-8'))
-                textctrl.AppendText(string.encode('utf-8'))  # encoding.SYSTEM_ENCODING))
+                textctrl.AppendText(string.encode(encoding.SYSTEM_ENCODING))  # encoding.SYSTEM_ENCODING)) 'utf-8'
             else:
                 textctrl.AppendText(str(string))  # DEBUG
         except UnicodeDecodeError as e:
             # I'm not sure why I sometimes get this, and I don't know what I
             # can do other than to ignore it.
             textctrl.AppendTextRaw(bytes(string))  # DEBUG .encode('utf-8'))
-            # print("DEBUG UnicodeDecodeError appendtext string=%s\n" % string)
+            # print(r"DEBUG UnicodeDecodeError appendtext string=%s\n" % string)
+            pass
+        except UnicodeEncodeError as e:
+            # I'm not sure why I sometimes get this, and I don't know what I
+            # can do other than to ignore it.
+            textctrl.AppendText(string.encode('utf-8'))  # DEBUG .encode('utf-8'))
+            # print(r"DEBUG UnicodeDecodeError appendtext string=%s\n" % string)
             pass
             #  raise  # DEBUG
 

src/robotide/editor/cellrenderer.py

@@ -30,10 +30,42 @@ def __init__(self, default_width, max_width, auto_fit, word_wrap=True):
         self.auto_fit = auto_fit
         self.word_wrap = word_wrap
 
+    def _wordwrap(self, text, width, dc, breakLongWords=True, margin=0):
+        ''' modification of ofiginal wordwrap function without extra space'''
+        wrapped_lines = []
+        text = text.split('\n')
+        for line in text:
+            pte = dc.GetPartialTextExtents(line)
+            wid = (width - (2 * margin + 1) * dc.GetTextExtent(' ')[0])
+            idx = 0
+            start = 0
+            startIdx = 0
+            spcIdx = -1
+            while idx < len(pte):
+                # remember the last seen space
+                if line[idx] == ' ':
+                    spcIdx = idx
+
+                # have we reached the max width?
+                if pte[idx] - start > wid and (spcIdx != -1 or breakLongWords):
+                    if spcIdx != -1:
+                        idx = min(spcIdx + 1, len(pte) - 1)
+                    wrapped_lines.append(' ' * margin + line[startIdx: idx] + ' ' * margin)
+                    start = pte[idx]
+                    startIdx = idx
+                    spcIdx = -1
+
+                idx += 1
+
+            wrapped_lines.append(' ' * margin + line[startIdx: idx] + ' ' * margin)
+
+        return '\n'.join(wrapped_lines)
+
     def Draw(self, grid, attr, dc, rect, row, col, isSelected):
         text = grid.GetCellValue(row, col)
         dc.SetFont(attr.GetFont())
-        text = wordwrap.wordwrap(text, grid.GetColSize(col), dc, breakLongWords=False)
+        suggest_width = grid.GetColSize(col)
+        text = self._wordwrap(text, suggest_width, dc, breakLongWords=False)
         hAlign, vAlign = attr.GetAlignment()
         if isSelected:
             bg = grid.GetSelectionBackground()
@@ -57,35 +89,27 @@ def GetBestSize(self, grid, attr, dc, row, col):
         _font = attr.GetFont()
         dc.SetFont(_font)
 
-        col_width = grid.GetColSize(col)
-        # margin = 2  # get border width into account when submitting optimal col size
-        margin = 0
-        w, h = _font.GetPixelSize()
-        if len(text) > 0:
-            w_sz = w * len(text) + 2 * w
-        else:
-            return wx.Size(2 * w, h)  # self.default_width
+        if len(text) == 0:
+            return dc.GetTextExtent("  ")  # self.default_width
 
+        w, h = dc.GetTextExtent(text)
         if self.auto_fit:
-            col_width = min(w_sz, col_width)
-            if col_width > self.max_width:
-                col_width = self.max_width
+            col_width = min(w, self.max_width)
         else:
-            col_width = min(w_sz, self.default_width)
-
+            col_width = min(w, self.default_width)
+        row_height = h
         if self.word_wrap:
-            text = wordwrap.wordwrap(text, col_width, dc, breakLongWords=False,
-                                     margin=margin)
+            suggest_width = max(grid.GetColSize(col), col_width)
+            text = self._wordwrap(text, suggest_width, dc, breakLongWords=False)
             w, h = dc.GetMultiLineTextExtent(text)
-        else:
-            w = col_width
-        if self.auto_fit:
-            if w_sz > self.max_width:
-                w_sz = self.max_width
-            w = max(w, w_sz)
-        else:
-            return wx.Size(self.default_width, h)
-        return wx.Size(w, h)
+            row_height = h
+            if self.auto_fit:
+                col_width = min(w, col_width)
+            else:
+                col_width = min(w, self.default_width)
+        # do not shrink col size (subtract col margin which is 10 pixels )
+        col_width = max(grid.GetColSize(col) - 10, col_width)
+        return wx.Size(col_width, row_height)
 
     def Clone(self):  # real signature unknown; restored from __doc__
         """ Clone(self) -> GridCellRenderer """

src/robotide/editor/contentassist.py

@@ -38,6 +38,7 @@ def __init__(self, suggestion_source):
         self.Bind(wx.EVT_KEY_DOWN, self.OnChar)
         self.Bind(wx.EVT_KILL_FOCUS, self.OnFocusLost)
         self.Bind(wx.EVT_MOVE, self.OnFocusLost)
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.OnDestroy)
         self._showing_content_assist = False
         self._row = None
         self.gherkin_prefix = ''  # Store gherkin prefix from input to add \
@@ -91,8 +92,8 @@ def _variable_creator_value(self, value, symbol, from_, to_):
         return value[:from_]+symbol+'{'+value[from_:to_]+'}'+value[to_:]
 
     def OnFocusLost(self, event, set_value=True):
+        event.Skip()
         if not self._popup.is_shown():
-            event.Skip()
             return
         if self.gherkin_prefix:
             value = self.gherkin_prefix + self._popup.get_value() or self.GetValue()
@@ -104,7 +105,12 @@ def OnFocusLost(self, event, set_value=True):
         else:
             self.Clear()
         self.hide()
-        event.Skip()
+
+    def OnDestroy(self, event):
+        # all pushed eventHandlers need to be popped before close
+        # the last event handler is window object itself - do not pop itself
+        while self.GetEventHandler() is not self:
+            self.PopEventHandler()
 
     def reset(self):
         self._popup.reset()

src/robotide/editor/customsourceeditor.py

@@ -491,7 +491,7 @@ def SetUpEditor(self):
 
         # Global default style
         if wx.Platform == '__WXMSW__':
-            print("DEBUG: Setup on Windows")
+            # print("DEBUG: Setup on Windows")
             self.StyleSetSpec(stc.STC_STYLE_DEFAULT,
                               'fore:#000000,back:#FFFFFF,face:Space Mono')  # Courier New')
         elif wx.Platform == '__WXMAC__':
@@ -584,16 +584,17 @@ class CodeEditorPanel(wx.Panel):
     """Panel for the 'Code Editor' tab"""
     def __init__(self, parent, mainFrame, path=None):
         self.log = sys.stdout  # From FileDialog
+        self.path = path
         wx.Panel.__init__(self, parent, size=(1,1))
         self.mainFrame = mainFrame
         self.editor = SourceCodeEditor(self)
         self.editor.RegisterModifiedEvent(self.OnCodeModified)
 
         self.btnSave = wx.Button(self, -1, "Save Changes")
-        self.btnRestore = wx.Button(self, -1, "Delete Modified")
+        # self.btnRestore = wx.Button(self, -1, "Delete Modified")
         self.btnSave.Enable(False)
         self.btnSave.Bind(wx.EVT_BUTTON, self.OnSave)
-        self.btnRestore.Bind(wx.EVT_BUTTON, self.OnRestore)
+        # self.btnRestore.Bind(wx.EVT_BUTTON, self.OnRestore)
 
         # From FileDialog
         self.btnOpen = wx.Button(self, -1, "Open...")
@@ -615,7 +616,7 @@ def __init__(self, parent, mainFrame, path=None):
             radioButton.Bind(wx.EVT_RADIOBUTTON, self.OnRadioButton)
 
         self.controlBox.Add(self.btnSave, 0, wx.RIGHT, 5)
-        self.controlBox.Add(self.btnRestore, 0, wx.RIGHT, 5)
+        # self.controlBox.Add(self.btnRestore, 0, wx.RIGHT, 5)
         self.controlBox.Add(self.btnOpen, 0, wx.RIGHT, 5)
         self.controlBox.Add(self.btnSaveAs, 0)
 
@@ -626,8 +627,9 @@ def __init__(self, parent, mainFrame, path=None):
 
         self.box.Fit(self)
         self.SetSizer(self.box)
-        if path:
-            self.LoadFile(path)
+        if self.path:
+            # print("DEBUG: path is init = %s" % self.path)
+            self.LoadFile(self.path)
 
     def LoadFile(self, path):
         # Open
@@ -691,19 +693,26 @@ def ReloadDemo(self):
     def OnCodeModified(self, event):
         self.btnSave.Enable(self.editor.IsModified())
 
-    def OnSave(self, modifiedFilename):
-        if os.path.isfile(modifiedFilename):
-            overwriteMsg = "You are about to overwrite an existing file\n" + \
-                           "Do you want to continue?"
-            dlg = wx.MessageDialog(self, overwriteMsg, "Editor Writer",
-                                   wx.YES_NO | wx.NO_DEFAULT| wx.ICON_EXCLAMATION)
-            result = dlg.ShowModal()
-            if result == wx.ID_NO:
-                return
-            dlg.Destroy()
+    def OnSave(self, event, path=None):
+        if self.path is None:
+            self.path = "noname"
+            self.OnButton2(event)
+            return
+        # print("DEBUG: OnSave path is init = %s passado %s" % (self.path, path))
+        if path:
+            if path != self.path and os.path.isfile(path):
+                overwriteMsg = "You are about to overwrite an existing file\n" + \
+                               "Do you want to continue?"
+                dlg = wx.MessageDialog(self, overwriteMsg, "Editor Writer",
+                                       wx.YES_NO | wx.NO_DEFAULT| wx.ICON_EXCLAMATION)
+                result = dlg.ShowModal()
+                if result == wx.ID_NO:
+                    return
+                dlg.Destroy()
+            self.path = path
 
         # Save
-        f = open(modifiedFilename, "wb")
+        f = open(self.path, "wb")
         source = self.editor.GetTextRaw()
         # print("DEBUG: Test is Unicode %s",isUTF8Strict(source))
         if isUTF8Strict(source):
@@ -723,23 +732,8 @@ def OnSave(self, modifiedFilename):
                     f.write(''.join(data))
             finally:
                 f.close()
-            # idx = 0
-            # while source[idx]:
-            #     try:
-            #         s = bytes(source[idx:-1].encoding('UTF-8'))
-            #         bsource.append(s)
-            #         idx += len(s)
-            #     except:
-            #         print("DEBUG: index=%d" % idx)
-            #         idx += 1
-            #         bsource.append(source[idx])
-            # try:
-            #     f.write(bsource)
-            #     print("DEBUG: Saved bytes")
-            # finally:
-            #     f.close()
-
-        # busy = wx.BusyInfo("Reloading Code module...")
+
+    # busy = wx.BusyInfo("Reloading Code module...")
         # self.CodeModules.LoadFromFile(modModified, modifiedFilename)
         #self.ActiveModuleChanged()
 
@@ -766,9 +760,13 @@ def OnButton(self, evt):
         #
         # Finally, if the directory is changed in the process of getting files, this
         # dialog is set up to change the current working directory to the path chosen.
+        if self.path:
+            cwd = os.path.dirname(self.path)
+        else:
+            cwd = os.getcwd()
         dlg = wx.FileDialog(
             self, message="Choose a file",
-            defaultDir=os.getcwd(),
+            defaultDir=cwd,
             defaultFile="",
             wildcard=wildcard,
             style=wx.FD_OPEN |
@@ -796,6 +794,8 @@ def OnButton(self, evt):
             finally:
                 f.close()
 
+            # store the new path
+            self.path = path
             # self.log.write('%s\n' % source)
             self.LoadSource(source)  # Just the last file
         # Compare this with the debug above; did we change working dirs?
@@ -817,9 +817,16 @@ def OnButton2(self, evt):
         # Unlike the 'open dialog' example found elsewhere, this example does NOT
         # force the current working directory to change if the user chooses a different
         # directory than the one initially set.
+        fname = ""
+        if self.path:
+            cwd = os.path.dirname(self.path)
+            fname = os.path.basename(self.path)
+        else:
+            cwd = os.getcwd()
+            self.path = "noname"
         dlg = wx.FileDialog(
-            self, message="Save file as ...", defaultDir=os.getcwd(),
-            defaultFile="", wildcard=wildcard, style=wx.FD_SAVE
+            self, message="Save file as ...", defaultDir=cwd,
+            defaultFile=fname, wildcard=wildcard, style=wx.FD_SAVE
             )  # | wx.FD_OVERWRITE_PROMPT
 
         # This sets the default filter that the user will initially see. Otherwise,
@@ -846,7 +853,9 @@ def OnButton2(self, evt):
             #
             # You might want to add some error checking :-)
             #
-            self.OnSave(path)
+            # store the new path
+            # self.path = path
+            self.OnSave(evt, path)
         # Note that the current working dir didn't change. This is good since
         # that's the way we set it up.
         # self.log.WriteText("CWD: %s\n" % os.getcwd())

src/robotide/editor/gridbase.py

@@ -42,7 +42,6 @@ def _bind_to_events(self):
         self.Bind(grid.EVT_GRID_SELECT_CELL, self.OnSelectCell)
         self.Bind(grid.EVT_GRID_RANGE_SELECT, self.OnRangeSelect)
         self.Bind(grid.EVT_GRID_CELL_RIGHT_CLICK, self.OnCellRightClick)
-        self.Bind(grid.EVT_GRID_CMD_COL_SIZE, self.OnCellColSizeChanged)
 
     def register_context_menu_hook(self, callable):
         self._popup_creator.add_hook(callable)
@@ -159,8 +158,8 @@ def _write_data(self, data, update_history=True):
         for row_index, row_data in enumerate(data):
             for col_index, cell_value in enumerate(row_data):
                 self.write_cell(row_index, col_index, cell_value, update_history)
-        self.AutoSizeColumns()
-        self.AutoSizeRows()
+        # self.AutoSizeColumns()
+        # self.AutoSizeRows()
         self.EndBatch()
 
     def OnSelectCell(self, event):
@@ -195,11 +194,6 @@ def OnCellRightClick(self, event):
         self._popup_creator.show(self, PopupMenuItems(self, self._popup_items),
                                  self.get_selected_content())
 
-    def OnCellColSizeChanged(self, event):
-        self.ForceRefresh()
-        self.AutoSizeRows()
-        event.Skip()
-
     # TODO This code is overriden at fieldeditors
     def OnInsertCells(self, event):
         self._insert_or_delete_cells(self._insert_cells, event)