Skip to content

fix: add UOS build support and update dependencies #138

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

Merged
lzwind merged 2 commits into from
Mar 31, 2026
Merged

fix: add UOS build support and update dependencies #138

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
a2d3629
fix: add UOS build support and update dependencies
dengzhongyuan365-dev Mar 31, 2026
c3fb040
chore: Update version to 6.0.28
dengzhongyuan365-dev Mar 31, 2026
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
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ include(ECMSetupVersion)
include(GenerateExportHeader)
option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)
option(ENABLE_TEST "Enable test" Off)
option(BUILD_UOS "Build for UOS (use UOS Sogou IM)" Off)
if (BUILD_UOS)
add_definitions(-DBUILD_UOS)
message(" >>> Build for UOS: Sogou IM = com.sogou.ime.ng.fcitx5.uos")
else()
message(" >>> Build for Deepin: Sogou IM = com.sogou.ime.ng.fcitx5.deepin")
endif()
add_definitions(-DTRANSLATION_DOMAIN=\"org.fcitx.fcitx5.kcm\")
add_definitions(-DFCITX_GETTEXT_DOMAIN=\"deepin-fcitx5-configtool\")
add_definitions(-DQT_NO_KEYWORDS)
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
deepin-fcitx5configtool-plugin (6.0.28) unstable; urgency=medium

* fix: add UOS build support and update dependencies
* style(ui): adjust font and icon size for keyboard layout
* style(ui): unify title styles and fix addon button alignment

-- dengzhongyuan <dengzhongyuan@uniontech.com> Tue, 31 Mar 2026 22:27:45 +0800

deepin-fcitx5configtool-plugin (6.0.27) unstable; urgency=medium

* fix: add gettext translation support for fcitx5 config
Expand Down
1 change: 1 addition & 0 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Build-Depends:
libpolkit-qt6-1-dev,
pkg-config,
xkb-data,
lsb-release,
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://github.com/fcitx/fcitx5-configtool
Expand Down
5 changes: 4 additions & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,14 @@ $(eval $(call detect_qt_version))
%:
dh $@ --parallel

UOS_SYSTEM := $(shell lsb_release -i -s 2>/dev/null | grep -i uos | wc -l | tr -d ' ')

override_dh_auto_configure:
dh_auto_configure -- \
-DENABLE_KCM=Off \
-DCMAKE_BUILD_TYPE=Release \
-DQT_DIR=$(QT_DIR)
-DQT_DIR=$(QT_DIR) \
$(if $(filter 1,$(UOS_SYSTEM)),-DBUILD_UOS=ON,)

override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
Expand Down
7 changes: 6 additions & 1 deletion src-old/src/dcc-module/imsettingwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2021 ~ 2021 Deepin Technology Co., Ltd.
// Copyright (C) 2021 ~ 2026 Deepin Technology Co., Ltd.
// SPDX-FileCopyrightText: 2023 Deepin Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -36,8 +36,13 @@

DWIDGET_USE_NAMESPACE

#ifdef BUILD_UOS
const QString SOGOU_IM_UNIQUE_NAME = "com.sogou.ime.ng.fcitx5.uos";
const QString SOGOU_CONFIGURE_APP_ID = "com.sogou.ime.ng.fcitx5.uos.configurer";
#else
const QString SOGOU_IM_UNIQUE_NAME = "com.sogou.ime.ng.fcitx5.deepin";
const QString SOGOU_CONFIGURE_APP_ID = "com.sogou.ime.ng.fcitx5.deepin.configurer";
#endif

using namespace dcc_fcitx_configtool::widgets;

Expand Down
10 changes: 8 additions & 2 deletions src/dcc-fcitx5configtool/operation/fcitx5configtool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
#include "fcitx5configtool.h"
Expand Down Expand Up @@ -31,9 +31,15 @@ namespace deepin {
namespace fcitx5configtool {

static QString kFcitxConfigGlobalPath = "fcitx://config/global";
#ifdef BUILD_UOS
static const QString kSogouAddonUniqueName = "com.sogou.ime.ng.fcitx5.uos-addon";
static const QString kSogouIMUniqueName = "com.sogou.ime.ng.fcitx5.uos";
static const QString kSogouConfigureAppId = "com.sogou.ime.ng.fcitx5.uos.configurer";
#else
static const QString kSogouAddonUniqueName = "com.sogou.ime.ng.fcitx5.deepin-addon";
static const QString kSogouIMUniqueName = "com.sogou.ime.ng.fcitx5.deepin";
static const QString kSogouConfigureAppId = "sogou-ime-setting";
static const QString kSogouConfigureAppId = "com.sogou.ime.ng.fcitx5.deepin.configurer";
#endif

Fcitx5ConfigToolWorkerPrivate::Fcitx5ConfigToolWorkerPrivate(Fcitx5ConfigToolWorker *parent)
: QObject(parent), q(parent)
Expand Down
193 changes: 96 additions & 97 deletions src/dcc-fcitx5configtool/qml/DetailConfigItem.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2024 - 2027 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2024 - 2026 UnionTech Software Technology Co., Ltd.
// SPDX-License-Identifier: GPL-3.0-or-later
import QtQuick 2.15
import QtQuick.Layouts 1.15
Expand Down Expand Up @@ -65,121 +65,120 @@ DccObject {
}
}

Loader {
active: !root.loading
asynchronous: true
sourceComponent: DccRepeater {
model: root.configOptions
delegate: Component {
DccObject {
parentName: containerItem.name
displayName: modelData.description
weight: root.weight + index + 1
pageType: DccObject.Editor
visible: headerItem.expanded
backgroundType: DccObject.Normal | DccObject.Hover
page: Loader {
height: 40
sourceComponent: {
switch (modelData.type) {
case "Boolean":
return booleanComponent
case "Integer":
return integerComponent
case "String":
return stringComponent
case "List|Key":
return keyComponent
case "Enum":
return enumComponent
default:
return null
}
// Must be a direct child of containerItem so DccManager can register it.
DccRepeater {
id: optionRepeater
visible: !root.loading
model: root.configOptions
delegate: Component {
DccObject {
parentName: containerItem.name
displayName: modelData.description
weight: root.weight + index + 1
pageType: DccObject.Editor
visible: headerItem.expanded
backgroundType: DccObject.Normal | DccObject.Hover
page: Loader {
height: 40
sourceComponent: {
switch (modelData.type) {
case "Boolean":
return booleanComponent
case "Integer":
return integerComponent
case "String":
return stringComponent
case "List|Key":
return keyComponent
case "Enum":
return enumComponent
default:
return null
}
}

Component {
id: booleanComponent
D.Switch {
checked: modelData.value === "True"
onCheckedChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
checked ? "True" : "False")
}
Component {
id: booleanComponent
D.Switch {
checked: modelData.value === "True"
onCheckedChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
checked ? "True" : "False")
}
}
}

Component {
id: integerComponent
D.SpinBox {
width: 55
implicitWidth: 55
value: parseInt(modelData.value)
onValueChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
value.toString())
}
Component {
id: integerComponent
D.SpinBox {
width: 55
implicitWidth: 55
value: parseInt(modelData.value)
onValueChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
value.toString())
}
}
}

Component {
id: stringComponent
D.TextField {
text: modelData.value
onTextChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
text)
}
Component {
id: stringComponent
D.TextField {
text: modelData.value
onTextChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
text)
}
}
}

Component {
id: keyComponent
KeySequenceDisplay {
placeholderText: qsTr("Please enter a new shortcut")
keys: modelData.value
background.visible: false
onFocusChanged: {
if (!focus) {
if (keys.length > 0) {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name + "/0",
keys, true)
} else if (root.keyName != modelData.name) {
keys = modelData.value
}
Component {
id: keyComponent
KeySequenceDisplay {
placeholderText: qsTr("Please enter a new shortcut")
keys: modelData.value
background.visible: false
onFocusChanged: {
if (!focus) {
if (keys.length > 0) {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name + "/0",
keys, true)
} else if (root.keyName != modelData.name) {
keys = modelData.value
}
}
onKeysChanged: {
root.keyName = modelData.name
}
}
onKeysChanged: {
root.keyName = modelData.name
}

Connections {
target: root
function onKeyNameChanged() {
if (root.keyName != modelData.name) {
focus = false
}
Connections {
target: root
function onKeyNameChanged() {
if (root.keyName != modelData.name) {
focus = false
}
}
}
}
}

Component {
id: enumComponent
D.ComboBox {
model: modelData.propertiesI18n
flat: true
currentIndex: modelData.properties.indexOf(
modelData.value) ? modelData.properties.indexOf(
modelData.value) : 0
onCurrentIndexChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
modelData.properties[currentIndex])
}
Component {
id: enumComponent
D.ComboBox {
model: modelData.propertiesI18n
flat: true
currentIndex: modelData.properties.indexOf(
modelData.value) ? modelData.properties.indexOf(
modelData.value) : 0
onCurrentIndexChanged: {
dccData.fcitx5ConfigProxy.setValue(
root.name + "/" + modelData.name,
modelData.properties[currentIndex])
}
}
}
Expand Down
Loading