diff -r 6b911d05207e -r bc5a64e5bc3c phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h --- a/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Wed Jun 23 18:12:20 2010 +0300 +++ b/phonesettings/cpphonesettingsplugins/cpnetworkplugin/src/cpnetworkpluginform.h Tue Jul 06 14:15:47 2010 +0300 @@ -38,22 +38,18 @@ Q_OBJECT public: - explicit CpNetworkPluginForm(QGraphicsItem *parent = 0); - virtual ~CpNetworkPluginForm(); - + void searchAvailableNetworks(); signals: - void showGlobalProgressNote(int ¬eId, const QString& text); void showGlobalNote( int ¬eId, const QString& text, HbMessageBox::MessageBoxType msgBoxType); void cancelNote(int noteId); -public slots: - +public slots: void cellularDataUseHomeStateChanged(int index); void cellularDataUseRoamStateChanged(int index); void networkModeStateChanged(int index); @@ -72,7 +68,7 @@ PSetNetworkWrapper::RegistrationStatus& status); void finishedManualSelectiondialog(HbAction* action); -private: +protected: HbDataFormModelItem *createNetworkModeItem(); HbDataFormModelItem *createOperatorSelectionItem(); HbDataFormModelItem *createHomeDataUsageItem(); @@ -86,16 +82,17 @@ void gsmSelection(); HbDialog* createDialog(const QString& heading) const; - void addItemToListWidget( - HbListWidget* w, const QString& item, const int& data) const; + void addItemToListWidget(HbListWidget* w, const QString& item, + const int& data, const HbIcon& primaryIcon) const; void showManualSelectiondialog(); void restoreOperatorSelectionUi(); QString networkName(PSetNetworkWrapper::NetworkInfo &info); void connectToNetworkWrapper(PSetNetworkWrapper &wrapper); - void connectToPhoneNotes(CpPhoneNotes ¬es); + + QString primaryIconForNetwork(const PSetNetworkWrapper::NetworkInfo &info); private: