Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-05 21:04:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

moved networkview and network dialog into tabs of Friends. Renamed "group chat" into "broadcast", removed chat lobbies => will be set elsewhere.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-01-30 20:56:31 +00:00
parent 2f18162ef9
commit e6e7a1b52f
11 changed files with 410 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/FriendsDialog.cpp
View file

@ -55,10 +55,14 @@
#include "FriendRecommendDialog.h" #include "FriendRecommendDialog.h"
#include "FriendsDialog.h" #include "FriendsDialog.h"
#include "ServicePermissionDialog.h" #include "ServicePermissionDialog.h"
#include "NetworkView.h"
#include "NetworkDialog.h"
/* Images for Newsfeed icons */ /* Images for Newsfeed icons */
#define IMAGE_NEWSFEED "" #define IMAGE_NEWSFEED ""
#define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png" #define IMAGE_NEWSFEED_NEW ":/images/message-state-new.png"
#define IMAGE_NETWORK2 ":/images/rs1.png"
#define IMAGE_PEERS ":/images/groupchat.png"
/****** /******
* #define FRIENDS_DEBUG 1 * #define FRIENDS_DEBUG 1
@ -97,8 +101,10 @@ FriendsDialog::FriendsDialog(QWidget *parent)
ui.avatar->setOwnId(); ui.avatar->setOwnId();
ui.tabWidget->setTabPosition(QTabWidget::North); ui.tabWidget->setTabPosition(QTabWidget::North);
ui.tabWidget->addTab(new ChatLobbyWidget(), tr("Chat lobbies")); ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_PEERS), tr("Local network"));
ui.tabWidget->addTab(new ProfileWidget(), tr("Profile")); ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_NETWORK2), tr("Known people"));
//ui.tabWidget->addTab(new ChatLobbyWidget(), tr("Chat lobbies"));
//ui.tabWidget->addTab(new ProfileWidget(), tr("Profile"));
newsFeed = new NewsFeed(); newsFeed = new NewsFeed();
int newsFeedTabIndex = ui.tabWidget->insertTab(0, newsFeed, tr("News Feed")); int newsFeedTabIndex = ui.tabWidget->insertTab(0, newsFeed, tr("News Feed"));
ui.tabWidget->setCurrentIndex(newsFeedTabIndex); ui.tabWidget->setCurrentIndex(newsFeedTabIndex);

4
retroshare-gui/src/gui/FriendsDialog.h
View file

@ -32,6 +32,8 @@ class QAction;
class QTextEdit; class QTextEdit;
class QTextCharFormat; class QTextCharFormat;
class ChatTabWidget; class ChatTabWidget;
class NetworkDialog;
class NetworkView;
class FriendsDialog : public RsAutoUpdatePage class FriendsDialog : public RsAutoUpdatePage
{ {
@ -51,6 +53,8 @@ public:
static bool isGroupChatActive(); static bool isGroupChatActive();
static void groupChatActivate(); static void groupChatActivate();
NetworkDialog *networkDialog ;
NetworkView *networkView ;
public slots: public slots:
void publicChatChanged(int type); void publicChatChanged(int type);

2
retroshare-gui/src/gui/FriendsDialog.ui
View file

@ -291,7 +291,7 @@
</property> </property>
<widget class="QWidget" name="groupChatTab"> <widget class="QWidget" name="groupChatTab">
<attribute name="title"> <attribute name="title">
<string>Group Chat</string> <string>Broadcast</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="0"> <item row="1" column="0">

22
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -118,7 +118,7 @@
/* Images for toolbar icons */ /* Images for toolbar icons */
#define IMAGE_NETWORK2 ":/images/rs1.png" //#define IMAGE_NETWORK2 ":/images/rs1.png"
#define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_PEERS ":/images/groupchat.png"
#define IMAGE_TRANSFERS ":/images/ktorrent32.png" #define IMAGE_TRANSFERS ":/images/ktorrent32.png"
#define IMAGE_FILES ":/images/fileshare32.png" #define IMAGE_FILES ":/images/fileshare32.png"
@ -237,8 +237,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
QAction *action; QAction *action;
ui->stackPages->add(networkDialog = new NetworkDialog(ui->stackPages), // ui->stackPages->add(networkDialog = new NetworkDialog(ui->stackPages),
createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp)); // createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp));
ui->stackPages->add(friendsDialog = new FriendsDialog(ui->stackPages), ui->stackPages->add(friendsDialog = new FriendsDialog(ui->stackPages),
action = createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp)); action = createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp));
@ -784,9 +784,9 @@ void SetForegroundWindowInternal(HWND hWnd)
MainPage *Page = NULL; MainPage *Page = NULL;
switch (page) { switch (page) {
case Network: // case Network:
Page = _instance->networkDialog; // Page = _instance->networkDialog;
break; // break;
case Friends: case Friends:
Page = _instance->friendsDialog; Page = _instance->friendsDialog;
break; break;
@ -833,9 +833,9 @@ void SetForegroundWindowInternal(HWND hWnd)
QWidget *page = _instance->ui->stackPages->currentWidget(); QWidget *page = _instance->ui->stackPages->currentWidget();
if (page == _instance->networkDialog) { // if (page == _instance->networkDialog) {
return Network; // return Network;
} // }
if (page == _instance->friendsDialog) { if (page == _instance->friendsDialog) {
return Friends; return Friends;
} }
@ -879,8 +879,8 @@ void SetForegroundWindowInternal(HWND hWnd)
} }
switch (page) { switch (page) {
case Network: // case Network:
return _instance->networkDialog; // return _instance->networkDialog;
case Friends: case Friends:
return _instance->friendsDialog; return _instance->friendsDialog;
// case Search: // case Search:

2
retroshare-gui/src/gui/MainWindow.h
View file

@ -117,7 +117,7 @@ public:
* Notify Class... * Notify Class...
*/ */
NetworkDialog *networkDialog; // NetworkDialog *networkDialog;
FriendsDialog *friendsDialog; FriendsDialog *friendsDialog;
// SearchDialog *searchDialog; // SearchDialog *searchDialog;
TransfersDialog *transfersDialog; TransfersDialog *transfersDialog;

199
retroshare-gui/src/gui/NetworkDialog.cpp
View file

@ -134,7 +134,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder ); ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder );
// ui.networkTab->addTab(new TrustView(),QString(tr("Authentication matrix"))); // ui.networkTab->addTab(new TrustView(),QString(tr("Authentication matrix")));
ui.networkTab->addTab(networkview = new NetworkView(),QString(tr("Network View"))); // ui.networkTab->addTab(networkview = new NetworkView(),QString(tr("Network View")));
ui.showUnvalidKeys->setMinimumWidth(20); ui.showUnvalidKeys->setMinimumWidth(20);
@ -159,7 +159,7 @@ NetworkDialog::NetworkDialog(QWidget *parent)
menu->addSeparator(); menu->addSeparator();
menu->addAction(ui.actionTabsTriangular); menu->addAction(ui.actionTabsTriangular);
menu->addAction(ui.actionTabsRounded); menu->addAction(ui.actionTabsRounded);
ui.viewButton->setMenu(menu); //ui.viewButton->setMenu(menu);
QTimer *timer2 = new QTimer(this); QTimer *timer2 = new QTimer(this);
connect(timer2, SIGNAL(timeout()), this, SLOT(updateNetworkStatus())); connect(timer2, SIGNAL(timeout()), this, SLOT(updateNetworkStatus()));
@ -170,8 +170,8 @@ NetworkDialog::NetworkDialog(QWidget *parent)
ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), COLUMN_PEERID, tr("Search Peer ID")); ui.filterLineEdit->addFilter(QIcon(), tr("Peer ID"), COLUMN_PEERID, tr("Search Peer ID"));
ui.filterLineEdit->setCurrentFilter(COLUMN_PEERNAME); ui.filterLineEdit->setCurrentFilter(COLUMN_PEERNAME);
updateNetworkStatus(); //updateNetworkStatus();
loadtabsettings(); //loadtabsettings();
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -192,12 +192,12 @@ void NetworkDialog::changeEvent(QEvent *e)
} }
} }
void NetworkDialog::updateNewDiscoveryInfo() //void NetworkDialog::updateNewDiscoveryInfo()
{ //{
//std::cerr << "Received new p3disc info. Updating networkview." << std::endl; // //std::cerr << "Received new p3disc info. Updating networkview." << std::endl;
networkview->update(); // //networkview->update();
networkview->updateDisplay(); // //networkview->updateDisplay();
} //}
void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ ) void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ )
{ {
@ -687,117 +687,74 @@ void NetworkDialog::on_actionCreate_New_Profile_activated()
// gencertdialog.exec (); // gencertdialog.exec ();
} }
void NetworkDialog::updateNetworkStatus() // void NetworkDialog::on_actionTabsnorth_activated()
{ // {
if(RsAutoUpdatePage::eventsLocked()) // ui.networkTab->setTabPosition(QTabWidget::North);
return ; //
// Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition());
rsiface->lockData(); /* Lock Interface */ // }
//
/* now the extra bit .... switch on check boxes */ // void NetworkDialog::on_actionTabssouth_activated()
const RsConfig &config = rsiface->getConfig(); // {
// ui.networkTab->setTabPosition(QTabWidget::South);
//
/******* Network Status Tab *******/ // Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition());
//
if(config.netUpnpOk) // }
{ //
ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledon1.png")); // void NetworkDialog::on_actionTabswest_activated()
} // {
else // ui.networkTab->setTabPosition(QTabWidget::West);
{ //
ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png")); // Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition());
} // }
//
if (config.netLocalOk) // void NetworkDialog::on_actionTabsright_activated()
{ // {
ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledon1.png")); // ui.networkTab->setTabPosition(QTabWidget::East);
} //
else // Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition());
{ // }
ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png")); //
} // void NetworkDialog::on_actionTabsTriangular_activated()
// {
if (config.netExtraAddressOk) // ui.networkTab->setTabShape(QTabWidget::Triangular);
{ // ui.tabBottom->setTabShape(QTabWidget::Triangular);
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png")); // }
} //
else // void NetworkDialog::on_actionTabsRounded_activated()
{ // {
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png")); // ui.networkTab->setTabShape(QTabWidget::Rounded);
} // ui.tabBottom->setTabShape(QTabWidget::Rounded);
// }
rsiface->unlockData(); /* UnLock Interface */ //
} // void NetworkDialog::loadtabsettings()
// {
void NetworkDialog::on_actionTabsnorth_activated() // Settings->beginGroup("NetworkDialog");
{ //
ui.networkTab->setTabPosition(QTabWidget::North); // if(Settings->value("TabWidget_Position","0").toInt() == 0)
// {
Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); // qDebug() << "Tab North";
} // ui.networkTab->setTabPosition(QTabWidget::North);
// }
void NetworkDialog::on_actionTabssouth_activated() // else if (Settings->value("TabWidget_Position","1").toInt() == 1)
{ // {
ui.networkTab->setTabPosition(QTabWidget::South); // qDebug() << "Tab South";
// ui.networkTab->setTabPosition(QTabWidget::South);
Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); // }
// else if (Settings->value("TabWidget_Position","2").toInt() ==2)
} // {
// qDebug() << "Tab West";
void NetworkDialog::on_actionTabswest_activated() // ui.networkTab->setTabPosition(QTabWidget::West);
{ // }
ui.networkTab->setTabPosition(QTabWidget::West); // else if(Settings->value("TabWidget_Position","3").toInt() ==3)
// {
Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); // qDebug() << "Tab East";
} // ui.networkTab->setTabPosition(QTabWidget::East);
// }
void NetworkDialog::on_actionTabsright_activated() //
{ // Settings->endGroup();
ui.networkTab->setTabPosition(QTabWidget::East); // }
Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition());
}
void NetworkDialog::on_actionTabsTriangular_activated()
{
ui.networkTab->setTabShape(QTabWidget::Triangular);
ui.tabBottom->setTabShape(QTabWidget::Triangular);
}
void NetworkDialog::on_actionTabsRounded_activated()
{
ui.networkTab->setTabShape(QTabWidget::Rounded);
ui.tabBottom->setTabShape(QTabWidget::Rounded);
}
void NetworkDialog::loadtabsettings()
{
Settings->beginGroup("NetworkDialog");
if(Settings->value("TabWidget_Position","0").toInt() == 0)
{
qDebug() << "Tab North";
ui.networkTab->setTabPosition(QTabWidget::North);
}
else if (Settings->value("TabWidget_Position","1").toInt() == 1)
{
qDebug() << "Tab South";
ui.networkTab->setTabPosition(QTabWidget::South);
}
else if (Settings->value("TabWidget_Position","2").toInt() ==2)
{
qDebug() << "Tab West";
ui.networkTab->setTabPosition(QTabWidget::West);
}
else if(Settings->value("TabWidget_Position","3").toInt() ==3)
{
qDebug() << "Tab East";
ui.networkTab->setTabPosition(QTabWidget::East);
}
Settings->endGroup();
}
void NetworkDialog::filterColumnChanged(int) void NetworkDialog::filterColumnChanged(int)
{ {

22
retroshare-gui/src/gui/NetworkDialog.h
View file

@ -59,7 +59,7 @@ public slots:
void insertConnect(); void insertConnect();
// std::string loadneighbour(); // std::string loadneighbour();
/* void loadneighbour(); */ /* void loadneighbour(); */
void updateNewDiscoveryInfo() ; //void updateNewDiscoveryInfo() ;
protected: protected:
void changeEvent(QEvent *e); void changeEvent(QEvent *e);
@ -87,17 +87,17 @@ private slots:
void on_actionCreate_New_Profile_activated(); void on_actionCreate_New_Profile_activated();
void updateNetworkStatus(); //void updateNetworkStatus();
void loadtabsettings(); // void loadtabsettings();
void on_actionTabsright_activated(); // void on_actionTabsright_activated();
void on_actionTabsnorth_activated(); // void on_actionTabsnorth_activated();
void on_actionTabssouth_activated(); // void on_actionTabssouth_activated();
void on_actionTabswest_activated(); // void on_actionTabswest_activated();
//
void on_actionTabsRounded_activated(); // void on_actionTabsRounded_activated();
void on_actionTabsTriangular_activated(); // void on_actionTabsTriangular_activated();
void filterColumnChanged(int); void filterColumnChanged(int);
void filterItems(const QString &text); void filterItems(const QString &text);
@ -107,7 +107,7 @@ private:
QTreeWidget *connecttreeWidget; QTreeWidget *connecttreeWidget;
class NetworkView *networkview; // class NetworkView *networkview;
bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn); bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn);

545
retroshare-gui/src/gui/NetworkDialog.ui
View file

@ -6,397 +6,168 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>629</width> <width>825</width>
<height>346</height> <height>567</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin"> <item>
<number>6</number> <layout class="QHBoxLayout" name="horizontalLayout">
</property> <item>
<property name="topMargin"> <widget class="QLabel" name="titleBarLabel">
<number>9</number> <property name="font">
</property> <font>
<property name="rightMargin"> <pointsize>10</pointsize>
<number>6</number> <weight>75</weight>
</property> <bold>true</bold>
<property name="bottomMargin"> </font>
<number>0</number> </property>
</property> <property name="text">
<item row="0" column="0"> <string>Filter:</string>
<widget class="QTabWidget" name="networkTab"> </property>
<property name="tabPosition"> </widget>
<enum>QTabWidget::North</enum> </item>
<item>
<widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip">
<string>Search Network</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showUnvalidKeys">
<property name="text">
<string>Show keys that are not validated by the PGP web of trust</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTreeWidget" name="connecttreeWidget">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="contextMenuPolicy">
<number>0</number> <enum>Qt::CustomContextMenu</enum>
</property> </property>
<widget class="QWidget" name="networkTab_1"> <property name="acceptDrops">
<attribute name="title"> <bool>false</bool>
<string>Network</string> </property>
</attribute> <property name="autoFillBackground">
<layout class="QGridLayout"> <bool>false</bool>
<property name="horizontalSpacing"> </property>
<number>6</number> <property name="lineWidth">
</property> <number>20</number>
<property name="verticalSpacing"> </property>
<number>0</number> <property name="iconSize">
</property> <size>
<property name="margin"> <width>16</width>
<number>0</number> <height>16</height>
</property> </size>
<item row="1" column="0"> </property>
<widget class="QTreeWidget" name="connecttreeWidget"> <property name="uniformRowHeights">
<property name="sizePolicy"> <bool>true</bool>
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> </property>
<horstretch>0</horstretch> <property name="sortingEnabled">
<verstretch>0</verstretch> <bool>true</bool>
</sizepolicy> </property>
</property> <property name="animated">
<property name="contextMenuPolicy"> <bool>true</bool>
<enum>Qt::CustomContextMenu</enum> </property>
</property> <property name="allColumnsShowFocus">
<property name="acceptDrops"> <bool>true</bool>
<bool>false</bool> </property>
</property> <property name="wordWrap">
<property name="autoFillBackground"> <bool>true</bool>
<bool>false</bool> </property>
</property> <attribute name="headerCascadingSectionResizes">
<property name="lineWidth"> <bool>true</bool>
<number>20</number> </attribute>
</property> <attribute name="headerDefaultSectionSize">
<property name="iconSize"> <number>200</number>
<size> </attribute>
<width>16</width> <attribute name="headerStretchLastSection">
<height>16</height> <bool>true</bool>
</size> </attribute>
</property> <column>
<property name="uniformRowHeights"> <property name="text">
<bool>true</bool> <string/>
</property> </property>
<property name="sortingEnabled"> </column>
<bool>true</bool> <column>
</property> <property name="text">
<property name="animated"> <string>Name</string>
<bool>true</bool> </property>
</property> </column>
<property name="allColumnsShowFocus"> <column>
<bool>true</bool> <property name="text">
</property> <string>Did I authenticated peer</string>
<property name="wordWrap"> </property>
<bool>true</bool> <property name="toolTip">
</property> <string>Did I sign his PGP key</string>
<attribute name="headerCascadingSectionResizes"> </property>
<bool>true</bool> </column>
</attribute> <column>
<attribute name="headerDefaultSectionSize"> <property name="text">
<number>200</number> <string>Did peer authenticated me</string>
</attribute> </property>
<attribute name="headerStretchLastSection"> </column>
<bool>true</bool> <column>
</attribute> <property name="text">
<column> <string>Cert Id</string>
<property name="text"> </property>
<string/> </column>
</property> </widget>
</column> </item>
<column> <item>
<property name="text"> <widget class="QTreeWidget" name="unvalidGPGkeyWidget">
<string>Name</string> <property name="contextMenuPolicy">
</property> <enum>Qt::CustomContextMenu</enum>
</column> </property>
<column> <property name="sortingEnabled">
<property name="text"> <bool>true</bool>
<string>Did I authenticated peer</string> </property>
</property> <property name="allColumnsShowFocus">
<property name="toolTip"> <bool>true</bool>
<string>Did I sign his PGP key</string> </property>
</property> <attribute name="headerCascadingSectionResizes">
</column> <bool>true</bool>
<column> </attribute>
<property name="text"> <attribute name="headerDefaultSectionSize">
<string>Did peer authenticated me</string> <number>200</number>
</property> </attribute>
</column> <attribute name="headerShowSortIndicator" stdset="0">
<column> <bool>true</bool>
<property name="text"> </attribute>
<string>Cert Id</string> <column>
</property> <property name="text">
</column> <string/>
</widget> </property>
</item> </column>
<item row="0" column="0"> <column>
<widget class="QFrame" name="titleBarFrame"> <property name="text">
<property name="minimumSize"> <string>Name</string>
<size> </property>
<width>0</width> </column>
<height>32</height> <column>
</size> <property name="text">
</property> <string>Did I authenticated peer</string>
<layout class="QHBoxLayout" name="horizontalLayout_2"> </property>
<property name="margin"> </column>
<number>2</number> <column>
</property> <property name="text">
<item> <string>Did peer authenticated me</string>
<widget class="QLabel" name="titleBarPixmap"> </property>
<property name="maximumSize"> </column>
<size> <column>
<width>22</width> <property name="text">
<height>22</height> <string>Cert Id</string>
</size> </property>
</property> </column>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="images.qrc">:/images/rs1.png</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="titleBarLabel">
<property name="font">
<font>
<pointsize>10</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Network</string>
</property>
</widget>
</item>
<item>
<widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip">
<string>Search Network</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showUnvalidKeys">
<property name="text">
<string>Show keys that are not validated by the PGP web of trust</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="viewButton">
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Display</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="QTabWidget" name="tabBottom">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>60</height>
</size>
</property>
<property name="tabPosition">
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex">
<number>0</number>
</property>
<widget class="QWidget" name="networkstatus">
<attribute name="title">
<string>Network Status</string>
</attribute>
<layout class="QGridLayout">
<item row="0" column="0">
<layout class="QGridLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_netLimited">
<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_netLimited">
<property name="text">
<string>Local network</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="1">
<layout class="QGridLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<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</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
<layout class="QGridLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_ext">
<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_ext">
<property name="text">
<string>External ip address finder</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="3">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>250</width>
<height>13</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</widget>
</item>
<item row="2" column="0">
<widget class="QTreeWidget" name="unvalidGPGkeyWidget">
<property name="contextMenuPolicy">
<enum>Qt::CustomContextMenu</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="allColumnsShowFocus">
<bool>true</bool>
</property>
<attribute name="headerCascadingSectionResizes">
<bool>true</bool>
</attribute>
<attribute name="headerDefaultSectionSize">
<number>200</number>
</attribute>
<attribute name="headerShowSortIndicator" stdset="0">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string/>
</property>
</column>
<column>
<property name="text">
<string>Name</string>
</property>
</column>
<column>
<property name="text">
<string>Did I authenticated peer</string>
</property>
</column>
<column>
<property name="text">
<string>Did peer authenticated me</string>
</property>
</column>
<column>
<property name="text">
<string>Cert Id</string>
</property>
</column>
</widget>
</item>
</layout>
</widget>
</widget> </widget>
</item> </item>
</layout> </layout>

29
retroshare-gui/src/gui/settings/ServerPage.cpp
View file

@ -31,6 +31,7 @@
#include <retroshare/rsconfig.h> #include <retroshare/rsconfig.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rsturtle.h> #include <retroshare/rsturtle.h>
#include <retroshare/rsiface.h>
#include <QTimer> #include <QTimer>
@ -248,6 +249,34 @@ void ServerPage::updateStatus()
ui.localAddress->setText(QString::fromStdString(detail.localAddr)); ui.localAddress->setText(QString::fromStdString(detail.localAddr));
/* set the server address */ /* set the server address */
ui.extAddress->setText(QString::fromStdString(detail.extAddr)); ui.extAddress->setText(QString::fromStdString(detail.extAddr));
// Now update network bits.
//
rsiface->lockData(); /* Lock Interface */
/* now the extra bit .... switch on check boxes */
const RsConfig &config = rsiface->getConfig();
/******* Network Status Tab *******/
if(config.netUpnpOk)
ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledon1.png"));
else
ui.iconlabel_upnp->setPixmap(QPixmap(":/images/ledoff1.png"));
if (config.netLocalOk)
ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledon1.png"));
else
ui.iconlabel_netLimited->setPixmap(QPixmap(":/images/ledoff1.png"));
if (config.netExtraAddressOk)
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledon1.png"));
else
ui.iconlabel_ext->setPixmap(QPixmap(":/images/ledoff1.png"));
rsiface->unlockData(); /* UnLock Interface */
} }
void ServerPage::toggleUPnP() void ServerPage::toggleUPnP()

