summaryrefslogtreecommitdiff
path: root/noncore/settings
Unidiff
Diffstat (limited to 'noncore/settings') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetup.ui6
-rw-r--r--noncore/settings/networksettings/mainwindowimp.cpp2
-rw-r--r--noncore/settings/networksettings/opie-networksettings.control2
3 files changed, 7 insertions, 3 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui
index efcab8b..fa2db40 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui
@@ -2,25 +2,25 @@
2<class>InterfaceSetup</class> 2<class>InterfaceSetup</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>InterfaceSetup</cstring> 7 <cstring>InterfaceSetup</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>286</width> 14 <width>282</width>
15 <height>280</height> 15 <height>280</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Interface Configuration</string> 20 <string>Interface Configuration</string>
21 </property> 21 </property>
22 <vbox> 22 <vbox>
23 <property stdset="1"> 23 <property stdset="1">
24 <name>margin</name> 24 <name>margin</name>
25 <number>11</number> 25 <number>11</number>
26 </property> 26 </property>
@@ -100,24 +100,28 @@
100 <class>QLineEdit</class> 100 <class>QLineEdit</class>
101 <property stdset="1"> 101 <property stdset="1">
102 <name>name</name> 102 <name>name</name>
103 <cstring>gatewayEdit</cstring> 103 <cstring>gatewayEdit</cstring>
104 </property> 104 </property>
105 </widget> 105 </widget>
106 <widget row="1" column="1" > 106 <widget row="1" column="1" >
107 <class>QLineEdit</class> 107 <class>QLineEdit</class>
108 <property stdset="1"> 108 <property stdset="1">
109 <name>name</name> 109 <name>name</name>
110 <cstring>subnetMaskEdit</cstring> 110 <cstring>subnetMaskEdit</cstring>
111 </property> 111 </property>
112 <property stdset="1">
113 <name>text</name>
114 <string>255.255.255.0</string>
115 </property>
112 </widget> 116 </widget>
113 <widget row="0" column="1" > 117 <widget row="0" column="1" >
114 <class>QLineEdit</class> 118 <class>QLineEdit</class>
115 <property stdset="1"> 119 <property stdset="1">
116 <name>name</name> 120 <name>name</name>
117 <cstring>ipAddressEdit</cstring> 121 <cstring>ipAddressEdit</cstring>
118 </property> 122 </property>
119 </widget> 123 </widget>
120 <widget row="3" column="0" > 124 <widget row="3" column="0" >
121 <class>QLabel</class> 125 <class>QLabel</class>
122 <property stdset="1"> 126 <property stdset="1">
123 <name>name</name> 127 <name>name</name>
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp
index a0b3113..4119490 100644
--- a/noncore/settings/networksettings/mainwindowimp.cpp
+++ b/noncore/settings/networksettings/mainwindowimp.cpp
@@ -486,25 +486,25 @@ void MainWindowImp::updateInterface(Interface *i){
486 } 486 }
487 else 487 else
488 item = items[i]; 488 item = items[i];
489 489
490 // Update the icons and information 490 // Update the icons and information
491#ifdef QWS 491#ifdef QWS
492 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down"))); 492 item->setPixmap(0, (Resource::loadPixmap(i->getStatus() ? "up": "down")));
493#else 493#else
494 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down"))); 494 item->setPixmap(0, (SmallIcon(i->getStatus() ? "up": "down")));
495#endif 495#endif
496 496
497 QString typeName = "lan"; 497 QString typeName = "lan";
498 if(i->getHardwareName().contains("Local Loopback")) 498 if(i->getInterfaceName() == "lo")
499 typeName = "lo"; 499 typeName = "lo";
500 if(i->getInterfaceName().contains("irda")) 500 if(i->getInterfaceName().contains("irda"))
501 typeName = "irda"; 501 typeName = "irda";
502 if(i->getInterfaceName().contains("wlan")) 502 if(i->getInterfaceName().contains("wlan"))
503 typeName = "wlan"; 503 typeName = "wlan";
504 if(i->getInterfaceName().contains("usb")) 504 if(i->getInterfaceName().contains("usb"))
505 typeName = "usb"; 505 typeName = "usb";
506 506
507 if(!i->isAttached()) 507 if(!i->isAttached())
508 typeName = "connect_no"; 508 typeName = "connect_no";
509 // Actually try to use the Module 509 // Actually try to use the Module
510 if(i->getModuleOwner() != NULL) 510 if(i->getModuleOwner() != NULL)
diff --git a/noncore/settings/networksettings/opie-networksettings.control b/noncore/settings/networksettings/opie-networksettings.control
index e2db92f..182615f 100644
--- a/noncore/settings/networksettings/opie-networksettings.control
+++ b/noncore/settings/networksettings/opie-networksettings.control
@@ -1,10 +1,10 @@
1Package: opie-networksettings 1Package: opie-networksettings
2Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so.1.0.0 $OPIEDIR/lib/libinterfaces.so.1.0 $OPIEDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile 2Files: bin/networksettings apps/Settings/networksettings.desktop plugins/networksettings/* pics/networksettings/* pics/Network/PPPConnect.png $OPIEDIR/lib/libinterfaces.so.1.0.0 $OPIEDIR/lib/libinterfaces.so.1.0 $OPIEDIR/lib/libinterfaces.so.1 root/usr/bin/changedns bin/getprofile
3Priority: optional 3Priority: optional
4Section: opie/settings 4Section: opie/settings
5Maintainer: Ben Meyer <meyerb@sharpsec.com> 5Maintainer: Patrick S. Vogt <tille@handhelds.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION-$SUB_VERSION 7Version: $QPE_VERSION-$SUB_VERSION
8Depends: task-opie-minimal 8Depends: task-opie-minimal
9Description: Network settings. 9Description: Network settings.
10Replaces: opie-networksetup 10Replaces: opie-networksetup