diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp index fa5abec1f..0c432d8e1 100644 --- a/retroshare-gui/src/gui/FriendsDialog.cpp +++ b/retroshare-gui/src/gui/FriendsDialog.cpp @@ -55,10 +55,14 @@ #include "FriendRecommendDialog.h" #include "FriendsDialog.h" #include "ServicePermissionDialog.h" +#include "NetworkView.h" +#include "NetworkDialog.h" /* Images for Newsfeed icons */ #define IMAGE_NEWSFEED "" #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 @@ -97,8 +101,10 @@ FriendsDialog::FriendsDialog(QWidget *parent) ui.avatar->setOwnId(); ui.tabWidget->setTabPosition(QTabWidget::North); - ui.tabWidget->addTab(new ChatLobbyWidget(), tr("Chat lobbies")); - ui.tabWidget->addTab(new ProfileWidget(), tr("Profile")); + ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_PEERS), tr("Local network")); + 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(); int newsFeedTabIndex = ui.tabWidget->insertTab(0, newsFeed, tr("News Feed")); ui.tabWidget->setCurrentIndex(newsFeedTabIndex); diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h index 8fbc4ae16..198240f38 100644 --- a/retroshare-gui/src/gui/FriendsDialog.h +++ b/retroshare-gui/src/gui/FriendsDialog.h @@ -32,6 +32,8 @@ class QAction; class QTextEdit; class QTextCharFormat; class ChatTabWidget; +class NetworkDialog; +class NetworkView; class FriendsDialog : public RsAutoUpdatePage { @@ -51,6 +53,8 @@ public: static bool isGroupChatActive(); static void groupChatActivate(); + NetworkDialog *networkDialog ; + NetworkView *networkView ; public slots: void publicChatChanged(int type); diff --git a/retroshare-gui/src/gui/FriendsDialog.ui b/retroshare-gui/src/gui/FriendsDialog.ui index ce1fd4c67..9c6a30391 100644 --- a/retroshare-gui/src/gui/FriendsDialog.ui +++ b/retroshare-gui/src/gui/FriendsDialog.ui @@ -291,7 +291,7 @@ - Group Chat + Broadcast diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 1c8fcc1d1..9ca5d2ba9 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -118,7 +118,7 @@ /* Images for toolbar icons */ -#define IMAGE_NETWORK2 ":/images/rs1.png" +//#define IMAGE_NETWORK2 ":/images/rs1.png" #define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_TRANSFERS ":/images/ktorrent32.png" #define IMAGE_FILES ":/images/fileshare32.png" @@ -237,8 +237,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags) QActionGroup *grp = new QActionGroup(this); QAction *action; - ui->stackPages->add(networkDialog = new NetworkDialog(ui->stackPages), - createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp)); +// ui->stackPages->add(networkDialog = new NetworkDialog(ui->stackPages), +// createPageAction(QIcon(IMAGE_NETWORK2), tr("Network"), grp)); ui->stackPages->add(friendsDialog = new FriendsDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp)); @@ -784,9 +784,9 @@ void SetForegroundWindowInternal(HWND hWnd) MainPage *Page = NULL; switch (page) { - case Network: - Page = _instance->networkDialog; - break; +// case Network: +// Page = _instance->networkDialog; +// break; case Friends: Page = _instance->friendsDialog; break; @@ -833,9 +833,9 @@ void SetForegroundWindowInternal(HWND hWnd) QWidget *page = _instance->ui->stackPages->currentWidget(); - if (page == _instance->networkDialog) { - return Network; - } +// if (page == _instance->networkDialog) { +// return Network; +// } if (page == _instance->friendsDialog) { return Friends; } @@ -879,8 +879,8 @@ void SetForegroundWindowInternal(HWND hWnd) } switch (page) { - case Network: - return _instance->networkDialog; +// case Network: +// return _instance->networkDialog; case Friends: return _instance->friendsDialog; // case Search: diff --git a/retroshare-gui/src/gui/MainWindow.h b/retroshare-gui/src/gui/MainWindow.h index 682053178..f429ba080 100644 --- a/retroshare-gui/src/gui/MainWindow.h +++ b/retroshare-gui/src/gui/MainWindow.h @@ -117,7 +117,7 @@ public: * Notify Class... */ - NetworkDialog *networkDialog; +// NetworkDialog *networkDialog; FriendsDialog *friendsDialog; // SearchDialog *searchDialog; TransfersDialog *transfersDialog; diff --git a/retroshare-gui/src/gui/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp index cef020cd7..44e58d12f 100644 --- a/retroshare-gui/src/gui/NetworkDialog.cpp +++ b/retroshare-gui/src/gui/NetworkDialog.cpp @@ -134,7 +134,7 @@ NetworkDialog::NetworkDialog(QWidget *parent) ui.unvalidGPGkeyWidget->sortItems( 1, Qt::AscendingOrder ); // 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); @@ -159,7 +159,7 @@ NetworkDialog::NetworkDialog(QWidget *parent) menu->addSeparator(); menu->addAction(ui.actionTabsTriangular); menu->addAction(ui.actionTabsRounded); - ui.viewButton->setMenu(menu); + //ui.viewButton->setMenu(menu); QTimer *timer2 = new QTimer(this); 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->setCurrentFilter(COLUMN_PEERNAME); - updateNetworkStatus(); - loadtabsettings(); + //updateNetworkStatus(); + //loadtabsettings(); /* Hide platform specific features */ #ifdef Q_WS_WIN @@ -192,12 +192,12 @@ void NetworkDialog::changeEvent(QEvent *e) } } -void NetworkDialog::updateNewDiscoveryInfo() -{ - //std::cerr << "Received new p3disc info. Updating networkview." << std::endl; - networkview->update(); - networkview->updateDisplay(); -} +//void NetworkDialog::updateNewDiscoveryInfo() +//{ +// //std::cerr << "Received new p3disc info. Updating networkview." << std::endl; +// //networkview->update(); +// //networkview->updateDisplay(); +//} void NetworkDialog::connecttreeWidgetCostumPopupMenu( QPoint /*point*/ ) { @@ -687,117 +687,74 @@ void NetworkDialog::on_actionCreate_New_Profile_activated() // gencertdialog.exec (); } -void NetworkDialog::updateNetworkStatus() -{ - if(RsAutoUpdatePage::eventsLocked()) - return ; - - 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 NetworkDialog::on_actionTabsnorth_activated() -{ - ui.networkTab->setTabPosition(QTabWidget::North); - - Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); -} - -void NetworkDialog::on_actionTabssouth_activated() -{ - ui.networkTab->setTabPosition(QTabWidget::South); - - Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); - -} - -void NetworkDialog::on_actionTabswest_activated() -{ - ui.networkTab->setTabPosition(QTabWidget::West); - - Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); -} - -void NetworkDialog::on_actionTabsright_activated() -{ - 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::on_actionTabsnorth_activated() +// { +// ui.networkTab->setTabPosition(QTabWidget::North); +// +// Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); +// } +// +// void NetworkDialog::on_actionTabssouth_activated() +// { +// ui.networkTab->setTabPosition(QTabWidget::South); +// +// Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); +// +// } +// +// void NetworkDialog::on_actionTabswest_activated() +// { +// ui.networkTab->setTabPosition(QTabWidget::West); +// +// Settings->setValueToGroup("NetworkDialog", "TabWidget_Position",ui.networkTab->tabPosition()); +// } +// +// void NetworkDialog::on_actionTabsright_activated() +// { +// 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) { diff --git a/retroshare-gui/src/gui/NetworkDialog.h b/retroshare-gui/src/gui/NetworkDialog.h index b9b1f69f7..7aa68ce01 100644 --- a/retroshare-gui/src/gui/NetworkDialog.h +++ b/retroshare-gui/src/gui/NetworkDialog.h @@ -59,7 +59,7 @@ public slots: void insertConnect(); // std::string loadneighbour(); /* void loadneighbour(); */ - void updateNewDiscoveryInfo() ; + //void updateNewDiscoveryInfo() ; protected: void changeEvent(QEvent *e); @@ -87,17 +87,17 @@ private slots: void on_actionCreate_New_Profile_activated(); - void updateNetworkStatus(); + //void updateNetworkStatus(); - void loadtabsettings(); +// void loadtabsettings(); - void on_actionTabsright_activated(); - void on_actionTabsnorth_activated(); - void on_actionTabssouth_activated(); - void on_actionTabswest_activated(); - - void on_actionTabsRounded_activated(); - void on_actionTabsTriangular_activated(); +// void on_actionTabsright_activated(); +// void on_actionTabsnorth_activated(); +// void on_actionTabssouth_activated(); +// void on_actionTabswest_activated(); +// +// void on_actionTabsRounded_activated(); +// void on_actionTabsTriangular_activated(); void filterColumnChanged(int); void filterItems(const QString &text); @@ -107,7 +107,7 @@ private: QTreeWidget *connecttreeWidget; - class NetworkView *networkview; +// class NetworkView *networkview; bool filterItem(QTreeWidgetItem *item, const QString &text, int filterColumn); diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui index 77d03b56a..1a6a2d54e 100644 --- a/retroshare-gui/src/gui/NetworkDialog.ui +++ b/retroshare-gui/src/gui/NetworkDialog.ui @@ -6,397 +6,168 @@ 0 0 - 629 - 346 + 825 + 567 - - - 6 - - - 9 - - - 6 - - - 0 - - - - - QTabWidget::North + + + + + + + + 10 + 75 + true + + + + Filter: + + + + + + + Search Network + + + + + + + Show keys that are not validated by the PGP web of trust + + + + + + + + + + 0 + 0 + - - 0 + + Qt::CustomContextMenu - - - Network - - - - 6 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - Qt::CustomContextMenu - - - false - - - false - - - 20 - - - - 16 - 16 - - - - true - - - true - - - true - - - true - - - true - - - true - - - 200 - - - true - - - - - - - - - Name - - - - - Did I authenticated peer - - - Did I sign his PGP key - - - - - Did peer authenticated me - - - - - Cert Id - - - - - - - - - 0 - 32 - - - - - 2 - - - - - - 22 - 22 - - - - - - - :/images/rs1.png - - - true - - - - - - - - 10 - 75 - true - - - - Network - - - - - - - Search Network - - - - - - - Show keys that are not validated by the PGP web of trust - - - - - - - Qt::NoFocus - - - Display - - - - :/images/looknfeel.png:/images/looknfeel.png - - - - 32 - 16 - - - - QToolButton::InstantPopup - - - true - - - - - - - - - - - 16777215 - 60 - - - - QTabWidget::North - - - 0 - - - - Network Status - - - - - - 6 - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - Local network - - - - - - - - - 6 - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - UPnP - - - - - - - - - 6 - - - 6 - - - - - - 16 - 16 - - - - - - - :/images/ledoff1.png - - - - - - - External ip address finder - - - - - - - - - Qt::Horizontal - - - - 250 - 13 - - - - - - - - - - - - Qt::CustomContextMenu - - - true - - - true - - - true - - - 200 - - - true - - - - - - - - - Name - - - - - Did I authenticated peer - - - - - Did peer authenticated me - - - - - Cert Id - - - - - - + + false + + + false + + + 20 + + + + 16 + 16 + + + + true + + + true + + + true + + + true + + + true + + + true + + + 200 + + + true + + + + + + + + + Name + + + + + Did I authenticated peer + + + Did I sign his PGP key + + + + + Did peer authenticated me + + + + + Cert Id + + + + + + + + Qt::CustomContextMenu + + + true + + + true + + + true + + + 200 + + + true + + + + + + + + + Name + + + + + Did I authenticated peer + + + + + Did peer authenticated me + + + + + Cert Id + + diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp index 126ef77f4..0b2531481 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.cpp +++ b/retroshare-gui/src/gui/settings/ServerPage.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -248,6 +249,34 @@ void ServerPage::updateStatus() ui.localAddress->setText(QString::fromStdString(detail.localAddr)); /* set the server address */ 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() diff --git a/retroshare-gui/src/gui/settings/ServerPage.ui b/retroshare-gui/src/gui/settings/ServerPage.ui index 92c722356..2e30558f0 100755 --- a/retroshare-gui/src/gui/settings/ServerPage.ui +++ b/retroshare-gui/src/gui/settings/ServerPage.ui @@ -109,7 +109,7 @@ peers still need to trust each other to allow connection. - + 0 @@ -213,6 +213,109 @@ peers still need to trust each other to allow connection. + + + + + + 6 + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + Local network + + + + + + + + + 6 + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + External ip address finder + + + + + + + + + 6 + + + 6 + + + + + + 16 + 16 + + + + + + + :/images/ledoff1.png + + + + + + + UPnP + + + + + + + @@ -447,6 +550,7 @@ The default value is 20. + diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp index 4260f5411..fc0ec2f30 100644 --- a/retroshare-gui/src/main.cpp +++ b/retroshare-gui/src/main.cpp @@ -43,6 +43,7 @@ #include "util/EventReceiver.h" #include "gui/RetroShareLink.h" #include "gui/SoundManager.h" +#include "gui/NetworkView.h" #include "lang/languagesupport.h" /*** 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(transfersChanged()) ,w->transfersDialog ,SLOT(insertTransfers() )) ; 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(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(ownStatusMessageChanged()),w->friendsDialog,SLOT(loadmypersonalstatus())); - QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)) ,w->networkDialog,SLOT(setLogInfo(QString))) ; - QObject::connect(notify,SIGNAL(discInfoChanged()) ,w->networkDialog,SLOT(updateNewDiscoveryInfo()),Qt::QueuedConnection) ; + QObject::connect(notify,SIGNAL(logInfoChanged(const QString&)) ,w->friendsDialog->networkDialog,SLOT(setLogInfo(QString))) ; + 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&))) ; w->installGroupChatNotifier();