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

Moved the filter edit and the display button from FriendsDialog and MessengerWindow into FriendList.

Browse source 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6649 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2013-08-30 12:24:39 +00:00
parent 0fb66c4af4
commit cc92fdfc81
9 changed files with 115 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/MessengerWindow.cpp
View file

@ -103,11 +103,7 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
ui.avatar->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatar->setOwnId();
connect( ui.shareButton, SIGNAL(clicked()), SLOT(openShareManager()));
connect( ui.addIMAccountButton, SIGNAL(clicked( bool ) ), this , SLOT( addFriend() ) );
connect(ui.messagelineEdit, SIGNAL(textChanged(const QString &)), this, SLOT(savestatusmessage()));
connect(ui.filterLineEdit, SIGNAL(textChanged(QString)), ui.friendList, SLOT(filterItems(QString)));
connect(NotifyQt::getInstance(), SIGNAL(ownAvatarChanged()), this, SLOT(updateAvatar()));
connect(NotifyQt::getInstance(), SIGNAL(ownStatusMessageChanged()), this, SLOT(loadmystatusmessage()));
@ -131,10 +127,18 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
ui.messagelineEdit->setMinimumWidth(20);
ui.displaytoolButton->setMenu(ui.friendList->createDisplayMenu());
/* Initialize friend list */
QToolButton *button = new QToolButton(this);
button->setIcon(QIcon(":/images/user/add_user24.png"));
button->setToolTip(tr("Add a Friend"));
connect(button, SIGNAL(clicked()), this, SLOT(addFriend()));
ui.friendList->addToolButton(button);
ui.filterLineEdit->setPlaceholderText(tr("Search")) ;
ui.filterLineEdit->showFilterIcon();
button = new QToolButton(this);
button->setIcon(QIcon(":/images/friendsfolder24.png"));
button->setToolTip(tr("Share files for your friends"));
connect(button, SIGNAL(clicked()), this, SLOT(openShareManager()));
ui.friendList->addToolButton(button);
// load settings
RsAutoUpdatePage::lockAllEvents();