Attachment #899052 for bug #937340

View | Details | Raw Unified | Return to bug 937340
Collapse All | Expand All




option(ENABLE_KCM "Enable KDE Config Module" On)
option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)
option(ENABLE_TEST "Enable test" Off)
option(ENABLE_X11 "Enable X11 integration" On)
add_definitions(-DTRANSLATION_DOMAIN=\"kcm_fcitx5\")
add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\")
add_definitions(-DQT_NO_KEYWORDS)
if (ENABLE_X11)
add_definitions(-DENABLE_X11)
endif ()

if (ENABLE_CONFIG_QT)
    find_package(KF${QT_MAJOR_VERSION}ItemViews REQUIRED)


find_package(PkgConfig REQUIRED)
find_package(Gettext REQUIRED)
if (ENABLE_X11)
find_package(X11 REQUIRED)
find_package(XKeyboardConfig REQUIRED)
pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET)
endif ()

configure_file(config.h.in config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})

add_subdirectory(po)
add_subdirectory(src)
if (ENABLE_X11)
add_subdirectory(layout)
endif ()

feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

Lines 28-32 target_link_libraries(configwidgetslib Link Here

(-)a/src/lib/configwidgetslib/CMakeLists.txt (-2 / +4 lines)
28	Fcitx5::Utils	28	Fcitx5::Utils
29	Fcitx5Qt${QT_MAJOR_VERSION}::DBusAddons	29	Fcitx5Qt${QT_MAJOR_VERSION}::DBusAddons
30	Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons	30	Fcitx5Qt${QT_MAJOR_VERSION}::WidgetsAddons
31	configlib	31	configlib)
32	layoutlib)	32	if (ENABLE_X11)
		33	target_link_libraries(configwidgetslib layoutlib)
		34	endif ()





#include "layoutselector.h"
#include "dbusprovider.h"
#ifdef ENABLE_X11
#include "keyboardlayoutwidget.h"
#endif	// ENABLE_X11
#include "layoutmodel.h"
#include "ui_layoutselector.h"
#include <QDBusPendingCallWatcher>

    connect(ui_->variantComboBox,
            qOverload<int>(&QComboBox::currentIndexChanged), this,
            &LayoutSelector::variantComboBoxChanged);
#ifdef ENABLE_X11
    if (qApp->platformName() == "xcb") {
        keyboardLayoutWidget_ = new KeyboardLayoutWidget(this);
        keyboardLayoutWidget_->setMinimumSize(QSize(400, 200));

                                             QSizePolicy::Expanding);
        ui_->verticalLayout->addWidget(keyboardLayoutWidget_);
    }
#endif	// ENABLE_X11
}

LayoutSelector::~LayoutSelector() {}

    ui_->variantComboBox->setCurrentIndex(0);
}

#ifdef ENABLE_X11
void LayoutSelector::variantComboBoxChanged() {
    if (!keyboardLayoutWidget_) {
        return;

        keyboardLayoutWidget_->setVisible(true);
    }
}
#else
void LayoutSelector::variantComboBoxChanged() { return; }
#endif	// ENABLE_X11

} // namespace kcm
} // namespace fcitx

Lines 53-59 private Q_SLOTS: Link Here

(-)a/src/lib/configwidgetslib/layoutselector.h (+2 lines)
53	std::unique_ptr<Ui::LayoutSelector> ui_;	53	std::unique_ptr<Ui::LayoutSelector> ui_;
54	DBusProvider *dbus_;	54	DBusProvider *dbus_;
55	LayoutProvider *layoutProvider_;	55	LayoutProvider *layoutProvider_;
		56	#ifdef ENABLE_X11
56	KeyboardLayoutWidget *keyboardLayoutWidget_ = nullptr;	57	KeyboardLayoutWidget *keyboardLayoutWidget_ = nullptr;
		58	#endif
57	Iso639 iso639_;	59	Iso639 iso639_;
58		60
59	QString preSelectLayout_;	61	QString preSelectLayout_;

Return to bug 937340

Lines 40-48 include(GenerateExportHeader) Link Here

(-)a/CMakeLists.txt (+8 lines)
40	option(ENABLE_KCM "Enable KDE Config Module" On)	40	option(ENABLE_KCM "Enable KDE Config Module" On)
41	option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)	41	option(ENABLE_CONFIG_QT "Enable fcitx5-config-qt" On)
42	option(ENABLE_TEST "Enable test" Off)	42	option(ENABLE_TEST "Enable test" Off)
		43	option(ENABLE_X11 "Enable X11 integration" On)
