Skip to content

replace SKK_DEFAULT_PATH with SKK_PATH #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eagleoflqj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

replace SKK_DEFAULT_PATH with SKK_PATH #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02303b1
replace SKK_DEFAULT_PATH with SKK_PATH
eagleoflqj Dec 9, 2025
e3f51cf
remove extraneous input
eagleoflqj Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
- name: Build and Install fcitx5-qt
uses: fcitx/github-actions@cmake
with:
repository: fcitx/fcitx5-qt
path: fcitx5-qt
cmake-option: >-
-DENABLE_QT4=Off -DENABLE_QT5=Off -DENABLE_QT6=On
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion config.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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__ */
2 changes: 1 addition & 1 deletion gui/adddictdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
Expand Down
2 changes: 1 addition & 1 deletion src/dictionary_list.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading