2 files changed, 59 insertions, 4 deletions

diff --git a/noncore/unsupported/gsmtool/gsmtool.cpp b/noncore/unsupported/gsmtool/gsmtool.cpp
index 38c8c59..38baf45 100644
--- a/noncore/unsupported/gsmtool/gsmtool.cpp
+++ b/noncore/unsupported/gsmtool/gsmtool.cpp
@@ -6,2 +6,3 @@
 #include <qtabwidget.h>
+#include <qlistview.h>
 
@@ -133,2 +134,48 @@ void GSMTool::doScanButton()
         qDebug("ScanButton");
+
+        NetworkList->setEnabled(FALSE);
+        AvailNetsLabel->setEnabled(FALSE);
+        NetworkList->clear();
+        new QListViewItem(NetworkList, "Scanning...");
+
+        vector<OPInfo> opis;
+
+        try {
+                opis = me->getAvailableOPInfo();
+        } catch (GsmException) {
+                NetworkList->clear();
+                new QListViewItem(NetworkList, "Scan failed...");
+                return;
+        }
+        
+        NetworkList->clear();
+        for (vector<OPInfo>::iterator i = opis.begin(); i != opis.end(); ++i) {
+                char *statustext;
+                switch (i->_status) {
+
+                case UnknownOPStatus:
+                        statustext = "unknown";
+                        break;
+                        
+                case CurrentOPStatus: 
+                        statustext = "current";
+                        break;
+
+                case AvailableOPStatus:
+                        statustext = "available";
+                        break;
+
+                case ForbiddenOPStatus:
+                        statustext = "forbidden";
+                        break;
+                       
+                default:
+                        statustext = "(ERROR)";
+                }
+                char num[7];
+                snprintf(num, 6, "%d", i->_numericName);
+                new QListViewItem(NetworkList, i->_longName.c_str(), statustext, num, i->_shortName.c_str());
+      }
+        NetworkList->setEnabled(TRUE);
+        AvailNetsLabel->setEnabled(TRUE);
 }
diff --git a/noncore/unsupported/gsmtool/gsmtoolbase.ui b/noncore/unsupported/gsmtool/gsmtoolbase.ui
index 36a3d8e..72c943a 100644
--- a/noncore/unsupported/gsmtool/gsmtoolbase.ui
+++ b/noncore/unsupported/gsmtool/gsmtoolbase.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>272</width>
-            <height>366</height>
+            <width>388</width>
+            <height>502</height>
         </rect>
@@ -554,3 +554,3 @@
                                     <name>name</name>
-                                    <cstring>AltNetsLabel</cstring>
+                                    <cstring>AvailNetsLabel</cstring>
                                 </property>
@@ -558,3 +558,3 @@
                                     <name>text</name>
-                                    <string>Alternative Networks:</string>
+                                    <string>Available Networks:</string>
                                 </property>
@@ -658,2 +658,6 @@
                         <property stdset="1">
+                            <name>enabled</name>
+                            <bool>false</bool>
+                        </property>
+                        <property stdset="1">
                             <name>sizePolicy</name>
@@ -708,2 +712,6 @@
                                 <property stdset="1">
+                                    <name>enabled</name>
+                                    <bool>false</bool>
+                                </property>
+                                <property stdset="1">
                                     <name>sizePolicy</name>