Skip to content

Commit 5f821df

Browse files
committed
🔖 Version 1.1 Release
1 parent 987ce0d commit 5f821df

6 files changed

Lines changed: 24 additions & 15 deletions

File tree

src/display/imessagebox.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ IMessageBox::IMessageBox(const QString &userName, const QString &avatar,
1313
: QWidget(parent), avatarLabel(new QLabel(this)),
1414
userLabel(new QLabel(userName, this)),
1515
messageBrowser(new IAutoResizeTextBrowser(this)), spinner(nullptr),
16-
messageCache() {
16+
m_message() {
1717
setupUI();
1818
setAvatar(avatar);
1919
setAnimation();
@@ -94,7 +94,7 @@ void IMessageBox::setMarkdown(const QString &markdown) {
9494

9595
void IMessageBox::finish() {
9696
// Finalizing the message display
97-
messageBrowser->setMarkdown(messageCache);
97+
messageBrowser->setMarkdown(m_message);
9898
}
9999

100100
void IMessageBox::appendMessage(const QString &message) {
@@ -107,8 +107,8 @@ void IMessageBox::appendMessage(const QString &message) {
107107
spinner->parentWidget()->close();
108108

109109
// Caching and displaying the message
110-
messageCache += message;
111-
messageBrowser->setMarkdown(messageCache);
110+
m_message += message;
111+
messageBrowser->setMarkdown(m_message);
112112
QString html = messageBrowser->toHtml();
113113

114114
// Adding a custom image to the HTML content

src/display/imessagebox.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ class IMessageBox : public QWidget {
1313
public:
1414
explicit IMessageBox(const QString& userName, const QString& avatar, const QString& message, QWidget* parent = nullptr);
1515

16+
QString message() {return m_message;}
17+
1618
protected:
1719
void resizeEvent(QResizeEvent *event) override;
1820

@@ -32,7 +34,7 @@ public slots:
3234
IAutoResizeTextBrowser* messageBrowser;
3335
WaitingSpinnerWidget* spinner;
3436

35-
QString messageCache;
37+
QString m_message;
3638
};
3739

3840
#endif // IMESSAGEBOX_H

src/objects/signalhub.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ class SignalHub : public QObject {
1616

1717
signals:
1818
void generateRequest(const QJsonObject &);
19+
void messageSent(const QString &);
20+
1921
void listRequest();
2022
void listReceived(const QList<QString>);
2123
void on_message_sent(const QString &, bool isNewChat);

src/pages/ichatspage.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ void IChatsPage::setupConnections() {
5454
&SignalHub::onNewChatButtonClicked);
5555
connect(m_userButton, &QPushButton::clicked, &SignalHub::instance(),
5656
&SignalHub::onUserButtonClicked);
57-
connect(m_langButton, &QPushButton::clicked, this,
58-
[this](){m_langButton->setText(m_langButton->text() == "cn" ? "en" : "cn");});
57+
connect(m_langButton, &QPushButton::clicked, this, [this]() {
58+
m_langButton->setText(m_langButton->text() == "cn" ? "en" : "cn");
59+
});
5960
}
6061

6162
void IChatsPage::setupTopArea() {
@@ -133,8 +134,12 @@ void IChatsPage::sendMessage(const QString &text, bool isNewChat) {
133134
chat->addMessage("", "llama3");
134135

135136
QJsonObject json;
136-
json["prompt"] = QString(m_langButton->text() == "cn" ? "请用中文回答\n" : "Please answer in english.\n") + text;
137+
json["prompt"] =
138+
QString(m_langButton->text() == "cn" ? "请用中文回答\n"
139+
: "Please answer in english.\n") +
140+
text;
137141
json["model"] = "llama3";
142+
emit SignalHub::instance().messageSent(text);
138143
emit SignalHub::instance().generateRequest(json);
139144
}
140145

src/pages/isidearea.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
ISideArea::ISideArea(QWidget *parent) : IWidget(parent) {
1010

11-
setMaximumSize(QSize(200, 16777215));
11+
setMaximumSize(QSize(170, 16777215));
1212
setObjectName("leftWindow");
1313

1414
QVBoxLayout *mainLayout = new QVBoxLayout(this);
@@ -62,13 +62,13 @@ void ISideArea::setupButtons(QVBoxLayout *layout) {
6262
m_modelButton =
6363
createOverlayButton(this, "newChatButton", buttonFont, QSize(0, 34));
6464
layout->addWidget(m_modelButton);
65-
m_modelButton->setText(tr("Message llama3"));
65+
m_modelButton->setText(tr("Llama3"));
6666

6767
m_exploreButton = createButton(this, "exploreButton", "://icon/grid.svg",
6868
QSize(0, 34), false);
6969
m_exploreButton->setFont(buttonFont);
7070
layout->addWidget(m_exploreButton);
71-
m_exploreButton->setText(tr("Explore GPTs"));
71+
m_exploreButton->setText(tr("Explore"));
7272
}
7373

7474
void ISideArea::setupHistoryList(QVBoxLayout *layout) {
@@ -93,7 +93,7 @@ void ISideArea::setupSettingButton(QVBoxLayout *layout) {
9393
m_settingButton->setFont(buttonFont);
9494
m_settingButton->setIconSize(QSize(20, 20));
9595
layout->addWidget(m_settingButton);
96-
m_settingButton->setText(tr("User Settings"));
96+
m_settingButton->setText(tr("Settings"));
9797
}
9898

9999
QWidget *ISideArea::createButtonContainer(QWidget *parent,

src/pages/mainwindow.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ void MainWindow::setupConnections() {
8484
m_pages->setCurrentWidget(m_welcome);
8585
});
8686

87-
connect(&SignalHub::instance(), &SignalHub::newChatAdded, this,
88-
[this](IChatScrollArea *chat) {
89-
m_left->historyList()->addItem("test");});
87+
connect(&SignalHub::instance(), &SignalHub::messageSent, this,
88+
[this](const QString & chat) {
89+
m_left->historyList()->addItem(chat);});
9090
connect(&SignalHub::instance(), &SignalHub::onExpandButtonClicked, this,
9191
[this]() { m_left->setVisible(!m_left->isVisible()); });
9292
connect(&SignalHub::instance(), &SignalHub::onUserButtonClicked, this,

0 commit comments

Comments
 (0)