小修小补

codiaclientgui/utils.py

@@ -17,7 +17,8 @@ Color = {
     'white': QColor(255, 255, 255),
     'disabled': QColor(120, 120, 120),
     'purple': QColor(128, 0, 128),
-    'darkblue': QColor(10, 40, 120)
+    'darkblue': QColor(10, 40, 120),
+    'black': QColor(0, 0, 0)
 }
 
 Palette = {}
@@ -27,7 +28,8 @@ Palette[QPalette.Text] = {
     "red": QPalette(),
     "gray": QPalette(),
     'purple': QPalette(),
-    'darkblue': QPalette()
+    'darkblue': QPalette(),
+    'black': QPalette()
 }
 
 Palette[QPalette.Window] = {
@@ -90,6 +92,13 @@ Palette[QPalette.Text]['darkblue'].setBrush(QPalette.Inactive, QPalette.Text, da
 darkblueBrush.setColor(Color['disabled'])
 Palette[QPalette.Text]['darkblue'].setBrush(QPalette.Disabled, QPalette.Text, darkblueBrush)
 
+blackBrush = QBrush(Color['black'])
+blackBrush.setStyle(Qt.SolidPattern)
+Palette[QPalette.Text]['black'].setBrush(QPalette.Active, QPalette.Text, blackBrush)
+Palette[QPalette.Text]['black'].setBrush(QPalette.Inactive, QPalette.Text, blackBrush)
+blackBrush.setColor(Color['disabled'])
+Palette[QPalette.Text]['black'].setBrush(QPalette.Disabled, QPalette.Text, blackBrush)
+
 
 class MyObject(QLabel):
     defaultColor = Color['white']

loginWindow.py

@@ -34,7 +34,7 @@ class Ui_windowLogin(object):
         self.checkBox.setObjectName("checkBox")
         self.label = QtWidgets.QLabel(self.frameLogin)
         self.label.setGeometry(QtCore.QRect(50, 70, 160, 30))
-        self.label.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label.setIndent(10)
         self.label.setObjectName("label")
         self.lineEditLoginUsername = QtWidgets.QLineEdit(self.frameLogin)
@@ -45,7 +45,7 @@ class Ui_windowLogin(object):
         self.lineEditLoginUsername.setObjectName("lineEditLoginUsername")
         self.label_2 = QtWidgets.QLabel(self.frameLogin)
         self.label_2.setGeometry(QtCore.QRect(50, 110, 160, 30))
-        self.label_2.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_2.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_2.setIndent(10)
         self.label_2.setObjectName("label_2")
         self.lineEditLoginPassword = QtWidgets.QLineEdit(self.frameLogin)
@@ -96,17 +96,17 @@ class Ui_windowLogin(object):
         self.lineEditRegisterCheckPassword.setObjectName("lineEditRegisterCheckPassword")
         self.label_3 = QtWidgets.QLabel(self.frameRegister)
         self.label_3.setGeometry(QtCore.QRect(50, 70, 160, 30))
-        self.label_3.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_3.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_3.setIndent(10)
         self.label_3.setObjectName("label_3")
         self.label_4 = QtWidgets.QLabel(self.frameRegister)
         self.label_4.setGeometry(QtCore.QRect(50, 110, 160, 30))
-        self.label_4.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_4.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_4.setIndent(10)
         self.label_4.setObjectName("label_4")
         self.label_5 = QtWidgets.QLabel(self.frameRegister)
         self.label_5.setGeometry(QtCore.QRect(50, 30, 160, 30))
-        self.label_5.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_5.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_5.setIndent(10)
         self.label_5.setObjectName("label_5")
         self.lineEditRegisterUserphone = QtWidgets.QLineEdit(self.frameRegister)
@@ -117,7 +117,7 @@ class Ui_windowLogin(object):
         self.lineEditRegisterUserphone.setObjectName("lineEditRegisterUserphone")
         self.label_6 = QtWidgets.QLabel(self.frameRegister)
         self.label_6.setGeometry(QtCore.QRect(50, 150, 160, 30))
-        self.label_6.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_6.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_6.setIndent(10)
         self.label_6.setObjectName("label_6")
         self.lineEditRegisterUsername = QtWidgets.QLineEdit(self.frameRegister)
@@ -139,12 +139,12 @@ class Ui_windowLogin(object):
         self.pushButtonReset.setObjectName("pushButtonReset")
         self.label_7 = QtWidgets.QLabel(self.frameReset)
         self.label_7.setGeometry(QtCore.QRect(60, 30, 150, 30))
-        self.label_7.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_7.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_7.setIndent(10)
         self.label_7.setObjectName("label_7")
         self.label_8 = QtWidgets.QLabel(self.frameReset)
         self.label_8.setGeometry(QtCore.QRect(60, 150, 150, 30))
-        self.label_8.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_8.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_8.setIndent(10)
         self.label_8.setObjectName("label_8")
         self.lineEditResetCheckNewPassword = QtWidgets.QLineEdit(self.frameReset)
@@ -155,7 +155,7 @@ class Ui_windowLogin(object):
         self.lineEditResetCheckNewPassword.setObjectName("lineEditResetCheckNewPassword")
         self.label_9 = QtWidgets.QLabel(self.frameReset)
         self.label_9.setGeometry(QtCore.QRect(60, 70, 150, 30))
-        self.label_9.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_9.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_9.setIndent(10)
         self.label_9.setObjectName("label_9")
         self.lineEditResetCheckNum = QtWidgets.QLineEdit(self.frameReset)
@@ -174,7 +174,7 @@ class Ui_windowLogin(object):
         self.lineEditResetAccount.setObjectName("lineEditResetAccount")
         self.label_10 = QtWidgets.QLabel(self.frameReset)
         self.label_10.setGeometry(QtCore.QRect(60, 110, 150, 30))
-        self.label_10.setAlignment(QtCore.Qt.AlignRight | QtCore.Qt.AlignTrailing | QtCore.Qt.AlignVCenter)
+        self.label_10.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
         self.label_10.setIndent(10)
         self.label_10.setObjectName("label_10")
         self.lineEditResetNewPassword = QtWidgets.QLineEdit(self.frameReset)
@@ -196,9 +196,6 @@ class Ui_windowLogin(object):
         self.menuBar = QtWidgets.QMenuBar(windowLogin)
         self.menuBar.setGeometry(QtCore.QRect(0, 0, 540, 24))
         self.menuBar.setObjectName("menuBar")
-        self.menu = QtWidgets.QMenu(self.menuBar)
-        self.menu.setGeometry(QtCore.QRect(270, 156, 120, 62))
-        self.menu.setObjectName("menu")
         windowLogin.setMenuBar(self.menuBar)
         self.actions = QtWidgets.QAction(windowLogin)
         self.actions.setObjectName("actions")
@@ -208,8 +205,6 @@ class Ui_windowLogin(object):
         self.actionsd.setObjectName("actionsd")
         self.action_2 = QtWidgets.QAction(windowLogin)
         self.action_2.setObjectName("action_2")
-        self.menu.addAction(self.action_2)
-        self.menuBar.addAction(self.menu.menuAction())
 
         self.retranslateUi(windowLogin)
         QtCore.QMetaObject.connectSlotsByName(windowLogin)
@@ -236,11 +231,8 @@ class Ui_windowLogin(object):
         self.label_10.setText(_translate("windowLogin", "新密码"))
         self.pushButtonResetAcquire.setText(_translate("windowLogin", "发送验证码"))
         self.pushButtonResetReturn.setText(_translate("windowLogin", "返回"))
-        self.menu.setTitle(_translate("windowLogin", "帮助"))
         self.actions.setText(_translate("windowLogin", "s"))
         self.action.setText(_translate("windowLogin", "关于"))
         self.actionsd.setText(_translate("windowLogin", "登陆"))
         self.action_2.setText(_translate("windowLogin", "关于"))
-
-
 from codiaclientgui.utils import NewProgressBar, NewPushButton

loginWindow.ui

@@ -573,21 +573,6 @@
      <height>24</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menu">
-    <property name="geometry">
-     <rect>
-      <x>270</x>
-      <y>156</y>
-      <width>120</width>
-      <height>62</height>
-     </rect>
-    </property>
-    <property name="title">
-     <string>帮助</string>
-    </property>
-    <addaction name="action_2"/>
-   </widget>
-   <addaction name="menu"/>
   </widget>
   <action name="actions">
    <property name="text">

mainFunctions.py

@@ -362,6 +362,10 @@ def BeginMain(callback=None):
     uiMain.listWidgetExercise.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
     uiMain.listWidgetData.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
     uiMain.listWidgetPack.setVerticalScrollMode(QAbstractItemView.ScrollPerPixel)
+    uiMain.listWidgetPack.setPalette(Palette[QPalette.Text]['black'])
+    uiMain.listWidgetExercise.setPalette(Palette[QPalette.Text]['black'])
+    uiMain.listWidgetPackHistory.setPalette(Palette[QPalette.Text]['black'])
+    uiMain.listWidgetData.setPalette(Palette[QPalette.Text]['black'])
 
     for i in range(0, variables["packPerPage"]):
         AddItemToPackList(uiMain.listWidgetPack)