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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
retroshare-gui/src/gui/FriendsDialog.cpp
View File

@ -90,10 +90,6 @@ FriendsDialog::FriendsDialog(QWidget *parent)
connect( ui.actionAdd_Friend, SIGNAL(triggered()), this, SLOT(addFriend())); connect( ui.actionAdd_Friend, SIGNAL(triggered()), this, SLOT(addFriend()));
connect( ui.actionFriendRecommendations, SIGNAL(triggered()), this, SLOT(recommendFriends())); connect( ui.actionFriendRecommendations, SIGNAL(triggered()), this, SLOT(recommendFriends()));
connect( ui.actionServicePermission, SIGNAL(triggered()), this, SLOT(servicePermission())); connect( ui.actionServicePermission, SIGNAL(triggered()), this, SLOT(servicePermission()));
connect( ui.filter_lineEdit, SIGNAL(textChanged(QString)), ui.friendList, SLOT(filterItems(QString)));
ui.filter_lineEdit->setPlaceholderText(tr("Search")) ;
ui.filter_lineEdit->showFilterIcon();
ui.avatar->setFrameType(AvatarWidget::STATUS_FRAME); ui.avatar->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatar->setOwnId(); ui.avatar->setOwnId();
@ -194,7 +190,6 @@ FriendsDialog::FriendsDialog(QWidget *parent)
ui.splitter_2->setSizes(sizes); ui.splitter_2->setSizes(sizes);
loadmypersonalstatus(); loadmypersonalstatus();
ui.displayButton->setMenu(ui.friendList->createDisplayMenu());
// load settings // load settings
RsAutoUpdatePage::lockAllEvents(); RsAutoUpdatePage::lockAllEvents();

50
retroshare-gui/src/gui/FriendsDialog.ui
View File

@ -96,51 +96,6 @@
<property name="spacing"> <property name="spacing">
<number>2</number> <number>2</number>
</property> </property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="LineEditClear" name="filter_lineEdit"/>
</item>
<item>
<widget class="QToolButton" name="displayButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>30</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Display</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="FriendList" name="friendList" native="true"> <widget class="FriendList" name="friendList" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
@ -895,11 +850,6 @@
</action> </action>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
<customwidget> <customwidget>
<class>LinkTextBrowser</class> <class>LinkTextBrowser</class>
<extends>QTextBrowser</extends> <extends>QTextBrowser</extends>

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->setFrameType(AvatarWidget::STATUS_FRAME);
ui.avatar->setOwnId(); 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.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(ownAvatarChanged()), this, SLOT(updateAvatar()));
connect(NotifyQt::getInstance(), SIGNAL(ownStatusMessageChanged()), this, SLOT(loadmystatusmessage())); connect(NotifyQt::getInstance(), SIGNAL(ownStatusMessageChanged()), this, SLOT(loadmystatusmessage()));
@ -131,10 +127,18 @@ MessengerWindow::MessengerWindow(QWidget* parent, Qt::WFlags flags)
ui.messagelineEdit->setMinimumWidth(20); 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")) ; button = new QToolButton(this);
ui.filterLineEdit->showFilterIcon(); 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 // load settings
RsAutoUpdatePage::lockAllEvents(); RsAutoUpdatePage::lockAllEvents();

105
retroshare-gui/src/gui/MessengerWindow.ui
View File

@ -14,7 +14,7 @@
<string>RetroShare Messenger</string> <string>RetroShare Messenger</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset> <iconset resource="images.qrc">
<normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset> <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
@ -99,95 +99,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QFrame" name="toolBarFrame">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin">
<number>2</number>
</property>
<item>
<widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip">
<string>Search Friends</string>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="addIMAccountButton">
<property name="toolTip">
<string>Add a Friend</string>
</property>
<property name="icon">
<iconset>
<normaloff>:/images/user/add_user24.png</normaloff>:/images/user/add_user24.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="shareButton">
<property name="toolTip">
<string>Share files for your friends</string>
</property>
<property name="icon">
<iconset>
<normaloff>:/images/friendsfolder24.png</normaloff>:/images/friendsfolder24.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="displaytoolButton">
<property name="icon">
<iconset>
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>24</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="3" column="0">
<widget class="LogoBar" name="logoFrame"> <widget class="LogoBar" name="logoFrame">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -203,7 +115,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QFrame" name="friendListFrame"> <widget class="QFrame" name="friendListFrame">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<property name="margin"> <property name="margin">
@ -230,17 +142,12 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>258</width> <width>258</width>
<height>20</height> <height>21</height>
</rect> </rect>
</property> </property>
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
</customwidget>
<customwidget> <customwidget>
<class>AvatarWidget</class> <class>AvatarWidget</class>
<extends>QLabel</extends> <extends>QLabel</extends>
@ -260,6 +167,8 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources/> <resources>
<include location="images.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

26
retroshare-gui/src/gui/common/FriendList.cpp
View File