106
retroshare-gui/src/gui/settings/ServerPage.ui
View file

@ -109,7 +109,7 @@ peers still need to trust each other to allow connection. </string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>0</number>
@ -213,6 +213,109 @@ peers still need to trust each other to allow connection. </string>
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QGridLayout" name="_4">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_netLimited">
<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_netLimited">
<property name="text">
<string>Local network</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="_6">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="iconlabel_ext">
<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_ext">
<property name="text">
<string>External ip address finder</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QGridLayout" name="_5">
<property name="leftMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<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</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item> <item>
<widget class="QCheckBox" name="allowTunnelConnectionCB"> <widget class="QCheckBox" name="allowTunnelConnectionCB">
<property name="toolTip"> <property name="toolTip">
@ -447,6 +550,7 @@ The default value is 20.</string>
</tabstops> </tabstops>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
<include location="images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

7
retroshare-gui/src/main.cpp
View file

@ -43,6 +43,7 @@
#include "util/EventReceiver.h" #include "util/EventReceiver.h"
#include "gui/RetroShareLink.h" #include "gui/RetroShareLink.h"
#include "gui/SoundManager.h" #include "gui/SoundManager.h"
#include "gui/NetworkView.h"
#include "lang/languagesupport.h" #include "lang/languagesupport.h"
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
@ -329,15 +330,15 @@ int main(int argc, char *argv[])
QObject::connect(notify,SIGNAL(filesPostModChanged(bool)) ,w ,SLOT(postModDirectories(bool) )) ; QObject::connect(notify,SIGNAL(filesPostModChanged(bool)) ,w ,SLOT(postModDirectories(bool) )) ;
QObject::connect(notify,SIGNAL(transfersChanged()) ,w->transfersDialog ,SLOT(insertTransfers() )) ; QObject::connect(notify,SIGNAL(transfersChanged()) ,w->transfersDialog ,SLOT(insertTransfers() )) ;
QObject::connect(notify,SIGNAL(publicChatChanged(int)) ,w->friendsDialog ,SLOT(publicChatChanged(int) )); QObject::connect(notify,SIGNAL(publicChatChanged(int)) ,w->friendsDialog ,SLOT(publicChatChanged(int) ));
QObject::connect(notify,SIGNAL(neighboursChanged()) ,w->networkDialog ,SLOT(insertConnect() )) ; QObject::connect(notify,SIGNAL(neighboursChanged()) ,w->friendsDialog->networkDialog ,SLOT(insertConnect() )) ;
QObject::connect(notify,SIGNAL(messagesChanged()) ,w->messagesDialog ,SLOT(insertMessages() )) ; QObject::connect(notify,SIGNAL(messagesChanged()) ,w->messagesDialog ,SLOT(insertMessages() )) ;
QObject::connect(notify,SIGNAL(messagesTagsChanged()) ,w->messagesDialog ,SLOT(messagesTagsChanged() )) ; QObject::connect(notify,SIGNAL(messagesTagsChanged()) ,w->messagesDialog ,SLOT(messagesTagsChanged() )) ;
QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool))); QObject::connect(notify,SIGNAL(chatStatusChanged(const QString&,const QString&,bool)),w->friendsDialog,SLOT(updatePeerStatusString(const QString&,const QString&,bool)));
QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus())); QObject::connect(notify,SIGNAL(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus()));
QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)) ,w->networkDialog,SLOT(setLogInfo(QString))) ; QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)) ,w->friendsDialog->networkDialog,SLOT(setLogInfo(QString))) ;
QObject::connect(notify,SIGNAL(discInfoChanged()) ,w->networkDialog,SLOT(updateNewDiscoveryInfo()),Qt::QueuedConnection) ; QObject::connect(notify,SIGNAL(discInfoChanged()) ,w->friendsDialog->networkView,SLOT(update()),Qt::QueuedConnection) ;
QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ; QObject::connect(notify,SIGNAL(errorOccurred(int,int,const QString&)),w,SLOT(displayErrorMessage(int,int,const QString&))) ;
w->installGroupChatNotifier(); w->installGroupChatNotifier();