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

moved networkview and network dialog into tabs of Friends. Renamed "group chat" into "broadcast", removed chat lobbies => will be set elsewhere.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-01-30 20:56:31 +00:00
parent 2f18162ef9
commit e6e7a1b52f
11 changed files with 410 additions and 538 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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: