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

improved layout of FriendsDialog, changed some naming to make it appear as a network visualization tab

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-09-09 19:19:18 +00:00
parent ff990b96b3
commit f490ff19a9
3 changed files with 111 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -95,9 +95,7 @@ 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(networkView = new NetworkView(),QIcon(IMAGE_NETWORK2), tr("Network graph"));
//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(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring")); ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring"));
//ui.tabWidget->addTab(new ProfileWidget(), tr("Profile")); //ui.tabWidget->addTab(new ProfileWidget(), tr("Profile"));
@ -182,7 +180,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
QToolButton *addFriendButton = new QToolButton(this); QToolButton *addFriendButton = new QToolButton(this);
addFriendButton->setIcon(QIcon(":/images/user/add_user24.png")); addFriendButton->setIcon(QIcon(":/images/user/add_user24.png"));
addFriendButton->setToolTip(tr("Add Friend")); addFriendButton->setToolTip(tr("Add friend node"));
connect(addFriendButton, SIGNAL(clicked()), this, SLOT(addFriend())); connect(addFriendButton, SIGNAL(clicked()), this, SLOT(addFriend()));
ui.friendList->addToolButton(addFriendButton); ui.friendList->addToolButton(addFriendButton);
@ -218,16 +216,16 @@ FriendsDialog::FriendsDialog(QWidget *parent)
} }
QString hlp_str = tr( QString hlp_str = tr(
" <h1><img width=\"32\" src=\":/images/64px_help.png\">&nbsp;&nbsp;Friends</h1> \ " <h1><img width=\"32\" src=\":/images/64px_help.png\">&nbsp;&nbsp;Network</h1> \
<p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. \ <p>The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you. \
</p> \ </p> \
<p>You can group friends together to allow a finer level of information access, for instance to only allow \ <p>You can group nodes together to allow a finer level of information access, for instance to only allow \
some friends to see some files.</p> \ some nodes to see some of your files.</p> \
<p>On the right, you will find 3 useful tabs: \ <p>On the right, you will find 3 useful tabs: \
<ul> \ <ul> \
<li>Broadcast sends messages to all connected friends at once</li> \ <li>Broadcast sends messages to all connected nodes at once</li> \
<li>Local Network shows the network around you, including friends of your friends</li> \ <li>Local network graph shows the network around you, based on discovery information</li> \
<li>Keyring contains keys you collected, mostly forwarded to you by your friends</li> \ <li>Keyring contains node keys you collected, mostly forwarded to you by your friend nodes</li> \
</ul> </p> \ </ul> </p> \
") ; ") ;

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

@ -10,17 +10,7 @@
<height>491</height> <height>491</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="0">
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QWidget" name="">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="spacing">
<number>1</number>
</property>
<item> <item>
<widget class="QFrame" name="titleBarFrame"> <widget class="QFrame" name="titleBarFrame">
<property name="sizePolicy"> <property name="sizePolicy">
@ -59,7 +49,7 @@
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Friends</string> <string>Network</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -97,11 +87,10 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout"> <widget class="QSplitter" name="splitter">
<property name="spacing"> <property name="orientation">
<number>2</number> <enum>Qt::Horizontal</enum>
</property> </property>
<item>
<widget class="FriendList" name="friendList" native="true"> <widget class="FriendList" name="friendList" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
@ -122,11 +111,6 @@
</size> </size>
</property> </property>
</widget> </widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="layoutWidget_1"> <widget class="QWidget" name="layoutWidget_1">
<layout class="QGridLayout" name="tabLayout"> <layout class="QGridLayout" name="tabLayout">
<property name="verticalSpacing"> <property name="verticalSpacing">

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

@ -351,10 +351,12 @@ void MainWindow::initStackedPage()
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify); addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
PeopleDialog *peopleDialog = NULL; PeopleDialog *peopleDialog = NULL;
#ifdef RS_USE_CIRCLES
//ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages), //ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages),
// action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp)); // action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
//notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action)); //notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify); addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, &notify);
#endif
IdDialog *idDialog = NULL; IdDialog *idDialog = NULL;
//ui->stackPages->add(idDialog = new IdDialog(ui->stackPages), //ui->stackPages->add(idDialog = new IdDialog(ui->stackPages),
@ -363,10 +365,12 @@ void MainWindow::initStackedPage()
addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify); addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
CirclesDialog *circlesDialog = NULL; CirclesDialog *circlesDialog = NULL;
#ifdef RS_USE_CIRCLES
//ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages), //ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages),
// action = createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp)); // action = createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
//notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action)); //notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify); addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, &notify);
#endif
//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));
@ -396,7 +400,9 @@ void MainWindow::initStackedPage()
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify); addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
WikiDialog *wikiDialog = NULL; WikiDialog *wikiDialog = NULL;
#ifdef RS_USE_WIKI
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify); addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
#endif
#ifdef BLOGS #ifdef BLOGS
//ui->stackPages->add(blogsFeed = new BlogsDialog(ui->stackPages), //ui->stackPages->add(blogsFeed = new BlogsDialog(ui->stackPages),