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

factored some duplicate code in MessagesDialog.cpp

Browse source
This commit is contained in:
csoler 2019-03-21 22:39:32 +01:00
parent dc24bb6f03
commit b4ab766da9
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,12 +173,12 @@ MessagesDialog::MessagesDialog(QWidget *parent)
msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.5); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_DATE, fm.width("01/01/1970")*1.5);
msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.1); msgwheader->resizeSection (RsMessageModel::COLUMN_THREAD_READ, fm.width('0')*1.1);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_STAR, QHeaderView::Interactive);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_ATTACHMENT, QHeaderView::Interactive);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_SUBJECT, QHeaderView::Interactive);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_AUTHOR, QHeaderView::Interactive);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_DATE, QHeaderView::Interactive);
QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Fixed); QHeaderView_setSectionResizeModeColumn(msgwheader, RsMessageModel::COLUMN_THREAD_READ, QHeaderView::Interactive);
ui.forwardmessageButton->setToolTip(tr("Forward selected Message")); ui.forwardmessageButton->setToolTip(tr("Forward selected Message"));
ui.replyallmessageButton->setToolTip(tr("Reply to All")); ui.replyallmessageButton->setToolTip(tr("Reply to All"));
@ -196,7 +196,6 @@ MessagesDialog::MessagesDialog(QWidget *parent)
// Set initial size of the splitter // Set initial size of the splitter
ui.listSplitter->setStretchFactor(0, 0); ui.listSplitter->setStretchFactor(0, 0);
ui.listSplitter->setStretchFactor(1, 1); ui.listSplitter->setStretchFactor(1, 1);
/* add filter actions */ /* add filter actions */
ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject")); ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), RsMessageModel::COLUMN_THREAD_SUBJECT, tr("Search Subject"));
@ -280,10 +279,7 @@ void MessagesDialog::preModelUpdate()
// save current selection // save current selection
mTmpSavedSelectedIds.clear(); mTmpSavedSelectedIds.clear();
QModelIndexList qmil = ui.messageTreeWidget->selectionModel()->selectedRows(); getSelectedMessages(mTmpSavedSelectedIds);
foreach(const QModelIndex& m, qmil)
mTmpSavedSelectedIds.push_back(m.sibling(m.row(),RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString()) ;
std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl; std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl;
} }
@ -298,7 +294,6 @@ void MessagesDialog::postModelUpdate()
foreach(const QString& s,mTmpSavedSelectedIds) foreach(const QString& s,mTmpSavedSelectedIds)
{ {
QModelIndex i = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(s.toStdString())); QModelIndex i = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(s.toStdString()));
sel.select(i.sibling(i.row(),0),i.sibling(i.row(),RsMessageModel::COLUMN_THREAD_NB_COLUMNS-1)); sel.select(i.sibling(i.row(),0),i.sibling(i.row(),RsMessageModel::COLUMN_THREAD_NB_COLUMNS-1));
} }

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

@ -454,7 +454,7 @@
<enum>Qt::NoFocus</enum> <enum>Qt::NoFocus</enum>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="icons.qrc"> <iconset resource="images.qrc">
<normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset> <normaloff>:/icons/help_64.png</normaloff>:/icons/help_64.png</iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
@ -745,6 +745,9 @@
<property name="expandsOnDoubleClick"> <property name="expandsOnDoubleClick">
<bool>false</bool> <bool>false</bool>
</property> </property>
<attribute name="headerCascadingSectionResizes">
<bool>true</bool>
</attribute>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<layout class="QGridLayout" name="msgLayout"/> <layout class="QGridLayout" name="msgLayout"/>
@ -850,8 +853,8 @@
<tabstop>listWidget</tabstop> <tabstop>listWidget</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="icons.qrc"/>
<include location="images.qrc"/> <include location="images.qrc"/>
<include location="icons.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>