diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp index 91f0fc525..617588430 100644 --- a/retroshare-gui/src/gui/MessagesDialog.cpp +++ b/retroshare-gui/src/gui/MessagesDialog.cpp @@ -645,8 +645,7 @@ void MessagesDialog::insertMessages() } /* make a widget per friend */ - - //QModelIndex index; + QStandardItem *item0 = new QStandardItem(); QStandardItem *item1 = new QStandardItem(); QStandardItem *item2 = new QStandardItem(); @@ -654,6 +653,13 @@ void MessagesDialog::insertMessages() QStandardItem *item4 = new QStandardItem(); QStandardItem *item5 = new QStandardItem(); + //set this false if you want to expand on double click + item0->setEditable(false); + item1->setEditable(false); + item2->setEditable(false); + item3->setEditable(false); + item4->setEditable(false); + /* So Text should be: * (1) Msg / Broadcast @@ -672,19 +678,16 @@ void MessagesDialog::insertMessages() qtime.setTime_t(it->ts); QString timestamp = qtime.toString("dd.MM.yyyy hh:mm:ss"); item3 -> setText(timestamp); - //index = MessagesModel->index(c, 3); - //MessagesModel->setData(index, timestamp); } // From .... { item2 -> setText(QString::fromStdString(rsPeers->getPeerName(it->srcId))); - //index = MessagesModel->index(c, 2); - //MessagesModel->setData(index, QString::fromStdString(rsPeers->getPeerName(it->srcId))); } // Subject - item1 -> setText(QString::fromStdWString(it->title)); + item1 -> setText(QString::fromStdWString(it->title)); + if ((it -> msgflags & RS_MSG_NEW) == RS_MSG_NEW) { QFont qf = item1->font(); @@ -692,8 +695,6 @@ void MessagesDialog::insertMessages() item1->setFont(qf); } - //index = MessagesModel->index(c, 1); - //MessagesModel->setData(index, QString::fromStdWString(it->title)); // Change Message icon when Subject is Re: or Fwd: QString text = QString::fromStdWString(it->title); diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui index 52919d2ed..6dd591dd2 100644 --- a/retroshare-gui/src/gui/MessagesDialog.ui +++ b/retroshare-gui/src/gui/MessagesDialog.ui @@ -7,7 +7,7 @@ 0 0 675 - 553 + 462 @@ -505,8 +505,8 @@ Qt::DefaultContextMenu - - + + 0 @@ -876,7 +876,7 @@ p, li { white-space: pre-wrap; } - + Qt::Horizontal @@ -963,410 +963,413 @@ p, li { white-space: pre-wrap; } Qt::Vertical - - - - - - - 9 - - - - Qt::CustomContextMenu - - - QAbstractItemView::ExtendedSelection - - - true - - - - - - - 6 - - - 0 - - - 0 - - - 0 - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - - 0 - - - 3 - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - Subject: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 12 - - - - - 9 - - - - - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - From: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 12 - - - - - 9 - - - - - - - true - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - Date: - - - - - - - - 2 - 0 - - - - - 0 - 12 - - - - - 16777215 - 12 - - - - - 9 - - - - - - - - - - - - 0 - 0 - - - - - 60 - 12 - - - - - 16777215 - 10 - - - - - 10 - 75 - true - - - - To: - - - - - - - - 16777215 - 22 - - - - - 9 - - - - - - - - - - - - - 0 - 10 - - - - true - - - - - - - - - 0 - - - 6 - - - - - - - - :/images/attachment.png - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + Qt::Vertical + + + + + 9 + + + + Qt::CustomContextMenu + + + QAbstractItemView::ExtendedSelection + + + true + + + + + + + + 6 + + + 0 + + + 0 + + + 0 + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + + + + + + 0 + + + 3 + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + Subject: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 12 + + + + + 9 + + + + + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + From: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 12 + + + + + 9 + + + + + + + true + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + Date: + + + + + + + + 2 + 0 + + + + + 0 + 12 + + + + + 16777215 + 12 + + + + + 9 + + + + + + + + + + + + 0 + 0 + + + + + 60 + 12 + + + + + 16777215 + 10 + + + + + 10 + 75 + true + + + + To: + + + + + + + + 16777215 + 22 + + + + + 9 + + + + + + + + + + + + + 0 + 10 + + + + true + + + + + + + + + 0 + + + 6 + + + + + + + + :/images/attachment.png + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Recommended Files</span></p></body></html> - - - - - - - - 10 - true - - - - - - - - - - - - - - - :/images/edit_remove24.png:/images/edit_remove24.png - - - - - - - - - Qt::Horizontal - - - - 351 - 20 - - - - - - - - <html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + + + + + + + 10 + true + + + + + + + + + + + + + + + :/images/edit_remove24.png:/images/edit_remove24.png + + + + + + + + + Qt::Horizontal + + + + 351 + 20 + + + + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Arial'; font-size:8pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Download all Recommended Files</p></body></html> - - - - - - - :/images/down.png:/images/down.png - - - - - - + + + + + + + :/images/down.png:/images/down.png + + + + + + +