FCL/sf/mw/wirelessacc: comparison wlanutilities/wlansniffer/wlansnifferapplication/src/wlansnifferlistwidget.cpp

equal deleted inserted replaced

-:d9ec2b8c6bad
+:2fbd1d709fe7
 #include <QSharedPointer>
 #include <HbListWidget>
 #include <HbListWidgetItem>
 #include <HbAbstractViewItem>
-#include <HbStyleLoader>
 #include <HbStringUtil>
 #include <cmmanagerdefines_shim.h>
 // User includes
 // External function prototypes
 // Local constants
-//! Location of WLAN Sniffer List Layout definitions
-static const QString WlanSnifferLayoutPath(":/wlansnifferlistlayout/");
 // ======== LOCAL FUNCTIONS ========
+/*!
+String comparator for list view. Used for locale-aware SSID comparison
+in list view.
+@param [in] string1 String #1 to compare.
+@param [in] string2 String #2 to compare.
+@return Zero (0), if strings are considered to be same,
+Positive (>0) if string1 is considered to be "greater than" string2.
+Negative (<0) if string1 is considered to be "less than" string2.
+*/
+static int WlanSsidStringComparator(
+const QString &string1,
+const QString &string2)
+{
+return HbStringUtil::compareC(string1, string2);
+}
 // ======== MEMBER FUNCTIONS ========
 /*!
 Constructor.
 WlanSnifferListWidget::WlanSnifferListWidget(HbListWidget *listWidget) :
 mListWidget(listWidget)
 {
 OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_WLANSNIFFERLISTWIDGET_ENTRY);
-// Register custom layout location
-HbStyleLoader::registerFilePath(WlanSnifferLayoutPath);
 // Set custom WLAN list item layout
 mListWidget->setLayoutName("wlanlistitem");
 OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_WLANSNIFFERLISTWIDGET_EXIT);
 }
 /*!
 Destructor.
 */
 WlanSnifferListWidget::~WlanSnifferListWidget()
 {
 OstTraceFunctionEntry0(DUP1_WLANSNIFFERLISTWIDGET_WLANSNIFFERLISTWIDGET_ENTRY);
-HbStyleLoader::unregisterFilePath(WlanSnifferLayoutPath);
 OstTraceFunctionExit0(DUP1_WLANSNIFFERLISTWIDGET_WLANSNIFFERLISTWIDGET_EXIT);
 }
 /*!
 Updates the list widget content with the given IAPs and APs.
 {
 // Primary comparison is based on the name
 int result = HbStringUtil::compareC(
 iap1->value(WlanQtUtilsIap::ConfIdName).toString(),
 iap2->value(WlanQtUtilsIap::ConfIdName).toString());
-// If name is equal, compare based on security mode
-if (result == 0) {
-result =
-iap1->value(WlanQtUtilsIap::ConfIdSecurityMode).toInt() -
-iap2->value(WlanQtUtilsIap::ConfIdSecurityMode).toInt();
-}
 return (result < 0) ? true : false;
 }
 /*!
 Compares two WLAN APs. Comparison is done with the AP SSID.
 bool WlanSnifferListWidget::apLessThan(
 const QSharedPointer<WlanQtUtilsAp> ap1,
 const QSharedPointer<WlanQtUtilsAp> ap2)
 {
-// Primary comparison is based on the SSID
+// Use AP comparison function with localized SSID comparison
-int result = HbStringUtil::compareC(
+int result = WlanQtUtilsAp::compare(
-ap1->value(WlanQtUtilsAp::ConfIdSsid).toString(),
+ap1.data(),
-ap2->value(WlanQtUtilsAp::ConfIdSsid).toString());
+ap2.data(),
+WlanSsidStringComparator);
-// If SSID is equal, compare based on security mode
-if (result == 0) {
-result =
-ap1->value(WlanQtUtilsIap::ConfIdSecurityMode).toInt() -
-ap2->value(WlanQtUtilsIap::ConfIdSecurityMode).toInt();
-}
 return (result < 0) ? true : false;
 }
 /*!
 Function for finding the given IAP from the old Wlan list.
 WlanSnifferListItem *result = NULL;
 for (int row = 0; row < mListWidget->count(); row++) {
 HbListWidgetItem *item = mListWidget->item(row);
 if (item->data().canConvert<WlanQtUtilsAp>()) {
 WlanQtUtilsAp oldAp = item->data().value<WlanQtUtilsAp>();
-if (WlanQtUtilsAp::compare(ap.data(), &oldAp) == true) {
+if (WlanQtUtilsAp::compare(ap.data(), &oldAp) == 0) {
 result = static_cast<WlanSnifferListItem *>(item);
 break;
 }
 }
 }
 {
 OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_IAP_ENTRY);
 WlanSnifferListItem *item = new WlanSnifferListItem();
 item->setNetworkName(iap->value(WlanQtUtilsIap::ConfIdName).toString());
+// Note: WPS icon is needed only in IAP setup, no longer here
 if (iap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt() !=
 CMManagerShim::WlanSecModeOpen) {
-item->setSecureIcon("qtg_small_secure");
+item->setSecureIcon("qtg_small_lock");
-// TODO: Handle WPS case - it uses a different icon!
-// Will be implemented with "Adding WLAN IAP manually" subfeature.
 }
 item->setLeftIcon(
 leftIconChoose(
 iap->value(WlanQtUtilsIap::ConfIdIapId).toInt(),
 {
 OstTraceFunctionEntry0(WLANSNIFFERLISTWIDGET_LISTITEMCREATE_AP_ENTRY);
 WlanSnifferListItem *item = new WlanSnifferListItem();
 item->setNetworkName(ap->value(WlanQtUtilsAp::ConfIdSsid).toString());
-if (ap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt()
+if (ap->value(WlanQtUtilsAp::ConfIdWpsSupported).toBool()) {
+// WPS is supported, use a dedicated security icon
+item->setSecureIcon("qtg_small_wifi");
+} else if (ap->value(WlanQtUtilsAp::ConfIdSecurityMode).toInt()
 != CMManagerShim::WlanSecModeOpen) {
-item->setSecureIcon("qtg_small_secure");
+// Other secure networks
-// TODO: Handle WPS case - it uses a different icon!
+item->setSecureIcon("qtg_small_lock");
-// Will be implemented with "Adding WLAN IAP manually" subfeature.
 }
 item->setSignalIcon(
 signalStrengthIconChoose(
 ap->value(WlanQtUtilsAp::ConfIdSignalStrength).toInt()));
 } else {
 // Item has to be an AP, try to find it from the new AP list
 Q_ASSERT(item->data().canConvert<WlanQtUtilsAp>());
 WlanQtUtilsAp oldAp = item->data().value<WlanQtUtilsAp>();
 foreach (QSharedPointer<WlanQtUtilsAp> newAp, aps) {
-if (WlanQtUtilsAp::compare(newAp.data(), &oldAp) == true) {
+if (WlanQtUtilsAp::compare(newAp.data(), &oldAp) == 0) {
 found = true;
 break;
 }
 }
 }
 } else {
 // Item still exists, move on to next row
 row++;
 }
 }
 OstTraceFunctionExit0(WLANSNIFFERLISTWIDGET_REMOVELOSTITEMS_EXIT);
 }
 /*!
 Function for adding to the Wlan list those items, which are new

changeset 46	2fbd1d709fe7
parent 38	2dc6da6fb431
child 58	301aeb18ae47