Commit 8f7a827f authored by Alexander Volkov's avatar Alexander Volkov
Browse files

Rename kcm_input to kcm_mouse

Summary: This KCM provides settings for mouse only.

Reviewers: #plasma, davidedmundson

Reviewed By: #plasma, davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D13193
parent 9d5bdcb1
......@@ -109,7 +109,7 @@ add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required f
find_package(Evdev)
set_package_properties(Evdev PROPERTIES TYPE OPTIONAL)
add_feature_info("Evdev" EVDEV_FOUND "Evdev driver headers needed for input KCM")
add_feature_info("Evdev" EVDEV_FOUND "Evdev driver headers needed for mouse KCM")
find_package(Synaptics)
set_package_properties(Synaptics PROPERTIES TYPE OPTIONAL)
......@@ -117,7 +117,7 @@ add_feature_info("Synaptics" SYNAPTICS_FOUND "Synaptics libraries needed for tou
find_package(XorgLibinput)
set_package_properties(XorgLibinput PROPERTIES TYPE OPTIONAL)
add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for input KCM")
add_feature_info("XorgLibinput" XORGLIBINPUT_FOUND "Libinput driver headers needed for mouse KCM")
include(ConfigureChecks.cmake)
......
......@@ -15,7 +15,7 @@ if(X11_Xkb_FOUND AND XCB_XKB_FOUND)
endif()
if (EVDEV_FOUND AND XORGLIBINPUT_FOUND AND X11_Xinput_FOUND)
add_subdirectory( input )
add_subdirectory( mouse )
endif()
add_subdirectory( access )
......
......@@ -3,7 +3,7 @@ if(NOT X11_Xinput_FOUND)
endif()
# KI18N Translation Domain for this library
add_definitions(-DTRANSLATION_DOMAIN=\"kcminput\")
add_definitions(-DTRANSLATION_DOMAIN=\"kcmmouse\")
add_subdirectory( misc )
......@@ -17,9 +17,9 @@ ecm_qt_declare_logging_category(common_SRCS
HEADER
logging.h
IDENTIFIER
KCM_INPUT
KCM_MOUSE
CATEGORY_NAME
kcm_input
kcm_mouse
DEFAULT_SEVERITY
Critical
)
......@@ -64,12 +64,12 @@ ki18n_wrap_ui(common_SRCS kcm/xlib/kcmmouse.ui)
qt5_add_resources( common_SRCS kcm/resources.qrc )
add_library(kcm_input MODULE
add_library(kcm_mouse MODULE
${common_SRCS}
${backend_SRCS}
)
target_link_libraries(kcm_input
target_link_libraries(kcm_mouse
${backend_LIBS}
KF5::KCMUtils
KF5::I18n
......@@ -82,7 +82,7 @@ target_link_libraries(kcm_input
Qt5::QuickWidgets
)
install(TARGETS kcm_input DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(TARGETS kcm_mouse DESTINATION ${KDE_INSTALL_PLUGINDIR} )
########### install files ###############
......
#! /usr/bin/env bash
$EXTRACTRC `find -name \*.ui` >> rc.cpp || exit 11
$XGETTEXT *.cpp -o $podir/kcminput.pot
$XGETTEXT *.cpp -o $podir/kcmmouse.pot
rm -f rc.cpp
......@@ -68,11 +68,11 @@ void KWinWaylandBackend::findDevices()
QStringList devicesSysNames;
const QVariant reply = m_deviceManager->property("devicesSysNames");
if (reply.isValid()) {
qCDebug(KCM_INPUT) << "Devices list received successfully from KWin.";
qCDebug(KCM_MOUSE) << "Devices list received successfully from KWin.";
devicesSysNames = reply.toStringList();
}
else {
qCCritical(KCM_INPUT) << "Error on receiving device list from KWin.";
qCCritical(KCM_MOUSE) << "Error on receiving device list from KWin.";
m_errorString = i18n("Querying input devices failed. Please reopen this settings module.");
return;
}
......@@ -92,12 +92,12 @@ void KWinWaylandBackend::findDevices()
KWinWaylandDevice* dev = new KWinWaylandDevice(sn);
if (!dev->init()) {
qCCritical(KCM_INPUT) << "Error on creating device object" << sn;
qCCritical(KCM_MOUSE) << "Error on creating device object" << sn;
m_errorString = i18n("Critical error on reading fundamental device infos of %1.", sn);
return;
}
m_devices.append(dev);
qCDebug(KCM_INPUT).nospace() << "Device found: " << dev->name() << " (" << dev->sysName() << ")";
qCDebug(KCM_MOUSE).nospace() << "Device found: " << dev->name() << " (" << dev->sysName() << ")";
}
}
}
......@@ -153,7 +153,7 @@ void KWinWaylandBackend::onDeviceAdded(QString sysName)
}
m_devices.append(dev);
qCDebug(KCM_INPUT).nospace() << "Device connected: " << dev->name() << " (" << dev->sysName() << ")";
qCDebug(KCM_MOUSE).nospace() << "Device connected: " << dev->name() << " (" << dev->sysName() << ")";
emit deviceAdded(true);
}
}
......@@ -167,7 +167,7 @@ void KWinWaylandBackend::onDeviceRemoved(QString sysName)
}
KWinWaylandDevice *dev = static_cast<KWinWaylandDevice*>(*it);
qCDebug(KCM_INPUT).nospace() << "Device disconnected: " << dev->name() << " (" << dev->sysName() << ")";
qCDebug(KCM_MOUSE).nospace() << "Device disconnected: " << dev->name() << " (" << dev->sysName() << ")";
int index = it - m_devices.cbegin();
m_devices.removeAt(index);
......
......@@ -132,7 +132,7 @@ bool KWinWaylandDevice::applyConfig()
for (QString m : msgs) {
if (!m.isNull()) {
qCCritical(KCM_INPUT) << "in error:" << m;
qCCritical(KCM_MOUSE) << "in error:" << m;
if (!success) {
error_msg.append("\n");
}
......@@ -142,7 +142,7 @@ bool KWinWaylandDevice::applyConfig()
}
if (!success) {
qCCritical(KCM_INPUT) << error_msg;
qCCritical(KCM_MOUSE) << error_msg;
}
return success;
}
......@@ -167,7 +167,7 @@ QString KWinWaylandDevice::valueWriter(const Prop<T> &prop)
m_iface->setProperty(prop.dbus, prop.val);
QDBusError error = m_iface->lastError();
if (error.isValid()) {
qCCritical(KCM_INPUT) << error.message();
qCCritical(KCM_MOUSE) << error.message();
return error.message();
}
return QString();
......@@ -178,7 +178,7 @@ bool KWinWaylandDevice::valueLoader(Prop<T> &prop)
{
QVariant reply = m_iface->property(prop.dbus);
if (!reply.isValid()) {
qCCritical(KCM_INPUT) << "Error on d-bus read of" << prop.dbus;
qCCritical(KCM_MOUSE) << "Error on d-bus read of" << prop.dbus;
prop.avail = false;
return false;
}
......
......@@ -53,11 +53,11 @@ X11Backend *X11Backend::implementation(QObject *parent)
//There are multiple possible drivers
if (testAtom) {
qCDebug(KCM_INPUT) << "Using libinput driver on X11.";
qCDebug(KCM_MOUSE) << "Using libinput driver on X11.";
return new X11LibinputBackend(parent);
}
else {
qCDebug(KCM_INPUT) << "Using evdev driver on X11.";
qCDebug(KCM_MOUSE) << "Using evdev driver on X11.";
return new X11EvdevBackend(parent);
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment