equal
deleted
inserted
replaced
16 */ |
16 */ |
17 #include <cpsettingformitemdata.h> |
17 #include <cpsettingformitemdata.h> |
18 #include <hbicon.h> |
18 #include <hbicon.h> |
19 #include "cpnetworkstatus.h" |
19 #include "cpnetworkstatus.h" |
20 #include "cppluginlogging.h" |
20 #include "cppluginlogging.h" |
|
21 #include "cpplugincommon.h" |
21 |
22 |
22 |
23 |
23 /*! |
24 /*! |
24 CpNetworkStatus::CpNetworkStatus |
25 CpNetworkStatus::CpNetworkStatus |
25 */ |
26 */ |
26 CpNetworkStatus::CpNetworkStatus() : |
27 CpNetworkStatus::CpNetworkStatus() : |
27 QObject(0), |
28 QObject(0), |
|
29 m_cpSettingsWrapper(NULL), |
28 m_settingFormItemData(NULL) |
30 m_settingFormItemData(NULL) |
29 { |
31 { |
30 DPRINT << ": IN"; |
32 DPRINT << ": IN"; |
31 |
33 |
32 m_networkInfo.reset(new QSystemNetworkInfo); |
34 m_networkInfo.reset(new QSystemNetworkInfo); |
46 QSystemNetworkInfo::NetworkStatus)), |
48 QSystemNetworkInfo::NetworkStatus)), |
47 this, |
49 this, |
48 SLOT(networkStatusChanged( |
50 SLOT(networkStatusChanged( |
49 QSystemNetworkInfo::NetworkMode, |
51 QSystemNetworkInfo::NetworkMode, |
50 QSystemNetworkInfo::NetworkStatus))); |
52 QSystemNetworkInfo::NetworkStatus))); |
51 |
53 |
|
54 m_cpSettingsWrapper = new CpSettingsWrapper; |
|
55 |
52 DPRINT << ": OUT"; |
56 DPRINT << ": OUT"; |
53 } |
57 } |
54 |
58 |
55 |
59 |
56 /*! |
60 /*! |
73 QSystemNetworkInfo::NetworkStatus)), |
77 QSystemNetworkInfo::NetworkStatus)), |
74 this, |
78 this, |
75 SLOT(networkStatusChanged( |
79 SLOT(networkStatusChanged( |
76 QSystemNetworkInfo::NetworkMode, |
80 QSystemNetworkInfo::NetworkMode, |
77 QSystemNetworkInfo::NetworkStatus))); |
81 QSystemNetworkInfo::NetworkStatus))); |
|
82 |
|
83 delete m_cpSettingsWrapper; |
|
84 m_cpSettingsWrapper = NULL; |
78 |
85 |
79 DPRINT << ": OUT"; |
86 DPRINT << ": OUT"; |
80 } |
87 } |
81 |
88 |
82 |
89 |
88 DPRINT << ": IN"; |
95 DPRINT << ": IN"; |
89 |
96 |
90 QString statusText; |
97 QString statusText; |
91 |
98 |
92 if ((QSystemDeviceInfo::SimNotAvailable == m_deviceInfo->simStatus()) || |
99 if ((QSystemDeviceInfo::SimNotAvailable == m_deviceInfo->simStatus()) || |
93 (QSystemDeviceInfo::OfflineProfile == m_deviceInfo->currentProfile())) { |
100 ( m_cpSettingsWrapper->isPhoneOffline())) { |
94 statusText = hbTrId("txt_cp_dblist_mobile_network_val_off"); |
101 statusText = hbTrId("txt_cp_dblist_mobile_network_val_off"); |
95 } else if (connectedToNetwork()) { |
102 } else if (connectedToNetwork()) { |
96 statusText = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode); |
103 statusText = m_networkInfo->networkName(QSystemNetworkInfo::WcdmaMode); |
97 if(statusText.isEmpty()) { |
104 if(statusText.isEmpty()) { |
98 statusText = m_networkInfo->networkName(QSystemNetworkInfo::GsmMode); |
105 statusText = m_networkInfo->networkName(QSystemNetworkInfo::GsmMode); |
126 DPRINT << ": IN"; |
133 DPRINT << ": IN"; |
127 |
134 |
128 QString statusIcon(""); |
135 QString statusIcon(""); |
129 |
136 |
130 if ((QSystemDeviceInfo::SimNotAvailable == m_deviceInfo->simStatus()) || |
137 if ((QSystemDeviceInfo::SimNotAvailable == m_deviceInfo->simStatus()) || |
131 (QSystemDeviceInfo::OfflineProfile == m_deviceInfo->currentProfile())) { |
138 (m_cpSettingsWrapper->isPhoneOffline())) { |
132 statusIcon = QString("qtg_large_network_off"); |
139 statusIcon = QString("qtg_large_network_off"); |
133 } else if (connectedToNetwork()) { |
140 } else if (connectedToNetwork()) { |
134 statusIcon = QString("qtg_large_network"); |
141 statusIcon = QString("qtg_large_network"); |
135 } else { |
142 } else { |
136 statusIcon = QString("qtg_large_network_off"); |
143 statusIcon = QString("qtg_large_network_off"); |