Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-16 01:47:17 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added icons for the Channel TreeWidget

Browse Source 
Added placeholder text for Search Filter items on Group TreeWidget
Added placeholder text for Search Filter items in Messages Dialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2012-10-30 02:44:14 +00:00
parent bfe037e029
commit aadb408533
8 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
retroshare-gui/src/gui/ChannelFeed.cpp
View File

@ -48,6 +48,12 @@
#define WARNING_LIMIT 3600*24*2
/* Images for TreeWidget */
#define IMAGE_CHANNELBLUE ":/images/channelsblue.png"
#define IMAGE_CHANNELGREEN ":/images/channelsgreen.png"
#define IMAGE_CHANNELRED ":/images/channelsred.png"
#define IMAGE_CHANNELYELLOW ":/images/channelsyellow.png"
/****
* #define CHAN_DEBUG
***/
@ -80,10 +86,10 @@ ChannelFeed::ChannelFeed(QWidget *parent)
/* Initialize group tree */
treeWidget->initDisplayMenu(displayButton);
ownChannels = treeWidget->addCategoryItem(tr("Own Channels"), QIcon(), true);
subcribedChannels = treeWidget->addCategoryItem(tr("Subscribed Channels"), QIcon(), true);
popularChannels = treeWidget->addCategoryItem(tr("Popular Channels"), QIcon(), false);
otherChannels = treeWidget->addCategoryItem(tr("Other Channels"), QIcon(), false);
ownChannels = treeWidget->addCategoryItem(tr("Own Channels"), QIcon(IMAGE_CHANNELBLUE), true);
subcribedChannels = treeWidget->addCategoryItem(tr("Subscribed Channels"), QIcon(IMAGE_CHANNELRED), true);
popularChannels = treeWidget->addCategoryItem(tr("Popular Channels"), QIcon(IMAGE_CHANNELGREEN ), false);
otherChannels = treeWidget->addCategoryItem(tr("Other Channels"), QIcon(IMAGE_CHANNELYELLOW), false);
progressLabel->hide();
progressBar->hide();

14
retroshare-gui/src/gui/MessagesDialog.cpp
View File

@ -220,12 +220,14 @@ MessagesDialog::MessagesDialog(QWidget *parent)
ui.viewtoolButton->setMenu(viewmenu);
/* add filter actions */
ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT);
ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM);
ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE);
ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT);
ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS);
ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS);
ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject"));
ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From"));
ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE, tr("Search Date"));
ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT, tr("Search Content"));
ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS, tr("Search Tags"));
ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS, tr("Search Attachments"));
// can be removed when the actions of the filter line edit have own placeholder text
ui.filterLineEdit->setPlaceholderText(tr("Search...")) ;
//setting default filter by column as subject
ui.filterLineEdit->setCurrentFilter(COLUMN_SUBJECT);

4
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View File

@ -85,8 +85,8 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
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->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX , tr("Search Title"));
ui->filterLineEdit->addFilter(QIcon(), tr("Description"), FILTER_DESC_INDEX , tr("Search Description"));
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"));

4
retroshare-gui/src/gui/images.qrc
View File

@ -80,6 +80,10 @@
<file>images/channels32.png</file>
<file>images/channels_new32.png</file>
<file>images/channels_new.png</file>
<file>images/channelsred.png</file>
<file>images/channelsyellow.png</file>
<file>images/channelsgreen.png</file>
<file>images/channelsblue.png</file>
<file>images/copyrslink.png</file>
<file>images/contacts24.png</file>
<file>images/connection.png</file>

BIN
retroshare-gui/src/gui/images/channelsblue.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
retroshare-gui/src/gui/images/channelsgreen.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
retroshare-gui/src/gui/images/channelsred.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
retroshare-gui/src/gui/images/channelsyellow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB