Browse Source

V0.7.1
1、修改了字体的加载方式,不再加载到qrc中

Apple 2 tháng trước cách đây
mục cha
commit
0b2bdd8929

+ 1 - 1
TransmitterSwitch/Resource/QSS/black/transmitterswitch.qss

@@ -2,7 +2,7 @@
 
 QWidget
 {
-    font-family: 思源黑体M;
+    font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
     color: #B1B3B4;

+ 1 - 1
TransmitterSwitch/Resource/QSS/white/transmitterswitch.qss

@@ -2,7 +2,7 @@
 
 QWidget
 {
-    font-family: 思源黑体M;
+    font-family: 思源黑体R;
     font-weight: 400;
     font-size: 14px;
     color: #1D2129;

+ 2 - 2
TransmitterSwitch/Resource/TransSwitch.qrc

@@ -34,9 +34,9 @@
         <file>ICON/DownArrow_Dark.png</file>
     </qresource>
     <qresource prefix="/Font">
-        <file>font/SiYuanBlack_ttf/SiYuanBlack_Bold.ttf</file>
+        <!-- <file>font/SiYuanBlack_ttf/SiYuanBlack_Bold.ttf</file>
         <file>font/SiYuanBlack_ttf/SiYuanBlack_M.ttf</file>
-        <file>font/SiYuanBlack_ttf/SiYuanBlack_R.ttf</file>
+        <file>font/SiYuanBlack_ttf/SiYuanBlack_R.ttf</file> -->
     </qresource>
 </RCC>
 

+ 7 - 6
show1/main.cpp

@@ -32,9 +32,10 @@ int main(int argc, char *argv[])
 void addFont()
 {
     /* 加载字体 */
-    int id1 = QFontDatabase::addApplicationFont(R"(:/Font/font/SiYuanBlack_ttf/SiYuanBlack_Bold.ttf)");
-    int id2 = QFontDatabase::addApplicationFont(R"(:/Font/font/SiYuanBlack_ttf/SiYuanBlack_M.ttf)");
-    int id3 = QFontDatabase::addApplicationFont(R"(:/Font/font/SiYuanBlack_ttf/SiYuanBlack_R.ttf)");
+    QString fontPath = QApplication::applicationDirPath() + "/font/SiYuanBlack_ttf/";
+    int id1 = QFontDatabase::addApplicationFont(fontPath + "/SiYuanBlack_Bold.ttf)");
+    int id2 = QFontDatabase::addApplicationFont(fontPath + "/SiYuanBlack_M.ttf)");
+    int id3 = QFontDatabase::addApplicationFont(fontPath + "/SiYuanBlack_R.ttf)");
     /***************************************************
      * 字体使用方式
      * id1 ("思源黑体-粗")
@@ -46,9 +47,9 @@ void addFont()
     // SPDLOG_DEBUG("id2 = {}", QFontDatabase::applicationFontFamilies(id2));
     // SPDLOG_DEBUG("id3 = {}", QFontDatabase::applicationFontFamilies(id3));
     QFont font_main;
-    font_main.setFamily("思源黑体M");
-    font_main.setPixelSize(14);
-    QApplication::setFont(font_main);
+    // font_main.setFamily("思源黑体M");
+    // font_main.setPixelSize(14);
+    // QApplication::setFont(font_main);
 }