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

Moved Search Filter to the top of the Selection Widget

Browse source 
Added a Filter ComboBox for Message Composer, to switch Show types.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2015-01-11 00:53:16 +00:00
parent bec858b9d5
commit 3755d540b7
4 changed files with 82 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,6 +14,34 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>Search :</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QPushButton" name="selectAll_PB">
<property name="text">
<string>All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deselectAll_PB">
<property name="text">
<string>None</string>
</property>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="QTreeWidget" name="friendList"> <widget class="QTreeWidget" name="friendList">
<property name="minimumSize"> <property name="minimumSize">
@ -44,34 +72,6 @@
</column> </column>
</widget> </widget>
</item> </item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="filterLabel">
<property name="text">
<string>Search :</string>
</property>
</widget>
</item>
<item>
<widget class="LineEditClear" name="filterLineEdit"/>
</item>
<item>
<widget class="QPushButton" name="selectAll_PB">
<property name="text">
<string>All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="deselectAll_PB">
<property name="text">
<string>None</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>

47
retroshare-gui/src/gui/msgs/MessageComposer.cpp
View file

@ -196,9 +196,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged())); connect(QApplication::clipboard(), SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged()));
connect(ui.onlyTrustedKeys, SIGNAL(clicked(bool)), this, SLOT(toggleShowNonFriend(bool))); connect(ui.filterComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(filterComboBoxChanged(int)));
ui.onlyTrustedKeys->setMinimumWidth(20);
ui.onlyTrustedKeys->setChecked(Settings->valueFromGroup("MessageComposer", "ShowOnlyTrustedKeys",false).toBool());
connect(ui.addToButton, SIGNAL(clicked(void)), this, SLOT(addTo())); connect(ui.addToButton, SIGNAL(clicked(void)), this, SLOT(addTo()));
connect(ui.addCcButton, SIGNAL(clicked(void)), this, SLOT(addCc())); connect(ui.addCcButton, SIGNAL(clicked(void)), this, SLOT(addCc()));
@ -218,7 +216,7 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI); ui.friendSelectionWidget->setModus(FriendSelectionWidget::MODUS_MULTI);
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP
| FriendSelectionWidget::SHOW_SSL | FriendSelectionWidget::SHOW_SSL
| (ui.onlyTrustedKeys->isChecked() ? FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_GXS)); | FriendSelectionWidget::SHOW_GXS);
ui.friendSelectionWidget->start(); ui.friendSelectionWidget->start();
QActionGroup *grp = new QActionGroup(this); QActionGroup *grp = new QActionGroup(this);
@ -241,14 +239,11 @@ MessageComposer::MessageComposer(QWidget *parent, Qt::WindowFlags flags)
ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ; ui.respond_to_CB->setFlags(IDCHOOSER_ID_REQUIRED) ;
/*ui.comboStyle->addItem("Standard"); /* Add filter types */
ui.comboStyle->addItem("Bullet List (Disc)"); ui.filterComboBox->addItem(tr("All"));
ui.comboStyle->addItem("Bullet List (Circle)"); ui.filterComboBox->addItem(tr("Friends"));
ui.comboStyle->addItem("Bullet List (Square)"); ui.filterComboBox->addItem(tr("Friends of Friends"));
ui.comboStyle->addItem("Ordered List (Decimal)"); ui.filterComboBox->setCurrentIndex(0);
ui.comboStyle->addItem("Ordered List (Alpha lower)");
ui.comboStyle->addItem("Ordered List (Alpha upper)");*/
//connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(textStyle(int)));
connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int))); connect(ui.comboStyle, SIGNAL(activated(int)),this, SLOT(changeFormatType(int)));
connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &))); connect(ui.comboFont, SIGNAL(activated(const QString &)), this, SLOT(textFamily(const QString &)));
@ -350,6 +345,11 @@ void MessageComposer::processSettings(bool bLoad)
// state of splitter // state of splitter
ui.splitter->restoreState(Settings->value("Splitter").toByteArray()); ui.splitter->restoreState(Settings->value("Splitter").toByteArray());
ui.splitter_2->restoreState(Settings->value("Splitter2").toByteArray()); ui.splitter_2->restoreState(Settings->value("Splitter2").toByteArray());
// state of filter combobox
int index = Settings->value("ShowType", 0).toInt();
ui.filterComboBox->setCurrentIndex(index);
} else { } else {
// save settings // save settings
@ -359,6 +359,10 @@ void MessageComposer::processSettings(bool bLoad)
// state of splitter // state of splitter
Settings->setValue("Splitter", ui.splitter->saveState()); Settings->setValue("Splitter", ui.splitter->saveState());
Settings->setValue("Splitter2", ui.splitter_2->saveState()); Settings->setValue("Splitter2", ui.splitter_2->saveState());
// state of filter combobox
Settings->setValue("ShowType", ui.filterComboBox->currentIndex());
} }
Settings->endGroup(); Settings->endGroup();
@ -2357,13 +2361,24 @@ void MessageComposer::addContact(enumType type)
addRecipient(type, *idIt); addRecipient(type, *idIt);
} }
void MessageComposer::toggleShowNonFriend(bool bValue) void MessageComposer::filterComboBoxChanged(int i)
{ {
ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP switch(i)
{
case 0: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP
| FriendSelectionWidget::SHOW_SSL | FriendSelectionWidget::SHOW_SSL
| (bValue?FriendSelectionWidget::SHOW_NONE : FriendSelectionWidget::SHOW_GXS)); | FriendSelectionWidget::SHOW_GXS) ;
break ;
case 1: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GROUP
| FriendSelectionWidget::SHOW_SSL) ;
break ;
case 2: ui.friendSelectionWidget->setShowType(FriendSelectionWidget::SHOW_GXS) ;
break ;
default: ;
}
Settings->setValueToGroup("MessageComposer", "ShowOnlyTrustedKeys", bValue);
} }
void MessageComposer::addTo() void MessageComposer::addTo()

2
retroshare-gui/src/gui/msgs/MessageComposer.h
View file

@ -95,6 +95,7 @@ private slots:
void buildCompleter(); void buildCompleter();
void updatecontactsviewicons(); void updatecontactsviewicons();
void filterComboBoxChanged(int);
void fileNew(); void fileNew();
void fileOpen(); void fileOpen();
@ -136,7 +137,6 @@ private slots:
void titleChanged(); void titleChanged();
// Add to To/Cc/Bcc address fields // Add to To/Cc/Bcc address fields
void toggleShowNonFriend(bool bValue);
void addTo(); void addTo();
void addCc(); void addCc();
void addBcc(); void addBcc();

28
retroshare-gui/src/gui/msgs/MessageComposer.ui
View file

@ -63,7 +63,7 @@
<property name="margin"> <property name="margin">
<number>1</number> <number>1</number>
</property> </property>
<item row="0" column="0"> <item row="1" column="0">
<widget class="FriendSelectionWidget" name="friendSelectionWidget" native="true"> <widget class="FriendSelectionWidget" name="friendSelectionWidget" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Expanding"> <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
@ -100,15 +100,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QCheckBox" name="onlyTrustedKeys">
<property name="text">
<string>Only show people you trusted</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
@ -175,6 +168,23 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="text">
<string>Show:</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="filterComboBox"/>
</item>
</layout>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>