Merge pull request #158 from NekoSilverFox/MengJianing

Meng jianing
nekosilverfox · Mar 13, 2024 · d8373eb · d8373eb
2 parents a159824 + c634d34
commit d8373eb
Show file tree

Hide file tree

Showing 6 changed files with 1,222 additions and 166 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,7 +32,7 @@ ui_*.h
 *.jsc
 Makefile*
 *build-*
-*.qm
+# *.qm
 *.prl
 
 # Qt unit tests

diff --git a/App/chatboxwidget.ui b/App/chatboxwidget.ui
@@ -385,10 +385,17 @@
               </property>
              </spacer>
             </item>
+            <item>
+             <widget class="QLabel" name="lbTrNumOnlineUser">
+              <property name="text">
+               <string>Number of online user: </string>
+              </property>
+             </widget>
+            </item>
             <item>
              <widget class="QLabel" name="lbNumberOnlineUse">
               <property name="text">
-               <string>Number of online user: 0</string>
+               <string>0</string>
               </property>
              </widget>
             </item>
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ ui_*.h @@
     *.jsc
     Makefile*
     *build-*
-    *.qm
+    # *.qm
     *.prl
     # Qt unit tests
@@ Expand Down @@