fix

Author: liuyug

meditor/app.py

@@ -405,9 +405,8 @@ def setupToolbar(self):
         newButton.setDefaultAction(self.explorer.action('new_rst'))
         tb_normal.addWidget(newButton)
 
-        # tb_normal.addAction(self.explorer.action('new_rst'))
-        # tb_normal.addAction(self.explorer.action('new_md'))
         tb_normal.addAction(self.tab_editor.action('open'))
+        tb_normal.addAction(self.explorer.action('open_workspace'))
         tb_normal.addAction(self.tab_editor.action('save'))
         tb_normal.addSeparator()
         tb_normal.addAction(self.tab_editor.action('undo'))
@@ -418,6 +417,7 @@ def setupToolbar(self):
         tb_normal.addAction(self.tab_editor.action('paste'))
         tb_normal.addSeparator()
         tb_normal.addAction(self.tab_editor.action('find'))
+        tb_normal.addAction(self.tab_editor.action('format_table'))
         tb_normal.addSeparator()
         tb_normal.addAction(self.tab_editor.action('zoom_in'))
         tb_normal.addAction(self.tab_editor.action('zoom_out'))

meditor/editor.py

@@ -10,7 +10,7 @@
 import chardet
 from mtable import MarkupTable
 
-from .scilib import _SciImSupport, EXTENSION_LEXER
+from .scilib import EXTENSION_LEXER
 
 from .util import toUtf8
 from . import __home_data_path__, __data_path__, __default_basename__
@@ -75,9 +75,6 @@ def __init__(self, find_dialog, parent=None):
         self.setCaretLineVisible(True)
         self.setWrapVisualFlags(QsciScintilla.WrapFlagByBorder)
 
-        self.inputMethodEventCount = 0
-        self._imsupport = _SciImSupport(self)
-
         self.cursorPositionChanged.connect(self.onCursorPositionChanged)
         self.linesChanged.connect(self.onLinesChanged)
 
@@ -146,7 +143,7 @@ def createAction(cls, parent, do_action):
         action = QtWidgets.QAction(parent.tr('&Find or Replace'), parent)
         action.setShortcut(QtGui.QKeySequence.Find)
         action.triggered.connect(partial(do_action, 'find'))
-        action.setIcon(QtGui.QIcon.fromTheme('edit-find-replace'))
+        action.setIcon(QtGui.QIcon.fromTheme('edit-find'))
         actions['find'] = action
 
         action = QtWidgets.QAction(parent.tr('Find Next'), parent)
@@ -743,12 +740,14 @@ def do_action(self, action, value):
             if self.lexer():
                 tables = None
                 if self.lexer().language() == 'reStructuredText':
+                    logger.debug('Format rst table: %s' % text)
                     tables = MarkupTable.from_rst(text)
                 elif self.lexer().language() == 'Markdown':
+                    logger.debug('Format md table: %s' % text)
                     tables = MarkupTable.from_md(text)
                 if tables:
                     mt = tables[0]
-            if not mt or mt.is_empty():
+            if not mt or mt.is_empty() or mt.is_invalid():
                 logger.debug('Format text table: %s' % text)
                 mt = MarkupTable.from_txt(text)
             if self.lexer():

meditor/explorer.py

@@ -73,8 +73,9 @@ def __init__(self, settings, parent, style=None):
         action.triggered.connect(self.onWindowsExplorer)
         self._actions['explorer'] = action
 
-        action = QtWidgets.QAction(self.tr('Open folder'), self)
+        action = QtWidgets.QAction(self.tr('Open Workspace'), self)
         action.triggered.connect(self.onOpenWorkspace)
+        action.setIcon(QtGui.QIcon.fromTheme('folder-open'))
         self._actions['open_workspace'] = action
 
         self.popupMenu = QtWidgets.QMenu(self)

requirements.txt

@@ -7,3 +7,4 @@ chardet
 docutils
 Markdown
 python-markdown-mathjax
+mtable