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

Removed the filter comboboxes and replaced it with a menu in LineEditClear.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-10-29 10:59:26 +00:00
parent 68f48a802c
commit a7c29c0f24
18 changed files with 289 additions and 388 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/common/FriendSelectionWidget.cpp
View file

@ -95,6 +95,8 @@ FriendSelectionWidget::FriendSelectionWidget(QWidget *parent) :
// sort list by name ascending
ui->friendList->sortItems(COLUMN_NAME, Qt::AscendingOrder);
ui->filterLineEdit->setPlaceholderText(tr("Search Friends"));
}
FriendSelectionWidget::~FriendSelectionWidget()

8
retroshare-gui/src/gui/common/FriendSelectionWidget.ui
View file

@ -33,11 +33,7 @@
</widget>
</item>
<item row="1" column="0">
<widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip">
<string>Search Friends</string>
</property>
</widget>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
</layout>
</item>
@ -77,7 +73,7 @@
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
</customwidgets>
<resources/>

19
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View file

@ -44,8 +44,8 @@
#define ROLE_LASTPOST Qt::UserRole + 4
#define ROLE_SEARCH_SCORE Qt::UserRole + 5
#define COMBO_NAME_INDEX 0
#define COMBO_DESC_INDEX 1
#define FILTER_NAME_INDEX 0
#define FILTER_DESC_INDEX 1
GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
QWidget(parent), ui(new Ui::GroupTreeWidget)
@ -64,7 +64,7 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
/* Connect signals */
connect(ui->filterLineEdit, SIGNAL(textChanged(QString)), this, SLOT(filterChanged()));
connect(ui->filterCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(filterChanged()));
connect(ui->filterLineEdit, SIGNAL(filterChanged(int)), this, SLOT(filterChanged()));
connect(ui->treeWidget, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(customContextMenuRequested(QPoint)));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)), this, SLOT(currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)));
@ -83,6 +83,13 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
header->resizeSection(COLUMN_NAME, 170);
header->setResizeMode(COLUMN_POPULARITY, QHeaderView::Fixed);
header->resizeSection(COLUMN_POPULARITY, 25);
/* add filter actions */
ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX);
ui->filterLineEdit->addFilter(QIcon(), tr("Description"), FILTER_DESC_INDEX);
ui->filterLineEdit->setCurrentFilter(FILTER_NAME_INDEX);
// can be removed when the actions of the filter line edit have own placeholder text
ui->filterLineEdit->setPlaceholderText(tr("Enter a Keyword here"));
}
GroupTreeWidget::~GroupTreeWidget()
@ -388,11 +395,11 @@ void GroupTreeWidget::calculateScore(QTreeWidgetItem *item, const QString &filte
} else {
QString scoreString;
switch (ui->filterCombo->currentIndex()) {
case COMBO_NAME_INDEX:
switch (ui->filterLineEdit->currentFilter()) {
case FILTER_NAME_INDEX:
scoreString = item->data(COLUMN_DATA, ROLE_NAME).toString();
break;
case COMBO_DESC_INDEX:
case FILTER_DESC_INDEX:
scoreString = item->data(COLUMN_DATA, ROLE_DESCRIPTION).toString();
break;
}

35
retroshare-gui/src/gui/common/GroupTreeWidget.ui
View file

@ -18,38 +18,7 @@
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="LineEditClear" name="filterLineEdit">
<property name="toolTip">
<string>Enter a Keyword here</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="filterCombo">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Title</string>
</property>
</item>
<item>
<property name="text">
<string>Description</string>
</property>
</item>
</widget>
</item>
</layout>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QTreeWidget" name="treeWidget">
@ -101,7 +70,7 @@
<customwidget>
<class>LineEditClear</class>
<extends>QLineEdit</extends>
<header>gui/common/LineEditClear.h</header>
<header location="global">gui/common/LineEditClear.h</header>
</customwidget>
</customwidgets>
<resources/>

187
retroshare-gui/src/gui/common/LineEditClear.cpp
View file

@ -24,46 +24,183 @@
#include <QToolButton>
#include <QStyle>
#include <QMenu>
#if QT_VERSION < 0x040700
#include <QLabel>
#endif
#define IMAGE_FILTER ":/images/find-16.png"
LineEditClear::LineEditClear(QWidget *parent)
: QLineEdit(parent)
{
findButton = new QToolButton(this);
QPixmap findPixmap(":/images/find-16.png");
findButton->setIcon(QIcon(findPixmap));
findButton->setIconSize(findPixmap.size());
findButton->setCursor(Qt::ArrowCursor);
findButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
mActionGroup = NULL;
clearButton = new QToolButton(this);
clearButton->setFixedSize(16, 16);
clearButton->setIconSize(QSize(16, 16));
clearButton->setCursor(Qt::ArrowCursor);
clearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }"
"QToolButton { border-image: url(:/images/closenormal.png) }"
"QToolButton:hover { border-image: url(:/images/closehover.png) }"
"QToolButton:pressed { border-image: url(:/images/closepressed.png) }");
clearButton->hide();
mFilterButton = new QToolButton(this);
mFilterButton->setFixedSize(16, 16);
QPixmap filterPixmap(IMAGE_FILTER);
mFilterButton->setIcon(QIcon(filterPixmap));
mFilterButton->setIconSize(filterPixmap.size());
mFilterButton->setCursor(Qt::ArrowCursor);
mFilterButton->setStyleSheet("QToolButton { border: none; padding: 0px; }"
"QToolButton[popupMode=\"2\"] { padding-right: 10px; }"
"QToolButton::menu-indicator[popupMode=\"2\"] { subcontrol-origin: padding; subcontrol-position: bottom right; top: 5px; left: -3px; width: 7px; }");
mFilterButton->move(2, 2);
connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateCloseButton(const QString&)));
mClearButton = new QToolButton(this);
mClearButton->setFixedSize(16, 16);
mClearButton->setIconSize(QSize(16, 16));
mClearButton->setCursor(Qt::ArrowCursor);
mClearButton->setStyleSheet("QToolButton { border: none; padding: 0px; }"
"QToolButton { border-image: url(:/images/closenormal.png) }"
"QToolButton:hover { border-image: url(:/images/closehover.png) }"
"QToolButton:pressed { border-image: url(:/images/closepressed.png) }");
mClearButton->hide();
connect(mClearButton, SIGNAL(clicked()), this, SLOT(clear()));
connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateClearButton(const QString&)));
#if QT_VERSION < 0x040700
mFilterLabel = new QLabel("", this);
mFilterLabel->setStyleSheet("QLabel { color: gray; }");
#endif
reposButtons();
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
setStyleSheet(QString("QLineEdit { padding-right: %1px; padding-left: %2px; } ").
arg(clearButton->sizeHint().width() + frameWidth + 1).
arg(findButton->sizeHint().width() + frameWidth + 1));
QSize msz = minimumSizeHint();
setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2), qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2));
setMinimumSize(
qMax(msz.width(), mClearButton->sizeHint().height() + mFilterButton->sizeHint().width() + frameWidth * 2),
qMax(msz.height(), mClearButton->sizeHint().height() + frameWidth * 2));
}
void LineEditClear::resizeEvent(QResizeEvent *)
{
QSize sz = clearButton->sizeHint();
QSize sz = mClearButton->sizeHint();
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
clearButton->move(rect().right() - frameWidth - sz.width() + 2, (rect().bottom() - sz.height()) / 2 + 2);
mClearButton->move(rect().right() - frameWidth - sz.width() + 2, (rect().bottom() - sz.height()) / 2 + 2);
#if QT_VERSION < 0x040700
sz = mFilterLabel->sizeHint();
mFilterLabel->move(frameWidth + mFilterButton->sizeHint().width() + 5, (rect().bottom() + 1 - sz.height())/2);
#endif
}
void LineEditClear::updateCloseButton(const QString& text)
void LineEditClear::setPlaceholderText(const QString &text)
{
clearButton->setVisible(!text.isEmpty());
#if QT_VERSION < 0x040700
mFilterLabel->setText(text);
#else
QLineEdit::setPlaceholderText(text);
#endif
setToolTip(text);
}
#if QT_VERSION < 0x040700
void LineEditClear::focusInEvent(QFocusEvent *event)
{
mFilterLabel->setVisible(false);
QLineEdit::focusInEvent(event);
}
void LineEditClear::focusOutEvent(QFocusEvent *event)
{
if (text().isEmpty()) {
mFilterLabel->setVisible(true);
}
QLineEdit::focusOutEvent(event);
}
#endif
void LineEditClear::reposButtons()
{
int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
setStyleSheet(QString("QLineEdit { padding-right: %1px; padding-left: %2px; }")
.arg(mClearButton->sizeHint().width() + frameWidth + 1)
.arg(mFilterButton->sizeHint().width() + frameWidth + 1));
}
void LineEditClear::updateClearButton(const QString& text)
{
mClearButton->setVisible(!text.isEmpty());
}
void LineEditClear::addFilter(const QIcon &icon, const QString &text, int id, const QString &description)
{
QAction *action = new QAction(icon, text, this);
action->setData(id);
action->setCheckable(true);
mDescription[id] = description;
if (mActionGroup == NULL) {
mFilterButton->setFixedSize(26, 16);
mFilterButton->setPopupMode(QToolButton::InstantPopup);
mActionGroup = new QActionGroup(this);
mActionGroup->setExclusive(true);
QMenu *menu = new QMenu;
mFilterButton->setMenu(menu);
connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(filterTriggered(QAction*)));
reposButtons();
/* set first action checked */
action->setChecked(true);
activateAction(action);
}
mFilterButton->menu()->addAction(action);
mActionGroup->addAction(action);
}
void LineEditClear::setCurrentFilter(int id)
{
QMenu *menu = mFilterButton->menu();
if (menu) {
Q_FOREACH (QAction *action, menu->actions()) {
if (action->data().toInt() == id) {
action->setChecked(true);
activateAction(action);
// emit filterChanged(id);
break;
}
}
}
}
int LineEditClear::currentFilter()
{
if (mActionGroup == NULL) {
return 0;
}
QAction *action = mActionGroup->checkedAction();
if (action) {
return action->data().toInt();
}
return 0;
}
void LineEditClear::filterTriggered(QAction *action)
{
activateAction(action);
emit filterChanged(action->data().toInt());
}
void LineEditClear::activateAction(QAction *action)
{
QMap<int, QString>::iterator description = mDescription.find(action->data().toInt());
if (description != mDescription.end() && !description->isEmpty()) {
setPlaceholderText(*description);
}
QIcon icon = action->icon();
if (icon.isNull()) {
icon = QIcon(IMAGE_FILTER);
}
mFilterButton->setIcon(icon);
}

