diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp index 7b656f7..c139c03 100644 --- a/src/chatmodel.cpp +++ b/src/chatmodel.cpp @@ -117,27 +117,22 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view) (p.getPartnerAddress() == c.second.getAddress()) ) - { - - // for (auto &p : AddressBook::getInstance()->getAllAddressLabels()) - - - // { - // if ((ui->checkBox->isChecked() == true) && (p.getCid() != c.second.getCid())) - - // { - - // } - + { QStandardItem* Items = new QStandardItem(c.second.toChatLine()); Items->setData("Incoming", Qt::UserRole +1); myModel->appendRow(Items); - qDebug()<text(); - ui->listChat->setModel(myModel); - ui->listChat->setMinimumSize(200,350); - ui->listChat->setItemDelegate(new ListViewDelegate()); - ui->listChat->show(); + + + ui->listChat->setResizeMode(QListView::Adjust); + ui->listChat->setWordWrap(true); + ui->listChat->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); + ui->listChat->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->listChat->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->listChat->setModel(myModel); + ui->listChat->setMinimumSize(200,350); + ui->listChat->setItemDelegate(new ListViewDelegate()); + ui->listChat->show(); } @@ -155,6 +150,12 @@ void ChatModel::renderChatBox(Ui::MainWindow* ui, QListView *view) myModel->appendRow(Items1); qDebug()<text(); } + + ui->listChat->setResizeMode(QListView::Adjust); + ui->listChat->setWordWrap(true); + ui->listChat->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel); + ui->listChat->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + ui->listChat->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); ui->listChat->setModel(myModel); ui->listChat->setMinimumSize(200,350); ui->listChat->setItemDelegate(new ListViewDelegate()); diff --git a/src/chatmodel.h b/src/chatmodel.h index b4caa95..490f336 100644 --- a/src/chatmodel.h +++ b/src/chatmodel.h @@ -13,6 +13,7 @@ #include "settings.h" #include "camount.h" + class ListViewDelegate : public QAbstractItemDelegate { int d_radius; @@ -267,8 +268,8 @@ class ChatItem { QDateTime myDateTime; myDateTime.setTime_t(_timestamp); - QString line = QString("[") + myDateTime.toString("dd.MM.yyyy hh:mm:ss ") + QString("] "); - line += QString(_memo) + QString("\n"); + QString line = QString("[") + myDateTime.toString("d.M.yy hh:mm") + QString("] ") ; + line += QString("") + QString(_memo) + QString("\n\n"); return line; } diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 0c6d66b..56b180b 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -1484,19 +1484,6 @@ true - - - - 340 - 430 - 911 - 31 - - - - Qt::Horizontal - -