diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/widgets/spinbox.cpp | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/widgets/spinbox.cpp')
| -rw-r--r-- | muse2/muse/widgets/spinbox.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/muse2/muse/widgets/spinbox.cpp b/muse2/muse/widgets/spinbox.cpp index bb6aaacc..a0f35478 100644 --- a/muse2/muse/widgets/spinbox.cpp +++ b/muse2/muse/widgets/spinbox.cpp @@ -28,22 +28,22 @@ namespace MusEGui { -//void SpinBoxLineEdit::mouseDoubleClickEvent(QMouseEvent* e) -//{ -// QLineEdit::mouseDoubleClickEvent(e); -// emit doubleClicked(); -// if((e->buttons() & Qt::LeftButton) && (e->modifiers() & Qt::ControlModifier)) -// emit ctrlDoubleClicked(); -//} - -void SpinBoxLineEdit::mousePressEvent(QMouseEvent* e) +void SpinBoxLineEdit::mouseDoubleClickEvent(QMouseEvent* e) { - QLineEdit::mousePressEvent(e); - //selectAll(); + QLineEdit::mouseDoubleClickEvent(e); + emit doubleClicked(); if((e->buttons() & Qt::LeftButton) && (e->modifiers() & Qt::ControlModifier)) - emit ctrlClicked(); + emit ctrlDoubleClicked(); } +//void SpinBoxLineEdit::mousePressEvent(QMouseEvent* e) +//{ +// QLineEdit::mousePressEvent(e); + //selectAll(); +// if((e->buttons() & Qt::LeftButton) && (e->modifiers() & Qt::ControlModifier)) +// emit ctrlClicked(); +//} + //--------------------------------------------------------- // SpinBox //--------------------------------------------------------- @@ -56,9 +56,9 @@ SpinBox::SpinBox(QWidget* parent) setLineEdit(le); setKeyboardTracking(false); - //connect(le, SIGNAL(doubleClicked()), this, SIGNAL(doubleClicked())); - //connect(le, SIGNAL(ctrlDoubleClicked()), this, SIGNAL(ctrlDoubleClicked())); - connect(le, SIGNAL(ctrlClicked()), this, SIGNAL(ctrlClicked())); + connect(le, SIGNAL(doubleClicked()), this, SIGNAL(doubleClicked())); + connect(le, SIGNAL(ctrlDoubleClicked()), this, SIGNAL(ctrlDoubleClicked())); + //connect(le, SIGNAL(ctrlClicked()), this, SIGNAL(ctrlClicked())); } SpinBox::SpinBox(int minValue, int maxValue, int step, QWidget* parent) @@ -71,9 +71,9 @@ SpinBox::SpinBox(int minValue, int maxValue, int step, QWidget* parent) setSingleStep(step); setKeyboardTracking(false); - //connect(le, SIGNAL(doubleClicked()), this, SIGNAL(doubleClicked())); - //connect(le, SIGNAL(ctrlDoubleClicked()), this, SIGNAL(ctrlDoubleClicked())); - connect(le, SIGNAL(ctrlClicked()), this, SIGNAL(ctrlClicked())); + connect(le, SIGNAL(doubleClicked()), this, SIGNAL(doubleClicked())); + connect(le, SIGNAL(ctrlDoubleClicked()), this, SIGNAL(ctrlDoubleClicked())); + //connect(le, SIGNAL(ctrlClicked()), this, SIGNAL(ctrlClicked())); } void SpinBox::keyPressEvent(QKeyEvent* ev) |