43	add_definitions(-DTRANSLATION_DOMAIN=\"kcm_fcitx5\")	44	add_definitions(-DTRANSLATION_DOMAIN=\"kcm_fcitx5\")
44	add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\")	45	add_definitions(-DFCITX_GETTEXT_DOMAIN=\"fcitx5-configtool\")
45	add_definitions(-DQT_NO_KEYWORDS)	46	add_definitions(-DQT_NO_KEYWORDS)
		47	if (ENABLE_X11)
		48	add_definitions(-DENABLE_X11)
		49	endif ()
46		50
47	if (ENABLE_CONFIG_QT)	51	if (ENABLE_CONFIG_QT)
48	find_package(KF${QT_MAJOR_VERSION}ItemViews REQUIRED)	52	find_package(KF${QT_MAJOR_VERSION}ItemViews REQUIRED)
Lines 95-109 include("${FCITX_INSTALL_CMAKECONFIG_DIR}/Fcitx5Utils/Fcitx5CompilerSettings.cma Link Here
95		99
96	find_package(PkgConfig REQUIRED)	100	find_package(PkgConfig REQUIRED)
97	find_package(Gettext REQUIRED)	101	find_package(Gettext REQUIRED)
		102	if (ENABLE_X11)
98	find_package(X11 REQUIRED)	103	find_package(X11 REQUIRED)
99	find_package(XKeyboardConfig REQUIRED)	104	find_package(XKeyboardConfig REQUIRED)
100	pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET)	105	pkg_check_modules(XkbFile "xkbfile" REQUIRED IMPORTED_TARGET)
		106	endif ()
101		107
102	configure_file(config.h.in config.h)	108	configure_file(config.h.in config.h)
103	include_directories(${CMAKE_CURRENT_BINARY_DIR})	109	include_directories(${CMAKE_CURRENT_BINARY_DIR})
104		110
105	add_subdirectory(po)	111	add_subdirectory(po)
106	add_subdirectory(src)	112	add_subdirectory(src)
		113	if (ENABLE_X11)
107	add_subdirectory(layout)	114	add_subdirectory(layout)
		115	endif ()
108		116
109	feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)	117	feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

Lines 6-12 Link Here

(-)a/src/lib/configwidgetslib/layoutselector.cpp (+8 lines)
6		6
7	#include "layoutselector.h"	7	#include "layoutselector.h"
8	#include "dbusprovider.h"	8	#include "dbusprovider.h"
		9	#ifdef ENABLE_X11
9	#include "keyboardlayoutwidget.h"	10	#include "keyboardlayoutwidget.h"
		11	#endif // ENABLE_X11
10	#include "layoutmodel.h"	12	#include "layoutmodel.h"
11	#include "ui_layoutselector.h"	13	#include "ui_layoutselector.h"
12	#include <QDBusPendingCallWatcher>	14	#include <QDBusPendingCallWatcher>
Lines 45-50 LayoutSelector::LayoutSelector(DBusProvider dbus, QWidget parent) Link Here
45	connect(ui_->variantComboBox,	47	connect(ui_->variantComboBox,
46	qOverload<int>(&QComboBox::currentIndexChanged), this,	48	qOverload<int>(&QComboBox::currentIndexChanged), this,
47	&LayoutSelector::variantComboBoxChanged);	49	&LayoutSelector::variantComboBoxChanged);
		50	#ifdef ENABLE_X11
48	if (qApp->platformName() == "xcb") {	51	if (qApp->platformName() == "xcb") {
49	keyboardLayoutWidget_ = new KeyboardLayoutWidget(this);	52	keyboardLayoutWidget_ = new KeyboardLayoutWidget(this);
50	keyboardLayoutWidget_->setMinimumSize(QSize(400, 200));	53	keyboardLayoutWidget_->setMinimumSize(QSize(400, 200));
Lines 52-57 LayoutSelector::LayoutSelector(DBusProvider dbus, QWidget parent) Link Here
52	QSizePolicy::Expanding);	55	QSizePolicy::Expanding);
53	ui_->verticalLayout->addWidget(keyboardLayoutWidget_);	56	ui_->verticalLayout->addWidget(keyboardLayoutWidget_);
54	}	57	}
		58	#endif // ENABLE_X11
55	}	59	}
56		60
57	LayoutSelector::~LayoutSelector() {}	61	LayoutSelector::~LayoutSelector() {}
Lines 128-133 void LayoutSelector::layoutComboBoxChanged() { Link Here
128	ui_->variantComboBox->setCurrentIndex(0);	132	ui_->variantComboBox->setCurrentIndex(0);
129	}	133	}
130		134
		135	#ifdef ENABLE_X11
131	void LayoutSelector::variantComboBoxChanged() {	136	void LayoutSelector::variantComboBoxChanged() {
132	if (!keyboardLayoutWidget_) {	137	if (!keyboardLayoutWidget_) {
133	return;	138	return;
Lines 142-147 void LayoutSelector::variantComboBoxChanged() { Link Here
142	keyboardLayoutWidget_->setVisible(true);	147	keyboardLayoutWidget_->setVisible(true);
143	}	148	}
144	}	149	}
		150	#else
		151	void LayoutSelector::variantComboBoxChanged() { return; }
		152	#endif // ENABLE_X11
145		153
146	} // namespace kcm	154	} // namespace kcm
147	} // namespace fcitx	155	} // namespace fcitx