mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify the code by removing a few options from the if.

Browse source 
There was some options on the 'if' that didn't
really belonged there, so I create a if before those
to quit earlier if the condition is true.

Signed-off-by: Tomaz Canabrava <tcanabrava@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2013-12-19 19:45:54 -02:00 • committed by Dirk Hohndel
parent bffceb18e7
commit 890d60ff9e
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
qt-ui/groupedlineedit.h
View file

@ -65,7 +65,6 @@ signals:
protected: protected:
virtual void paintEvent(QPaintEvent *e); virtual void paintEvent(QPaintEvent *e);
virtual void keyPressEvent(QKeyEvent *e); virtual void keyPressEvent(QKeyEvent *e);
private: private:
struct Private; struct Private;
Private *d; Private *d;

14
qt-ui/maintab.cpp
View file

@ -281,23 +281,27 @@ void MainTab::enableEdition(EditMode newEditMode)
bool MainTab::eventFilter(QObject* object, QEvent* event) bool MainTab::eventFilter(QObject* object, QEvent* event)
{ {
if (!isEnabled())
return false;
if (editMode != NONE)
return false;
// we want to prevent the user from accidentally enabling editMode: // we want to prevent the user from accidentally enabling editMode:
// for the tagWidget we ignore FocusIn - that's both a click and starting the scroll wheel // for the tagWidget we ignore FocusIn - that's both a click and starting the scroll wheel
// this means a click by itself won't start edit mode - but typing something will // this means a click by itself won't start edit mode - but typing something will
if (isEnabled() && editMode == NONE && object->objectName() == "tagWidget" && if (object->objectName() == "tagWidget" &&
event->type() == QEvent::FocusIn) event->type() == QEvent::FocusIn)
return true; return true;
// for the dateTimeEdit widget we need to ignore Wheel events as well (as long as we aren't editing) // for the dateTimeEdit widget we need to ignore Wheel events as well (as long as we aren't editing)
if (isEnabled() && editMode == NONE && object->objectName() == "dateTimeEdit" && if (object->objectName() == "dateTimeEdit" &&
(event->type() == QEvent::FocusIn || event->type() == QEvent::Wheel)) (event->type() == QEvent::FocusIn || event->type() == QEvent::Wheel))
return true; return true;
// MouseButtonPress in any widget (not all will ever get this), KeyPress in the dateTimeEdit, // MouseButtonPress in any widget (not all will ever get this), KeyPress in the dateTimeEdit,
// FocusIn for the starWidgets or RequestSoftwareInputPanel for tagWidget start the editing // FocusIn for the starWidgets or RequestSoftwareInputPanel for tagWidget start the editing
if (isEnabled() && editMode == NONE && if ((event->type() == QEvent::MouseButtonPress) ||
((event->type() == QEvent::MouseButtonPress) ||
(event->type() == QEvent::KeyPress && object == ui.dateTimeEdit) || (event->type() == QEvent::KeyPress && object == ui.dateTimeEdit) ||
(event->type() == QEvent::FocusIn && (object == ui.rating || object == ui.visibility)) || (event->type() == QEvent::FocusIn && (object == ui.rating || object == ui.visibility)) ||
(event->type() == QEvent::RequestSoftwareInputPanel && object == ui.tagWidget))) { (event->type() == QEvent::RequestSoftwareInputPanel && object == ui.tagWidget)) {
tabBar()->setTabIcon(currentIndex(), QIcon(":warning")); tabBar()->setTabIcon(currentIndex(), QIcon(":warning"));
enableEdition(); enableEdition();
} }