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

Moved Circles & Identities to Network

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7349 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-05-07 23:45:53 +00:00
parent 1fd00c1c51
commit dacc60d28f
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
retroshare-gui/src/gui/FriendsDialog.cpp
View File

@ -54,12 +54,16 @@
#include "FriendsDialog.h" #include "FriendsDialog.h"
#include "NetworkView.h" #include "NetworkView.h"
#include "NetworkDialog.h" #include "NetworkDialog.h"
#include "gui/Identity/IdDialog.h"
#include "gui/Circles/CirclesDialog.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_NETWORK2 ":/images/logo/logo_16.png"
#define IMAGE_PEERS ":/images/groupchat.png" #define IMAGE_PEERS ":/images/groupchat.png"
#define IMAGE_IDENTITY ":/images/identity/identities_32.png"
#define IMAGE_CIRCLES ":/images/circles/circles_32.png"
/****** /******
* #define FRIENDS_DEBUG 1 * #define FRIENDS_DEBUG 1
@ -91,6 +95,8 @@ FriendsDialog::FriendsDialog(QWidget *parent)
ui.avatar->setOwnId(); ui.avatar->setOwnId();
ui.tabWidget->setTabPosition(QTabWidget::North); ui.tabWidget->setTabPosition(QTabWidget::North);
ui.tabWidget->addTab(idDialog = new IdDialog(),QIcon(IMAGE_IDENTITY), tr("Identities"));
ui.tabWidget->addTab(circlesDialog = new CirclesDialog(),QIcon(IMAGE_CIRCLES), tr("Circles"));
ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_NETWORK2), tr("Local network")); ui.tabWidget->addTab(networkView = new NetworkView(),QIcon(IMAGE_NETWORK2), tr("Local network"));
ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring")); ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring"));
@ -103,6 +109,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
ui.tabWidget->hideCloseButton(1); ui.tabWidget->hideCloseButton(1);
ui.tabWidget->hideCloseButton(2); ui.tabWidget->hideCloseButton(2);
ui.tabWidget->hideCloseButton(3); ui.tabWidget->hideCloseButton(3);
ui.tabWidget->hideCloseButton(4);
/* get the current text and text color of the tab bar */ /* get the current text and text color of the tab bar */
//newsFeedTabColor = ui.tabWidget->tabBar()->tabTextColor(newsFeedTabIndex); //newsFeedTabColor = ui.tabWidget->tabBar()->tabTextColor(newsFeedTabIndex);
@ -251,6 +258,10 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
{ {
switch(page) switch(page)
{ {
case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
break ;
case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
break ;
case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ; case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
break ; break ;
case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ; case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;

15
retroshare-gui/src/gui/FriendsDialog.h
View File

@ -34,6 +34,8 @@ class QTextCharFormat;
class ChatTabWidget; class ChatTabWidget;
class NetworkDialog; class NetworkDialog;
class NetworkView; class NetworkView;
class IdDialog;
class CirclesDialog;
class FriendsDialog : public RsAutoUpdatePage class FriendsDialog : public RsAutoUpdatePage
{ {
@ -42,9 +44,12 @@ class FriendsDialog : public RsAutoUpdatePage
public: public:
enum Page { enum Page {
/* Fixed numbers for load and save the last page */ /* Fixed numbers for load and save the last page */
NetworkTab = 0, /** Network page. */ IdTab = 0, /** Identities page. */
NetworkViewTab = 1, /** Network new graph. */ CirclesTab = 1, /** Circles page. */
BroadcastTab = 2 /** Old group chat page. */ NetworkTab = 2, /** Network page. */
NetworkViewTab = 3, /** Network new graph. */
BroadcastTab = 4 /** Old group chat page. */
}; };
/** Default Constructor */ /** Default Constructor */
@ -63,6 +68,10 @@ public:
NetworkDialog *networkDialog ; NetworkDialog *networkDialog ;
NetworkView *networkView ; NetworkView *networkView ;
CirclesDialog *circlesDialog;
IdDialog *idDialog;
public slots: public slots:
void publicChatChanged(int type); void publicChatChanged(int type);

4
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -252,13 +252,13 @@ MainWindow::MainWindow(QWidget* parent, Qt::WindowFlags flags)
ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp)); ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action)); notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
IdDialog *idDialog = NULL; /*IdDialog *idDialog = NULL;
ui->stackPages->add(idDialog = new IdDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("Itentities"), grp)); ui->stackPages->add(idDialog = new IdDialog(ui->stackPages), action = createPageAction(QIcon(IMAGE_IDENTITY), tr("Itentities"), grp));
notify.push_back(QPair<MainPage*, QAction*>(idDialog, action)); notify.push_back(QPair<MainPage*, QAction*>(idDialog, action));
CirclesDialog *circlesDialog = NULL; CirclesDialog *circlesDialog = NULL;
ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages), createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp)); ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages), createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action)); notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));*/
ui->stackPages->add(transfersDialog = new TransfersDialog(ui->stackPages), ui->stackPages->add(transfersDialog = new TransfersDialog(ui->stackPages),
action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp)); action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp));