equal
deleted
inserted
replaced
23 #include <hblistwidget.h> |
23 #include <hblistwidget.h> |
24 #include <hblistwidgetitem.h> |
24 #include <hblistwidgetitem.h> |
25 #include <hblabel.h> |
25 #include <hblabel.h> |
26 #include <cpsettingformitemdata.h> |
26 #include <cpsettingformitemdata.h> |
27 #include <psetwrapper.h> |
27 #include <psetwrapper.h> |
|
28 #include <psuinotes.h> |
28 |
29 |
29 #include "cpnetworkpluginform.h" |
30 #include "cpnetworkpluginform.h" |
30 #include "cpplugincommon.h" |
31 #include "cpplugincommon.h" |
31 #include "cppluginlogging.h" |
32 #include "cppluginlogging.h" |
32 #include "cpphonenotes.h" |
|
33 #include "cellulardatasettings.h" |
33 #include "cellulardatasettings.h" |
34 |
34 |
35 /*! |
35 /*! |
36 CpNetworkPluginForm::CpNetworkPluginForm |
36 CpNetworkPluginForm::CpNetworkPluginForm |
37 */ |
37 */ |
50 |
50 |
51 QScopedPointer<PSetWrapper> pSetWrapperGuard(new PSetWrapper); |
51 QScopedPointer<PSetWrapper> pSetWrapperGuard(new PSetWrapper); |
52 m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper(); |
52 m_psetNetworkWrapper = &pSetWrapperGuard->networkWrapper(); |
53 mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings); |
53 mCellularSettings = QSharedPointer<CellularDataSettings>(new CellularDataSettings); |
54 connectToNetworkWrapper(*m_psetNetworkWrapper); |
54 connectToNetworkWrapper(*m_psetNetworkWrapper); |
55 connectToPhoneNotes(*CpPhoneNotes::instance()); |
55 connectToPhoneNotes(*PsUiNotes::instance()); |
56 |
56 |
57 QScopedPointer<HbDataFormModel> model(new HbDataFormModel); |
57 QScopedPointer<HbDataFormModel> model(new HbDataFormModel); |
58 QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper); |
58 QScopedPointer<CpSettingsWrapper> cpSettingsWrapperGuard(new CpSettingsWrapper); |
59 |
59 |
60 // #1 Read Network mode value from Cenrep |
60 // #1 Read Network mode value from Cenrep |
599 { |
599 { |
600 DPRINT << ": IN"; |
600 DPRINT << ": IN"; |
601 |
601 |
602 if (type != PSetNetworkWrapper::RequestNone) { |
602 if (type != PSetNetworkWrapper::RequestNone) { |
603 QObject::connect( |
603 QObject::connect( |
604 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()), |
604 PsUiNotes::instance(), SIGNAL(progressNoteCanceled()), |
605 this, SLOT(userCancel())); |
605 this, SLOT(userCancel())); |
606 emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_cp_info_updating")); |
606 emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_cp_info_updating")); |
607 } else { |
607 } else { |
608 QObject::disconnect( |
608 QObject::disconnect( |
609 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()), |
609 PsUiNotes::instance(), SIGNAL(progressNoteCanceled()), |
610 this, SLOT(userCancel())); |
610 this, SLOT(userCancel())); |
611 emit cancelNote(m_activeProgressNoteId); |
611 emit cancelNote(m_activeProgressNoteId); |
612 m_activeProgressNoteId = 0; |
612 m_activeProgressNoteId = 0; |
613 } |
613 } |
614 |
614 |
623 { |
623 { |
624 DPRINT << ": IN"; |
624 DPRINT << ": IN"; |
625 |
625 |
626 if (ongoing) { |
626 if (ongoing) { |
627 QObject::connect( |
627 QObject::connect( |
628 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()), |
628 PsUiNotes::instance(), SIGNAL(progressNoteCanceled()), |
629 this, SLOT(userCancel())); |
629 this, SLOT(userCancel())); |
630 emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_common_info_requesting")); |
630 emit showGlobalProgressNote(m_activeProgressNoteId, hbTrId("txt_common_info_requesting")); |
631 } else { |
631 } else { |
632 QObject::disconnect( |
632 QObject::disconnect( |
633 CpPhoneNotes::instance(), SIGNAL(progressNoteCanceled()), |
633 PsUiNotes::instance(), SIGNAL(progressNoteCanceled()), |
634 this, SLOT(userCancel())); |
634 this, SLOT(userCancel())); |
635 emit cancelNote(m_activeProgressNoteId); |
635 emit cancelNote(m_activeProgressNoteId); |
636 m_activeProgressNoteId = 0; |
636 m_activeProgressNoteId = 0; |
637 } |
637 } |
638 |
638 |
890 |
890 |
891 |
891 |
892 /*! |
892 /*! |
893 CpNetworkPluginForm::connectToPhoneNotes |
893 CpNetworkPluginForm::connectToPhoneNotes |
894 */ |
894 */ |
895 void CpNetworkPluginForm::connectToPhoneNotes(CpPhoneNotes ¬es) |
895 void CpNetworkPluginForm::connectToPhoneNotes(PsUiNotes ¬es) |
896 { |
896 { |
897 QObject::connect( |
897 QObject::connect( |
898 this, |
898 this, |
899 SIGNAL(showGlobalProgressNote(int &, const QString&)), |
899 SIGNAL(showGlobalProgressNote(int &, const QString&)), |
900 ¬es, |
900 ¬es, |