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

tag feature in MessagesDialog

Browse source 
its disabled until the msgId is static

uncomment the define STATIC_MSGID in MessagesDialog.h for testing 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-27 19:48:52 +00:00
parent 3ff6fce00f
commit 5b4985e3d3
11 changed files with 822 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

3
retroshare-gui/src/RetroShare.pro
View file

@ -233,6 +233,7 @@ HEADERS += rshare.h \
gui/settings/NotifyPage.h \ gui/settings/NotifyPage.h \
gui/settings/CryptoPage.h \ gui/settings/CryptoPage.h \
gui/settings/MessagePage.h \ gui/settings/MessagePage.h \
gui/settings/NewTag.h \
gui/settings/AppearancePage.h \ gui/settings/AppearancePage.h \
gui/settings/FileAssociationsPage.h \ gui/settings/FileAssociationsPage.h \
gui/settings/SoundPage.h \ gui/settings/SoundPage.h \
@ -327,6 +328,7 @@ FORMS += gui/StartDialog.ui \
gui/settings/NotifyPage.ui \ gui/settings/NotifyPage.ui \
gui/settings/CryptoPage.ui \ gui/settings/CryptoPage.ui \
gui/settings/MessagePage.ui \ gui/settings/MessagePage.ui \
gui/settings/NewTag.ui \
gui/settings/AppearancePage.ui \ gui/settings/AppearancePage.ui \
gui/settings/TransferPage.ui \ gui/settings/TransferPage.ui \
gui/settings/SoundPage.ui \ gui/settings/SoundPage.ui \
@ -439,6 +441,7 @@ SOURCES += main.cpp \
gui/settings/NotifyPage.cpp \ gui/settings/NotifyPage.cpp \
gui/settings/CryptoPage.cpp \ gui/settings/CryptoPage.cpp \
gui/settings/MessagePage.cpp \ gui/settings/MessagePage.cpp \
gui/settings/NewTag.cpp \
gui/settings/AppearancePage.cpp \ gui/settings/AppearancePage.cpp \
gui/settings/FileAssociationsPage.cpp \ gui/settings/FileAssociationsPage.cpp \
gui/settings/SoundPage.cpp \ gui/settings/SoundPage.cpp \

36
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -515,6 +515,42 @@ void MainWindow::addAction(QAction *action, const char *slot)
} }
} }
/** get page */
/*static*/ MainPage *MainWindow::getPage (Page page)
{
if (_instance == NULL) {
return NULL;
}
switch (page) {
case Network:
return _instance->networkDialog;
case Friends:
return _instance->peersDialog;
case Search:
return _instance->searchDialog;
case Transfers:
return _instance->transfersDialog;
case SharedDirectories:
return _instance->sharedfilesDialog;
case Messages:
return _instance->messagesDialog;
#ifndef RS_RELEASE_VERSION
case Links:
return _instance->linksDialog;
case Channels:
return _instance->channelFeed;
#endif
case Forums:
return _instance->forumsDialog;
#ifdef BLOGS
case Blogs:
return _instance->blogsFeed;
#endif
}
return NULL;
}
/***** TOOL BAR FUNCTIONS *****/ /***** TOOL BAR FUNCTIONS *****/

3
retroshare-gui/src/gui/MainWindow.h
View file

@ -100,6 +100,9 @@ public:
/** Set focus to the given page. */ /** Set focus to the given page. */
static void activatePage (Page page); static void activatePage (Page page);
/** get page */
static MainPage *getPage (Page page);
/* A Bit of a Hack... but public variables for /* A Bit of a Hack... but public variables for
* the dialogs, so we can add them to the * the dialogs, so we can add them to the
* Notify Class... * Notify Class...

628
retroshare-gui/src/gui/MessagesDialog.cpp
View file

@ -33,9 +33,6 @@
#include <QtGui> #include <QtGui>
// Thunder: need a static msgId
//#define STATIC_MSGID
/* Images for context menu icons */ /* Images for context menu icons */
#define IMAGE_MESSAGE ":/images/folder-draft.png" #define IMAGE_MESSAGE ":/images/folder-draft.png"
#define IMAGE_MESSAGEREPLY ":/images/mail_reply.png" #define IMAGE_MESSAGEREPLY ":/images/mail_reply.png"
@ -45,7 +42,7 @@
#define IMAGE_DOWNLOAD ":/images/start.png" #define IMAGE_DOWNLOAD ":/images/start.png"
#define IMAGE_DOWNLOADALL ":/images/startall.png" #define IMAGE_DOWNLOADALL ":/images/startall.png"
#define COLUMN_COUNT 8 #define COLUMN_COUNT 9
#define COLUMN_ATTACHEMENTS 0 #define COLUMN_ATTACHEMENTS 0
#define COLUMN_SUBJECT 1 #define COLUMN_SUBJECT 1
#define COLUMN_READ 2 #define COLUMN_READ 2
@ -54,9 +51,28 @@
#define COLUMN_SRCID 5 #define COLUMN_SRCID 5
#define COLUMN_MSGID 6 #define COLUMN_MSGID 6
#define COLUMN_CONTENT 7 #define COLUMN_CONTENT 7
#define COLUMN_TAGS 8
#define ACTION_TAGSINDEX_SIZE 3
#define ACTION_TAGSINDEX_TYPE "Type"
#define ACTION_TAGSINDEX_ID "ID"
#define ACTION_TAGSINDEX_COLOR "Color"
#define ACTION_TAGS_REMOVEALL 0
#define ACTION_TAGS_TAG 1
#define ACTION_TAGS_NEWTAG 2
#define CONFIG_FILE (RsInit::RsProfileConfigDirectory() + "/msg_locale.cfg")
#define CONFIG_SECTION_UNREAD "Unread" #define CONFIG_SECTION_UNREAD "Unread"
#define CONFIG_SECTION_TAGS "Tags"
#define CONFIG_KEY_TEXT "Text"
#define CONFIG_KEY_COLOR "Color"
#define CONFIG_SECTION_TAG "Tag"
#define CONFIG_KEY_TAG "Tag"
class MyItemDelegate : public QItemDelegate class MyItemDelegate : public QItemDelegate
{ {
public: public:
@ -87,6 +103,51 @@ public:
} }
}; };
class MyMenu : public QMenu
{
public:
MyMenu(const QString &title, QWidget *parent) : QMenu (title, parent)
{
}
protected:
virtual void paintEvent(QPaintEvent *e)
{
QMenu::paintEvent(e);
QPainter p(this);
QRegion emptyArea = QRegion(rect());
//draw the items with color
foreach (QAction *pAction, actions()) {
QRect adjustedActionRect = actionGeometry(pAction);
if (!e->rect().intersects(adjustedActionRect))
continue;
const QMap<QString, QVariant> &Values = pAction->data().toMap();
if (Values.size () != ACTION_TAGSINDEX_SIZE) {
continue;
}
if (Values [ACTION_TAGSINDEX_TYPE] != ACTION_TAGS_TAG) {
continue;
}
//set the clip region to be extra safe (and adjust for the scrollers)
QRegion adjustedActionReg(adjustedActionRect);
emptyArea -= adjustedActionReg;
p.setClipRegion(adjustedActionReg);
QStyleOptionMenuItem opt;
initStyleOption(&opt, pAction);
opt.palette.setColor(QPalette::ButtonText, QColor(Values [ACTION_TAGSINDEX_COLOR].toInt()));
opt.rect = adjustedActionRect;
style()->drawControl(QStyle::CE_MenuItem, &opt, &p, this);
}
}
};
static int FilterColumnFromComboBox(int nIndex) static int FilterColumnFromComboBox(int nIndex)
{ {
switch (nIndex) { switch (nIndex) {
@ -100,6 +161,8 @@ static int FilterColumnFromComboBox(int nIndex)
return COLUMN_DATE; return COLUMN_DATE;
case 4: case 4:
return COLUMN_CONTENT; return COLUMN_CONTENT;
case 5:
return COLUMN_TAGS;
} }
return COLUMN_SUBJECT; return COLUMN_SUBJECT;
@ -118,6 +181,8 @@ static int FilterColumnToComboBox(int nIndex)
return 3; return 3;
case COLUMN_CONTENT: case COLUMN_CONTENT:
return 4; return 4;
case COLUMN_TAGS:
return 5;
} }
return FilterColumnToComboBox(COLUMN_SUBJECT); return FilterColumnToComboBox(COLUMN_SUBJECT);
@ -131,7 +196,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
ui.setupUi(this); ui.setupUi(this);
m_bProcessSettings = false; m_bProcessSettings = false;
m_pConfig = new RSettings (RsInit::RsProfileConfigDirectory() + "/msg_locale.cfg"); m_pConfig = new RSettings (CONFIG_FILE);
connect( ui.messagestreeView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( messageslistWidgetCostumPopupMenu( QPoint ) ) ); connect( ui.messagestreeView, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( messageslistWidgetCostumPopupMenu( QPoint ) ) );
connect( ui.msgList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgfilelistWidgetCostumPopupMenu( QPoint ) ) ); connect( ui.msgList, SIGNAL( customContextMenuRequested( QPoint ) ), this, SLOT( msgfilelistWidgetCostumPopupMenu( QPoint ) ) );
@ -178,6 +243,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
MessagesModel->setHeaderData(COLUMN_READ, Qt::Horizontal, QIcon(":/images/message-mail-state-header.png"), Qt::DecorationRole); MessagesModel->setHeaderData(COLUMN_READ, Qt::Horizontal, QIcon(":/images/message-mail-state-header.png"), Qt::DecorationRole);
MessagesModel->setHeaderData(COLUMN_FROM, Qt::Horizontal, tr("From")); MessagesModel->setHeaderData(COLUMN_FROM, Qt::Horizontal, tr("From"));
MessagesModel->setHeaderData(COLUMN_DATE, Qt::Horizontal, tr("Date")); MessagesModel->setHeaderData(COLUMN_DATE, Qt::Horizontal, tr("Date"));
MessagesModel->setHeaderData(COLUMN_TAGS, Qt::Horizontal, tr("Tags"));
MessagesModel->setHeaderData(COLUMN_SRCID, Qt::Horizontal, tr("SRCID")); MessagesModel->setHeaderData(COLUMN_SRCID, Qt::Horizontal, tr("SRCID"));
MessagesModel->setHeaderData(COLUMN_MSGID, Qt::Horizontal, tr("MSGID")); MessagesModel->setHeaderData(COLUMN_MSGID, Qt::Horizontal, tr("MSGID"));
MessagesModel->setHeaderData(COLUMN_CONTENT, Qt::Horizontal, tr("Content")); MessagesModel->setHeaderData(COLUMN_CONTENT, Qt::Horizontal, tr("Content"));
@ -266,6 +332,13 @@ MessagesDialog::MessagesDialog(QWidget *parent)
updateMessageSummaryList(); updateMessageSummaryList();
ui.listWidget->setCurrentRow(0); ui.listWidget->setCurrentRow(0);
#ifdef STATIC_MSGID
// create tag menu
createTagMenu();
#else
ui.tagButton->setHidden(true);
#endif
// create timer for navigation // create timer for navigation
timer = new QTimer(this); timer = new QTimer(this);
timer->setInterval(300); timer->setInterval(300);
@ -333,6 +406,217 @@ void MessagesDialog::processSettings(bool bLoad)
m_bProcessSettings = false; m_bProcessSettings = false;
} }
#ifdef STATIC_MSGID
static void getMessageTags (RSettings *pConfig, QString &msgId, QList<int> &tagIds)
{
pConfig->beginGroup(CONFIG_SECTION_TAG);
int nSize = pConfig->beginReadArray(msgId);
for (int i = 0; i < nSize; i++) {
pConfig->setArrayIndex(i);
int nTagId = pConfig->value(CONFIG_KEY_TAG).toInt();
tagIds.push_back(nTagId);
}
pConfig->endArray();
pConfig->endGroup();
}
static void setMessageTags (RSettings *pConfig, QString &msgId, QList<int> &tagIds)
{
pConfig->beginGroup(CONFIG_SECTION_TAG);
pConfig->remove(msgId);
if (tagIds.size()) {
pConfig->beginWriteArray(msgId, tagIds.size());
int i = 0;
for (QList<int>::iterator tagId = tagIds.begin(); tagId != tagIds.end(); tagId++) {
pConfig->setArrayIndex(i++);
pConfig->setValue(CONFIG_KEY_TAG, *tagId);
}
pConfig->endArray();
}
pConfig->endGroup();
}
void MessagesDialog::getTagItems(std::map<int, TagItem> &Items)
{
TagItem Item;
// create standard enties ... id = sort, maybe later own member
Item.text = tr("Important");
Item.color = QColor(255, 0, 0).rgb();
Items [-5] = Item;
Item.text = tr("Privat");
Item.color = QColor(0, 153, 0).rgb();
Items [-4] = Item;
Item.text = tr("Todo");
Item.color = QColor(51, 51, 255).rgb();
Items [-3] = Item;
Item.text = tr("Work");
Item.color = QColor(255, 153, 0).rgb();
Items [-2] = Item;
Item.text = tr("Later");
Item.color = QColor(153, 51, 153).rgb();
Items [-1] = Item;
// load user tags and colors
m_pConfig->beginGroup(CONFIG_SECTION_TAGS);
QStringList ids = m_pConfig->childGroups();
for (QStringList::iterator id = ids.begin(); id != ids.end(); id++) {
int nId = 0;
std::istringstream instream((*id).toStdString());
instream >> nId;
m_pConfig->beginGroup(*id);
if (nId < 0) {
// standard tag
Item = Items[nId];
} else {
Item.text = m_pConfig->value(CONFIG_KEY_TEXT).toString();
}
Item.color = m_pConfig->value(CONFIG_KEY_COLOR, Item.color).toUInt();
m_pConfig->endGroup();
Items [nId] = Item;
}
m_pConfig->endGroup();
}
void MessagesDialog::setTagItems(std::map<int, TagItem> &Items)
{
// process deleted tags
QList<int> tagIdsToDelete;
std::map<int, TagItem>::iterator Item;
for (Item = Items.begin(); Item != Items.end(); Item++) {
if (Item->second._delete) {
tagIdsToDelete.push_back(Item->first);
}
}
if (tagIdsToDelete.size()) {
// iterate all saved tags on messages and remove the id's
// get all msgIds with tags
m_pConfig->beginGroup(CONFIG_SECTION_TAG);
QStringList msgIds = m_pConfig->childGroups();
m_pConfig->endGroup();
for (QStringList::iterator msgId = msgIds.begin(); msgId != msgIds.end(); msgId++) {
QList<int> tagIds;
getMessageTags (m_pConfig, *msgId, tagIds);
bool bSave = false;
for (QList<int>::iterator tagIdToDelete = tagIdsToDelete.begin(); tagIdToDelete != tagIdsToDelete.end(); tagIdToDelete++) {
QList<int>::iterator tagId = qFind(tagIds.begin(), tagIds.end(), *tagIdToDelete);
if (tagId != tagIds.end()) {
tagIds.erase(tagId);
bSave = true;
}
}
if (bSave) {
setMessageTags (m_pConfig, *msgId, tagIds);
}
}
}
// save tags
m_pConfig->remove(CONFIG_SECTION_TAGS);
m_pConfig->beginGroup(CONFIG_SECTION_TAGS);
for (Item = Items.begin(); Item != Items.end(); Item++) {
if (Item->second._delete) {
continue;
}
QString sId;
sId.sprintf("%d", Item->first);
m_pConfig->beginGroup(sId);
if (Item->first > 0) {
m_pConfig->setValue(CONFIG_KEY_TEXT, Item->second.text);
}
m_pConfig->setValue(CONFIG_KEY_COLOR, Item->second.color);
m_pConfig->endGroup();
}
m_pConfig->endGroup();
createTagMenu();
insertMessages();
}
void MessagesDialog::createTagMenu()
{
QMenu *pMenu = new MyMenu (tr("Tag"), this);
connect(pMenu, SIGNAL(triggered (QAction*)), this, SLOT(tagTriggered(QAction*)));
connect(pMenu, SIGNAL(aboutToShow()), this, SLOT(tagAboutToShow()));
std::map<int, TagItem> TagItems;
getTagItems(TagItems);
bool bUser = false;
QAction *pAction;
QMap<QString, QVariant> Values;
if (TagItems.size()) {
pAction = new QAction(tr("Remove All Tags"), pMenu);
Values [ACTION_TAGSINDEX_TYPE] = ACTION_TAGS_REMOVEALL;
Values [ACTION_TAGSINDEX_ID] = 0;
Values [ACTION_TAGSINDEX_COLOR] = 0;
pAction->setData (Values);
pMenu->addAction(pAction);
pMenu->addSeparator();
std::map<int, TagItem>::iterator Item;
for (Item = TagItems.begin(); Item != TagItems.end(); Item++) {
pAction = new QAction(Item->second.text, pMenu);
Values [ACTION_TAGSINDEX_TYPE] = ACTION_TAGS_TAG;
Values [ACTION_TAGSINDEX_ID] = Item->first;
Values [ACTION_TAGSINDEX_COLOR] = Item->second.color;
pAction->setData (Values);
pAction->setCheckable(true);
if (Item->first > 0 && bUser == false) {
bUser = true;
pMenu->addSeparator();
}
pMenu->addAction(pAction);
}
pMenu->addSeparator();
}
pAction = new QAction(tr("New tag ..."), pMenu);
Values [ACTION_TAGSINDEX_TYPE] = ACTION_TAGS_NEWTAG;
Values [ACTION_TAGSINDEX_ID] = 0;
Values [ACTION_TAGSINDEX_COLOR] = 0;
pAction->setData (Values);
pMenu->addAction(pAction);
ui.tagButton->setMenu(pMenu);
}
#endif
// replaced by shortcut // replaced by shortcut
//void MessagesDialog::keyPressEvent(QKeyEvent *e) //void MessagesDialog::keyPressEvent(QKeyEvent *e)
//{ //{
@ -345,7 +629,7 @@ void MessagesDialog::processSettings(bool bLoad)
// MainPage::keyPressEvent(e) ; // MainPage::keyPressEvent(e) ;
//} //}
int MessagesDialog::getSelectedMsgCount (QList<int> *pRowsRead, QList<int> *pRowsUnread) int MessagesDialog::getSelectedMsgCount (QList<int> *pRows, QList<int> *pRowsRead, QList<int> *pRowsUnread)
{ {
if (pRowsRead) pRowsRead->clear(); if (pRowsRead) pRowsRead->clear();
if (pRowsUnread) pRowsUnread->clear(); if (pRowsUnread) pRowsUnread->clear();
@ -360,8 +644,11 @@ int MessagesDialog::getSelectedMsgCount (QList<int> *pRowsRead, QList<int> *pRow
{ {
rowList.append(row); rowList.append(row);
if (pRowsRead || pRowsUnread) { if (pRows || pRowsRead || pRowsUnread) {
int mappedRow = proxyModel->mapToSource(*it).row(); int mappedRow = proxyModel->mapToSource(*it).row();
if (pRows) pRows->append(mappedRow);
if (MessagesModel->item(mappedRow, COLUMN_SUBJECT)->font().bold()) { if (MessagesModel->item(mappedRow, COLUMN_SUBJECT)->font().bold()) {
if (pRowsUnread) pRowsUnread->append(mappedRow); if (pRowsUnread) pRowsUnread->append(mappedRow);
} else { } else {
@ -386,23 +673,16 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
QMenu contextMnu( this ); QMenu contextMnu( this );
/** Defines the actions for the context menu */ /** Defines the actions for the context menu */
QAction* newmsgAct = NULL;
QAction* replytomsgAct = NULL;
QAction* replyallmsgAct = NULL;
QAction* forwardmsgAct = NULL;
QAction* removemsgAct = NULL;
QAction* markAsRead = NULL;
QAction* markAsUnread = NULL;
replytomsgAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr( "Reply to Message" ), this ); QAction *replytomsgAct = new QAction(QIcon(IMAGE_MESSAGEREPLY), tr( "Reply to Message" ), this );
connect( replytomsgAct , SIGNAL( triggered() ), this, SLOT( replytomessage() ) ); connect( replytomsgAct , SIGNAL( triggered() ), this, SLOT( replytomessage() ) );
contextMnu.addAction( replytomsgAct); contextMnu.addAction( replytomsgAct);
replyallmsgAct = new QAction(QIcon(IMAGE_MESSAGEREPLYALL), tr( "Reply to All" ), this ); QAction *replyallmsgAct = new QAction(QIcon(IMAGE_MESSAGEREPLYALL), tr( "Reply to All" ), this );
connect( replyallmsgAct , SIGNAL( triggered() ), this, SLOT( replyallmessage() ) ); connect( replyallmsgAct , SIGNAL( triggered() ), this, SLOT( replyallmessage() ) );
contextMnu.addAction( replyallmsgAct); contextMnu.addAction( replyallmsgAct);
forwardmsgAct = new QAction(QIcon(IMAGE_MESSAGEFORWARD), tr( "Forward Message" ), this ); QAction *forwardmsgAct = new QAction(QIcon(IMAGE_MESSAGEFORWARD), tr( "Forward Message" ), this );
connect( forwardmsgAct , SIGNAL( triggered() ), this, SLOT( forwardmessage() ) ); connect( forwardmsgAct , SIGNAL( triggered() ), this, SLOT( forwardmessage() ) );
contextMnu.addAction( forwardmsgAct); contextMnu.addAction( forwardmsgAct);
@ -410,17 +690,17 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
QList<int> RowsRead; QList<int> RowsRead;
QList<int> RowsUnread; QList<int> RowsUnread;
int nCount = getSelectedMsgCount (&RowsRead, &RowsUnread); int nCount = getSelectedMsgCount (NULL, &RowsRead, &RowsUnread);
#ifdef STATIC_MSGID #ifdef STATIC_MSGID
markAsRead = new QAction(QIcon(":/images/message-mail-read.png"), tr( "Mark as read" ), this); QAction *markAsRead = new QAction(QIcon(":/images/message-mail-read.png"), tr( "Mark as read" ), this);
connect(markAsRead , SIGNAL(triggered()), this, SLOT(markAsRead())); connect(markAsRead , SIGNAL(triggered()), this, SLOT(markAsRead()));
contextMnu.addAction(markAsRead); contextMnu.addAction(markAsRead);
if (RowsUnread.size() == 0) { if (RowsUnread.size() == 0) {
markAsRead->setDisabled(true); markAsRead->setDisabled(true);
} }
markAsUnread = new QAction(QIcon(":/images/message-mail.png"), tr( "Mark as unread" ), this); QAction *markAsUnread = new QAction(QIcon(":/images/message-mail.png"), tr( "Mark as unread" ), this);
connect(markAsUnread , SIGNAL(triggered()), this, SLOT(markAsUnread())); connect(markAsUnread , SIGNAL(triggered()), this, SLOT(markAsUnread()));
contextMnu.addAction(markAsUnread); contextMnu.addAction(markAsUnread);
if (RowsRead.size() == 0) { if (RowsRead.size() == 0) {
@ -428,9 +708,14 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
} }
contextMnu.addSeparator(); contextMnu.addSeparator();
// add tags
contextMnu.addMenu(ui.tagButton->menu());
contextMnu.addSeparator();
#endif #endif
if (nCount > 1) { QAction *removemsgAct;
if (nCount > 1) {
removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Messages" ), this ); removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Messages" ), this );
} else { } else {
removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Message" ), this ); removemsgAct = new QAction(QIcon(IMAGE_MESSAGEREMOVE), tr( "Remove Message" ), this );
@ -444,7 +729,7 @@ void MessagesDialog::messageslistWidgetCostumPopupMenu( QPoint point )
contextMnu.addAction( ui.actionPrint); contextMnu.addAction( ui.actionPrint);
contextMnu.addSeparator(); contextMnu.addSeparator();
newmsgAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "New Message" ), this ); QAction *newmsgAct = new QAction(QIcon(IMAGE_MESSAGE), tr( "New Message" ), this );
connect( newmsgAct , SIGNAL( triggered() ), this, SLOT( newmessage() ) ); connect( newmsgAct , SIGNAL( triggered() ), this, SLOT( newmessage() ) );
contextMnu.addAction( newmsgAct); contextMnu.addAction( newmsgAct);
@ -835,7 +1120,6 @@ void MessagesDialog::insertMessages()
std::cerr << "Current Row: " << listrow << std::endl; std::cerr << "Current Row: " << listrow << std::endl;
fflush(0); fflush(0);
int i;
int nFilterColumn = FilterColumnFromComboBox(ui.filterColumnComboBox->currentIndex()); int nFilterColumn = FilterColumnFromComboBox(ui.filterColumnComboBox->currentIndex());
/* check the mode we are in */ /* check the mode we are in */
@ -866,6 +1150,11 @@ void MessagesDialog::insertMessages()
} }
if (bFill) { if (bFill) {
#ifdef STATIC_MSGID
std::map<int, TagItem> TagItems;
getTagItems(TagItems);
#endif
/* remove old items */ /* remove old items */
int nRowCount = MessagesModel->rowCount(); int nRowCount = MessagesModel->rowCount();
int nRow = 0; int nRow = 0;
@ -933,18 +1222,18 @@ void MessagesDialog::insertMessages()
bool bInsert = false; bool bInsert = false;
if (nRow < nRowCount) { if (nRow < nRowCount) {
for (i = 0; i < COLUMN_COUNT; i++) { for (int i = 0; i < COLUMN_COUNT; i++) {
item[i] = MessagesModel->item(nRow, i); item[i] = MessagesModel->item(nRow, i);
} }
} else { } else {
for (i = 0; i < COLUMN_COUNT; i++) { for (int i = 0; i < COLUMN_COUNT; i++) {
item[i] = new QStandardItem(); item[i] = new QStandardItem();
} }
bInsert = true; bInsert = true;
} }
//set this false if you want to expand on double click //set this false if you want to expand on double click
for (i = 0; i < COLUMN_COUNT; i++) { for (int i = 0; i < COLUMN_COUNT; i++) {
item[i]->setEditable(false); item[i]->setEditable(false);
} }
@ -1022,12 +1311,39 @@ void MessagesDialog::insertMessages()
item[COLUMN_SUBJECT]->setData(text + dateString, Qt::UserRole); item[COLUMN_SUBJECT]->setData(text + dateString, Qt::UserRole);
// internal data // internal data
QString msgId = QString::fromStdString(it->msgId);
item[COLUMN_SRCID]->setText(QString::fromStdString(it->srcId)); item[COLUMN_SRCID]->setText(QString::fromStdString(it->srcId));
item[COLUMN_MSGID]->setText(QString::fromStdString(it->msgId)); item[COLUMN_MSGID]->setText(msgId);
// Init icon and font // Init icon and font
InitIconAndFont(m_pConfig, item, it->msgflags); InitIconAndFont(m_pConfig, item, it->msgflags);
#ifdef STATIC_MSGID
// Tags
QList<int> tagIds;
getMessageTags (m_pConfig, msgId, tagIds);
qSort(tagIds.begin(), tagIds.end());
text.clear();
for (QList<int>::iterator tagId = tagIds.begin(); tagId != tagIds.end(); tagId++) {
if (text.isEmpty() == false) {
text += ",";
}
text += TagItems[*tagId].text;
}
item[COLUMN_TAGS]->setText(text);
// set color
QBrush Brush; // standard
if (tagIds.size()) {
Brush = QBrush(TagItems [tagIds [0]].color);
}
for (int i = 0; i < COLUMN_COUNT; i++) {
item[i]->setForeground(Brush);
}
#endif
// No of Files. // No of Files.
{ {
std::ostringstream out; std::ostringstream out;
@ -1053,7 +1369,7 @@ void MessagesDialog::insertMessages()
if (bInsert) { if (bInsert) {
/* add to the list */ /* add to the list */
QList<QStandardItem *> itemList; QList<QStandardItem *> itemList;
for (i = 0; i < COLUMN_COUNT; i++) { for (int i = 0; i < COLUMN_COUNT; i++) {
itemList.append(item[i]); itemList.append(item[i]);
} }
MessagesModel->appendRow(itemList); MessagesModel->appendRow(itemList);
@ -1072,6 +1388,11 @@ void MessagesDialog::insertMessages()
#endif #endif
ui.messagestreeView->showColumn(COLUMN_FROM); ui.messagestreeView->showColumn(COLUMN_FROM);
ui.messagestreeView->showColumn(COLUMN_DATE); ui.messagestreeView->showColumn(COLUMN_DATE);
#ifdef STATIC_MSGID
ui.messagestreeView->showColumn(COLUMN_TAGS);
#else
ui.messagestreeView->hideColumn(COLUMN_TAGS);
#endif
ui.messagestreeView->hideColumn(COLUMN_SRCID); ui.messagestreeView->hideColumn(COLUMN_SRCID);
ui.messagestreeView->hideColumn(COLUMN_MSGID); ui.messagestreeView->hideColumn(COLUMN_MSGID);
ui.messagestreeView->hideColumn(COLUMN_CONTENT); ui.messagestreeView->hideColumn(COLUMN_CONTENT);
@ -1182,10 +1503,11 @@ void MessagesDialog::setMsgAsReadUnread(const QList<int> &Rows, bool bRead)
} }
} }
#ifdef STATIC_MSGID
void MessagesDialog::markAsRead() void MessagesDialog::markAsRead()
{ {
QList<int> RowsUnread; QList<int> RowsUnread;
getSelectedMsgCount (NULL, &RowsUnread); getSelectedMsgCount (NULL, NULL, &RowsUnread);
setMsgAsReadUnread (RowsUnread, true); setMsgAsReadUnread (RowsUnread, true);
updateMessageSummaryList(); updateMessageSummaryList();
@ -1194,11 +1516,12 @@ void MessagesDialog::markAsRead()
void MessagesDialog::markAsUnread() void MessagesDialog::markAsUnread()
{ {
QList<int> RowsRead; QList<int> RowsRead;
getSelectedMsgCount (&RowsRead, NULL); getSelectedMsgCount (NULL, &RowsRead, NULL);
setMsgAsReadUnread (RowsRead, false); setMsgAsReadUnread (RowsRead, false);
updateMessageSummaryList(); updateMessageSummaryList();
} }
#endif
void MessagesDialog::insertMsgTxtAndFiles(QModelIndex Index, bool bSetToRead) void MessagesDialog::insertMsgTxtAndFiles(QModelIndex Index, bool bSetToRead)
{ {
@ -1238,7 +1561,7 @@ void MessagesDialog::insertMsgTxtAndFiles(QModelIndex Index, bool bSetToRead)
mid = item->text().toStdString(); mid = item->text().toStdString();
} }
int nCount = getSelectedMsgCount (NULL, NULL); int nCount = getSelectedMsgCount (NULL, NULL, NULL);
if (nCount == 1) { if (nCount == 1) {
ui.actionSave_as->setEnabled(true); ui.actionSave_as->setEnabled(true);
ui.actionPrintPreview->setEnabled(true); ui.actionPrintPreview->setEnabled(true);
@ -1445,6 +1768,11 @@ void MessagesDialog::removemessage()
m_pConfig->beginGroup(CONFIG_SECTION_UNREAD); m_pConfig->beginGroup(CONFIG_SECTION_UNREAD);
m_pConfig->remove (mid); m_pConfig->remove (mid);
m_pConfig->endGroup(); m_pConfig->endGroup();
// remove tag
m_pConfig->beginGroup(CONFIG_SECTION_TAG);
m_pConfig->remove (mid);
m_pConfig->endGroup();
} }
insertMessages(); insertMessages();
@ -1559,116 +1887,43 @@ void MessagesDialog::setCurrentFileName(const QString &fileName)
setWindowModified(false); setWindowModified(false);
} }
void MessagesDialog::setToolbarButtonStyle(Qt::ToolButtonStyle style)
{
ui.newmessageButton->setToolButtonStyle(style);
ui.removemessageButton->setToolButtonStyle(style);
ui.replymessageButton->setToolButtonStyle(style);
ui.replyallmessageButton->setToolButtonStyle(style);
ui.forwardmessageButton->setToolButtonStyle(style);
ui.tagButton->setToolButtonStyle(style);
ui.printbutton->setToolButtonStyle(style);
ui.viewtoolButton->setToolButtonStyle(style);
}
void MessagesDialog::buttonsicononly() void MessagesDialog::buttonsicononly()
{ {
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly); setToolbarButtonStyle(Qt::ToolButtonIconOnly);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
Settings->beginGroup(QString("MessageDialog")); Settings->setValueToGroup("MessageDialog", "ToolButon_Stlye", Qt::ToolButtonIconOnly);
Settings->setValue("ToolButon_Stlye1",ui.newmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye2",ui.removemessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye3",ui.replymessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye4",ui.replyallmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye5",ui.forwardmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye6",ui.printbutton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye7",ui.viewtoolButton->toolButtonStyle());
Settings->endGroup();
} }
void MessagesDialog::buttonstextbesideicon() void MessagesDialog::buttonstextbesideicon()
{ {
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); setToolbarButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
Settings->beginGroup(QString("MessageDialog")); Settings->setValueToGroup("MessageDialog", "ToolButon_Stlye", Qt::ToolButtonTextBesideIcon);
Settings->setValue("ToolButon_Stlye1",ui.newmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye2",ui.removemessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye3",ui.replymessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye4",ui.replyallmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye5",ui.forwardmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye6",ui.printbutton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye7",ui.viewtoolButton->toolButtonStyle());
Settings->endGroup();
} }
void MessagesDialog::buttonstextundericon() void MessagesDialog::buttonstextundericon()
{ {
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); setToolbarButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
Settings->beginGroup("MessageDialog"); Settings->setValueToGroup("MessageDialog", "ToolButon_Stlye", Qt::ToolButtonTextUnderIcon);
Settings->setValue("ToolButon_Stlye1",ui.newmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye2",ui.removemessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye3",ui.replymessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye4",ui.replyallmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye5",ui.forwardmessageButton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye6",ui.printbutton->toolButtonStyle());
Settings->setValue("ToolButon_Stlye7",ui.viewtoolButton->toolButtonStyle());
Settings->endGroup();
} }
void MessagesDialog::loadToolButtonsettings() void MessagesDialog::loadToolButtonsettings()
{ {
Settings->beginGroup("MessageDialog"); Qt::ToolButtonStyle style = (Qt::ToolButtonStyle) Settings->valueFromGroup("MessageDialog", "ToolButon_Stlye", Qt::ToolButtonIconOnly).toInt();
setToolbarButtonStyle(style);
if(Settings->value("ToolButon_Stlye1","0").toInt() == 0)
{
qDebug() << "ToolButon IconOnly";
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonIconOnly);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
}
else if (Settings->value("ToolButon_Stlye1","2").toInt() ==2)
{
qDebug() << "ToolButon TextBesideIcon";
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
}
else if(Settings->value("ToolButon_Stlye1","3").toInt() ==3)
{
qDebug() << "ToolButton TextUnderIcon";
ui.newmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.removemessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.replymessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.replyallmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.forwardmessageButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.printbutton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
ui.viewtoolButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
}
Settings->endGroup();
} }
void MessagesDialog::filterRegExpChanged() void MessagesDialog::filterRegExpChanged()
@ -1834,3 +2089,126 @@ void MessagesDialog::clearFilter()
ui.filterPatternLineEdit->clear(); ui.filterPatternLineEdit->clear();
ui.filterPatternLineEdit->setFocus(); ui.filterPatternLineEdit->setFocus();
} }
#ifdef STATIC_MSGID
void MessagesDialog::tagAboutToShow()
{
// activate actions from the first selected row
QList<int> tagIds;
QList<int> Rows;
getSelectedMsgCount (&Rows, NULL, NULL);
if (Rows.size()) {
QStandardItem* pItem = MessagesModel->item(Rows [0], COLUMN_MSGID);
QString msgId = pItem->text();
getMessageTags(m_pConfig, msgId, tagIds);
}
QMenu *pMenu = ui.tagButton->menu();
foreach(QObject *pObject, pMenu->children()) {
QAction *pAction = qobject_cast<QAction*> (pObject);
if (pAction == NULL) {
continue;
}
const QMap<QString, QVariant> &Values = pAction->data().toMap();
if (Values.size () != ACTION_TAGSINDEX_SIZE) {
continue;
}
if (Values [ACTION_TAGSINDEX_TYPE] != ACTION_TAGS_TAG) {
continue;
}
QList<int>::iterator tagId = qFind(tagIds.begin(), tagIds.end(), Values [ACTION_TAGSINDEX_ID]);
pAction->setChecked(tagId != tagIds.end());
}
}
void MessagesDialog::tagTriggered(QAction *pAction)
{
if (pAction == NULL) {
return;
}
const QMap<QString, QVariant> &Values = pAction->data().toMap();
if (Values.size () != ACTION_TAGSINDEX_SIZE) {
return;
}
bool bRemoveAll = false;
int nId = 0;
bool bSet = false;
if (Values [ACTION_TAGSINDEX_TYPE] == ACTION_TAGS_REMOVEALL) {
// remove all tags
bRemoveAll = true;
} else if (Values [ACTION_TAGSINDEX_TYPE] == ACTION_TAGS_NEWTAG) {
// new tag
std::map<int, TagItem> TagItems;
getTagItems(TagItems);
NewTag Tag(TagItems);
if (Tag.exec() == QDialog::Accepted && Tag.m_nId) {
// Tag.m_nId
setTagItems (TagItems);
nId = Tag.m_nId;
bSet = true;
} else {
return;
}
} else if (Values [ACTION_TAGSINDEX_TYPE].toInt() == ACTION_TAGS_TAG) {
nId = Values [ACTION_TAGSINDEX_ID].toInt();
if (nId == 0) {
return;
}
bSet = pAction->isChecked();
} else {
return;
}
QList<int> Rows;
getSelectedMsgCount (&Rows, NULL, NULL);
for (int nRow = 0; nRow < Rows.size(); nRow++) {
QStandardItem* pItem = MessagesModel->item(Rows [nRow], COLUMN_MSGID);
QString msgId = pItem->text();
if (bRemoveAll) {
// remove all
m_pConfig->beginGroup(CONFIG_SECTION_TAG);
m_pConfig->remove (msgId);
m_pConfig->endGroup();
insertMessages();
} else {
// set or unset tag
QList<int> tagIds;
getMessageTags(m_pConfig, msgId, tagIds);
QList<int>::iterator tagId = qFind(tagIds.begin(), tagIds.end(), pAction->data().toInt());
bool bSaveAndRefresh = false;
if (bSet) {
if (tagId == tagIds.end()) {
// not found
tagIds.push_back(nId);
bSaveAndRefresh = true;
}
} else {
if (tagId != tagIds.end()) {
// found
tagIds.erase(tagId);
bSaveAndRefresh = true;
}
}
if (bSaveAndRefresh) {
setMessageTags(m_pConfig, msgId, tagIds);
insertMessages();
}
}
}
}
#endif

24
retroshare-gui/src/gui/MessagesDialog.h
View file

@ -33,8 +33,13 @@
#include "mainpage.h" #include "mainpage.h"
#include "ui_MessagesDialog.h" #include "ui_MessagesDialog.h"
#include "settings/NewTag.h"
class RSettings; class RSettings;
// Thunder: need a static msgId
//#define STATIC_MSGID
class MessagesDialog : public MainPage class MessagesDialog : public MainPage
{ {
Q_OBJECT Q_OBJECT
@ -45,6 +50,11 @@ public:
/** Default Destructor */ /** Default Destructor */
~MessagesDialog(); ~MessagesDialog();
#ifdef STATIC_MSGID
void getTagItems(std::map<int, TagItem> &Items);
void setTagItems(std::map<int, TagItem> &Items);
#endif
// replaced by shortcut // replaced by shortcut
// virtual void keyPressEvent(QKeyEvent *) ; // virtual void keyPressEvent(QKeyEvent *) ;
void updateMessageSummaryList(); void updateMessageSummaryList();
@ -78,9 +88,11 @@ private slots:
bool fileSaveAs(); bool fileSaveAs();
void removemessage(); void removemessage();
#ifdef STATIC_MSGID
void markAsRead(); void markAsRead();
void markAsUnread(); void markAsUnread();
#endif
void anchorClicked (const QUrl &); void anchorClicked (const QUrl &);
@ -100,6 +112,10 @@ private slots:
void filterColumnChanged(); void filterColumnChanged();
void clearFilter(); void clearFilter();
#ifdef STATIC_MSGID
void tagTriggered(QAction *pAction);
void tagAboutToShow();
#endif
private: private:
class QStandardItemModel *MessagesModel; class QStandardItemModel *MessagesModel;
@ -112,7 +128,7 @@ private:
void setCurrentFileName(const QString &fileName); void setCurrentFileName(const QString &fileName);
int getSelectedMsgCount (QList<int> *pRowsRead, QList<int> *pRowsUnread); int getSelectedMsgCount (QList<int> *pRows, QList<int> *pRowsRead, QList<int> *pRowsUnread);
bool isMessageRead(int nRow); bool isMessageRead(int nRow);
/* internal handle splitter */ /* internal handle splitter */
@ -120,6 +136,10 @@ private:
void processSettings(bool bLoad); void processSettings(bool bLoad);
void setToolbarButtonStyle(Qt::ToolButtonStyle style);
#ifdef STATIC_MSGID
void createTagMenu();
#endif
bool m_bProcessSettings; bool m_bProcessSettings;
std::string mCurrCertId; std::string mCurrCertId;

46
retroshare-gui/src/gui/MessagesDialog.ui
View file

@ -733,7 +733,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="6"> <item row="0" column="7">
<widget class="QToolButton" name="removemessageButton"> <widget class="QToolButton" name="removemessageButton">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
@ -777,7 +777,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="7"> <item row="0" column="8">
<widget class="QToolButton" name="printbutton"> <widget class="QToolButton" name="printbutton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -821,7 +821,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="8"> <item row="0" column="9">
<widget class="QToolButton" name="viewtoolButton"> <widget class="QToolButton" name="viewtoolButton">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed"> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@ -850,7 +850,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="9"> <item row="0" column="10">
<spacer name="horizontalSpacer"> <spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -863,7 +863,7 @@ p, li { white-space: pre-wrap; }
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="10"> <item row="0" column="11">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing"> <property name="spacing">
<number>1</number> <number>1</number>
@ -920,10 +920,10 @@ border-image: url(:/images/closepressed.png)
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="11"> <item row="0" column="12">
<widget class="QComboBox" name="filterColumnComboBox"> <widget class="QComboBox" name="filterColumnComboBox">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<item> <item>
<property name="text"> <property name="text">
@ -950,6 +950,34 @@ border-image: url(:/images/closepressed.png)
<string>Content</string> <string>Content</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>Tags</string>
</property>
</item>
</widget>
</item>
<item row="0" column="6">
<widget class="QToolButton" name="tagButton">
<property name="text">
<string>Tag</string>
</property>
<property name="icon">
<iconset resource="images.qrc">
<normaloff>:/images/tag24.png</normaloff>:/images/tag24.png</iconset>
</property>
<property name="iconSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::MenuButtonPopup</enum>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -1557,8 +1585,8 @@ p, li { white-space: pre-wrap; }
<slot>setVisible(bool)</slot> <slot>setVisible(bool)</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>150</x> <x>184</x>
<y>321</y> <y>348</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>399</x> <x>399</x>

1
retroshare-gui/src/gui/images.qrc
View file

@ -355,6 +355,7 @@
<file>images/sort_incr.png</file> <file>images/sort_incr.png</file>
<file>images/sort_decrease.png</file> <file>images/sort_decrease.png</file>
<file>images/sound.png</file> <file>images/sound.png</file>
<file>images/tag24.png</file>
<file>images/transferupdown.png</file> <file>images/transferupdown.png</file>
<file>images/tools_wizard.png</file> <file>images/tools_wizard.png</file>
<file>images/typing.png</file> <file>images/typing.png</file>

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

127
retroshare-gui/src/gui/settings/MessagePage.cpp
View file

@ -21,14 +21,25 @@
#include "MessagePage.h" #include "MessagePage.h"
#include "rshare.h" #include "rshare.h"
#include "rsharesettings.h" #include "rsharesettings.h"
#include "../MainWindow.h"
#include "../MessagesDialog.h"
MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags) MessagePage::MessagePage(QWidget * parent, Qt::WFlags flags)
: ConfigPage(parent, flags) : ConfigPage(parent, flags)
{ {
ui.setupUi(this); ui.setupUi(this);
setAttribute(Qt::WA_QuitOnClose, false); setAttribute(Qt::WA_QuitOnClose, false);
connect (ui.addpushButton, SIGNAL(clicked(bool)), this, SLOT (addTag()));
connect (ui.editpushButton, SIGNAL(clicked(bool)), this, SLOT (editTag()));
connect (ui.deletepushButton, SIGNAL(clicked(bool)), this, SLOT (deleteTag()));
connect (ui.tags_listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(currentRowChangedTag(int)));
ui.editpushButton->setEnabled(false);
ui.deletepushButton->setEnabled(false);
} }
MessagePage::~MessagePage() MessagePage::~MessagePage()
@ -47,6 +58,13 @@ MessagePage::save(QString &errmsg)
{ {
Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked()); Settings->setMsgSetToReadOnActivate(ui.setMsgToReadOnActivate->isChecked());
#ifdef STATIC_MSGID
MessagesDialog *pPage = (MessagesDialog*) MainWindow::getPage (MainWindow::Messages);
if (pPage) {
pPage->setTagItems (m_TagItems);
}
#endif
return true; return true;
} }
@ -55,5 +73,112 @@ void
MessagePage::load() MessagePage::load()
{ {
ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate()); ui.setMsgToReadOnActivate->setChecked(Settings->getMsgSetToReadOnActivate());
#ifdef STATIC_MSGID
MessagesDialog *pPage = (MessagesDialog*) MainWindow::getPage (MainWindow::Messages);
if (pPage) {
pPage->getTagItems (m_TagItems);
// fill items
std::map<int, TagItem>::iterator Item;
for (Item = m_TagItems.begin(); Item != m_TagItems.end(); Item++) {
if (Item->second._delete) {
continue;
}
QListWidgetItem *pItemWidget = new QListWidgetItem(Item->second.text, ui.tags_listWidget);
pItemWidget->setTextColor(QColor(Item->second.color));
pItemWidget->setData(Qt::UserRole, Item->first);
}
if (m_TagItems.size()) {
ui.tags_listWidget->setCurrentItem(ui.tags_listWidget->item(0));
}
} else {
ui.tags_listWidget->setEnabled(false);
ui.addpushButton->setEnabled(false);
ui.editpushButton->setEnabled(false);
ui.deletepushButton->setEnabled(false);
}
#else
ui.tags_listWidget->setEnabled(false);
ui.addpushButton->setEnabled(false);
ui.editpushButton->setEnabled(false);
ui.deletepushButton->setEnabled(false);
#endif
} }
void MessagePage::addTag()
{
NewTag Tag(m_TagItems);
if (Tag.exec() == QDialog::Accepted && Tag.m_nId) {
TagItem &Item = m_TagItems [Tag.m_nId];
QListWidgetItem *pItemWidget = new QListWidgetItem(Item.text, ui.tags_listWidget);
pItemWidget->setTextColor(QColor(Item.color));
pItemWidget->setData(Qt::UserRole, Tag.m_nId);
}
}
void MessagePage::editTag()
{
QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem();
if (pItemWidget == NULL) {
return;
}
int nId = pItemWidget->data(Qt::UserRole).toInt();
if (nId == 0) {
return;
}
NewTag Tag(m_TagItems, nId);
if (Tag.exec() == QDialog::Accepted && Tag.m_nId) {
TagItem &Item = m_TagItems [Tag.m_nId];
pItemWidget->setText(Item.text);
pItemWidget->setTextColor(QColor(Item.color));
}
}
void MessagePage::deleteTag()
{
QListWidgetItem *pItemWidget = ui.tags_listWidget->currentItem();
if (pItemWidget == NULL) {
return;
}
int nId = pItemWidget->data(Qt::UserRole).toInt();
if (nId == 0) {
return;
}
if (nId < 0) {
return;
}
TagItem &Item = m_TagItems [nId];
Item._delete = true;
ui.tags_listWidget->removeItemWidget(pItemWidget);
delete (pItemWidget);
}
void MessagePage::currentRowChangedTag(int row)
{
QListWidgetItem *pItemWidget = ui.tags_listWidget->item(row);
bool bEditEnable = false;
bool bDeleteEnable = false;
if (pItemWidget) {
bEditEnable = true;
int nId = pItemWidget->data(Qt::UserRole).toInt();
if (nId > 0) {
bDeleteEnable = true;
}
}
ui.editpushButton->setEnabled(bEditEnable);
ui.deletepushButton->setEnabled(bDeleteEnable);
}

