Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-02 03:16:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed net status gui

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-10-30 00:36:33 +00:00
parent 04ecbc5514
commit b8be372c4d
3 changed files with 48 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
retroshare-gui/src/gui/NetworkDialog.cpp
View File

@ -797,109 +797,63 @@ void NetworkDialog::updateNetworkStatus()
if(config.netUpnpOk) if(config.netUpnpOk)
{ {
ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.textlabel_upnp->setText(tr("UPnP active"));
} }
else else
{ {
ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_upnp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.textlabel_upnp->setText(tr("UPnP inactive"));
} }
if(config.netDhtOk) if(config.netDhtOk)
{ {
ui.iconlabel_dht->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_dht->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.textlabel_dht->setText(tr("DHT active"));
} }
else else
{ {
ui.iconlabel_dht->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_dht->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.textlabel_dht->setText(tr("DHT inactive"));
} }
if(config.netExtOk) if(config.netExtOk)
{ {
ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.textlabel_ext->setText(tr("Stabile External IP Address"));
} }
else else
{ {
ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_ext->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.textlabel_ext->setText(tr("Not Found External IP Address"));
} }
if(config.netUdpOk) if(config.netUdpOk)
{ {
ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.textlabel_udp->setText(tr("UDP Port is active ( UDP Connections )"));
} }
else else
{ {
ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_udp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.textlabel_udp->setText(tr("UDP Port is not active"));
} }
if (config.netExtOk) if (config.netExtOk)
{ {
if (config.netUpnpOk) if (config.netUpnpOk)
{ {
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_nonet->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
} }
else else
{ {
ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); }
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_nonet->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
}
} }
else if (config.netOk) else if (config.netOk)
{ {
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png")); ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_nonet->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
} }
else else
{ {
ui.iconlabel_nonet->setPixmap(QPixmap::QPixmap(":/images/ledon1.png"));
ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_netUdp->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_netServer->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png")); ui.iconlabel_netLimited->setPixmap(QPixmap::QPixmap(":/images/ledoff1.png"));
} }
//ui.check_net->setChecked(config.netOk);
/*ui.check_upnp->setChecked(config.netUpnpOk);
ui.check_dht->setChecked(config.netDhtOk);
ui.check_ext->setChecked(config.netExtOk);
ui.check_udp->setChecked(config.netUdpOk);
ui.check_tcp->setChecked(config.netTcpOk);
if (config.netExtOk)
{
if (config.netUpnpOk || config.netTcpOk)
{
ui.radio_netServer->setChecked(true);
}
else
{
ui.radio_netUdp->setChecked(true);
}
}
else if (config.netOk)
{
ui.radio_netLimited->setChecked(true);
}
else
{
ui.radio_nonet->setChecked(true);
}*/
rsiface->unlockData(); /* UnLock Interface */ rsiface->unlockData(); /* UnLock Interface */
} }

74
retroshare-gui/src/gui/NetworkDialog.ui
View File

@ -183,33 +183,6 @@
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_nonet">
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/ledoff1.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="textlabel_nonet">
<property name="text">
<string>No Connectivity</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="iconlabel_netLimited"> <widget class="QLabel" name="iconlabel_netLimited">
@ -230,13 +203,13 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_netLimited"> <widget class="QLabel" name="textlabel_netLimited">
<property name="text"> <property name="text">
<string>Limited</string> <string>Local network</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="iconlabel_netUdp"> <widget class="QLabel" name="iconlabel_netUdp">
@ -257,16 +230,16 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_netUdp"> <widget class="QLabel" name="textlabel_netUdp">
<property name="text"> <property name="text">
<string>UDP</string> <string>Internet connection</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="iconlabel_netServer"> <widget class="QLabel" name="iconlabel_upnp">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16</width> <width>16</width>
@ -282,9 +255,9 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_netServer"> <widget class="QLabel" name="textlabel_upnp">
<property name="text"> <property name="text">
<string>RetroShare Server</string> <string>UPnP</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -315,7 +288,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_udp"> <widget class="QLabel" name="textlabel_udp">
<property name="text"> <property name="text">
<string>UDP Connections</string> <string>UDP stun external ip address</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -342,7 +315,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_ext"> <widget class="QLabel" name="textlabel_ext">
<property name="text"> <property name="text">
<string>Stable External IP Address</string> <string>Stable external IP address</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -369,34 +342,7 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLabel" name="textlabel_dht"> <widget class="QLabel" name="textlabel_dht">
<property name="text"> <property name="text">
<string>DHT OK</string> <string>DHT</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="3" column="0">
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_upnp">
<property name="maximumSize">
<size>
<width>16</width>
<height>16</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/ledoff1.png</pixmap>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="textlabel_upnp">
<property name="text">
<string>UPnP Active</string>
</property> </property>
</widget> </widget>
</item> </item>

64
retroshare-gui/src/gui/statusbar/natstatus.cpp
View File

@ -70,38 +70,38 @@ void NATStatus::getNATStatus()
/* now the extra bit .... switch on check boxes */ /* now the extra bit .... switch on check boxes */
const RsConfig &config = rsiface->getConfig(); const RsConfig &config = rsiface->getConfig();
if(config.netUpnpOk) // if(config.netUpnpOk)
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("UPNP is active.")); // iconLabel->setToolTip(tr("UPNP is active."));
} // }
else // else
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png"));
iconLabel->setToolTip(tr("UPNP NOT FOUND.")); // iconLabel->setToolTip(tr("UPNP NOT FOUND."));
} // }
//
if(config.netExtOk) // if(config.netExtOk)
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png"));
iconLabel->setToolTip(tr("Stable External IP Address")); // iconLabel->setToolTip(tr("Stable External IP Address"));
} // }
else // else
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png"));
iconLabel->setToolTip(tr("Not Found External Address")); // iconLabel->setToolTip(tr("Not Found External Address"));
} // }
//
if(config.netUdpOk) // if(config.netUdpOk)
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/greenled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png"));
iconLabel->setToolTip(tr("UDP Port is reachable")); // iconLabel->setToolTip(tr("UDP Port is reachable"));
} // }
else // else
{ // {
iconLabel->setPixmap(QPixmap::QPixmap(":/images/yellowled.png")); // iconLabel->setPixmap(QPixmap::QPixmap(":/images/grayled.png"));
iconLabel->setToolTip(tr("UDP Port is not reachable")); // iconLabel->setToolTip(tr("UDP Port is not reachable"));
} // }
if (config.netExtOk) if (config.netExtOk)
{ {