Commit fe82d72797b3dbe1fdb76dc393cadbdc4a7dab19

swiesner <swiesner @283d02a7-25f6-0310…ecb5cbfe19da.>
Wed Aug 04 18:50:39 CEST 2010

Tree SHA1: 62f171f
Parent SHA1: c8323b8 (Added property and configuration setting for two finger emulation pressure)
raw diff | raw patch

Added property and configuration setting for two-finger emulation width

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/utils/synaptiks@1159179 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

Diff rendering mode:
inline
side by side


136	136	<method name="setTwoFingerEmulationMinimumPressure">
137	137	<arg type="i" direction="in"/>
138	138	</method>
	139	<method name="twoFingerEmulationMinimumWidth">
	140	<arg type="i" direction="out"/>
	141	</method>
	142	<method name="setTwoFingerEmulationMinimumWidth">
	143	<arg type="i" direction="in"/>
	144	</method>
139	145	<method name="fastTaps">
140	146	<arg type="b" direction="out"/>
141	147	</method>


277	277	// tapping configuration
278	278	<< "FastTaps" << "TapAndDragGesture" << "LockedDrags"
279	279	// two finger emulation
280		<< "TwoFingerEmulationMinimumPressure";
	280	<< "TwoFingerEmulationMinimumPressure"
	281	<< "TwoFingerEmulationMinimumWidth";
281	282	foreach (const QString &name, names) {
282	283	KConfigSkeletonItem *item = d->config->findItem(name);
283	284	Q_ASSERT(item);
…	…
333	333	// tapping configuration
334	334	<< "FastTaps" << "TapAndDragGesture" << "LockedDrags"
335	335	// two finger emulation
336		<< "TwoFingerEmulationMinimumPressure";
	336	<< "TwoFingerEmulationMinimumPressure"
	337	<< "TwoFingerEmulationMinimumWidth";
337	338	foreach (const QString &name, names) {
338	339	KConfigSkeletonItem *item = d->config->findItem(name);
339	340	Q_ASSERT(item);


52	52	static const char SCROLLING_DISTANCE[] = "Synaptics Scrolling Distance";
53	53	static const char TAP_ACTION[] = "Synaptics Tap Action";
54	54	static const char TWO_FINGER_PRESSURE[] = "Synaptics Two-Finger Pressure";
	55	static const char TWO_FINGER_WIDTH[] = "Synaptics Two-Finger Width";
55	56	static const char FAST_TAP[] = "Synaptics Tap FastTap";
56	57	static const char CIRCULAR_PAD[] = "Synaptics Circular Pad";
57	58	static const char CAPABILITIES[] = "Synaptics Capabilities";
…	…
378	378	void Touchpad::setTwoFingerEmulationMinimumPressure(int pressure) {
379	379	Q_D(Touchpad);
380	380	d->device->setProperty(TWO_FINGER_SCROLLING, pressure);
	381	}
	382
	383	int Touchpad::twoFingerEmulationMinimumWidth() const {
	384	Q_D(const Touchpad);
	385	return d->device->property<int>(TWO_FINGER_WIDTH, 0);
	386	}
	387
	388	void Touchpad::setTwoFingerEmulationMinimumWidth(int width) {
	389	Q_D(Touchpad);
	390	d->device->setProperty(TWO_FINGER_WIDTH, width);
381	391	}
382	392
383	393	bool Touchpad::fastTaps() const {


532	532	DESIGNABLE false)
533	533
534	534	/**
	535	* @brief Minimum with of a touch to be recognized as two-finger touch.
	536	*
	537	* Some touchpads report two-finger touches as "wide" finger
	538	* touches. This property sets the minimum width of a touch to
	539	* create a two-finger touch. Only if a "wide" touch is wider than
	540	* the threshold configured by this property, a two-finger press is
	541	* issued by the driver.
	542	*
	543	* @see setTwoFingerEmulationMinimumWidth(int)
	544	* @see twoFingerEmulationMinimumWidth() const
	545	* @see capabilities
	546	* @see fingerDetection
	547	*/
	548	Q_PROPERTY(int twoFingerEmulationMinimumWidth
	549	READ twoFingerEmulationMinimumWidth
	550	WRITE setTwoFingerEmulationMinimumWidth
	551	DESIGNABLE false)
	552
	553	/**
535	554	* @brief Whether or not fast tapping is enabled.
536	555	*
537	556	* Fast tapping makes the driver react faster on single taps, but
…	…
1152	1152	* @see twoFingerEmulationMinimumPressure
1153	1153	*/
1154	1154	Q_SCRIPTABLE void setTwoFingerEmulationMinimumPressure(int);
	1155
	1156	/**
	1157	* @brief The width threshold to emulate a two-finger press.
	1158	*
	1159	* @see twoFingerEmulationMinimumWidth
	1160	*/
	1161	Q_SCRIPTABLE int twoFingerEmulationMinimumWidth() const;
	1162
	1163	/**
	1164	* @brief Set the width threshold to emulate a two-finger press.
	1165	*
	1166	* @see twoFingerEmulationMinimumWidth
	1167	*/
	1168	Q_SCRIPTABLE void setTwoFingerEmulationMinimumWidth(int);
1155	1169
1156	1170	/**
1157	1171	* @brief Whether fast taps are enabled.


253	253	pressure);
254	254	}
255	255
	256	int TouchpadAdaptor::twoFingerEmulationMinimumWidth() const {
	257	return this->propertyOrDBusError(
	258	"twoFingerEmulationMinimumWidth").toInt();
	259	}
	260
	261	void TouchpadAdaptor::setTwoFingerEmulationMinimumWidth(int width) {
	262	this->setPropertyOrDBusError("twoFingerEmulationMinimumWidth", width);
	263	}
	264
256	265	bool TouchpadAdaptor::fastTaps() const {
257	266	return this->propertyOrDBusError("fastTaps").toBool();
258	267	}


119	119	int twoFingerEmulationMinimumPressure() const;
120	120	void setTwoFingerEmulationMinimumPressure(int);
121	121
	122	int twoFingerEmulationMinimumWidth() const;
	123	void setTwoFingerEmulationMinimumWidth(int);
	124
122	125	bool fastTaps() const;
123	126	void setFastTaps(bool enabled);
124	127


156	156	<label>Minimum pressure to emulate a two-finger press</label>
157	157	<default>150</default>
158	158	</entry>
	159	<entry name="TwoFingerEmulationMinimumWidth" type="Int">
	160	<label>Minimum width to emulate a two-finger press</label>
	161	<default>10</default>
	162	</entry>
159	163	</group>
160	164	<group name="Tapping">
161	165	<entry name="$(Corner)CornerButton" type="Enum">

Commit fe82d72797b3dbe1fdb76dc393cadbdc4a7dab19

Gitorious