Changeset 3 for trunk

Timestamp:

09/23/06 18:47:13 (2 years ago)

Author:

mjoc

Message:

Ability to activate/deactivate installed dictionaries so that only a
part of them would be shown in the menu at the time.

Files:

• trunk/lib/config.py (modified) (2 diffs)
• trunk/lib/gui/mainwin.py (modified) (2 diffs)
• trunk/lib/gui/pluginwin.py (modified) (9 diffs)
• trunk/lib/gui/prefswin.py (modified) (2 diffs)
• trunk/lib/meta.py (modified) (3 diffs)
• trunk/opendict.py (modified) (1 diff)

trunk/lib/config.py

@@ -31 +31 @@
-
-
+class ActiveDictConfig(object):
+    """Config file manager for activated dictionaries. Operates with
+    names of dictionaries only."""
+
+    def __init__(self):
+      self.filePath = os.path.join(info.LOCAL_HOME, "active.conf")
+
+      # If config file does not exist (this is the first time),
+      # set special attribute init=True to notify that
+      if not os.path.exists(self.filePath):
+          self.init = True
+      else:
+          self.init = False
+
+      self.dicts = []
+
+
+    def load(self):
+        """Load list of active dictionaries."""
+
+        try:
+            for line in open(self.filePath):
+                name = line.strip()
+                name = unicode(name, 'UTF-8')
+                self.dicts.append(name)
+        except IOError, e:
+            pass
+
+
+    def save(self):
+        """Save list of active dictionaries."""
+
+        fd = open(self.filePath, 'w')
+        for d in self.dicts:
+            name = d.encode('UTF-8')
+            print >> fd, name
+        fd.close()
+
+
+    def enabled(self, name):
+        """Return True if this dictionary is enabled."""
+
+        if name in self.dicts:
+            return True
+
+        return False
+
+
+    def add(self, name):
+        """Add new dictionary to the list."""
+
+        if type(name) == str:
+            name = unicode(name, 'UTF-8')
+
+        if not name in self.dicts:
+            self.dicts.append(name)
+
+
+    def remove(self, name):
+        """Remove dictionary from the list."""
+
+        if type(name) == str:
+            name = unicode(name, 'UTF-8')
+
+        if name in self.dicts:
+            self.dicts.remove(name)
+
+
+
-class Configuration:
-   """This class is used for reading and writing config file.
@@ -37 +106 @@
-   def __init__(self):
-      """Initialize default values"""
+
+      self.activedict = ActiveDictConfig()
+      self.activedict.load()
-      
-      self.filePath = os.path.join(info.LOCAL_HOME, "opendict.xml")

trunk/lib/gui/mainwin.py

@@ -265 +265 @@
-      self.menuDict = wxMenu()
-
-Name
+
-      for dictionary in self.app.dictionaries.values():
-
-
-
-
+
+
+
+
+
+
+
+
+
-         encoded = enc.toWX(name)
-
@@ -1049 +1054 @@
-      EVT_MENU(self, unid, self.onDefault)
-      
-
+
+
+
+
+
+
+
+
+
+
-
-

trunk/lib/gui/pluginwin.py

@@ -1 +1 @@
-
-# OpenDict
-5
+6
-#
-# This program is free software; you can redistribute it and/or modify
@@ -123 +123 @@
-       #
-       idDictList = wx.NewId()
-DictListCtrl
+wx.CheckListBox
-                                         style=wx.LC_REPORT
-                                         | wx.LC_SINGLE_SEL
-                                         | wx.SUNKEN_BORDER)
+       self.Bind(wx.EVT_CHECKLISTBOX, self.onDictionaryChecked,
+            self.installedList)
+       self.Bind(wx.EVT_LISTBOX, self.onInstalledSelected,
+            self.installedList)
-       vboxInstalled.Add(self.installedList, 1, wxALL | wxEXPAND, 1)
-
@@ -155 +159 @@
-       # Make columns
-       #
-
+#
-       
-       dictNames = self.installedDictionaries.keys()
@@ -162 +166 @@
-       self.setInstalledDicts(dictNames)
-
-
-
+#
+#
-
-       self.Bind(wx.EVT_BUTTON, self.onRemove, self.buttonRemove)
@@ -181 +185 @@
-
-       #
-Installed list
+List of available dictionaries
-       #
-       idAvailList = wx.NewId()
@@ -306 +310 @@
-
-       return panelInfo
+
+
+   def onDictionaryChecked(self, event, *args):
+       index = event.GetSelection()
+       label = self.installedList.GetString(index)
+       if self.installedList.IsChecked(index):
+           self._addDictToMenu(label)
+           d = self.app.dictionaries.get(label)
+           d.setActive()
+       else:
+           self._removeDictFromMenu(label)
+           d = self.app.dictionaries.get(label)
+           d.setActive(active=False)
+       self.installedList.SetSelection(index)
+
+
+   def _removeDictFromMenu(self, name):
+       self.app.config.activedict.remove(name)
+       self.app.config.activedict.save()
+       self.app.window.removeDictionary(name)
+
+
+   def _addDictToMenu(self, name):
+       dict = None
+       for k, v in self.app.dictionaries.items():
+           if k == name:
+               dict = v
+       if dict:
+           self.app.config.activedict.add(name)
+           self.app.config.activedict.save()
+           self.app.window.addDictionary(dict)
-
-
@@ -334 +369 @@
-       """Called when list item is selected"""
-       
-m_itemIndex
+GetSelection()
-       self.buttonRemove.Enable(1)
-       
@@ -343 +378 @@
-       """Show information about selected dictionary"""
-
-ItemText
+String
-          self.currentInstalledItemSelection)
-
@@ -441 +476 @@
-   def setInstalledDicts(self, dictNames):
-       """Clear the list of installed dictionaries and set new items"""
-
-
+
+
+
-
-       dictNames.sort()
-       dictNames.reverse()
-
+
+
-       for dictionary in dictNames:
-
-
-
-
-
-
-
-
+
+
+
+
-
-

trunk/lib/gui/prefswin.py

@@ -1 +1 @@
-#
-# OpenDict
-5
+6
-#
-# This program is free software; you can redistribute it and/or modify
@@ -48 +48 @@
-                   0, wxALIGN_CENTER_VERTICAL)
-
-
+
+
+
+
+
-      dictNames.sort()
-      dictNames.insert(0, "")

trunk/lib/meta.py

@@ -1 +1 @@
-#
-# OpenDict
-
+-2006
-#
-# This program is free software; you can redistribute it and/or modify
@@ -76 +76 @@
-class Dictionary:
-    """Dictionary interface"""
+
+    active = True
-
-
@@ -154 +156 @@
-
-        return None
+
+
+    def getActive(self):
+        return self.active
+
+
+    def setActive(self, active=True):
+        self.active = active
-    
-

trunk/opendict.py

@@ -162 +162 @@
-
-
+      for d in self.dictionaries.values():
+          if not self.config.activedict.init:
+              if not self.config.activedict.enabled(d.getName()):
+                  d.setActive(active=False)
+          else:
+              # Fill up with names if not initialized yet
+              self.config.activedict.add(d.getName())
+
+
-      windowPos = (int(self.config.get('windowPosX')),
-                                int(self.config.get('windowPosY')))