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

moved search tab into transfers. Simplified the layout (but kept all buttons)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-ImprovedGUI@6093 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-01-26 14:03:30 +00:00
parent 6648474c99
commit 31d0e3438e
6 changed files with 234 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -120,7 +120,6 @@
/* Images for toolbar icons */
#define IMAGE_NETWORK2 ":/images/rs1.png"
#define IMAGE_PEERS ":/images/groupchat.png"
#define IMAGE_SEARCH ":/images/filefind.png"
#define IMAGE_TRANSFERS ":/images/ktorrent32.png"
#define IMAGE_FILES ":/images/fileshare32.png"
#define IMAGE_CHANNELS ":/images/channels.png"
@ -245,8 +244,8 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
action = createPageAction(QIcon(IMAGE_PEERS), tr("Friends"), grp));
notify.push_back(QPair<MainPage*, QAction*>(friendsDialog, action));
ui->stackPages->add(searchDialog = new SearchDialog(ui->stackPages),
createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp));
// ui->stackPages->add(searchDialog = new SearchDialog(ui->stackPages),
// createPageAction(QIcon(IMAGE_SEARCH), tr("Search"), grp));
ui->stackPages->add(transfersDialog = new TransfersDialog(ui->stackPages),
action = createPageAction(QIcon(IMAGE_TRANSFERS), tr("Transfers"), grp));
@ -791,9 +790,9 @@ void SetForegroundWindowInternal(HWND hWnd)
case Friends:
Page = _instance->friendsDialog;
break;
case Search:
Page = _instance->searchDialog;
break;
// case Search:
// Page = _instance->searchDialog;
// break;
case Transfers:
Page = _instance->transfersDialog;
break;
@ -840,9 +839,9 @@ void SetForegroundWindowInternal(HWND hWnd)
if (page == _instance->friendsDialog) {
return Friends;
}
if (page == _instance->searchDialog) {
return Search;
}
// if (page == _instance->searchDialog) {
// return Search;
// }
if (page == _instance->transfersDialog) {
return Transfers;
}
@ -884,8 +883,8 @@ void SetForegroundWindowInternal(HWND hWnd)
return _instance->networkDialog;
case Friends:
return _instance->friendsDialog;
case Search:
return _instance->searchDialog;
// case Search:
// return _instance->searchDialog;
case Transfers:
return _instance->transfersDialog;
case SharedDirectories: