# HG changeset patch # User nemo # Date 1363142157 14400 # Node ID b19be476a2fa1447a90ef43fc685b72cca6e564a # Parent d2f6262452a3de36b35a5e8ab986ca07a00a5130 Call steps on focus instead. fix typo diff -r d2f6262452a3 -r b19be476a2fa QTfrontend/ui/mouseoverfilter.cpp --- a/QTfrontend/ui/mouseoverfilter.cpp Tue Mar 12 22:20:42 2013 -0400 +++ b/QTfrontend/ui/mouseoverfilter.cpp Tue Mar 12 22:35:57 2013 -0400 @@ -5,6 +5,7 @@ #include #include #include +#include #include "mouseoverfilter.h" #include "ui/page/AbstractPage.h" @@ -21,7 +22,7 @@ bool MouseOverFilter::eventFilter( QObject *dist, QEvent *event ) { - if (event->type() == QEvent::Enter) + if (event->type() == QEvent::FocusIn) { QWidget * widget = dynamic_cast(dist); @@ -39,7 +40,8 @@ QComboBox * droplist = dynamic_cast(dist); QSlider * slider = dynamic_cast(dist); QTabWidget * tab = dynamic_cast(dist); - if (button || textfield || checkbox || droplist || slider || tab) + QListView * listview = dynamic_cast(dist); + if (button || textfield || checkbox || droplist || slider || tab || listview) { SDLInteraction::instance().playSoundFile("/Sounds/steps.ogg"); } @@ -50,9 +52,9 @@ { abstractpage = qobject_cast(ui->Pages->currentWidget()); - if (abstractpage->getDefautDescription() != NULL) + if (abstractpage->getDefaultDescription() != NULL) { - abstractpage->setButtonDescription( * abstractpage->getDefautDescription()); + abstractpage->setButtonDescription( * abstractpage->getDefaultDescription()); } else abstractpage->setButtonDescription(""); diff -r d2f6262452a3 -r b19be476a2fa QTfrontend/ui/page/AbstractPage.cpp --- a/QTfrontend/ui/page/AbstractPage.cpp Tue Mar 12 22:20:42 2013 -0400 +++ b/QTfrontend/ui/page/AbstractPage.cpp Tue Mar 12 22:35:57 2013 -0400 @@ -158,13 +158,13 @@ descLabel->setText(desc); } -void AbstractPage::setDefautDescription(QString text) +void AbstractPage::setDefaultDescription(QString text) { *defautDesc = text; descLabel->setText(text); } -QString * AbstractPage::getDefautDescription() +QString * AbstractPage::getDefaultDescription() { return defautDesc; } diff -r d2f6262452a3 -r b19be476a2fa QTfrontend/ui/page/AbstractPage.h --- a/QTfrontend/ui/page/AbstractPage.h Tue Mar 12 22:20:42 2013 -0400 +++ b/QTfrontend/ui/page/AbstractPage.h Tue Mar 12 22:35:57 2013 -0400 @@ -70,12 +70,12 @@ * * @param text the defaut desc */ - void setDefautDescription(QString text); + void setDefaultDescription(QString text); /** * @brief Get the desc defaut text */ - QString * getDefautDescription(); + QString * getDefaultDescription(); signals: diff -r d2f6262452a3 -r b19be476a2fa QTfrontend/ui/page/pagemain.cpp --- a/QTfrontend/ui/page/pagemain.cpp Tue Mar 12 22:20:42 2013 -0400 +++ b/QTfrontend/ui/page/pagemain.cpp Tue Mar 12 22:35:57 2013 -0400 @@ -134,9 +134,9 @@ mainNote->setOpenExternalLinks(true); #ifdef DEBUG - setDefautDescription(QLabel::tr("This development build is 'work in progress' and may not be compatible with other versions of the game, while some features might be broken or incomplete!")); + setDefaultDescription(QLabel::tr("This development build is 'work in progress' and may not be compatible with other versions of the game, while some features might be broken or incomplete!")); #else - setDefautDescription(QLabel::tr("Tip: ") + randomTip()); + setDefaultDescription(QLabel::tr("Tip: ") + randomTip()); #endif } diff -r d2f6262452a3 -r b19be476a2fa QTfrontend/ui/page/pageroomslist.cpp --- a/QTfrontend/ui/page/pageroomslist.cpp Tue Mar 12 22:20:42 2013 -0400 +++ b/QTfrontend/ui/page/pageroomslist.cpp Tue Mar 12 22:35:57 2013 -0400 @@ -582,7 +582,7 @@ void PageRoomsList::updateNickCounter(int cnt) { - setDefautDescription(tr("%1 players online", 0, cnt).arg(cnt)); + setDefaultDescription(tr("%1 players online", 0, cnt).arg(cnt)); } void PageRoomsList::setUser(const QString & nickname)