mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-02-17 13:24:15 -05:00
improved layout of FriendsDialog, changed some naming to make it appear as a network visualization tab
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7517 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler
parent
ff990b96b3
commit
f490ff19a9
@ -95,9 +95,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
|
||||
ui.avatar->setOwnId();
|
||||
|
||||
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("Network graph"));
|
||||
ui.tabWidget->addTab(networkDialog = new NetworkDialog(),QIcon(IMAGE_PEERS), tr("Keyring"));
|
||||
|
||||
//ui.tabWidget->addTab(new ProfileWidget(), tr("Profile"));
|
||||
@ -182,7 +180,7 @@ FriendsDialog::FriendsDialog(QWidget *parent)
|
||||
|
||||
QToolButton *addFriendButton = new QToolButton(this);
|
||||
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()));
|
||||
ui.friendList->addToolButton(addFriendButton);
|
||||
|
||||
@ -218,16 +216,16 @@ FriendsDialog::FriendsDialog(QWidget *parent)
|
||||
}
|
||||
|
||||
QString hlp_str = tr(
|
||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Friends</h1> \
|
||||
<p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. \
|
||||
" <h1><img width=\"32\" src=\":/images/64px_help.png\"> Network</h1> \
|
||||
<p>The Network tab shows your friend Retroshare nodes: the neighbor Retroshare nodes that are connected to you. \
|
||||
</p> \
|
||||
<p>You can group friends together to allow a finer level of information access, for instance to only allow \
|
||||
some friends to see some files.</p> \
|
||||
<p>You can group nodes together to allow a finer level of information access, for instance to only allow \
|
||||
some nodes to see some of your files.</p> \
|
||||
<p>On the right, you will find 3 useful tabs: \
|
||||
<ul> \
|
||||
<li>Broadcast sends messages to all connected friends at once</li> \
|
||||
<li>Local Network shows the network around you, including friends of your friends</li> \
|
||||
<li>Keyring contains keys you collected, mostly forwarded to you by your friends</li> \
|
||||
<li>Broadcast sends messages to all connected nodes at once</li> \
|
||||
<li>Local network graph shows the network around you, based on discovery information</li> \
|
||||
<li>Keyring contains node keys you collected, mostly forwarded to you by your friend nodes</li> \
|
||||
</ul> </p> \
|
||||
") ;
|
||||
|
||||
|
||||
@ -10,122 +10,106 @@
|
||||
<height>491</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QFrame" name="titleBarFrame">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="margin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="titleBarPixmap">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="images.qrc">:/images/user/friends24.png</pixmap>
|
||||
</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>
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>123</width>
|
||||
<height>13</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="helpButton">
|
||||
<property name="focusPolicy">
|
||||
<enum>Qt::NoFocus</enum>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="images.qrc">
|
||||
<normaloff>:/images/64px_help.png</normaloff>:/images/64px_help.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<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>
|
||||
<widget class="QFrame" name="titleBarFrame">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="frameShape">
|
||||
<enum>QFrame::Box</enum>
|
||||
</property>
|
||||
<property name="frameShadow">
|
||||
<enum>QFrame::Sunken</enum>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="margin">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="titleBarPixmap">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="images.qrc">:/images/user/friends24.png</pixmap>
|
||||
</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>Friends</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer>
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>123</width>
|
||||
<height>13</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QToolButton" name="helpButton">
|
||||
<property name="focusPolicy">
|
||||
<enum>Qt::NoFocus</enum>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="images.qrc">
|
||||
<normaloff>:/images/64px_help.png</normaloff>:/images/64px_help.png</iconset>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="autoRaise">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<property name="spacing">
|
||||
<number>2</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="FriendList" name="friendList" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>150</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
<widget class="FriendList" name="friendList" native="true">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Expanding">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>150</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>16777215</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QWidget" name="layoutWidget_1">
|
||||
<layout class="QGridLayout" name="tabLayout">
|
||||
|
||||
@ -351,10 +351,12 @@ void MainWindow::initStackedPage()
|
||||
addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, ¬ify);
|
||||
|
||||
PeopleDialog *peopleDialog = NULL;
|
||||
#ifdef RS_USE_CIRCLES
|
||||
//ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages),
|
||||
// action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
|
||||
//notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
|
||||
addPage(peopleDialog = new PeopleDialog(ui->stackPages), grp, ¬ify);
|
||||
#endif
|
||||
|
||||
IdDialog *idDialog = NULL;
|
||||
//ui->stackPages->add(idDialog = new IdDialog(ui->stackPages),
|
||||
@ -363,10 +365,12 @@ void MainWindow::initStackedPage()
|
||||
addPage(idDialog = new IdDialog(ui->stackPages), grp, ¬ify);
|
||||
|
||||
CirclesDialog *circlesDialog = NULL;
|
||||
#ifdef RS_USE_CIRCLES
|
||||
//ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages),
|
||||
// action = createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
|
||||
//notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
|
||||
addPage(circlesDialog = new CirclesDialog(ui->stackPages), grp, ¬ify);
|
||||
#endif
|
||||
|
||||
//ui->stackPages->add(transfersDialog = new TransfersDialog(ui->stackPages),
|
||||
// action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("File sharing"), grp));
|
||||
@ -396,7 +400,9 @@ void MainWindow::initStackedPage()
|
||||
addPage(postedDialog = new PostedDialog(ui->stackPages), grp, ¬ify);
|
||||
|
||||
WikiDialog *wikiDialog = NULL;
|
||||
#ifdef RS_USE_WIKI
|
||||
addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, ¬ify);
|
||||
#endif
|
||||
|
||||
#ifdef BLOGS
|
||||
//ui->stackPages->add(blogsFeed = new BlogsDialog(ui->stackPages),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user