diff --git a/PolyChatApp/chatboxwidget.ui b/PolyChatApp/chatboxwidget.ui index e6b325f..f693db3 100644 --- a/PolyChatApp/chatboxwidget.ui +++ b/PolyChatApp/chatboxwidget.ui @@ -93,13 +93,8 @@ - 0 + 2 - - - 8 - - 10 @@ -442,7 +437,7 @@ - Return + Shift+Return diff --git a/PolyChatApp/chatlist.ui b/PolyChatApp/chatlist.ui index 18da970..d8293df 100644 --- a/PolyChatApp/chatlist.ui +++ b/PolyChatApp/chatlist.ui @@ -28,17 +28,39 @@ Qt::Horizontal - - QSizePolicy::Expanding - - 20 + 40 20 + + + + + 0 + 0 + + + + + 50 + 50 + + + + + + + :/icon/icons/logo_fox.png + + + true + + + @@ -57,37 +79,14 @@ Qt::Horizontal - - QSizePolicy::Fixed - - 25 + 40 20 - - - - ... - - - - :/icon/icons/plus.png:/icon/icons/plus.png - - - - 20 - 16 - - - - true - - - @@ -129,6 +128,41 @@ + + + + + 0 + 25 + + + + + 16777215 + 25 + + + + + + + + + :/icon/icons/add.png:/icon/icons/add.png + + + + 20 + 25 + + + + Qt::ToolButtonIconOnly + + + true + + + @@ -143,7 +177,7 @@ 0 0 334 - 493 + 470 @@ -155,9 +189,15 @@ + + false + Your info + + false + @@ -172,10 +212,10 @@ - - + + - Name: + NO_NAME @@ -186,24 +226,24 @@ - - + + - name + Name: - - + + - XXXX/XXXXXX + 000.000.0.0 - - + + - 000.000.0.0 + XXXX/XXXXXX diff --git a/PolyChatApp/icons/add.png b/PolyChatApp/icons/add.png new file mode 100644 index 0000000..13572f5 Binary files /dev/null and b/PolyChatApp/icons/add.png differ diff --git a/PolyChatApp/resource.qrc b/PolyChatApp/resource.qrc index 3d8e238..5548edb 100644 --- a/PolyChatApp/resource.qrc +++ b/PolyChatApp/resource.qrc @@ -16,5 +16,6 @@ icons/register-add-friend.png icons/logo_fox.png icons/send-file.png + icons/add.png diff --git a/PolyChatApp/uil_chatboxwidget.cpp b/PolyChatApp/uil_chatboxwidget.cpp index c03df9a..c8466f5 100644 --- a/PolyChatApp/uil_chatboxwidget.cpp +++ b/PolyChatApp/uil_chatboxwidget.cpp @@ -290,7 +290,7 @@ void ChatBoxWidget::receiveUDPMessage() // 追加聊天记录 ui->msgTextBrowser->setTextColor(Qt::red); ui->msgTextBrowser->append(">>> [FILE] " + time); - ui->msgTextBrowser->append(QString("

[Name]: %2 [Size]: %3Kb

").arg(msg_7).arg(QFileInfo(msg_7).fileName()).arg(QFileInfo(msg_7).size())); + ui->msgTextBrowser->append(QString("").arg(msg_7).arg(QFileInfo(msg_7).fileName()).arg(QFileInfo(msg_7).size())); break; case SignalType::UserJoin: diff --git a/PolyChatApp/uil_chatlist.cpp b/PolyChatApp/uil_chatlist.cpp index 178e082..152df77 100644 --- a/PolyChatApp/uil_chatlist.cpp +++ b/PolyChatApp/uil_chatlist.cpp @@ -14,7 +14,7 @@ ChatList::ChatList(QWidget* parent, QString localUserName, QString localUserGrou ui(new Ui::ChatList) { ui->setupUi(this); - this->setWindowTitle("Chat list"); + this->setWindowTitle("PolyChat Chat list"); this->setWindowIcon(QIcon(":/icon/icons/logo_fox.png"));