[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [gluon] /
From: Laszlo Papp <djszapi () archlinux ! us>
Date: 2011-01-23 14:15:46
Message-ID: 20110123141546.93154A6092 () git ! kde ! org
[Download RAW message or body]
Git commit 9b4aedea2f122fd34a8995288930d3ec88d811ab by Laszlo Papp.
Pushed by lpapp into branch 'master'.
Add a new bool mouseTrack property inside the mouse component class.
M +1 -0 creator/dialogs/newprojectdialogpage.cpp
M +1 -0 creator/dialogs/newprojectdialogpage.h
M +1 -0 creator/dialogs/projectselectiondialog.cpp
M +1 -0 creator/dialogs/projectselectiondialog.h
M +1 -0 creator/lib/widgets/enumpropertywidgetitem.cpp
M +1 -0 creator/lib/widgets/enumpropertywidgetitem.h
M +1 -0 creator/lib/widgets/propertywidgetitemfactory.cpp
M +12 -0 engine/components/input/mouseinput/mouseinputcomponent.cpp
M +4 -0 engine/components/input/mouseinput/mouseinputcomponent.h
http://commits.kde.org/fad2ae7b/9b4aedea2f122fd34a8995288930d3ec88d811ab
diff --git a/creator/dialogs/newprojectdialogpage.cpp \
b/creator/dialogs/newprojectdialogpage.cpp index f8a9d47..26d22c0 100644
--- a/creator/dialogs/newprojectdialogpage.cpp
+++ b/creator/dialogs/newprojectdialogpage.cpp
@@ -2,6 +2,7 @@
* This file is part of the Gluon Development Platform
* Copyright (C) 2010 Arjen Hiemstra <ahiemstra@heimr.nl>
* Copyright (C) 2010 Keith Rusler <xzekecomax@gmail.com>
+ * Copyright (C) 2010 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/dialogs/newprojectdialogpage.h \
b/creator/dialogs/newprojectdialogpage.h index 398c2bb..45e99a8 100644
--- a/creator/dialogs/newprojectdialogpage.h
+++ b/creator/dialogs/newprojectdialogpage.h
@@ -2,6 +2,7 @@
* This file is part of the Gluon Development Platform
* Copyright (C) 2010 Arjen Hiemstra <ahiemstra@heimr.nl>
* Copyright (C) 2010 Keith Rusler <xzekecomax@gmail.com>
+ * Copyright (C) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/dialogs/projectselectiondialog.cpp \
b/creator/dialogs/projectselectiondialog.cpp index 788bd97..8c93c1c 100644
--- a/creator/dialogs/projectselectiondialog.cpp
+++ b/creator/dialogs/projectselectiondialog.cpp
@@ -2,6 +2,7 @@
* This file is part of the Gluon Development Platform
* Copyright (C) 2010 Arjen Hiemstra <ahiemstra@heimr.nl>
* Copyright (C) 2010 Keith Rusler <xzekecomax@gmail.com>
+ * Copyright (C) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/dialogs/projectselectiondialog.h \
b/creator/dialogs/projectselectiondialog.h index 28b699c..1f19128 100644
--- a/creator/dialogs/projectselectiondialog.h
+++ b/creator/dialogs/projectselectiondialog.h
@@ -2,6 +2,7 @@
* This file is part of the Gluon Development Platform
* Copyright (C) 2010 Arjen Hiemstra <ahiemstra@heimr.nl>
* Copyright (C) 2010 Keith Rusler <xzekecomax@gmail.com>
+ * Copyright (C) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/lib/widgets/enumpropertywidgetitem.cpp \
b/creator/lib/widgets/enumpropertywidgetitem.cpp index 5310075..6509219 100644
--- a/creator/lib/widgets/enumpropertywidgetitem.cpp
+++ b/creator/lib/widgets/enumpropertywidgetitem.cpp
@@ -1,6 +1,7 @@
/******************************************************************************
* This file is part of the Gluon Development Platform
* Copyright (c) 2010 Dan Leinir Turthra Jensen <admin@leinir.dk>
+ * Copyright (c) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/lib/widgets/enumpropertywidgetitem.h \
b/creator/lib/widgets/enumpropertywidgetitem.h index 31cbc0b..2936ca3 100644
--- a/creator/lib/widgets/enumpropertywidgetitem.h
+++ b/creator/lib/widgets/enumpropertywidgetitem.h
@@ -2,6 +2,7 @@
* This file is part of the Gluon Development Platform
* Copyright (c) 2010 Dan Leinir Turthra Jensen <admin@leinir.dk>
* Copyright (c) 2010 Arjen Hiemstra <ahiemstra@heimr.nl>
+ * Copyright (c) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/creator/lib/widgets/propertywidgetitemfactory.cpp \
b/creator/lib/widgets/propertywidgetitemfactory.cpp index 36adc13..e6482f4 100644
--- a/creator/lib/widgets/propertywidgetitemfactory.cpp
+++ b/creator/lib/widgets/propertywidgetitemfactory.cpp
@@ -1,6 +1,7 @@
/******************************************************************************
* This file is part of the Gluon Development Platform
* Copyright (c) 2010 Dan Leinir Turthra Jensen <admin@leinir.dk>
+ * Copyright (c) 2011 Laszlo Papp <djszapi@archlinux.us>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
diff --git a/engine/components/input/mouseinput/mouseinputcomponent.cpp \
b/engine/components/input/mouseinput/mouseinputcomponent.cpp index 11f8667..8568790 \
100644
--- a/engine/components/input/mouseinput/mouseinputcomponent.cpp
+++ b/engine/components/input/mouseinput/mouseinputcomponent.cpp
@@ -46,6 +46,8 @@ class MouseInputComponent::MouseInputComponentPrivate
int lastY;
int lastZ;
+ bool mouseTrack;
+
static const int mouseButtonOffset;
};
@@ -163,6 +165,16 @@ void MouseInputComponent::setMouseButton( \
MouseInputComponent::MouseButton butto d->mouseButton = button;
}
+bool MouseInputComponent::mouseTrack() const
+{
+ return d->mouseTrack;
+}
+
+void MouseInputComponent::setMouseTrack( bool enable )
+{
+ d->mouseTrack = enable;
+}
+
int MouseInputComponent::relativeXAxis()
{
return d->lastX - d->mouse->position().x();
diff --git a/engine/components/input/mouseinput/mouseinputcomponent.h \
b/engine/components/input/mouseinput/mouseinputcomponent.h index b4ad0bf..3c4941b \
100644
--- a/engine/components/input/mouseinput/mouseinputcomponent.h
+++ b/engine/components/input/mouseinput/mouseinputcomponent.h
@@ -37,6 +37,7 @@ namespace GluonEngine
GLUON_OBJECT( GluonEngine::MouseInputComponent )
Q_INTERFACES( GluonEngine::Component )
Q_PROPERTY( MouseButton mouseButton READ mouseButton WRITE \
setMouseButton ) + Q_PROPERTY( bool mouseTrack READ mouseTrack WRITE \
setMouseTrack ) Q_ENUMS( MouseButton )
public:
@@ -74,6 +75,9 @@ namespace GluonEngine
MouseButton mouseButton() const;
void setMouseButton( MouseButton button );
+ bool mouseTrack() const;
+ void setMouseTrack( bool enable );
+
Q_INVOKABLE virtual int xAxis();
Q_INVOKABLE virtual int yAxis();
Q_INVOKABLE virtual int zAxis();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic