Merge pull request #26 from iotang/rescue

Rescue Finished!!
Project-LemonLime · Apr 26, 2020 · 8a7c411 · 8a7c411
2 parents 8e720eb + e9bb89c
commit 8a7c411
Show file tree

Hide file tree

Showing 27 changed files with 1,412 additions and 737 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -20,7 +20,7 @@ jobs:
     strategy:
       # 矩阵配置
       matrix:
-        qt_ver: [5.12.6]
+        qt_ver: [5.12.8]
         qt_target: [desktop]
         # mingw用不了
         # qt_arch: [win64_msvc2017_64, win32_msvc2017, win32_mingw53,win32_mingw73]

diff --git a/Psapi.Lib b/Psapi.Lib
diff --git a/README.md b/README.md
@@ -16,11 +16,12 @@ A tiny judging environment for OI contest based on Lemon + LemonPlus
 |:--:|:--:|:--:|:--:|
 |Windows|7|32, 64|Untitled|
 |Windows|10|64|Untitled|
-|Manjaro|19.0.2|64|KDE-Xorg|
+|Manjaro|20.0|64|KDE-Xorg|
+|Manjaro|20.0|64|i3WM|
 |Arch|2020-3-20|64|KDE-Xorg|
 |Arch|2020-3-20|64|KDE-Wayland|
 |Ubuntu|18.04.4|64|GNOME 3|
-|NOI Linux (Ubuntu) *|14.04|32|GNOME 2|
+|NOI Linux (Ubuntu) \*|14.04|32|GNOME 2|
 |Linux Mint|19.3|64|Cinnamon|
 |Deepin|15.11|64|DDE|
 |Debian|10.3.0|64|LXQt|
@@ -89,6 +90,10 @@ A tiny judging environment for OI contest based on Lemon + LemonPlus
 
 当然如果你装有 Qt 5，也可以下载源码编译。
 
+#### 非常严重的提示
+
+由于未知原因，Windows 的 `Releases` 中的 LemonLime 可能无法检测内存用量。不过，如果下载源码编译的话就不会出现这个问题。
+
 > **提示：**
 > 
 > 在很多地方，下载 Qt 的时间 + 安装 Qt 的时间 + 下载 LemonLime 源代码的时间 + 编译的时间 < 从 Github 上下载可执行文件的时间。
@@ -105,7 +110,8 @@ A tiny judging environment for OI contest based on Lemon + LemonPlus
 |:--:|:--:|:--:|:--:|
 |Arch|2020-3-20|64|KDE-Xorg|
 |Arch|2020-3-20|64|KDE-Wayland|
-|Manjaro|19.0.2|64|KDE-Xorg|
+|Manjaro|20.0|64|KDE-Xorg|
+|Manjaro|20.0|64|i3WM|
 
 ```bash
 ## 迅速安装 ##

diff --git a/detaildialog.cpp b/detaildialog.cpp
@@ -204,7 +204,7 @@ void DetailDialog::refreshViewer(Contest *_contest, Contestant *_contestant)
 					if (minv >= maxv) bgColor = "rgb(192, 255, 192)";
 					else if (minv > 0) bgColor = "rgb(192, 255, 255)";
 
-					htmlCode += QString(R"(<td rowspan="%1" align="center" valign="middle" style="background-color: %2;"><a style="font-weight: bold; font-size: 14px;">%3</a> / %4</td>)").arg(inputFiles[j].size()).arg(bgColor).arg(minv).arg(maxv);
+					htmlCode += QString(R"(<td rowspan="%1" align="center" valign="middle" style="background-color: %2;"><a style="font-weight: bold; font-size: 14pt;">%3</a> / %4</td>)").arg(inputFiles[j].size()).arg(bgColor).arg(minv).arg(maxv);
 				}
 
 				htmlCode += "</tr>";