remove packet service from network modes.

1 files changed, 29 insertions, 66 deletions

diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp
index dd9b08f9bb..0b9ed3a921 100644
--- a/examples/sysinfo/dialog.cpp
+++ b/examples/sysinfo/dialog.cpp
@@ -344,6 +344,8 @@ void Dialog::setupNetwork()
     connect(ni,SIGNAL(networkModeChanged(QSystemNetworkInfo::NetworkMode)),
             this,SLOT(networkModeChanged(QSystemNetworkInfo::NetworkMode)));
 
+    connect(ni,SIGNAL(cellDataTechnologyChanged(QSystemNetworkInfo::CellDataTechnology)),
+            this,SLOT(dataTechnologyChanged(QSystemNetworkInfo::CellDataTechnology)));
 
     networkModeChanged(ni->currentMode());
     netStatusComboBox->setCurrentIndex((int)ni->currentMode());
@@ -357,6 +359,8 @@ void Dialog::setupNetwork()
     homeMCCLabel->setText(ni->homeMobileCountryCode());
 
     homeMNCLabel->setText(ni->homeMobileNetworkCode());
+
+    dataTechnologyChanged(ni->cellDataTechnology());
 }
 void Dialog::netStatusComboActivated(int index)
 {
@@ -648,24 +652,6 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode ,
         }
     }
 
-    if (mode == QSystemNetworkInfo::GprsMode) {
-        if (netStatusComboBox->currentText() == "Gprs") {
-            signalLevelProgressBar->setValue(strength);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::EdgeMode) {
-        if (netStatusComboBox->currentText() == "Edge") {
-            signalLevelProgressBar->setValue(strength);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::HspaMode) {
-        if (netStatusComboBox->currentText() == "Hspa") {
-            signalLevelProgressBar->setValue(strength);
-        }
-    }
-
     if (mode == QSystemNetworkInfo::LteMode) {
         if (netStatusComboBox->currentText() == "Lte") {
             signalLevelProgressBar->setValue(strength);
@@ -724,24 +710,6 @@ void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QStri
         }
     }
 
-    if (mode == QSystemNetworkInfo::GprsMode) {
-        if (netStatusComboBox->currentText() == "Gprs") {
-            operatorNameLabel->setText(text);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::EdgeMode) {
-        if (netStatusComboBox->currentText() == "Edge") {
-            operatorNameLabel->setText(text);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::HspaMode) {
-        if (netStatusComboBox->currentText() == "Hspa") {
-            operatorNameLabel->setText(text);
-        }
-    }
-
     if (mode == QSystemNetworkInfo::LteMode) {
         if (netStatusComboBox->currentText() == "Lte") {
             operatorNameLabel->setText(text);
@@ -799,24 +767,6 @@ void Dialog::networkStatusChanged(QSystemNetworkInfo::NetworkMode mode , QSystem
         }
     }
 
-    if (mode == QSystemNetworkInfo::GprsMode) {
-        if (netStatusComboBox->currentText() == "Gprs") {
-            displayNetworkStatus(status);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::EdgeMode) {
-        if (netStatusComboBox->currentText() == "Edge") {
-            displayNetworkStatus(status);
-        }
-    }
-
-    if (mode == QSystemNetworkInfo::HspaMode) {
-        if (netStatusComboBox->currentText() == "Hspa") {
-            displayNetworkStatus(status);
-        }
-    }
-
     if (mode == QSystemNetworkInfo::LteMode) {
         if (netStatusComboBox->currentText() == "Lte") {
             displayNetworkStatus(status);
@@ -857,18 +807,6 @@ void Dialog::networkModeChanged(QSystemNetworkInfo::NetworkMode mode)
         primaryModeLabel->setText("Wimax");
     }
 
-    if (mode == QSystemNetworkInfo::GprsMode) {
-        primaryModeLabel->setText("Gprs");
-    }
-
-    if (mode == QSystemNetworkInfo::EdgeMode) {
-        primaryModeLabel->setText("Edge");
-    }
-
-    if (mode == QSystemNetworkInfo::HspaMode) {
-        primaryModeLabel->setText("Hspa");
-    }
-
     if (mode == QSystemNetworkInfo::LteMode) {
         primaryModeLabel->setText("Lte");
     }
@@ -1184,3 +1122,28 @@ void Dialog::backlightTotext(QSystemDisplayInfo::BacklightState state)
     };
     backlightStatusLabel->setText(blState);
 }
+
+
+void Dialog::dataTechnologyChanged(QSystemNetworkInfo::CellDataTechnology tech)
+{
+    QString techString;
+    switch(tech) {
+    case QSystemNetworkInfo::UnknownDataTechnology:
+        techString = "Unknown";
+        break;
+    case QSystemNetworkInfo::GprsDataTechnology:
+        techString = "Gprs";
+        break;
+    case QSystemNetworkInfo::EdgeDataTechnology:
+        techString = "Edge";
+        break;
+    case QSystemNetworkInfo::UmtsDataTechnology:
+        techString = "Umts";
+        break;
+    case QSystemNetworkInfo::HspaDataTechnology:
+        techString = "Hspa";
+        break;
+    };
+    dataTechnologyLabel->setText(techString);
+}
+