--- a/logsui/logsapp/src/logsbaseview.cpp Thu Jun 24 14:44:14 2010 +0300
+++ b/logsui/logsapp/src/logsbaseview.cpp Thu Jul 08 11:31:03 2010 +0300
@@ -45,6 +45,7 @@
#include <hbactivitymanager.h>
#include <hbmodeliterator.h>
#include <hbscrollbar.h>
+#include <hbstringutil.h>
Q_DECLARE_METATYPE(LogsCall*)
Q_DECLARE_METATYPE(LogsMessage*)
@@ -229,6 +230,19 @@
//
// -----------------------------------------------------------------------------
//
+void LogsBaseView::cancelServiceRequest()
+{
+ LOGS_QDEBUG( "logs [UI] -> LogsBaseView::cancelServiceRequest()" );
+ if (mContact) {
+ mContact->cancelServiceRequest();
+ }
+ LOGS_QDEBUG( "logs [UI] <- LogsBaseView::cancelServiceRequest()" );
+}
+
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//
void LogsBaseView::notSupported()
{
HbMessageBox* messageBox = new HbMessageBox(QString("Not supported"));
@@ -643,7 +657,9 @@
bool called = false;
if ( isDialpadInput() ){
// Call to inputted number
- LogsCall::callToNumber( callType, mDialpad->editor().text() );
+ QString phoneNumber =
+ HbStringUtil::convertDigitsTo(mDialpad->editor().text(), WesternDigit);
+ LogsCall::callToNumber( callType, phoneNumber );
called = true;
}
LOGS_QDEBUG_2( "logs [UI] <- LogsBaseView::tryCallToDialpadNumber(), called",
@@ -921,10 +937,12 @@
{
LOGS_QDEBUG( "logs [UI] -> LogsBaseView::deleteEvent()" );
if ( mDetailsModel ) {
- askConfirmation(hbTrId("txt_dialer_ui_title_delete_event"),
+ HbMessageBox::question(
hbTrId("txt_dialer_info_call_event_will_be_removed_from"),
this,
- SLOT(deleteEventOkAnswer()));
+ SLOT(deleteEventAnswer(int)),
+ HbMessageBox::Ok | HbMessageBox::Cancel,
+ new HbLabel(hbTrId("txt_dialer_ui_title_delete_event")));
}
LOGS_QDEBUG( "logs [UI] <- LogsBaseView::deleteEvent()" );
}
@@ -933,13 +951,13 @@
//
// -----------------------------------------------------------------------------
//
-void LogsBaseView::deleteEventOkAnswer()
+void LogsBaseView::deleteEventAnswer(int action)
{
- LOGS_QDEBUG( "logs [UI] -> LogsBaseView::deleteEventOkAnswer()" );
- if (mDetailsModel) {
+ LOGS_QDEBUG( "logs [UI] -> LogsBaseView::deleteEventAnswer()" );
+ if ((action == HbMessageBox::Ok) && mDetailsModel) {
mDetailsModel->clearEvent();
}
- LOGS_QDEBUG( "logs [UI] <- LogsBaseView::deleteEventOkAnswer()" );
+ LOGS_QDEBUG( "logs [UI] <- LogsBaseView::deleteEventAnswer()" );
}
// -----------------------------------------------------------------------------
@@ -1071,37 +1089,6 @@
//
// -----------------------------------------------------------------------------
//
-void LogsBaseView::askConfirmation( QString heading , QString text,
- QObject* receiver, const char* okSlot, const char* cancelSlot )
-{
- LOGS_QDEBUG( "logs [UI] -> LogsBaseView::askConfirmation()" );
- HbMessageBox* note = new HbMessageBox(text, HbMessageBox::MessageTypeQuestion);
- note->setAttribute(Qt::WA_DeleteOnClose);
- note->setHeadingWidget(new HbLabel(heading));
- note->setDismissPolicy(HbPopup::TapOutside);
-
- if (note->actions().count() > 0 && note->actions().at(0)) {
- note->actions().at(0)->setText(hbTrId("txt_common_button_ok"));
-
- if (receiver && okSlot) {
- connect(note->actions().at(0), SIGNAL(triggered()), receiver, okSlot);
- }
- }
- if (note->actions().count() > 1 && note->actions().at(1)) {
- note->actions().at(1)->setText(hbTrId("txt_common_button_cancel"));
-
- if (receiver && cancelSlot) {
- connect(note->actions().at(1), SIGNAL(triggered()), receiver, cancelSlot);
- }
- }
- note->open();
- LOGS_QDEBUG( "logs [UI] <- LogsBaseView::askConfirmation()" );
-}
-
-// -----------------------------------------------------------------------------
-//
-// -----------------------------------------------------------------------------
-//
void LogsBaseView::updateContactSearchAction()
{
LOGS_QDEBUG( "logs [UI] -> LogsBaseView::updateContactSearchAction()" );