From 289ee4f5352edab1fa31311ef6a800e7d9998acd Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Fri, 27 Apr 2012 09:50:19 +0000 Subject: Changed filling protocol Listbox to match the Filter and Tracker. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@109 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.h | 9 ++++ FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.vcproj | 46 +++++++++++++++++++++ FTNoIR_Protocol_MOUSE/FTNoIR_mousecontrols.ui | 10 +++-- FTNoIR_Protocol_MOUSE/Protocol.qrc | 5 +++ FTNoIR_Protocol_MOUSE/images/Mouse.ico | Bin 0 -> 17542 bytes 5 files changed, 66 insertions(+), 4 deletions(-) create mode 100644 FTNoIR_Protocol_MOUSE/Protocol.qrc create mode 100644 FTNoIR_Protocol_MOUSE/images/Mouse.ico (limited to 'FTNoIR_Protocol_MOUSE') diff --git a/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.h b/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.h index af9574ca..dfe4ae3e 100644 --- a/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.h +++ b/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.h @@ -71,6 +71,10 @@ public: void sendHeadposeToGame( T6DOF *headpose ); void getNameFromGame( char *dest ); // Take care dest can handle up to 100 chars... + void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }; + void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }; + void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }; + private: HANDLE h; INPUT MouseStruct; @@ -107,6 +111,11 @@ public: void Release(); // Member functions which are accessible from outside the DLL void Initialize(QWidget *parent); + void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }; + void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look"); }; + void getDescription(QString *strToBeFilled) { *strToBeFilled = QString("Mouse Look protocol"); }; + void getIcon(QIcon *icon) { *icon = QIcon(":/images/Mouse.ico"); }; + private: Ui::UICMOUSEControls ui; void loadSettings(); diff --git a/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.vcproj b/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.vcproj index 1cfa3218..ec50f7ad 100644 --- a/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.vcproj +++ b/FTNoIR_Protocol_MOUSE/FTNoIR_Protocol_MOUSE.vcproj @@ -250,6 +250,32 @@ UniqueIdentifier="{D9D6E242-F8AF-46E4-B9FD-80ECBC20BA3E}" ParseFiles="false" > + + + + + + + + + + + + + + + + diff --git a/FTNoIR_Protocol_MOUSE/FTNoIR_mousecontrols.ui b/FTNoIR_Protocol_MOUSE/FTNoIR_mousecontrols.ui index bb32ff11..4a6cc3b9 100644 --- a/FTNoIR_Protocol_MOUSE/FTNoIR_mousecontrols.ui +++ b/FTNoIR_Protocol_MOUSE/FTNoIR_mousecontrols.ui @@ -11,11 +11,11 @@ - PPJoy settings FaceTrackNoIR + MouseLook settings FaceTrackNoIR - - images/FaceTrackNoIR.icoimages/FaceTrackNoIR.ico + + :/images/Mouse.ico:/images/Mouse.ico Qt::LeftToRight @@ -403,7 +403,9 @@ - + + + slideSensX diff --git a/FTNoIR_Protocol_MOUSE/Protocol.qrc b/FTNoIR_Protocol_MOUSE/Protocol.qrc new file mode 100644 index 00000000..0e5e11d9 --- /dev/null +++ b/FTNoIR_Protocol_MOUSE/Protocol.qrc @@ -0,0 +1,5 @@ + + + images/Mouse.ico + + diff --git a/FTNoIR_Protocol_MOUSE/images/Mouse.ico b/FTNoIR_Protocol_MOUSE/images/Mouse.ico new file mode 100644 index 00000000..1151ab2b Binary files /dev/null and b/FTNoIR_Protocol_MOUSE/images/Mouse.ico differ -- cgit v1.2.3