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

fixed small bug in box initialization

Browse source
This commit is contained in:
csoler 2019-03-12 16:59:45 +01:00
parent a67a35624d
commit 14d29a4490
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
4 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -142,7 +142,7 @@ MessagesDialog::MessagesDialog(QWidget *parent)
mMessageProxyModel->setSortRole(RsMessageModel::SortRole); mMessageProxyModel->setSortRole(RsMessageModel::SortRole);
ui.messageTreeWidget->setModel(mMessageProxyModel); ui.messageTreeWidget->setModel(mMessageProxyModel);
changeBox(RsMessageModel::BOX_INBOX); changeBox(0); // set to inbox
mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole); mMessageProxyModel->setFilterRole(RsMessageModel::FilterRole);
//mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ; //mMessageProxyModel->setFilterRegExp(QRegExp(QString(RsMessageModel::FilterString))) ;
@ -782,14 +782,9 @@ void MessagesDialog::changeBox(int box_row)
inChange = true; inChange = true;
// ui.messageTreeWidget->clear();
ui.quickViewWidget->setCurrentItem(NULL); ui.quickViewWidget->setCurrentItem(NULL);
listMode = LIST_BOX; listMode = LIST_BOX;
// insertMessages();
// insertMsgTxtAndFiles(ui.messageTreeWidget->currentItem());
switch(box_row) switch(box_row)
{ {
case 0: mMessageModel->setCurrentBox(RsMessageModel::BOX_INBOX ); break; case 0: mMessageModel->setCurrentBox(RsMessageModel::BOX_INBOX ); break;

6
retroshare-gui/src/gui/gxs/GxsIdTreeWidgetItem.h
View file

@ -146,11 +146,6 @@ public:
QIcon icon ; QIcon icon ;
if(id.isNull())
{
str = tr("[Retroshare]");
icon = QIcon();
}
if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages) if(rsPeers->isFriend(RsPeerId(id))) // horrible trick because some widgets still use locations as IDs (e.g. messages)
{ {
str = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ; str = QString::fromUtf8(rsPeers->getPeerName(RsPeerId(id)).c_str()) ;
@ -186,7 +181,6 @@ public:
mLoading = true; mLoading = true;
++mReloadPeriod; ++mReloadPeriod;
std::cerr << "Re-loading" << std::endl;
QTimer::singleShot(1000,this,SLOT(reload())); QTimer::singleShot(1000,this,SLOT(reload()));
} }

11
retroshare-gui/src/gui/msgs/MessageModel.cpp
View file

@ -48,10 +48,10 @@ const QString RsMessageModel::FilterString("filtered");
RsMessageModel::RsMessageModel(QObject *parent) RsMessageModel::RsMessageModel(QObject *parent)
: QAbstractItemModel(parent) : QAbstractItemModel(parent)
{ {
mFilteringEnabled=false;
mCurrentBox = BOX_NONE; mCurrentBox = BOX_NONE;
mQuickViewFilter = QUICK_VIEW_ALL; mQuickViewFilter = QUICK_VIEW_ALL;
mFilterType = FILTER_TYPE_NONE; mFilterType = FILTER_TYPE_NONE;
mFilterStrings.clear();
} }
void RsMessageModel::preMods() void RsMessageModel::preMods()
@ -63,15 +63,6 @@ void RsMessageModel::postMods()
emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mMessages.size()-1,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL)); emit dataChanged(createIndex(0,0,(void*)NULL), createIndex(mMessages.size()-1,COLUMN_THREAD_NB_COLUMNS-1,(void*)NULL));
} }
// void RsGxsForumModel::setSortMode(SortMode mode)
// {
// preMods();
//
// mSortMode = mode;
//
// postMods();
// }
int RsMessageModel::rowCount(const QModelIndex& parent) const int RsMessageModel::rowCount(const QModelIndex& parent) const
{ {
if(!parent.isValid()) if(!parent.isValid())

1
retroshare-gui/src/gui/msgs/MessageModel.h
View file

@ -181,7 +181,6 @@ private:
QuickViewFilter mQuickViewFilter ; QuickViewFilter mQuickViewFilter ;
QStringList mFilterStrings; QStringList mFilterStrings;
FilterType mFilterType; FilterType mFilterType;
bool mFilteringEnabled;
std::vector<Rs::Msgs::MsgInfoSummary> mMessages; std::vector<Rs::Msgs::MsgInfoSummary> mMessages;
}; };