24
retroshare-gui/src/gui/settings/MessagePage.h
View file

@ -27,22 +27,34 @@
#include "configpage.h" #include "configpage.h"
#include "ui_MessagePage.h" #include "ui_MessagePage.h"
#include "NewTag.h"
class MessagePage : public ConfigPage class MessagePage : public ConfigPage
{ {
public: Q_OBJECT
MessagePage(QWidget * parent = 0, Qt::WFlags flags = 0);
~MessagePage(); public:
MessagePage(QWidget * parent = 0, Qt::WFlags flags = 0);
~MessagePage();
/** Saves the changes on this page */ /** Saves the changes on this page */
bool save(QString &errmsg); bool save(QString &errmsg);
/** Loads the settings for this page */ /** Loads the settings for this page */
void load(); void load();
private: private slots:
void addTag();
void editTag();
void deleteTag();
void closeEvent (QCloseEvent * event); void currentRowChangedTag(int row);
Ui::MessagePage ui; private:
void closeEvent (QCloseEvent * event);
std::map<int, TagItem> m_TagItems;
Ui::MessagePage ui;
}; };
#endif // !MESSAGEPAGE_H #endif // !MESSAGEPAGE_H

97
retroshare-gui/src/gui/settings/MessagePage.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>556</width> <width>423</width>
<height>389</height> <height>340</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -499,28 +499,77 @@
<property name="contextMenuPolicy"> <property name="contextMenuPolicy">
<enum>Qt::NoContextMenu</enum> <enum>Qt::NoContextMenu</enum>
</property> </property>
<widget class="QGroupBox" name="groupBox"> <layout class="QGridLayout" name="gridLayout_3">
<property name="geometry"> <item row="0" column="0">
<rect> <widget class="QGroupBox" name="groupBox">
<x>10</x> <property name="title">
<y>10</y> <string>Misc</string>
<width>395</width> </property>
<height>61</height> <layout class="QGridLayout" name="gridLayout_2">
</rect> <item row="0" column="0">
</property> <widget class="QCheckBox" name="setMsgToReadOnActivate">
<property name="title"> <property name="text">
<string>Misc</string> <string>Set message to read on activate</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> </widget>
<item row="0" column="0"> </item>
<widget class="QCheckBox" name="setMsgToReadOnActivate"> </layout>
<property name="text"> </widget>
<string>Set message to read on activate</string> </item>
</property> <item row="1" column="0">
</widget> <widget class="QGroupBox" name="groupBox_2">
</item> <property name="title">
</layout> <string>Tags</string>
</widget> </property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Tags can be used to categorize and prioritize your messages</string>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="4">
<widget class="QListWidget" name="tags_listWidget"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="addpushButton">
<property name="text">
<string>Add</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QPushButton" name="editpushButton">
<property name="text">
<string>Edit</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="deletepushButton">
<property name="text">
<string>Delete</string>
</property>
</widget>
</item>
<item row="4" column="1">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>38</width>
<height>116</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget> </widget>
<resources/> <resources/>
<connections/> <connections/>