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

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

View file

@ -35,7 +35,7 @@ namespace Ui {
class RSTreeWidgetItemCompareRole;
class QTreeWidgetItem;
class QMenu;
class QToolButton;
class FriendList : public RsAutoUpdatePage
{
@ -52,7 +52,8 @@ public:
explicit FriendList(QWidget *parent = 0);
~FriendList();
QMenu *createDisplayMenu();
// Add a tool button to the tool area
void addToolButton(QToolButton *toolButton);
void processSettings(bool bLoad);
void addGroupToExpand(const std::string &groupId);
bool getExpandedGroups(std::set<std::string> &groups) const;
@ -98,6 +99,7 @@ public slots:
protected:
void changeEvent(QEvent *e);
void createDisplayMenu();
private:
Ui::FriendList *ui;