Commit da1a35ab authored by Jan Möbius's avatar Jan Möbius

Fixed Qt 4.6 delete key event in datacontrol. Fixes Bug 320

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@9483 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 09dbe1bd
......@@ -48,14 +48,19 @@ DatacontrolToolboxWidget::DatacontrolToolboxWidget(QWidget* _parent)
: QWidget(_parent)
{
setupUi(this);
connect(treeView,SIGNAL(keyEvent( QKeyEvent* )), this,SIGNAL(keyEvent( QKeyEvent* )));
setFocusPolicy(Qt::StrongFocus);
}
void DatacontrolToolboxWidget::keyPressEvent (QKeyEvent * _event ) {
// Only react on our own key events
if ( ( (_event->modifiers() & Qt::ControlModifier) && ( _event->key() == Qt::Key_A ) ) ||
( _event->key() == Qt::Key_Delete ) )
emit keyEvent( _event );
else
_event->ignore();
}
......@@ -54,6 +54,7 @@ class DatacontrolToolboxWidget : public QWidget, public Ui::dctoolbox
DatacontrolToolboxWidget(QWidget* _parent = 0);
protected:
void keyPressEvent ( QKeyEvent* _event );
virtual void keyPressEvent ( QKeyEvent * event );
};
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 83 $ *
* $Author: moebius $ *
* $Date: 2009-02-27 17:31:45 +0100 (Fr, 27. Feb 2009) $ *
* *
\*===========================================================================*/
#include "TreeView.hh"
#include <QtGui>
#include <iostream>
DataControlTreeView::DataControlTreeView(QWidget* _parent)
: QTreeView(_parent)
{
setFocusPolicy(Qt::StrongFocus);
}
void DataControlTreeView::keyPressEvent (QKeyEvent * _event ) {
// Only react on our own key events
if ( ( (_event->modifiers() & Qt::ControlModifier) && ( _event->key() == Qt::Key_A ) ) ||
( _event->key() == Qt::Key_Delete ) )
emit keyEvent( _event );
else {
// Pass on to Treeview
QTreeView::keyPressEvent(_event);
}
}
/*===========================================================================*\
* *
* OpenFlipper *
* Copyright (C) 2001-2009 by Computer Graphics Group, RWTH Aachen *
* www.openflipper.org *
* *
*---------------------------------------------------------------------------*
* This file is part of OpenFlipper. *
* *
* OpenFlipper is free software: you can redistribute it and/or modify *
* it under the terms of the GNU Lesser General Public License as *
* published by the Free Software Foundation, either version 3 of *
* the License, or (at your option) any later version with the *
* following exceptions: *
* *
* If other files instantiate templates or use macros *
* or inline functions from this file, or you compile this file and *
* link it with other files to produce an executable, this file does *
* not by itself cause the resulting executable to be covered by the *
* GNU Lesser General Public License. This exception does not however *
* invalidate any other reasons why the executable file might be *
* covered by the GNU Lesser General Public License. *
* *
* OpenFlipper is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU LesserGeneral Public *
* License along with OpenFlipper. If not, *
* see <http://www.gnu.org/licenses/>. *
* *
\*===========================================================================*/
/*===========================================================================*\
* *
* $Revision: 83 $ *
* $Author: moebius $ *
* $Date: 2009-02-27 17:31:45 +0100 (Fr, 27. Feb 2009) $ *
* *
\*===========================================================================*/
#include <QTreeView>
#include <QtGui>
class DataControlTreeView : public QTreeView
{
Q_OBJECT
signals:
void keyEvent( QKeyEvent* _event );
public:
DataControlTreeView(QWidget* _parent = 0);
protected:
virtual void keyPressEvent ( QKeyEvent * event );
};
......@@ -15,7 +15,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QTreeView" name="treeView">
<widget class="DataControlTreeView" name="treeView">
<property name="minimumSize">
<size>
<width>0</width>
......@@ -88,6 +88,13 @@
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
<class>DataControlTreeView</class>
<extends>QTreeView</extends>
<header>TreeView.hh</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>
Markdown is supported
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