36
retroshare-gui/src/gui/common/LineEditClear.h
View file

@ -24,8 +24,13 @@
#define LINEEDITCLEAR_H
#include <QLineEdit>
#include <QMap>
class QToolButton;
class QActionGroup;
#if QT_VERSION < 0x040700
class QLabel;
#endif
class LineEditClear : public QLineEdit
{
@ -34,15 +39,40 @@ class LineEditClear : public QLineEdit
public:
LineEditClear(QWidget *parent = 0);
void addFilter(const QIcon &icon, const QString &text, int id, const QString &description = "");
void setCurrentFilter(int id);
int currentFilter();
//#if QT_VERSION < 0x040700
// for Qt version with setPlaceholderText too to set the tooltip of the lineedit
void setPlaceholderText(const QString &text);
//#endif
signals:
void filterChanged(int id);
protected:
void resizeEvent(QResizeEvent *);
#if QT_VERSION < 0x040700
void focusInEvent(QFocusEvent *event);
void focusOutEvent(QFocusEvent *event);
#endif
void reposButtons();
void activateAction(QAction *action);
private slots:
void updateCloseButton(const QString &text);
void updateClearButton(const QString &text);
void filterTriggered(QAction *action);
private:
QToolButton *clearButton;
QToolButton *findButton;
QToolButton *mClearButton;
QToolButton *mFilterButton;
QActionGroup *mActionGroup;
QMap<int, QString> mDescription;
#if QT_VERSION < 0x040700
QLabel *mFilterLabel;
#endif
};
#endif // LINEEDITCLEAR_H