Port socializer to Python 3. #16
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
import spellchecker
 | 
			
		||||
from . import spellchecker
 | 
			
		||||
import platform
 | 
			
		||||
if platform.system() == "Windows":
 | 
			
		||||
	from wx_ui import *
 | 
			
		||||
	from .wx_ui import *
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
# -*- coding: utf-8 -*-
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
import logging
 | 
			
		||||
import wx_ui
 | 
			
		||||
import widgetUtils
 | 
			
		||||
import output
 | 
			
		||||
import config
 | 
			
		||||
@@ -8,6 +8,7 @@ import languageHandler
 | 
			
		||||
from enchant.checker import SpellChecker
 | 
			
		||||
from enchant.errors import DictNotFoundError
 | 
			
		||||
from enchant import tokenize
 | 
			
		||||
from . import wx_ui
 | 
			
		||||
 | 
			
		||||
log = logging.getLogger("extra.SpellChecker.spellChecker")
 | 
			
		||||
 | 
			
		||||
@@ -25,7 +26,7 @@ class spellChecker(object):
 | 
			
		||||
				self.checker = SpellChecker(languageHandler.curLang, filters=[tokenize.EmailFilter, tokenize.URLFilter])
 | 
			
		||||
			self.checker.set_text(text)
 | 
			
		||||
		except DictNotFoundError:
 | 
			
		||||
			print "no dict"
 | 
			
		||||
			print("no dict")
 | 
			
		||||
			log.exception("Dictionary for language %s not found." % (dictionary,))
 | 
			
		||||
			wx_ui.dict_not_found_error()
 | 
			
		||||
			self.active = False
 | 
			
		||||
@@ -42,9 +43,9 @@ class spellChecker(object):
 | 
			
		||||
 | 
			
		||||
	def check(self):
 | 
			
		||||
		try:
 | 
			
		||||
			self.checker.next()
 | 
			
		||||
			textToSay = _(u"Misspelled word: %s") % (self.checker.word,)
 | 
			
		||||
			context = u"... %s %s %s" % (self.checker.leading_context(10), self.checker.word, self.checker.trailing_context(10))
 | 
			
		||||
			next(self.checker)
 | 
			
		||||
			textToSay = _("Misspelled word: %s") % (self.checker.word,)
 | 
			
		||||
			context = "... %s %s %s" % (self.checker.leading_context(10), self.checker.word, self.checker.trailing_context(10))
 | 
			
		||||
			self.dialog.set_title(textToSay)
 | 
			
		||||
			output.speak(textToSay)
 | 
			
		||||
			self.dialog.set_word_and_suggestions(word=self.checker.word, context=context, suggestions=self.checker.suggest())
 | 
			
		||||
 
 | 
			
		||||
@@ -16,6 +16,7 @@
 | 
			
		||||
#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		||||
#
 | 
			
		||||
############################################################
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
import wx
 | 
			
		||||
import application
 | 
			
		||||
 | 
			
		||||
@@ -24,25 +25,25 @@ class spellCheckerDialog(wx.Dialog):
 | 
			
		||||
		super(spellCheckerDialog, self).__init__(None, 1)
 | 
			
		||||
		panel = wx.Panel(self)
 | 
			
		||||
		sizer = wx.BoxSizer(wx.VERTICAL)
 | 
			
		||||
		word = wx.StaticText(panel, -1, _(u"&Misspelled word"))
 | 
			
		||||
		word = wx.StaticText(panel, -1, _("&Misspelled word"))
 | 
			
		||||
		self.word = wx.TextCtrl(panel, -1)
 | 
			
		||||
		wordBox = wx.BoxSizer(wx.HORIZONTAL)
 | 
			
		||||
		wordBox.Add(word, 0, wx.ALL, 5)
 | 
			
		||||
		wordBox.Add(self.word, 0, wx.ALL, 5)
 | 
			
		||||
		context = wx.StaticText(panel, -1, _(u"Con&text"))
 | 
			
		||||
		context = wx.StaticText(panel, -1, _("Con&text"))
 | 
			
		||||
		self.context = wx.TextCtrl(panel, -1)
 | 
			
		||||
		contextBox = wx.BoxSizer(wx.HORIZONTAL)
 | 
			
		||||
		contextBox.Add(context, 0, wx.ALL, 5)
 | 
			
		||||
		contextBox.Add(self.context, 0, wx.ALL, 5)
 | 
			
		||||
		suggest = wx.StaticText(panel, -1, _(u"&Suggestions"))
 | 
			
		||||
		suggest = wx.StaticText(panel, -1, _("&Suggestions"))
 | 
			
		||||
		self.suggestions = wx.ListBox(panel, -1, choices=[], style=wx.LB_SINGLE)
 | 
			
		||||
		suggestionsBox = wx.BoxSizer(wx.HORIZONTAL)
 | 
			
		||||
		suggestionsBox.Add(suggest, 0, wx.ALL, 5)
 | 
			
		||||
		suggestionsBox.Add(self.suggestions, 0, wx.ALL, 5)
 | 
			
		||||
		self.ignore = wx.Button(panel, -1, _(u"&Ignore"))
 | 
			
		||||
		self.ignoreAll = wx.Button(panel, -1, _(u"Ignore &all"))
 | 
			
		||||
		self.replace = wx.Button(panel, -1, _(u"&Replace"))
 | 
			
		||||
		self.replaceAll = wx.Button(panel, -1, _(u"Replace a&ll"))
 | 
			
		||||
		self.ignore = wx.Button(panel, -1, _("&Ignore"))
 | 
			
		||||
		self.ignoreAll = wx.Button(panel, -1, _("Ignore &all"))
 | 
			
		||||
		self.replace = wx.Button(panel, -1, _("&Replace"))
 | 
			
		||||
		self.replaceAll = wx.Button(panel, -1, _("Replace a&ll"))
 | 
			
		||||
		close = wx.Button(panel, wx.ID_CANCEL)
 | 
			
		||||
		btnBox = wx.BoxSizer(wx.HORIZONTAL)
 | 
			
		||||
		btnBox.Add(self.ignore, 0, wx.ALL, 5)
 | 
			
		||||
@@ -73,7 +74,7 @@ class spellCheckerDialog(wx.Dialog):
 | 
			
		||||
		return self.suggestions.GetStringSelection()
 | 
			
		||||
 | 
			
		||||
def dict_not_found_error():
 | 
			
		||||
	wx.MessageDialog(None, _(u"An error has occurred. There are no dictionaries available for the selected language in {0}").format(application.name,), _(u"Error"), wx.ICON_ERROR).ShowModal()
 | 
			
		||||
	wx.MessageDialog(None, _("An error has occurred. There are no dictionaries available for the selected language in {0}").format(application.name,), _("Error"), wx.ICON_ERROR).ShowModal()
 | 
			
		||||
 | 
			
		||||
def finished():
 | 
			
		||||
	wx.MessageDialog(None, _(u"Spell check complete."), application.name, style=wx.OK).ShowModal()
 | 
			
		||||
	wx.MessageDialog(None, _("Spell check complete."), application.name, style=wx.OK).ShowModal()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user