* Changed default configuration to no longer refer to Gjiten directories.

diff --git a/jiten-pai.py b/jiten-pai.py
index fefd8bed8380dd6def3540235c65e1b9f47d78d5..26a91a4b0e63c00c52c0ed76d04e6cd51f9ac889 100755 (executable)
--- a/jiten-pai.py
+++ b/jiten-pai.py
@@ -67,15 +67,13 @@ class ScanMode(enum.Enum):
 # configuration
 
 cfg = {
-    'kanjidic': '/usr/share/gjiten/dics/kanjidic',
+    'kanjidic': '/usr/local/share/jiten-pai/dics/kanjidic',
     'dicts': [
-        ['edict', '/usr/share/gjiten/dics/edict'],
-        ['enamdict', '/usr/share/gjiten/dics/enamdict'],
+        ['edict2', '/usr/local/share/jiten-pai/dics/edict2'],
     ],
     'dict_idx': 0,
     'dict_all': False,
     'limit': 100,
-    'hardlimit': 10000,
     'do_limit': True,
     'auto_adj': True,
     'jap_opt': [True, False, False, False],
@@ -87,10 +85,11 @@ cfg = {
     'lfont_sz': 24.0,
     'hl_col': 'blue',
     'deinflect': False,
+    # saved, but not editable from GUI:
+    'hardlimit': 10000,
     'max_hist': 12,
     'history': [],
-
-    # run-time only, not saved:
+    # not saved, run-time only:
     'cfgfile': None,
 }
 

diff --git a/kanjidic.py b/kanjidic.py
index f4703253499c41a938099ec29693ff7a48049faf..a302c0e60ea2c97fa7cf283c8c270ca0a55ee936 100755 (executable)
--- a/kanjidic.py
+++ b/kanjidic.py
@@ -66,7 +66,7 @@ def _get_dfile_path(fname, mode=os.R_OK):
 # configuration
 
 cfg = {
-    'kanjidic': '/usr/share/gjiten/dics/kanjidic',
+    'kanjidic': '/usr/local/share/jiten-pai/dics/kanjidic',
     'nfont': 'sans',
     'nfont_sz': 12.0,
     'lfont': 'IPAPMincho',