replace SKK_DEFAULT_PATH with SKK_PATH

Author: eagleoflqj

CMakeLists.txt

@@ -21,7 +21,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cmake")
 
-set(SKK_DEFAULT_PATH "/usr/share/skk/SKK-JISYO.L" CACHE STRING "Default path of SKK")
+set(SKK_PATH "/usr/share/skk/" CACHE STRING "Default path of SKK directory that has SKK-JISYO.L, could start with \$XDG_DATA_DIRS/")
+if("${SKK_DEFAULT_PATH}" MATCHES "SKK-JISYO.L$")
+  message(FATAL_ERROR "SKK_DEFAULT_PATH is superseded by SKK_PATH")
+endif()
 
 include(GNUInstallDirs)
 

README.md

@@ -30,9 +30,9 @@ Please install this packages before build this Program.
  - extra-cmake-modules
  - gettext
 
-You can specify the skk dictionary path by -DSKK_DEFAULT_PATH=path_you_want
+You can specify the skk dictionary path by -DSKK_PATH=path_you_want
 
-By default it's /usr/share/skk/SKK-JISYO.L
+By default it's /usr/share/skk/
 
 ## Installation 
 

config.h.in

@@ -1,6 +1,6 @@
 #ifndef ___CONFIG_H___
 #define ___CONFIG_H___
 
-#define SKK_DEFAULT_PATH "@SKK_DEFAULT_PATH@"
+#define SKK_PATH "@SKK_PATH@"
 
 #endif /* __CONFIG_H__ */

gui/adddictdialog.cpp

@@ -111,7 +111,7 @@ void AddDictDialog::browseClicked() {
     if (m_ui->typeComboBox->currentIndex() == DictType_System) {
         QString dir;
         if (path.isEmpty()) {
-            path = SKK_DEFAULT_PATH;
+            path = SKK_PATH "SKK-JISYO.L";
         }
         QFileInfo info(path);
         path = QFileDialog::getOpenFileName(this, _("Select Dictionary File"),

src/dictionary_list.in

@@ -1,2 +1,2 @@
 type=file,file=$FCITX_CONFIG_DIR/skk/user.dict,mode=readwrite
-type=file,file=@SKK_DEFAULT_PATH@,mode=readonly
+type=file,file=@[email protected],mode=readonly