Skip to content

Commit 6380f77

Browse files
committed
Enhance logging format for release builds and improve font handling in internal log window
Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
1 parent fd592e7 commit 6380f77

File tree

2 files changed

+21
-0
lines changed

2 files changed

+21
-0
lines changed

lib/qspdlog/qspdlogger.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ class QSpdLogger: public QObject
3232
explicit QSpdLogger(QObject *parent = nullptr);
3333
~QSpdLogger();
3434
static QSpdLogger* self;
35+
#if defined(QT_NO_DEBUG)
36+
QString logPattern = "(%Y-%m-%d %T:%f) [%10t] [%^%10l%$] %v";
37+
#else
3538
QString logPattern = "(%Y-%m-%d %T:%f) [%10t] [%^%10l%$] [%s:%#:%!] %v";
39+
#endif
3640

3741
public:
3842
static QSpdLogger* Instance();

src/internallogwindow/internallogwindow.cpp

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include <QDateTime>
22
#include <QMessageBox>
3+
#include <QFontDatabase>
4+
35
#include "internallogwindow.h"
46
#include "ui_internallogwindow.h"
57
#include "filedialog.h"
@@ -10,6 +12,21 @@ InternalLogWindow::InternalLogWindow(QWidget *parent)
1012
, ui(new Ui::InternalLogWindow)
1113
{
1214
ui->setupUi(this);
15+
16+
QFont font = QApplication::font();
17+
#if defined(Q_OS_WIN) && defined(Q_CC_MSVC)
18+
int fontId = QFontDatabase::addApplicationFont(QApplication::applicationDirPath() + "/inziu-iosevkaCC-SC-regular.ttf");
19+
#else
20+
int fontId = QFontDatabase::addApplicationFont(QStringLiteral(":/font/font/inziu-iosevkaCC-SC-regular.ttf"));
21+
#endif
22+
QStringList fontFamilies = QFontDatabase::applicationFontFamilies(fontId);
23+
if (fontFamilies.size() > 0) {
24+
font.setFamily(fontFamilies[0]);
25+
}
26+
font.setFixedPitch(true);
27+
font.setPointSize(12);
28+
ui->textEdit->setFont(font);
29+
1330
QSpdLogger::Instance()->addQTextEditSink(ui->textEdit, 4096, true, true);
1431
QSpdLogger::Instance()->setQTextEditSinkLogLevel(ui->textEdit, QtDebugMsg);
1532

0 commit comments

Comments
 (0)