Skip to content

Commit

Permalink
修改了子模块的链接地址,并更换了江城黑体作为主要使用字体
Browse files Browse the repository at this point in the history
  • Loading branch information
SunnySlopes committed Feb 14, 2023
1 parent dabf4fa commit 39c1280
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "cubiomes"]
path = cubiomes
url = https://github.com/Cubitect/cubiomes.git
url = https://github.com/SunnySlopes/cubiomes.git
Binary file removed rc/fonts/AlibabaPuHuiTi-2-105-Heavy.ttf
Binary file not shown.
Binary file removed rc/fonts/AlibabaPuHuiTi-2-55-Regular.ttf
Binary file not shown.
Binary file added rc/fonts/jiangchengheiti-400W.ttf
Binary file not shown.
Binary file added rc/fonts/jiangchengheiti-700W.ttf
Binary file not shown.
4 changes: 2 additions & 2 deletions rc/style.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@
<file>dark/window_undock_pressed.png</file>
<file>dark/[email protected]</file>
<file>dark.qss</file>
<file>fonts/AlibabaPuHuiTi-2-55-Regular.ttf</file>
<file>fonts/AlibabaPuHuiTi-2-105-Heavy.ttf</file>
<file>fonts/jiangchengheiti-400W.ttf</file>
<file>fonts/jiangchengheiti-700W.ttf</file>
<file>fonts/JetBrainsMonoNL-Regular.ttf</file>
</qresource>
</RCC>
2 changes: 1 addition & 1 deletion src/aboutdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<item row="0" column="2" rowspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Cubiomes-Viewer 汉化版 _VERSION_&lt;/span&gt;&lt;/p&gt;&lt;p&gt;发布日期: _DATE_&lt;/p&gt;&lt;p&gt;原项目地址: &lt;a href=&quot;https://github.com/Cubitect/cubiomes-viewer&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/Cubitect/cubiomes-viewer&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;许可证: &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.en.html&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;GPLv3&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;汉化版项目地址: &lt;a href=&quot;https://github.com/SunnySlopes/cubiomes-viewer&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/SunnySlopes/cubiomes-viewer&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;参考和法律信息&lt;/span&gt;&lt;/p&gt;&lt;p&gt;— MC群系结构生成: &lt;a href=&quot;https://github.com/Cubitect/cubiomes/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;cubiomes&lt;/span&gt;&lt;/a&gt;, 遵照&lt;a href=&quot;https://mit-license.org/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;MIT&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 跨平台GUI工具: Qt _QT_MAJOR_._QT_MINOR_, 遵照&lt;a href=&quot;https://www.qt.io/licensing/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;(L)GPLv3&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 暗色系设计来源于 &lt;a href=&quot;https://github.com/ColinDuquesnoy/QDarkStyleSheet&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;QDarkStyleSheet&lt;/span&gt;&lt;/a&gt;, 遵照&lt;a href=&quot;https://mit-license.org/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;MIT&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 字体使用: &lt;a href=&quot; https://done.alibabadesign.com/puhuiti2.0&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;阿里巴巴普惠体&lt;/span&gt;&lt;/a&gt;、&lt;a href=&quot; https://www.jetbrains.com/lp/mono/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;JetBrains Mono&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;— 群系颜色与结构图标来自于 &lt;a href=&quot;https://github.com/toolbox4minecraft/amidst&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;Amidst&lt;/span&gt;&lt;/a&gt;, 遵照GPLv3许可证进行分发&lt;/p&gt;&lt;p&gt;— &lt;a href=&quot;https://www.lua.org/license.html&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;Lua _LUA_VERS_&lt;/span&gt;&lt;/a&gt; 遵照MIT许可证进行分发&lt;br/&gt;&lt;/p&gt;&lt;p&gt;未经MOJANG许可且与其无关&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:16pt; font-weight:600;&quot;&gt;Cubiomes-Viewer 汉化版 _VERSION_&lt;/span&gt;&lt;/p&gt;&lt;p&gt;发布日期: _DATE_&lt;/p&gt;&lt;p&gt;原项目地址: &lt;a href=&quot;https://github.com/Cubitect/cubiomes-viewer&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/Cubitect/cubiomes-viewer&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;许可证: &lt;a href=&quot;https://www.gnu.org/licenses/gpl-3.0.en.html&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;GPLv3&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;汉化版项目地址: &lt;a href=&quot;https://github.com/SunnySlopes/cubiomes-viewer&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;https://github.com/SunnySlopes/cubiomes-viewer&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;参考和法律信息&lt;/span&gt;&lt;/p&gt;&lt;p&gt;— MC群系结构生成: &lt;a href=&quot;https://github.com/Cubitect/cubiomes/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;cubiomes&lt;/span&gt;&lt;/a&gt;, 遵照&lt;a href=&quot;https://mit-license.org/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;MIT&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 跨平台GUI工具: Qt _QT_MAJOR_._QT_MINOR_, 遵照&lt;a href=&quot;https://www.qt.io/licensing/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;(L)GPLv3&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 暗色系设计来源于 &lt;a href=&quot;https://github.com/ColinDuquesnoy/QDarkStyleSheet&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;QDarkStyleSheet&lt;/span&gt;&lt;/a&gt;, 遵照&lt;a href=&quot;https://mit-license.org/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;MIT&lt;/span&gt;&lt;/a&gt;许可证进行分发&lt;/p&gt;&lt;p&gt;— 字体使用: &lt;a href=&quot; https://www.maoken.com/freefonts/5275.html&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;江城黑体&lt;/span&gt;&lt;/a&gt;、&lt;a href=&quot; https://www.jetbrains.com/lp/mono/&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;JetBrains Mono&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;— 群系颜色与结构图标来自于 &lt;a href=&quot;https://github.com/toolbox4minecraft/amidst&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;Amidst&lt;/span&gt;&lt;/a&gt;, 遵照GPLv3许可证进行分发&lt;/p&gt;&lt;p&gt;— &lt;a href=&quot;https://www.lua.org/license.html&quot;&gt;&lt;span style=&quot; font-family:'Sans Serif'; text-decoration: underline; color:#0057ae;&quot;&gt;Lua _LUA_VERS_&lt;/span&gt;&lt;/a&gt; 遵照MIT许可证进行分发&lt;br/&gt;&lt;/p&gt;&lt;p&gt;未经MOJANG许可且与其无关&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QCoreApplication::setApplicationName("cubiomes-viewer");

int fontid = QFontDatabase::addApplicationFont(":/fonts/AlibabaPuHuiTi-2-55-Regular.ttf");
int fontid = QFontDatabase::addApplicationFont(":/fonts/jiangchengheiti-400W.ttf");
if (fontid >= 0)
{
QFontDatabase::addApplicationFont(":/fonts/AlibabaPuHuiTi-2-105-Heavy.ttf");
QFontDatabase::addApplicationFont(":/fonts/jiangchengheiti-700W.ttf");
int fontid_mono = QFontDatabase::addApplicationFont(":/fonts/JetBrainsMonoNL-Regular.ttf");

static QFont font_default = QFontDatabase::applicationFontFamilies(fontid).at(0);
Expand Down

0 comments on commit 39c1280

Please sign in to comment.