@ -156,6 +156,11 @@ FriendList::FriendList(QWidget *parent) :
connect(ui->actionSortPeersAscendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersAscendingOrder())); connect(ui->actionSortPeersAscendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersAscendingOrder()));
connect(ui->actionSortPeersDescendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersDescendingOrder())); connect(ui->actionSortPeersDescendingOrder, SIGNAL(triggered()), this, SLOT(sortPeersDescendingOrder()));
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterItems(QString)));
ui->filterLineEdit->setPlaceholderText(tr("Search")) ;
ui->filterLineEdit->showFilterIcon();
initializeHeader(false); initializeHeader(false);
ui->peerTreeWidget->sortItems(COLUMN_NAME, Qt::AscendingOrder); ui->peerTreeWidget->sortItems(COLUMN_NAME, Qt::AscendingOrder);
@ -170,6 +175,9 @@ FriendList::FriendList(QWidget *parent) :
// http://bugreports.qt.nokia.com/browse/QTBUG-8270 // http://bugreports.qt.nokia.com/browse/QTBUG-8270
QShortcut *Shortcut = new QShortcut(QKeySequence(Qt::Key_Delete), ui->peerTreeWidget, 0, 0, Qt::WidgetShortcut); QShortcut *Shortcut = new QShortcut(QKeySequence(Qt::Key_Delete), ui->peerTreeWidget, 0, 0, Qt::WidgetShortcut);
connect(Shortcut, SIGNAL(activated()), this, SLOT(removefriend())); connect(Shortcut, SIGNAL(activated()), this, SLOT(removefriend()));
/* Initialize display menu */
createDisplayMenu();
} }
FriendList::~FriendList() FriendList::~FriendList()
@ -178,6 +186,20 @@ FriendList::~FriendList()
delete(m_compareRole); delete(m_compareRole);
} }
void FriendList::addToolButton(QToolButton *toolButton)
{
if (!toolButton) {
return;
}
/* Initialize button */
toolButton->setAutoRaise(true);
toolButton->setIconSize(ui->displayButton->iconSize());
toolButton->setFocusPolicy(ui->displayButton->focusPolicy());
ui->titleBarFrame->layout()->addWidget(toolButton);
}
void FriendList::processSettings(bool bLoad) void FriendList::processSettings(bool bLoad)
{ {
int peerTreeVersion = 2; // version number for the settings to solve problems when modifying the column count int peerTreeVersion = 2; // version number for the settings to solve problems when modifying the column count
@ -1965,7 +1987,7 @@ void FriendList::addPeerToExpand(const std::string &gpgId)
openPeers->insert(gpgId); openPeers->insert(gpgId);
} }
QMenu *FriendList::createDisplayMenu() void FriendList::createDisplayMenu()
{ {
QMenu *displayMenu = new QMenu(this); QMenu *displayMenu = new QMenu(this);
connect(displayMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu())); connect(displayMenu, SIGNAL(aboutToShow()), this, SLOT(updateMenu()));
@ -1993,7 +2015,7 @@ QMenu *FriendList::createDisplayMenu()
// group->addAction(ui->actionSortByLastContact); // group->addAction(ui->actionSortByLastContact);
// group->addAction(ui->actionSortByIP); // group->addAction(ui->actionSortByIP);
return displayMenu; ui->displayButton->setMenu(displayMenu);
} }
void FriendList::updateMenu() void FriendList::updateMenu()

6
retroshare-gui/src/gui/common/FriendList.h
View File

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

65
retroshare-gui/src/gui/common/FriendList.ui
View File

@ -10,10 +10,66 @@
<height>229</height> <height>229</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QFrame" name="titleBarFrame">
<property name="frameShape">
<enum>QFrame::Box</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>3</number>
</property>
<property name="margin">
<number>2</number>
</property>
<item>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QToolButton" name="displayButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>30</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="focusPolicy">
<enum>Qt::NoFocus</enum>
</property>
<property name="toolTip">
<string>Display</string>
</property>
<property name="icon">
<iconset resource="../images.qrc">
<normaloff>:/images/looknfeel.png</normaloff>:/images/looknfeel.png</iconset>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QTreeWidget" name="peerTreeWidget"> <widget class="QTreeWidget" name="peerTreeWidget">
<property name="font"> <property name="font">
@ -238,6 +294,13 @@
</property> </property>
</action> </action>
</widget> </widget>
<customwidgets>
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
</customwidgets>
<resources> <resources>
<include location="../images.qrc"/> <include location="../images.qrc"/>
</resources> </resources>

2
retroshare-gui/src/gui/common/GroupTreeWidget.h
View File

@ -73,7 +73,7 @@ public:
GroupTreeWidget(QWidget *parent = 0); GroupTreeWidget(QWidget *parent = 0);
~GroupTreeWidget(); ~GroupTreeWidget();
// Add a widget to the tool area // Add a tool button to the tool area
void addToolButton(QToolButton *toolButton); void addToolButton(QToolButton *toolButton);
// Load and save settings (group must be startet from the caller) // Load and save settings (group must be startet from the caller)

20
retroshare-gui/src/lang/retroshare_en.ts
View File

@ -5538,6 +5538,10 @@ p, li { white-space: pre-wrap; }
<source>Service permissions matrix</source> <source>Service permissions matrix</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>FriendRecommendDialog</name> <name>FriendRecommendDialog</name>
@ -5610,10 +5614,6 @@ p, li { white-space: pre-wrap; }
<source>Friends</source> <source>Friends</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Display</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Edit status message</source> <source>Edit status message</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -5722,10 +5722,6 @@ p, li { white-space: pre-wrap; }
<source>Service permissions</source> <source>Service permissions</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Local network</source> <source>Local network</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -9172,10 +9168,6 @@ Do you want to save message ?</source>
<source>RetroShare Messenger</source> <source>RetroShare Messenger</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Search Friends</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Add a Friend</source> <source>Add a Friend</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -9184,10 +9176,6 @@ Do you want to save message ?</source>
<source>Share files for your friends</source> <source>Share files for your friends</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Search</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>MsgItem</name> <name>MsgItem</name>