diff -Nru opendict-0.6.5/debian/changelog opendict-0.6.6/debian/changelog --- opendict-0.6.5/debian/changelog 2014-10-21 00:45:14.000000000 +0000 +++ opendict-0.6.6/debian/changelog 2015-07-15 20:07:08.000000000 +0000 @@ -1,3 +1,16 @@ +opendict (0.6.6-1) unstable; urgency=medium + + * QA upload. + * New upstream release. + * Remove wxpy3.0-compat.patch patch, + merge with upstream. + * Add fix-desktop-file.patch to fix + desktop file issues. + * Add doc-base documentation. + * Update copyright to copyright-format 1.0. + + -- Julián Moreno Patiño Wed, 15 Jul 2015 13:52:00 -0500 + opendict (0.6.5-3) unstable; urgency=low * QA upload. diff -Nru opendict-0.6.5/debian/copyright opendict-0.6.6/debian/copyright --- opendict-0.6.5/debian/copyright 2014-08-07 07:00:38.000000000 +0000 +++ opendict-0.6.6/debian/copyright 2015-07-15 20:14:54.000000000 +0000 @@ -1,32 +1,34 @@ -This package was debianized by Kęstutis Biliūnas on -Sun, 30 Oct 2005 23:00:26 +0200. - -It was downloaded from http://opendict.sourceforge.net/ - -Upstream Authors: Martynas Jocius - Nerijus Baliūnas - Mantas Kriaučiūnas - -Copyright (c) 2003-2006 Martynas Jocius -Copyright (c) 2007 IDILES SYSTEMS, UAB - -The files lib/extra/{dictclient,dictdlib}.py are Copyright (C) 2002 -John Goerzen. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License with - the Debian GNU/Linux distribution in file /usr/share/common-licenses/GPL-2; - if not, write to the Free Software Foundation, Inc., 51 Franklin Street, - Fifth Floor, Boston, MA 02110-1301, USA - -On Debian systems, the complete text of the GNU General Public -License, version 2, can be found in /usr/share/common-licenses/GPL-2. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Contact: Martynas Jocius +Source: http://sourceforge.net/projects/opendict/files/ +Upstram-Name: opendict + +Files: * +Copyright: 2003-2006 Martynas Jocius + 2007 IDILES SYSTEMS, UAB +License: GPL-2.0+ + +Files: lib/extra/dictclient.py lib/extra/dictdlib.py +Copyright: 2002 John Goerzen +License: GPL-2.0+ + +Files: debian/* +Copyright: 2005 Kęstutis Biliūnas +License: GPL-2.0+ + +License: GPL-2.0+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru opendict-0.6.5/debian/opendict.doc-base opendict-0.6.6/debian/opendict.doc-base --- opendict-0.6.5/debian/opendict.doc-base 1970-01-01 00:00:00.000000000 +0000 +++ opendict-0.6.6/debian/opendict.doc-base 2015-07-15 20:19:16.000000000 +0000 @@ -0,0 +1,10 @@ +Document: opendict +Title: computer dictionary for several dictionary formats +Author: Various +Abstract: Documentation to make easy-installable OpenDict + dictionaries. +Section: Help/HOWTO + +Format: HTML +Index: /usr/share/doc/opendict/Plugin-HOWTO.html +Files: /usr/share/doc/opendict/*.html diff -Nru opendict-0.6.5/debian/patches/fix-desktop-file.patch opendict-0.6.6/debian/patches/fix-desktop-file.patch --- opendict-0.6.5/debian/patches/fix-desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 +++ opendict-0.6.6/debian/patches/fix-desktop-file.patch 2015-07-15 20:11:04.000000000 +0000 @@ -0,0 +1,17 @@ +Description: Add Keywords entry and remove + Encoding entry to the desktop file. +Author: Julián Moreno Patiño +Last-Update: 2015-07-15 +--- a/misc/opendict.desktop ++++ b/misc/opendict.desktop +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=Dictionary OpenDict + Name[lt]=Žodynas „OpenDict“ + Name[de]=OpenDict Wörterbuch +@@ -123,3 +122,4 @@ + Terminal=false + Type=Application + Categories=GTK;Utility;Dictionary; ++Keywords=Dictonary;Words diff -Nru opendict-0.6.5/debian/patches/series opendict-0.6.6/debian/patches/series --- opendict-0.6.5/debian/patches/series 2014-08-07 06:41:41.000000000 +0000 +++ opendict-0.6.6/debian/patches/series 2015-07-15 19:30:27.000000000 +0000 @@ -1 +1 @@ -wxpy3.0-compat.patch +fix-desktop-file.patch diff -Nru opendict-0.6.5/debian/patches/wxpy3.0-compat.patch opendict-0.6.6/debian/patches/wxpy3.0-compat.patch --- opendict-0.6.5/debian/patches/wxpy3.0-compat.patch 2014-10-21 00:45:16.000000000 +0000 +++ opendict-0.6.6/debian/patches/wxpy3.0-compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,122 +0,0 @@ -Description: Update to work with wxPython 3.0 -Author: Olly Betts -Forwarded: no -Last-Update: 2014-10-21 - ---- a/lib/gui/dicteditorwin.py -+++ b/lib/gui/dicteditorwin.py -@@ -484,7 +484,7 @@ - wildcard=wildCard, - defaultFile=default, - message=_("Save file"), -- style=wx.SAVE | wx.CHANGE_DIR) -+ style=wx.FD_SAVE | wx.FD_CHANGE_DIR) - if dialog.ShowModal() == wx.ID_OK: - self.filePath = dialog.GetPaths()[0] - else: -@@ -598,7 +598,7 @@ - wildCard = "Slowo dictionaries (*.dwa)|*.dwa" - - dialog = wx.FileDialog(self, message=_("Choose dictionary file"), -- wildcard=wildCard, style=wx.OPEN|wx.MULTIPLE) -+ wildcard=wildCard, style=wx.FD_OPEN|wx.FD_MULTIPLE) - if dialog.ShowModal() == wx.ID_OK: - name = os.path.split(dialog.GetPaths()[0])[1] - self.filePath = dialog.GetPaths()[0] ---- a/lib/gui/mainwin.py -+++ b/lib/gui/mainwin.py -@@ -455,7 +455,6 @@ - self.search = None - self.load = None - -- wx.InitAllImageHandlers() - self.SetIcon(wx.Icon(os.path.join(info.GLOBAL_HOME, - "pixmaps", - "icon-32x32.png"), -@@ -1297,7 +1296,7 @@ - """Starts dictionary registration process""" - - fileDialog = wx.FileDialog(self, _("Choose dictionary file"), "", "", -- "", wx.OPEN|wx.MULTIPLE) -+ "", wx.FD_OPEN|wx.FD_MULTIPLE) - - if fileDialog.ShowModal() == wx.ID_OK: - file = fileDialog.GetPaths()[0] -@@ -1330,7 +1329,7 @@ - """Starts plugin installation process""" - - dialog = wx.FileDialog(self, _("Choose plugin file"), "", "", -- "", wx.OPEN|wx.MULTIPLE) -+ "", wx.FD_OPEN|wx.FD_MULTIPLE) - if dialog.ShowModal() == wx.ID_OK: - plugin.installPlugin(self.app.config, dialog.GetPaths()[0]) - dialog.Destroy() ---- a/lib/installer.py -+++ b/lib/installer.py -@@ -60,7 +60,7 @@ - fileDialog = wx.FileDialog(self.mainWin, - message=_("Choose dictionary file"), - wildcard=wildCard, -- style=wx.OPEN|wx.CHANGE_DIR) -+ style=wx.FD_OPEN|wx.FD_CHANGE_DIR) - fileDialog.CentreOnScreen() - - if fileDialog.ShowModal() == wx.ID_OK: ---- a/opendict.py -+++ b/opendict.py -@@ -34,14 +34,14 @@ - hasattr(sys, "importers") # old py2exe - or imp.is_frozen("__main__")) # tools/freeze - --# If application is not frozen to binary, try selecting wxPython 2.6 or 2.5 -+# If application is not frozen to binary, try selecting wxPython 3.0 - # on multiversioned wxPython installation. - if not main_is_frozen(): - try: - import wxversion -- wxversion.select(["2.6-unicode", "2.8-unicode"]) -+ wxversion.select(["3.0"]) - except Exception, e: -- print "You seem to have wxPython 2.4: %s" \ -+ print "You seem to have an unsupported wxPython version: %s" \ - % e - - try: -@@ -49,7 +49,7 @@ - except ImportError: - print >> sys.stderr, "**" - print >> sys.stderr, "** Error: wxPython library not found" -- print >> sys.stderr, "** Please install wxPython 2.6 or later to run OpenDict" -+ print >> sys.stderr, "** Please install wxPython 3.0 or later to run OpenDict" - print >> sys.stderr, "**" - sys.exit(1) - -@@ -99,14 +99,13 @@ - except: - pass - -- if wx.Version.split('.') < ['2', '6']: -+ if wx.Version.split('.') < ['3', '0']: - from lib.gui import errorwin - -- # Go away, wxPython 2.4! - title = _("wxPython Version Error") - msg = _("wxPython %s is installed on this system.\n\n" -- "OpenDict %s requires wxPython 2.6 to run smoothly.\n\n" -- "You can find wxPython 2.6 at " -+ "OpenDict %s requires wxPython 3.0 or newer to run smoothly.\n\n" -+ "You can find wxPython at " - "http://www.wxpython.org or you can " - "install it using your system package manager.") \ - % (wx.Version, info.VERSION) ---- a/lib/gui/prefswin.py -+++ b/lib/gui/prefswin.py -@@ -43,7 +43,7 @@ - vboxMain = wx.BoxSizer(wx.VERTICAL) - hboxButtons = wx.BoxSizer(wx.HORIZONTAL) - -- grid = wx.FlexGridSizer(2, 2, 1, 1) -+ grid = wx.FlexGridSizer(4, 2, 1, 1) - - grid.Add(wx.StaticText(self, -1, _("Default dictionary: ")), - 0, wx.ALIGN_CENTER_VERTICAL) diff -Nru opendict-0.6.5/lib/gui/dicteditorwin.py opendict-0.6.6/lib/gui/dicteditorwin.py --- opendict-0.6.5/lib/gui/dicteditorwin.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/lib/gui/dicteditorwin.py 2014-12-04 12:31:38.000000000 +0000 @@ -484,7 +484,7 @@ wildcard=wildCard, defaultFile=default, message=_("Save file"), - style=wx.SAVE | wx.CHANGE_DIR) + style=wx.FD_SAVE | wx.FD_CHANGE_DIR) if dialog.ShowModal() == wx.ID_OK: self.filePath = dialog.GetPaths()[0] else: @@ -598,7 +598,7 @@ wildCard = "Slowo dictionaries (*.dwa)|*.dwa" dialog = wx.FileDialog(self, message=_("Choose dictionary file"), - wildcard=wildCard, style=wx.OPEN|wx.MULTIPLE) + wildcard=wildCard, style=wx.FD_OPEN|wx.FD_MULTIPLE) if dialog.ShowModal() == wx.ID_OK: name = os.path.split(dialog.GetPaths()[0])[1] self.filePath = dialog.GetPaths()[0] diff -Nru opendict-0.6.5/lib/gui/mainwin.py opendict-0.6.6/lib/gui/mainwin.py --- opendict-0.6.5/lib/gui/mainwin.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/lib/gui/mainwin.py 2014-12-04 12:31:38.000000000 +0000 @@ -455,7 +455,6 @@ self.search = None self.load = None - wx.InitAllImageHandlers() self.SetIcon(wx.Icon(os.path.join(info.GLOBAL_HOME, "pixmaps", "icon-32x32.png"), @@ -1297,7 +1296,7 @@ """Starts dictionary registration process""" fileDialog = wx.FileDialog(self, _("Choose dictionary file"), "", "", - "", wx.OPEN|wx.MULTIPLE) + "", wx.FD_OPEN|wx.FD_MULTIPLE) if fileDialog.ShowModal() == wx.ID_OK: file = fileDialog.GetPaths()[0] @@ -1330,7 +1329,7 @@ """Starts plugin installation process""" dialog = wx.FileDialog(self, _("Choose plugin file"), "", "", - "", wx.OPEN|wx.MULTIPLE) + "", wx.FD_OPEN|wx.FD_MULTIPLE) if dialog.ShowModal() == wx.ID_OK: plugin.installPlugin(self.app.config, dialog.GetPaths()[0]) dialog.Destroy() diff -Nru opendict-0.6.5/lib/gui/prefswin.py opendict-0.6.6/lib/gui/prefswin.py --- opendict-0.6.5/lib/gui/prefswin.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/lib/gui/prefswin.py 2014-12-04 12:31:38.000000000 +0000 @@ -43,7 +43,7 @@ vboxMain = wx.BoxSizer(wx.VERTICAL) hboxButtons = wx.BoxSizer(wx.HORIZONTAL) - grid = wx.FlexGridSizer(2, 2, 1, 1) + grid = wx.FlexGridSizer(4, 2, 1, 1) grid.Add(wx.StaticText(self, -1, _("Default dictionary: ")), 0, wx.ALIGN_CENTER_VERTICAL) diff -Nru opendict-0.6.5/lib/info.py opendict-0.6.6/lib/info.py --- opendict-0.6.5/lib/info.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/lib/info.py 2014-12-04 12:31:38.000000000 +0000 @@ -24,7 +24,7 @@ import imp # OpenDict version -VERSION = "0.6.5" +VERSION = "0.6.6" # File system objects __OPENDICT_LOCAL_DIR = ".opendict" diff -Nru opendict-0.6.5/lib/installer.py opendict-0.6.6/lib/installer.py --- opendict-0.6.5/lib/installer.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/lib/installer.py 2014-12-04 12:31:38.000000000 +0000 @@ -60,7 +60,7 @@ fileDialog = wx.FileDialog(self.mainWin, message=_("Choose dictionary file"), wildcard=wildCard, - style=wx.OPEN|wx.CHANGE_DIR) + style=wx.FD_OPEN|wx.FD_CHANGE_DIR) fileDialog.CentreOnScreen() if fileDialog.ShowModal() == wx.ID_OK: diff -Nru opendict-0.6.5/misc/opendict.desktop opendict-0.6.6/misc/opendict.desktop --- opendict-0.6.5/misc/opendict.desktop 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/misc/opendict.desktop 2014-12-04 12:31:38.000000000 +0000 @@ -4,14 +4,119 @@ Name[lt]=Žodynas „OpenDict“ Name[de]=OpenDict Wörterbuch Name[ru]=Словарь OpenDict +Name[af]=OpenDict woordeboek +Name[sq]=Fjalori OpenDict +Name[ast]=Diccionariu OpenDict +Name[bn]=OpenDict অভিধান +Name[bs]=Rječnik OpenDict +Name[pt_BR]=Dicionário OpenDict +Name[bg]=Речник OpenDict +Name[ca]=Diccionari OpenDict +Name[ca@valencia]=Diccionari OpenDict +Name[zh_CN]=OpenDict 词典 +Name[crh]=Szölük OpenDict +Name[cs]=Slovník OpenDict +Name[nl]=OpenDict woordenboek +Name[da]=Ordbogen OpenDict +Name[fr]=Dictionnaire OpenDict +Name[gl]=Dicionario OpenDict +Name[el]=Λεξικό OpenDict +Name[hu]=OpenDict szótár +Name[it]=Dizionario OpenDict +Name[ja]=OpenDict 辞書 +Name[ky]=OpenDict сөздүгү +Name[ms]=Kamus OpenDict +Name[nb]=OpenDict ordbok +Name[oc]=Diccionari OpenDict +Name[pt]=Dicionário OpenDict +Name[pl]=Słownik OpenDict +Name[ro]=Dicționar OpenDict +Name[sk]=Slovník OpenDict +Name[sl]=Slovar OpenDict +Name[sv]=OpenDict ordbok +Name[tg]=Луғати OpenDict +Name[es]=Diccionario OpenDict +Name[tr]=Szölük OpenDict +Name[uk]=Словник OpenDict +Name[vi]=Từ điển OpenDict GenericName=Dictionary OpenDict GenericName[lt]=Žodynas „OpenDict“ GenericName[de]=OpenDict Wörterbuch GenericName[ru]=Словарь OpenDict -Comment=Lookup words in a local or Internet dictionary +GenericName[af]=OpenDict woordeboek +GenericName[sq]=Fjalori OpenDict +GenericName[ast]=Diccionariu OpenDict +GenericName[bn]=OpenDict অভিধান +GenericName[bs]=Rječnik OpenDict +GenericName[pt_BR]=Dicionário OpenDict +GenericName[bg]=Речник OpenDict +GenericName[ca]=Diccionari OpenDict +GenericName[ca@valencia]=Diccionari OpenDict +GenericName[zh_CN]=OpenDict 词典 +GenericName[crh]=Szölük OpenDict +GenericName[cs]=Slovník OpenDict +GenericName[nl]=OpenDict woordenboek +GenericName[da]=Ordbogen OpenDict +GenericName[fr]=Dictionnaire OpenDict +GenericName[gl]=Dicionario OpenDict +GenericName[el]=Λεξικό OpenDict +GenericName[hu]=OpenDict szótár +GenericName[it]=Dizionario OpenDict +GenericName[ja]=OpenDict 辞書 +GenericName[ky]=OpenDict сөздүгү +GenericName[ms]=Kamus OpenDict +GenericName[nb]=OpenDict ordbok +GenericName[oc]=Diccionari OpenDict +GenericName[pt]=Dicionário OpenDict +GenericName[pl]=Słownik OpenDict +GenericName[ro]=Dicționar OpenDict +GenericName[sk]=Slovník OpenDict +GenericName[sl]=Slovar OpenDict +GenericName[sv]=OpenDict ordbok +GenericName[tg]=Луғати OpenDict +GenericName[es]=Diccionario OpenDict +GenericName[tr]=Szölük OpenDict +GenericName[uk]=Словник OpenDict +GenericName[vi]=Từ điển OpenDict +Comment=Lookup words in a local or Internet dictionary Comment[lt]=Ieškoti žodžių kompiuterio arba Interneto žodyne Comment[de]=Wörter in einem lokalen Wörterbuch oder im Internet nachschlagen Comment[ru]=Поиск слов в интернет-словаре или в локальном словаре +Comment[af]=Slaan woorde na in 'n plaaslike of internasionale woordeboek +Comment[sq]=Kontrollo fjalët në një fjalor lokal ose në internet +Comment[ast]=Gueta pallabres nun diccionariu llocal o d'Internet +Comment[bn]=স্থানীয় অথবা ইন্টারনেট অভিধানে শব্দ দেখুন +Comment[bs]=Tražite riječ u u lokalnom ili mrežnom rječniku +Comment[pt_BR]=Pesquisa palavras em um dicionário local ou da internet +Comment[bg]=Търсене на думи в локален или Интернет речник +Comment[ca]=Cerqueu paraules en un diccionari local o d'Internet +Comment[ca@valencia]=Cerqueu paraules en un diccionari local o d'Internet +Comment[zh_CN]=在本地或互联网词典中查找词语 +Comment[crh]=Bir yerel ya da internet sözlüğünde kelimeleri ara +Comment[cs]=Vyhledávání slov v místním nebo online slovníku +Comment[da]=Slå ord op i en lokal ordbog eller på nettet +Comment[nl]=Woorden in een lokaal woordenboek of over het internet +Comment[fi]=Etsi sanoja paikallisesta tai verkossa sijaitsevasta sanakirjasta +Comment[fr]=Chercher des mots sur un dictionnaire local ou en ligne +Comment[gl]=Busque palabras nun dicionario local ou da Internet +Comment[el]=Αναζητήστε λέξεις σε τοπικά ή διαδικτυακά λεξικά +Comment[hu]=Szavak keresése helyi vagy internetes szótárban +Comment[it]=Cerca parole in un dizionario locale o su Internet +Comment[ja]=ローカルまたはインターネット上の辞書を使って単語を検索します +Comment[ky]=Сөздөрдү сөздүктөн же интернетен издөө +Comment[ms]=Cari perkataan didalam kamus setempat atau Internet +Comment[nb]=Slå opp ord i en lokal eller nettbasert ordbok +Comment[oc]=Cercar de mots sus un diccionari local o en linha +Comment[pl]=Wyszukuje tłumaczeń w słowniku lokalnym oraz internetowym +Comment[pt]=Procurar palavras num dicionário local ou online +Comment[ro]=Căutați cuvinte într-un dicționar local sau de pe Internet +Comment[sk]=Vyhľadávanie slov v lokálnom alebo internetovom slovníku +Comment[sl]=Poiščite besede v krajevnem ali medmrežnem slovarju +Comment[es]=Busca palabras en un diccionario local o de Internet +Comment[sv]=Slå upp ord i en ordbok lokalt eller på internet +Comment[tr]=Bir yerel ya da internet sözlüğünde kelimeleri ara +Comment[uk]=Пошук слів у локальному або інтернет-словниках +Comment[vi]=Tra cứu từ với từ điển ở máy hoặc trên Internet Exec=opendict Icon=opendict StartupNotify=true diff -Nru opendict-0.6.5/opendict.py opendict-0.6.6/opendict.py --- opendict-0.6.5/opendict.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/opendict.py 2014-12-04 12:31:38.000000000 +0000 @@ -34,14 +34,14 @@ hasattr(sys, "importers") # old py2exe or imp.is_frozen("__main__")) # tools/freeze -# If application is not frozen to binary, try selecting wxPython 2.6 or 2.5 +# If application is not frozen to binary, try selecting wxPython 3.0 or 2.8 # on multiversioned wxPython installation. if not main_is_frozen(): try: import wxversion - wxversion.select(["2.6-unicode", "2.8-unicode"]) + wxversion.select(["2.8-unicode", "3.0"]) except Exception, e: - print "You seem to have wxPython 2.4: %s" \ + print "You seem to have an unsupported wxPython version: %s" \ % e try: @@ -49,7 +49,7 @@ except ImportError: print >> sys.stderr, "**" print >> sys.stderr, "** Error: wxPython library not found" - print >> sys.stderr, "** Please install wxPython 2.6 or later to run OpenDict" + print >> sys.stderr, "** Please install wxPython 2.8 or later to run OpenDict" print >> sys.stderr, "**" sys.exit(1) @@ -99,25 +99,24 @@ except: pass - if wx.Version.split('.') < ['2', '6']: + if wx.Version.split('.') < ['2', '8']: from lib.gui import errorwin - - # Go away, wxPython 2.4! + title = _("wxPython Version Error") msg = _("wxPython %s is installed on this system.\n\n" - "OpenDict %s requires wxPython 2.6 to run smoothly.\n\n" - "You can find wxPython 2.6 at " + "OpenDict %s requires wxPython 2.8 or newer to run smoothly.\n\n" + "You can find wxPython at " "http://www.wxpython.org or you can " "install it using your system package manager.") \ % (wx.Version, info.VERSION) errorwin.showErrorMessage(title, msg) return False - + util.makeDirectories() - + systemLog(DEBUG, "Unicode version: %s" % wx.USE_UNICODE) - + # Init gettext support wx.Locale_AddCatalogLookupPathPrefix(os.path.join(info.GLOBAL_HOME, 'po')) @@ -126,7 +125,7 @@ # Data cache instance self.cache = {} - + # Dictionaries container # Mapping: name -> object self.dictionaries = {} @@ -134,15 +133,15 @@ # Failed dictionaries. # For error message that may be shown after creating main window self.invalidDictionaries = [] - + self.config = Configuration() self.config.load() self.agreements = util.AgreementsManager(os.path.join(info.LOCAL_HOME, 'agreements.txt')) - - - + + + # Set unique ids for plugin in newplugin.loadDictionaryPlugins(self.dictionaries, self.invalidDictionaries): @@ -170,7 +169,7 @@ windowPos, windowSize, style=wx.DEFAULT_FRAME_STYLE) - + try: systemLog(INFO, "OpenDict %s" % info.VERSION) systemLog(INFO, "wxPython %s" % wx.Version) @@ -179,13 +178,13 @@ systemLog(DEBUG, "Loaded in %f seconds" % (time.time() - _start)) except Exception, e: print "Logger Error: Unable to write to log (%s)" % e - + self.window.Show(True) return True if __name__ == "__main__": - + openDictApp = OpenDictApp(0) openDictApp.MainLoop() diff -Nru opendict-0.6.5/win32/setup.manifest.py opendict-0.6.6/win32/setup.manifest.py --- opendict-0.6.5/win32/setup.manifest.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/win32/setup.manifest.py 2014-12-04 12:31:38.000000000 +0000 @@ -53,7 +53,7 @@ setup( name="OpenDict", - version="0.6.5", + version="0.6.6", options = options, zipfile = None, package_dir = {"": "lib"}, diff -Nru opendict-0.6.5/win32/setup.py opendict-0.6.6/win32/setup.py --- opendict-0.6.5/win32/setup.py 2014-04-12 19:47:12.000000000 +0000 +++ opendict-0.6.6/win32/setup.py 2014-12-04 12:31:38.000000000 +0000 @@ -7,7 +7,7 @@ setup( name="opendict", - version="0.6.5", + version="0.6.6", zipfile=None, package_dir = {"": "lib"}, windows = [{