diff --git a/CMakeLists.txt b/CMakeLists.txt index d145f47..4a1251b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,12 +110,12 @@ SET(PROJECT_SOURCES ${src} ) # 设置消息策略为qFatal来禁用qDebug信息 -LIST(APPEND CMAKE_CXX_FLAGS "-DQT_NO_DEBUG_OUTPUT") +#LIST(APPEND CMAKE_CXX_FLAGS "-DQT_NO_DEBUG_OUTPUT") #资源文件 QT6_ADD_RESOURCES(RCFILES res.qrc) #WIN32 -add_executable(${PROJECT_NAME} WIN32 ${PROJECT_SOURCES} ${RCFILES} xsteam.rc) +add_executable(${PROJECT_NAME} ${PROJECT_SOURCES} ${RCFILES} xsteam.rc) #安全编译 #关闭RPATH特性 diff --git a/main.cpp b/main.cpp index 3fca25f..15d8b4f 100644 --- a/main.cpp +++ b/main.cpp @@ -7,11 +7,6 @@ int main(int argc, char *argv[]) { QApplication a(argc, argv); - /* - QTranslator qtTranslator; - qtTranslator.load(":/res/translator//qt_zh_CN.qm"); - a.installTranslator(&qtTranslator); - */ QTranslator qtBaseTranslator; if (!qtBaseTranslator.load(QStringLiteral(":/res/translator/qtbase_zh_CN.qm"))) { @@ -19,7 +14,7 @@ int main(int argc, char *argv[]) qDebug() << "Failed to load translation file."; return -1; } - a.installTranslator(&qtBaseTranslator); + a.installTranslator(&qtBaseTranslator); sui x; x.show(); return a.exec(); diff --git a/res.qrc b/res.qrc index 9845f03..1c9f73a 100644 --- a/res.qrc +++ b/res.qrc @@ -15,6 +15,5 @@ res/qss/light_style.qss res/txt/about.txt - res/font/HarmonyOS_Sans_SC_Black.ttf diff --git a/res/font/HarmonyOS_Sans_SC_Black.ttf b/res/font/HarmonyOS_Sans_SC_Black.ttf deleted file mode 100644 index 824b3d4..0000000 Binary files a/res/font/HarmonyOS_Sans_SC_Black.ttf and /dev/null differ diff --git a/src/sui_title.cpp b/src/sui_title.cpp index c6c0c42..390c3ea 100644 --- a/src/sui_title.cpp +++ b/src/sui_title.cpp @@ -58,10 +58,12 @@ sui_title::sui_title(QWidget *parent) m_layout->setSpacing(5); m_layout->setContentsMargins(0, 0, 0, 0); setFixedHeight(40); - setLayout(m_layout); - QDir *fontDir = new QDir(tr(":/res/font/")); - font_table = fontDir->entryList(QDir::Files); - font_table.append(QFontDatabase::applicationFontFamilies(QFontDatabase::SimplifiedChinese)); + setLayout(m_layout); + QFontDatabase database; + foreach(const QString & family, database.families(QFontDatabase::SimplifiedChinese)) + { + font_table.append(family); + } QDir *styleDir = new QDir(tr(":/res/qss/")); style_table = styleDir->entryList(QDir::Files); slots_set_style_change(); @@ -127,20 +129,19 @@ void sui_title::slots_set_style_change() } void sui_title::slots_set_font_change() { - if(sender()!=nullptr){ + if(sender()!=nullptr){ _data.x_config.font=sender()->objectName().toInt(); - } - QString font=tr(":/res/font/")+font_table[_data.x_config.font]; - int fontId = QFontDatabase::addApplicationFont(font); - QStringList fontIDs = QFontDatabase::applicationFontFamilies(fontId); - if (!fontIDs.isEmpty()) { - QFont font(fontIDs.first()); + } + QFont font; + if(!font_table[_data.x_config.font].isEmpty()){ + font.setFamily(font_table[_data.x_config.font]); font.setPointSize(10); + font.setBold(true); QApplication::setFont(font); - } - else { + }else { qDebug()<<"Failed to load font."; } + change_style(_data.x_config.style); } void sui_title::change_style(int index){