Merge branch 'master' into 1.3

Conflicts:
	examples/declarative-systeminfo/declarative-systeminfo.pro
	examples/sysinfo/dialog_small_landscape.ui
	src/systeminfo/qsysteminfo_s60.cpp
	src/systeminfo/systeminfo.pro

1 files changed, 309 insertions, 93 deletions

diff --git a/examples/sysinfo/dialog.cpp b/examples/sysinfo/dialog.cpp
index 301342866f..469f4d68de 100644
--- a/examples/sysinfo/dialog.cpp
+++ b/examples/sysinfo/dialog.cpp
@@ -41,7 +41,15 @@
 #include "dialog.h"
 #include <QMessageBox>
 #include <QTimer>
-
+#include <math.h>
+#ifndef Q_CC_MINGW
+#ifdef Q_OS_WIN
+// silly MS
+inline float round(float x) {
+      return floor(x+0.5);
+   }
+#endif
+#endif
 Dialog::Dialog() :
     QWidget(),
     saver(NULL), systemInfo(NULL), di(NULL), ni(NULL),sti(NULL),bi(NULL),dis(NULL)
@@ -163,23 +171,23 @@ void Dialog::setupDevice()
 //! [inputMethod flags]
     QSystemDeviceInfo::InputMethodFlags methods = di->inputMethodType();
     QStringList inputs;
-    if((methods & QSystemDeviceInfo::Keys)=QSystemDeviceInfo::Keypad){
+    if ((methods & QSystemDeviceInfo::Keys)=QSystemDeviceInfo::Keypad){
         inputs << "Keys";
     }
-    if((methods & QSystemDeviceInfo::Keypad)=QSystemDeviceInfo::Keypad) {
+    if ((methods & QSystemDeviceInfo::Keypad)=QSystemDeviceInfo::Keypad) {
         inputs << "Keypad";
     }
 //! [inputMethod flags]
-    if((methods & QSystemDeviceInfo::Keyboard)=QSystemDeviceInfo::Keyboard) {
+    if ((methods & QSystemDeviceInfo::Keyboard)=QSystemDeviceInfo::Keyboard) {
         inputs << "Keyboard";
     }
-    if((methods & QSystemDeviceInfo::SingleTouch)=QSystemDeviceInfo::SingleTouch) {
+    if ((methods & QSystemDeviceInfo::SingleTouch)=QSystemDeviceInfo::SingleTouch) {
         inputs << "Touch Screen";
     }
-    if((methods & QSystemDeviceInfo::MultiTouch)=QSystemDeviceInfo::MultiTouch) {
+    if ((methods & QSystemDeviceInfo::MultiTouch)=QSystemDeviceInfo::MultiTouch) {
         inputs << "Multi touch";
     }
-    if((methods & QSystemDeviceInfo::Mouse)=QSystemDeviceInfo::Mouse){
+    if ((methods & QSystemDeviceInfo::Mouse)=QSystemDeviceInfo::Mouse){
         inputs << "Mouse";
     }
 
@@ -193,18 +201,20 @@ void Dialog::setupDevice()
     updateKeyboard(di->keyboardTypes());
 
     keyboardFlipRadioButton->setChecked(di->isKeyboardFlippedOpen());
+    connect(di,SIGNAL(keyboardFlipped(bool)),this,SLOT(keyboardFlipped(bool)));
+
     wirelessKeyboardConnectedRadioButton->setChecked(di->isWirelessKeyboardConnected());
 
-    QString lockState;
-    QSystemDeviceInfo::LockTypeFlags lock = di->lockStatus();
-    if((lock & QSystemDeviceInfo::PinLocked)){
-        lockState = "Pin/Password Locked";
-    } else if((lock & QSystemDeviceInfo::TouchAndKeyboardLocked)){
-        lockState = "Touch and keyboard locked";
-    } else {
-        lockState = "Unknown";
-    }
-    lockStateLabel->setText(lockState);
+    QSystemDeviceInfo::LockTypeFlags locktype = di->lockStatus();
+    lockStateLabel->setText(lockStateToString(locktype));
+
+    oldLockStatus = QSystemDeviceInfo::UnknownLock;
+    lockStateLabel_2->setText(lockStateToString(oldLockStatus));
+    oldLockStatus = locktype;
+
+    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)),
+            this,SLOT(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)),Qt::UniqueConnection);
+
 }
 
 void Dialog::updateKeyboard(QSystemDeviceInfo::KeyboardTypeFlags type)
@@ -218,7 +228,7 @@ void Dialog::updateKeyboard(QSystemDeviceInfo::KeyboardTypeFlags type)
         halfKeysRadioButton->setChecked(true);
     } else if ((type & QSystemDeviceInfo::FullQwertyKeyboard)) {
         qwertyKeysRadioButton->setChecked(true);
-    } else if((type & QSystemDeviceInfo::WirelessKeyboard)) {
+    } else if ((type & QSystemDeviceInfo::WirelessKeyboard)) {
         wirelessRadioButton->setChecked(true);
     } else {
         uknownKeysRadioButton->setChecked(true);
@@ -241,7 +251,7 @@ void Dialog::updateProfile(QSystemDeviceInfo::Profile /*profile*/)
 
 void Dialog::setupDisplay()
 {
-    if(!dis) {
+    if (!dis) {
         dis = new QSystemDisplayInfo(this);
         connect(dis,SIGNAL(orientationChanged(QSystemDisplayInfo::DisplayOrientation)),
                 this,SLOT(orientationChanged(QSystemDisplayInfo::DisplayOrientation )));
@@ -259,17 +269,22 @@ void Dialog::setupDisplay()
 
     physicalHeightLabel->setText(QString::number(dis->physicalHeight(0)));
     physicalWidthLabel->setText(QString::number(dis->physicalWidth((0))));
+
+    backlightTotext(dis->backlightStatus(0));
 }
 
 void Dialog::setupStorage()
 {
-    if(!sti) {
+    if (!sti) {
     sti = new QSystemStorageInfo(this);
     storageTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
 
     connect(sti,SIGNAL(logicalDriveChanged(bool,const QString &)),
             this,SLOT(storageChanged(bool ,const QString &)));
     }
+    connect(sti,SIGNAL(storageStateChanged(const QString &,QSystemStorageInfo::StorageState)),
+            this,SLOT(storageStateChanged(const QString &, QSystemStorageInfo::StorageState)));
+
     updateStorage();
 }
 
@@ -282,35 +297,67 @@ void Dialog::updateStorage()
         QString type;
         QSystemStorageInfo::DriveType volType;
         volType = sti->typeForDrive(volName);
-        if(volType == QSystemStorageInfo::InternalDrive) {
+        if (volType == QSystemStorageInfo::InternalDrive) {
             type =  "Internal";
         }
-        if(volType == QSystemStorageInfo::RemovableDrive) {
+        if (volType == QSystemStorageInfo::RemovableDrive) {
             type = "Removable";
         }
-        if(volType == QSystemStorageInfo::CdromDrive) {
+        if (volType == QSystemStorageInfo::CdromDrive) {
             type =  "CDRom";
         }
-        if(volType == QSystemStorageInfo::RemoteDrive) {
+        if (volType == QSystemStorageInfo::RemoteDrive) {
             type =  "Network";
         }
-        if(volType == QSystemStorageInfo::InternalFlashDrive) {
+        if (volType == QSystemStorageInfo::InternalFlashDrive) {
             type =  "Flash";
         }
-        if(volType == QSystemStorageInfo::RamDrive) {
+        if (volType == QSystemStorageInfo::RamDrive) {
             type =  "Ram";
         }
         QStringList items;
         items << volName;
         items << type;
-        items << QString::number(sti->totalDiskSpace(volName));
-        items << QString::number(sti->availableDiskSpace(volName));
+        items << sizeToString(sti->totalDiskSpace(volName));
+        items << sizeToString(sti->availableDiskSpace(volName));
         items << sti->uriForDrive(volName);
+        items << storageStateToString(sti->getStorageState(volName));
+
         QTreeWidgetItem *item = new QTreeWidgetItem(items);
+
+        for (int i = 0; i < 5; i++) {
+            item->setBackground( i ,brushForStorageState( sti->getStorageState(volName)));
+        }
         storageTreeWidget->addTopLevelItem(item);
     }
 }
 
+QBrush Dialog::brushForStorageState(QSystemStorageInfo::StorageState state)
+{
+    if (state == QSystemStorageInfo::CriticalStorageState) {
+        return  QBrush(Qt::red);
+    }
+    if (state== QSystemStorageInfo::VeryLowStorageState) {
+        return  QBrush(Qt::magenta);
+    }
+    if (state == QSystemStorageInfo::LowStorageState) {
+        return  QBrush(Qt::yellow);
+    }
+    return  QBrush();
+}
+
+QString Dialog:: sizeToString(qlonglong size)
+{
+    float fSize = size;
+    int i = 0;
+    const char* units[] = {"B", "kB", "MB", "GB", "TB"};
+    while (fSize > 1024) {
+        fSize /= 1024.0;
+        i++;
+    }
+    fSize = round((fSize)*100)/100;
+    return QString::number(fSize)+" "+ units[i];
+}
 
 void Dialog::setupNetwork()
 {
@@ -336,6 +383,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());
@@ -349,6 +398,8 @@ void Dialog::setupNetwork()
     homeMCCLabel->setText(ni->homeMobileCountryCode());
 
     homeMNCLabel->setText(ni->homeMobileNetworkCode());
+
+    dataTechnologyChanged(ni->cellDataTechnology());
 }
 void Dialog::netStatusComboActivated(int index)
 {
@@ -360,7 +411,7 @@ void Dialog::netStatusComboActivated(int index)
     macAddressLabel->setText(ni->macAddress((QSystemNetworkInfo::NetworkMode)reIndex));
 
     int strength = ni->networkSignalStrength((QSystemNetworkInfo::NetworkMode)reIndex);
-    if(strength < 0)
+    if (strength < 0)
         strength = 0;
     signalLevelProgressBar->setValue(strength);
 
@@ -368,7 +419,7 @@ void Dialog::netStatusComboActivated(int index)
 
     operatorNameLabel->setText(ni->networkName((QSystemNetworkInfo::NetworkMode)reIndex));
 
-    if((index == 1 || index == 2 || index == 3)
+    if ((index == 1 || index == 2 || index == 3)
         && ni->networkStatus((QSystemNetworkInfo::NetworkMode)reIndex)
                              != QSystemNetworkInfo::UndefinedStatus) {
 
@@ -498,16 +549,7 @@ void Dialog::setupSaver()
 
 void Dialog::setSaverEnabled(bool b)
 {
-    if (b) {
-        if (!saver) {
-            saver = new QSystemScreenSaver(this);
-        }
-       if(saver->setScreenSaverInhibit()) {
-        }
-    } else {
-        delete saver;
-        saver = NULL;
-    }
+    saver->setScreenSaverInhibited(b);
 }
 
 
@@ -546,7 +588,7 @@ void Dialog::updatePowerState(QSystemDeviceInfo::PowerState /*newState*/)
 
 void Dialog::displayBatteryStatus(QSystemBatteryInfo::BatteryStatus status)
 {
-    if(currentBatStat == status)
+    if (currentBatStat == status)
         return;
     QString msg;
         switch(status) {
@@ -601,32 +643,56 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode ,
         strength = 0;
     }
 
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
             signalLevelProgressBar->setValue(strength);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
+            signalLevelProgressBar->setValue(strength);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
             signalLevelProgressBar->setValue(strength);
         }
     }
@@ -635,95 +701,153 @@ void Dialog::networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode mode ,
 
 void Dialog::networkNameChanged(QSystemNetworkInfo::NetworkMode mode,const QString &text)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
             operatorNameLabel->setText(text);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
             operatorNameLabel->setText(text);
         }
     }
 
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
+            operatorNameLabel->setText(text);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
+            operatorNameLabel->setText(text);
+        }
+    }
 }
 
 void Dialog::networkStatusChanged(QSystemNetworkInfo::NetworkMode mode , QSystemNetworkInfo::NetworkStatus status)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        if(netStatusComboBox->currentText() == "Wlan") {
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        if (netStatusComboBox->currentText() == "Unknown") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::GsmMode) {
+        if (netStatusComboBox->currentText() == "Gsm") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::CdmaMode) {
+        if (netStatusComboBox->currentText() == "Cdma") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
+        if (netStatusComboBox->currentText() == "Wcdma") {
+            displayNetworkStatus(status);
+        }
+    }
+
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        if (netStatusComboBox->currentText() == "Wlan") {
            displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        if(netStatusComboBox->currentText() == "Ethernet") {
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        if (netStatusComboBox->currentText() == "Ethernet") {
            displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
-        if(netStatusComboBox->currentText() == "Gsm") {
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        if (netStatusComboBox->currentText() == "Bluetooth") {
             displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
-        if(netStatusComboBox->currentText() == "Cdma") {
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        if (netStatusComboBox->currentText() == "Wimax") {
             displayNetworkStatus(status);
         }
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
-        if(netStatusComboBox->currentText() == "Wcdma") {
+    if (mode == QSystemNetworkInfo::LteMode) {
+        if (netStatusComboBox->currentText() == "Lte") {
             displayNetworkStatus(status);
         }
     }
-
 }
 
 void Dialog::networkModeChanged(QSystemNetworkInfo::NetworkMode mode)
 {
-    if(mode == QSystemNetworkInfo::WlanMode) {
-        primaryModeLabel->setText("Wlan");
-    }
-
-    if(mode == QSystemNetworkInfo::EthernetMode) {
-        primaryModeLabel->setText("Ethernet");
+    if (mode == QSystemNetworkInfo::UnknownMode) {
+        primaryModeLabel->setText("None");
     }
 
-    if(mode == QSystemNetworkInfo::GsmMode) {
+    if (mode == QSystemNetworkInfo::GsmMode) {
         primaryModeLabel->setText("Gsm");
     }
 
-    if(mode == QSystemNetworkInfo::CdmaMode) {
+    if (mode == QSystemNetworkInfo::CdmaMode) {
         primaryModeLabel->setText("Cdma");
     }
 
-    if(mode == QSystemNetworkInfo::WcdmaMode) {
+    if (mode == QSystemNetworkInfo::WcdmaMode) {
         primaryModeLabel->setText("Wcdma");
     }
-    if(mode == QSystemNetworkInfo::UnknownMode) {
-        primaryModeLabel->setText("None");
+    if (mode == QSystemNetworkInfo::WlanMode) {
+        primaryModeLabel->setText("Wlan");
+    }
+
+    if (mode == QSystemNetworkInfo::EthernetMode) {
+        primaryModeLabel->setText("Ethernet");
+    }
+
+    if (mode == QSystemNetworkInfo::BluetoothMode) {
+        primaryModeLabel->setText("Bluetooth");
+    }
+
+    if (mode == QSystemNetworkInfo::WimaxMode) {
+        primaryModeLabel->setText("Wimax");
+    }
+
+    if (mode == QSystemNetworkInfo::LteMode) {
+        primaryModeLabel->setText("Lte");
     }
 }
 
@@ -766,7 +890,7 @@ void Dialog::displayNetworkStatus(QSystemNetworkInfo::NetworkStatus status)
 void Dialog::updateProfile()
 {
 
-    if(di) {
+    if (di) {
         QString profilestring;
         switch(di->currentProfile()) {
             case QSystemDeviceInfo::SilentProfile:
@@ -826,7 +950,7 @@ void Dialog::updateProfile()
 
 void Dialog::updateSimStatus()
 {
-    if(di) {
+    if (di) {
         QString simstring;
         switch(di->simStatus()) {
         case QSystemDeviceInfo::SimLocked:
@@ -892,7 +1016,7 @@ void Dialog::updateThermalState()
 
 void Dialog::storageChanged(bool added,const QString &volName)
 {
-    if(added) {
+    if (added) {
         updateStorage();
     } else {
         storageTreeWidget->takeTopLevelItem( storageTreeWidget->indexOfTopLevelItem(storageTreeWidget->findItems(volName,Qt::MatchExactly).at(0)));
@@ -968,7 +1092,7 @@ void Dialog::setupBattery()
 
 void Dialog::chargingStateChanged(QSystemBatteryInfo::ChargingState chargingState)
 {
-    if(chargingState == QSystemBatteryInfo::Charging) {
+    if (chargingState == QSystemBatteryInfo::Charging) {
         chargingCheckBox->setChecked(true);
     } else {
         chargingCheckBox->setChecked(false);
@@ -979,17 +1103,17 @@ void Dialog::chargingStateChanged(QSystemBatteryInfo::ChargingState chargingStat
 
 void Dialog::chargerTypeChanged(QSystemBatteryInfo::ChargerType chargerType)
 {
-    if(chargerType == QSystemBatteryInfo::NoCharger) {
+    if (chargerType == QSystemBatteryInfo::NoCharger) {
         radioButton_2->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::WallCharger) {
+    } else if (chargerType == QSystemBatteryInfo::WallCharger) {
         radioButton_3->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USBCharger) {
+    } else if (chargerType == QSystemBatteryInfo::USBCharger) {
         radioButton_4->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USB_500mACharger) {
+    } else if (chargerType == QSystemBatteryInfo::USB_500mACharger) {
         radioButton_5->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::USB_100mACharger) {
+    } else if (chargerType == QSystemBatteryInfo::USB_100mACharger) {
         radioButton_6->setChecked(true);
-    } else if(chargerType == QSystemBatteryInfo::VariableCurrentCharger) {
+    } else if (chargerType == QSystemBatteryInfo::VariableCurrentCharger) {
         radioButton_7->setChecked(true);
     } else {
         radioButton->setChecked(true);
@@ -1022,3 +1146,95 @@ void Dialog::orientationChanged(QSystemDisplayInfo::DisplayOrientation orientati
 }
 
 
+void Dialog::keyboardFlipped(bool on)
+{
+    keyboardFlipRadioButton->setChecked(on);
+}
+
+void Dialog::storageStateChanged(const QString &vol, QSystemStorageInfo::StorageState state)
+{
+    QList<QTreeWidgetItem *>item = storageTreeWidget->findItems(vol,Qt::MatchExactly,0);
+    item.at(0)->setText(3,sizeToString(sti->availableDiskSpace(item.at(0)->text(0))));
+    item.at(0)->setText(5,storageStateToString(state));
+}
+
+QString Dialog::storageStateToString(QSystemStorageInfo::StorageState state)
+{
+    QString str;
+    if (state == QSystemStorageInfo::CriticalStorageState) {
+        str = "Critical";
+    } else if (state == QSystemStorageInfo::VeryLowStorageState) {
+        str = "Very Low";
+    } else if (state == QSystemStorageInfo::LowStorageState) {
+        str = "Low";
+    } else {
+        str = "Normal";
+    }
+    return str;
+}
+
+
+void Dialog::backlightTotext(QSystemDisplayInfo::BacklightState state)
+{
+    QString blState;
+
+    switch(state) {
+    case QSystemDisplayInfo::BacklightStateUnknown:
+        blState = "Unknown";
+        break;
+    case QSystemDisplayInfo::BacklightStateOff:
+        blState = "Off";
+        break;
+    case QSystemDisplayInfo::BacklightStateDimmed:
+        blState = "Dimmed";
+        break;
+    case QSystemDisplayInfo::BacklightStateOn:
+        blState = "On";
+        break;
+    };
+    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);
+}
+
+QString Dialog::lockStateToString(QSystemDeviceInfo::LockTypeFlags lock)
+{
+    if ((lock & QSystemDeviceInfo::PinLocked)){
+        return "Pin/Password Locked";
+    } else if ((lock & QSystemDeviceInfo::TouchAndKeyboardLocked)){
+        return "Touch and keyboard locked";
+    }
+    return "Unknown";
+}
+
+void Dialog::lockStatusChanged(QSystemDeviceInfo::LockTypeFlags locktype)
+{
+    if (locktype != oldLockStatus) {
+        lockStateLabel_2->setText(lockStateToString(oldLockStatus));
+        oldLockStatus = locktype;
+        lockStateLabel->setText(lockStateToString(locktype));
+    }
+}
+