diff -r acd4e87b24b4 -r 2f0af9ba7665 logsui/logsapp/src/logsmatchesview.cpp --- a/logsui/logsapp/src/logsmatchesview.cpp Fri Sep 17 16:47:32 2010 +0300 +++ b/logsui/logsapp/src/logsmatchesview.cpp Fri Oct 15 14:47:48 2010 +0300 @@ -67,9 +67,10 @@ // LogsMatchesView::activated // ----------------------------------------------------------------------------- // -void LogsMatchesView::activated(bool showDialer, QVariant args) -{ - LogsBaseView::activated(showDialer, args); +void LogsMatchesView::activated(bool showDialer, QVariant args, const QString& dialpadText) +{LOGS_QDEBUG( "logs [UI] -> LogsMatchesView::activated()" ); + mShowDialpad = showDialer; + LogsBaseView::activated(showDialer, args, dialpadText); LogsMatchesModel* model = qVariantValue(args); updateModel(model); @@ -80,6 +81,7 @@ scrollToTopItem(mListView); LogsBaseView::activationCompleted(); + LOGS_QDEBUG( "logs [UI] <- LogsMatchesView::activated()" ); } // ----------------------------------------------------------------------------- @@ -195,21 +197,8 @@ void LogsMatchesView::handleBackSoftkey() { LOGS_QDEBUG( "logs [UI] -> LogsMatchesView::::handleBackSoftkey()" ); - mDialpad->editor().blockSignals(true); - mDialpad->editor().setText(QString()); - mDialpad->editor().blockSignals(false); - - if (mDialpad->isOpen()){ - LOGS_QDEBUG( "logs [UI] -> LogsMatchesView::::handleBackSoftkey() closeDialpad" ); - // Block aboutToClose signal to interfere with layout loading - // at backstepping phase - mDialpad->blockSignals(true); - mDialpad->closeDialpad(); - mDialpad->blockSignals(false); - } - - LogsBaseView::handleBackSoftkey(); - + mShowDialpad = false; + mDialpad->editor().setText(QString()); LOGS_QDEBUG( "logs [UI] <- LogsMatchesView::::handleBackSoftkey()" ); } @@ -223,7 +212,7 @@ updateCallButton(); updateMenu(); - QString pattern = mDialpad->editor().text(); + QString pattern = currDialpadText(); if ( pattern.isEmpty() ){ // Treat empty input field same way as back press LogsBaseView::handleBackSoftkey();