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

Remorked GUI layout a little bit:

Browse source 
- made all pages have a bar with full width
- added help button to each of them (needs adding text)
- improved help system so that it's easy to register a new help button
FriendsDialog still needs some cleaning.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-07-19 12:18:58 +00:00
parent 9c40fb878f
commit d7e25e24e5
13 changed files with 848 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,6 +212,20 @@ FriendsDialog::FriendsDialog(QWidget *parent)
ui.nicknameLabel->setText(PeerDefs::nameWithLocation(pd));
}
QString hlp_str = tr(
" <h1><img width=\"32\" src=\":/images/64px_help.png\">&nbsp;&nbsp;Friends</h1> \
<p>The Friends tab shows...your friends: the list of persons you have accepted to connect to. \
</p> \
<p>On the right, you will find 3 useful tabs: \
<ul> \
<li>Broadcast allows you to send messages to all connected friends at once</li> \
<li>Local Network represents the network around you, including friends of your friends</li> \
<li>Keyring contains keys you collected, forwarded to you by your friends</li> \
</ul> </p> \
") ;
registerHelpButton(ui.helpButton, hlp_str) ;
/* Hide platform specific features */
#ifdef Q_WS_WIN
@ -859,41 +873,6 @@ void FriendsDialog::on_actionMessageHistory_triggered()
imBrowser.exec();
}
//void FriendsDialog::on_actionAdd_Group_activated()
//{
// CreateGroup createGrpDialog ("", this);
// createGrpDialog.exec();
//}
// void FriendsDialog::newsFeedChanged(int count)
// {
// int newsFeedTabIndex = ui.tabWidget->indexOf(newsFeed);
// if (newsFeedTabIndex < 0) {
// return;
// }
//
// if (count) {
// ui.tabWidget->tabBar()->setTabText(newsFeedTabIndex, QString("%1 (%2)").arg(newsFeedText).arg(count));
// ui.tabWidget->tabBar()->setTabTextColor(newsFeedTabIndex, Qt::blue);
// ui.tabWidget->tabBar()->setTabIcon(newsFeedTabIndex, QIcon(IMAGE_NEWSFEED_NEW));
// } else {
// ui.tabWidget->tabBar()->setTabText(newsFeedTabIndex, newsFeedText);
// ui.tabWidget->tabBar()->setTabTextColor(newsFeedTabIndex, newsFeedTabColor);
// ui.tabWidget->tabBar()->setTabIcon(newsFeedTabIndex, QIcon(IMAGE_NEWSFEED));
// }
// }
//void FriendsDialog::recommendFriends()
//{
// FriendRecommendDialog::showYourself();
//}
//void FriendsDialog::servicePermission()
//{
// ServicePermissionDialog dlg;
// dlg.exec();
//}
/*static*/ bool FriendsDialog::isGroupChatActive()
{
FriendsDialog *friendsDialog = dynamic_cast<FriendsDialog*>(MainWindow::getPage(MainWindow::Friends));