diff --git a/client/src/client_gui.ui b/client/src/client_gui.ui
index e9e1943..bf5119f 100644
--- a/client/src/client_gui.ui
+++ b/client/src/client_gui.ui
@@ -16,7 +16,13 @@
Messenger
+
+ background-color: rgb(20, 20, 20);
+
+
+
+
@@ -26,6 +32,9 @@
71
+
+ color: rgb(255, 255, 255);
+
Parameters
@@ -38,6 +47,9 @@
16
+
+ color: rgb(255, 255, 255);
+
User name:
@@ -51,6 +63,9 @@
16
+
+ color: rgb(255, 255, 255);
+
Server IP:
@@ -64,6 +79,9 @@
16
+
+ color: rgb(255, 255, 255);
+
Server port:
@@ -77,6 +95,9 @@
16
+
+ color: rgb(255, 255, 255);
+
TestUser
@@ -90,6 +111,9 @@
16
+
+ color: rgb(255, 255, 255);
+
127.0.0.1
@@ -103,6 +127,9 @@
16
+
+ color: rgb(255, 255, 255);
+
65789
@@ -117,6 +144,10 @@
51
+
+ color: rgb(255, 255, 255);
+
+
Add contact
@@ -139,6 +170,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Add
@@ -153,6 +188,10 @@
371
+
+ color: rgb(255, 255, 255);
+
+
Contacts
@@ -165,6 +204,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Delete selected contact
@@ -189,6 +232,10 @@
111
+
+ color: rgb(255, 255, 255);
+
+
Input
@@ -214,6 +261,10 @@
23
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Send
@@ -228,6 +279,10 @@
321
+
+ color: rgb(255, 255, 255);
+
+
Messages
@@ -251,6 +306,10 @@
131
+
+ color: rgb(255, 255, 255);
+
+
Service info
@@ -277,6 +336,10 @@
141
+
+ color: rgb(255, 255, 255);
+
+
Connection
@@ -321,6 +384,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Connect
@@ -369,6 +436,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Disconnect
@@ -384,8 +455,15 @@
21
+
+ color: rgb(255, 255, 255);
+
+
+
+
+ color: rgb(255, 255, 255);
+
-
diff --git a/client/src/client_pyqt.py b/client/src/client_pyqt.py
index 6709ebd..f93635f 100644
--- a/client/src/client_pyqt.py
+++ b/client/src/client_pyqt.py
@@ -2,75 +2,102 @@
# Form implementation generated from reading ui file 'client_gui.ui'
#
-# Created by: PyQt5 UI code generator 5.10.1
+# Created by: PyQt5 UI code generator 5.13.2
#
# WARNING! All changes made in this file will be lost!
+
from PyQt5 import QtCore, QtGui, QtWidgets
+
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.setEnabled(True)
MainWindow.resize(662, 711)
+ MainWindow.setStyleSheet("background-color: rgb(20, 20, 20);")
self.centralwidget = QtWidgets.QWidget(MainWindow)
+ self.centralwidget.setStyleSheet("")
self.centralwidget.setObjectName("centralwidget")
self.groupBox = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox.setGeometry(QtCore.QRect(30, 10, 601, 71))
+ self.groupBox.setStyleSheet("color: rgb(255, 255, 255);")
self.groupBox.setObjectName("groupBox")
self.label_username_key = QtWidgets.QLabel(self.groupBox)
self.label_username_key.setGeometry(QtCore.QRect(20, 20, 61, 16))
+ self.label_username_key.setStyleSheet("color: rgb(255, 255, 255);")
self.label_username_key.setObjectName("label_username_key")
self.label_server_ip_key = QtWidgets.QLabel(self.groupBox)
self.label_server_ip_key.setGeometry(QtCore.QRect(260, 20, 61, 16))
+ self.label_server_ip_key.setStyleSheet("color: rgb(255, 255, 255);")
self.label_server_ip_key.setObjectName("label_server_ip_key")
self.label_server_port_key = QtWidgets.QLabel(self.groupBox)
self.label_server_port_key.setGeometry(QtCore.QRect(520, 20, 61, 16))
+ self.label_server_port_key.setStyleSheet("color: rgb(255, 255, 255);")
self.label_server_port_key.setObjectName("label_server_port_key")
self.label_username_val = QtWidgets.QLabel(self.groupBox)
self.label_username_val.setGeometry(QtCore.QRect(20, 40, 121, 16))
+ self.label_username_val.setStyleSheet("color: rgb(255, 255, 255);")
self.label_username_val.setObjectName("label_username_val")
self.label_server_ip_val = QtWidgets.QLabel(self.groupBox)
self.label_server_ip_val.setGeometry(QtCore.QRect(260, 40, 121, 16))
+ self.label_server_ip_val.setStyleSheet("color: rgb(255, 255, 255);")
self.label_server_ip_val.setObjectName("label_server_ip_val")
self.label_server_port_val = QtWidgets.QLabel(self.groupBox)
self.label_server_port_val.setGeometry(QtCore.QRect(520, 40, 51, 16))
+ self.label_server_port_val.setStyleSheet("color: rgb(255, 255, 255);")
self.label_server_port_val.setObjectName("label_server_port_val")
self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_2.setGeometry(QtCore.QRect(30, 240, 201, 51))
+ self.groupBox_2.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_2.setObjectName("groupBox_2")
self.lineEdit_add_contact = QtWidgets.QLineEdit(self.groupBox_2)
self.lineEdit_add_contact.setGeometry(QtCore.QRect(10, 20, 131, 21))
self.lineEdit_add_contact.setObjectName("lineEdit_add_contact")
self.pushButton_add_contact = QtWidgets.QPushButton(self.groupBox_2)
self.pushButton_add_contact.setGeometry(QtCore.QRect(150, 20, 41, 21))
+ self.pushButton_add_contact.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_add_contact.setObjectName("pushButton_add_contact")
self.groupBox_3 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_3.setGeometry(QtCore.QRect(30, 300, 201, 371))
+ self.groupBox_3.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_3.setObjectName("groupBox_3")
self.pushButton_delete_contact = QtWidgets.QPushButton(self.groupBox_3)
self.pushButton_delete_contact.setGeometry(QtCore.QRect(10, 340, 121, 21))
+ self.pushButton_delete_contact.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_delete_contact.setObjectName("pushButton_delete_contact")
self.listWidget_contacts = QtWidgets.QListWidget(self.groupBox_3)
self.listWidget_contacts.setGeometry(QtCore.QRect(10, 20, 181, 311))
self.listWidget_contacts.setObjectName("listWidget_contacts")
self.groupBox_4 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_4.setGeometry(QtCore.QRect(250, 420, 381, 111))
+ self.groupBox_4.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_4.setObjectName("groupBox_4")
self.textEdit_input = QtWidgets.QTextEdit(self.groupBox_4)
self.textEdit_input.setGeometry(QtCore.QRect(10, 20, 301, 81))
self.textEdit_input.setObjectName("textEdit_input")
self.pushButton_send = QtWidgets.QPushButton(self.groupBox_4)
self.pushButton_send.setGeometry(QtCore.QRect(320, 20, 51, 23))
+ self.pushButton_send.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_send.setObjectName("pushButton_send")
self.groupBox_5 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_5.setGeometry(QtCore.QRect(250, 90, 381, 321))
+ self.groupBox_5.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_5.setObjectName("groupBox_5")
self.textBrowser_messages = QtWidgets.QTextBrowser(self.groupBox_5)
self.textBrowser_messages.setGeometry(QtCore.QRect(10, 20, 361, 291))
self.textBrowser_messages.setObjectName("textBrowser_messages")
self.groupBox_6 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_6.setGeometry(QtCore.QRect(250, 540, 381, 131))
+ self.groupBox_6.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_6.setObjectName("groupBox_6")
self.textBrowser_service_info = QtWidgets.QTextBrowser(self.groupBox_6)
self.textBrowser_service_info.setEnabled(True)
@@ -78,6 +105,8 @@ def setupUi(self, MainWindow):
self.textBrowser_service_info.setObjectName("textBrowser_service_info")
self.groupBox_7 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_7.setGeometry(QtCore.QRect(30, 90, 201, 141))
+ self.groupBox_7.setStyleSheet("color: rgb(255, 255, 255);\n"
+"")
self.groupBox_7.setObjectName("groupBox_7")
self.lineEdit_server_ip = QtWidgets.QLineEdit(self.groupBox_7)
self.lineEdit_server_ip.setGeometry(QtCore.QRect(10, 80, 111, 20))
@@ -87,6 +116,8 @@ def setupUi(self, MainWindow):
self.lineEdit_server_port.setObjectName("lineEdit_server_port")
self.pushButton_connect = QtWidgets.QPushButton(self.groupBox_7)
self.pushButton_connect.setGeometry(QtCore.QRect(130, 80, 61, 21))
+ self.pushButton_connect.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_connect.setObjectName("pushButton_connect")
self.lineEdit_username = QtWidgets.QLineEdit(self.groupBox_7)
self.lineEdit_username.setGeometry(QtCore.QRect(10, 20, 181, 20))
@@ -97,13 +128,17 @@ def setupUi(self, MainWindow):
self.lineEdit_password.setObjectName("lineEdit_password")
self.pushButton_disconnect = QtWidgets.QPushButton(self.groupBox_7)
self.pushButton_disconnect.setGeometry(QtCore.QRect(130, 110, 61, 21))
+ self.pushButton_disconnect.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_disconnect.setObjectName("pushButton_disconnect")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 662, 21))
+ self.menubar.setStyleSheet("color: rgb(255, 255, 255);")
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
+ self.statusbar.setStyleSheet("color: rgb(255, 255, 255);")
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
@@ -140,4 +175,3 @@ def retranslateUi(self, MainWindow):
self.lineEdit_password.setText(_translate("MainWindow", "TestPassword"))
self.lineEdit_password.setPlaceholderText(_translate("MainWindow", "Password"))
self.pushButton_disconnect.setText(_translate("MainWindow", "Disconnect"))
-
diff --git a/server/src/server_gui.ui b/server/src/server_gui.ui
index a4c908d..034c927 100644
--- a/server/src/server_gui.ui
+++ b/server/src/server_gui.ui
@@ -13,6 +13,9 @@
Server
+
+ background-color: rgb(20, 20, 20);
+
@@ -23,6 +26,9 @@
191
+
+ color: rgb(255, 255, 255);
+
Clients
@@ -41,6 +47,10 @@
0
+
+ background-color: rgb(255, 255, 255);
+color: rgb(0, 0, 0);
+
true
@@ -73,6 +83,9 @@
261
+
+ color: rgb(255, 255, 255);
+
Service info
@@ -96,6 +109,9 @@
101
+
+ color: rgb(255, 255, 255);
+
Parameters
@@ -166,6 +182,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Stop server
@@ -179,6 +199,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Start server
@@ -193,6 +217,9 @@
51
+
+ color: rgb(255, 255, 255);
+
Add new client
@@ -231,6 +258,10 @@
21
+
+ background-color: rgb(255, 138, 21);
+border: none;
+
Add client
@@ -246,8 +277,15 @@
21
+
+ color: rgb(255, 255, 255);
+
+
+
+
+ color: rgb(255, 255, 255);
+
-
diff --git a/server/src/server_pyqt.py b/server/src/server_pyqt.py
index 6023182..27b61f3 100644
--- a/server/src/server_pyqt.py
+++ b/server/src/server_pyqt.py
@@ -2,20 +2,24 @@
# Form implementation generated from reading ui file 'server_gui.ui'
#
-# Created by: PyQt5 UI code generator 5.10.1
+# Created by: PyQt5 UI code generator 5.13.2
#
# WARNING! All changes made in this file will be lost!
+
from PyQt5 import QtCore, QtGui, QtWidgets
+
class Ui_MainWindow(object):
def setupUi(self, MainWindow):
MainWindow.setObjectName("MainWindow")
MainWindow.resize(451, 681)
+ MainWindow.setStyleSheet("background-color: rgb(20, 20, 20);")
self.centralwidget = QtWidgets.QWidget(MainWindow)
self.centralwidget.setObjectName("centralwidget")
self.groupBox = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox.setGeometry(QtCore.QRect(30, 120, 391, 191))
+ self.groupBox.setStyleSheet("color: rgb(255, 255, 255);")
self.groupBox.setObjectName("groupBox")
self.tableWidget_clients = QtWidgets.QTableWidget(self.groupBox)
self.tableWidget_clients.setGeometry(QtCore.QRect(10, 20, 371, 161))
@@ -24,6 +28,8 @@ def setupUi(self, MainWindow):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.tableWidget_clients.sizePolicy().hasHeightForWidth())
self.tableWidget_clients.setSizePolicy(sizePolicy)
+ self.tableWidget_clients.setStyleSheet("background-color: rgb(255, 255, 255);\n"
+"color: rgb(0, 0, 0);")
self.tableWidget_clients.setObjectName("tableWidget_clients")
self.tableWidget_clients.setColumnCount(3)
self.tableWidget_clients.setRowCount(0)
@@ -37,12 +43,14 @@ def setupUi(self, MainWindow):
self.tableWidget_clients.verticalHeader().setVisible(False)
self.groupBox_2 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_2.setGeometry(QtCore.QRect(30, 380, 391, 261))
+ self.groupBox_2.setStyleSheet("color: rgb(255, 255, 255);")
self.groupBox_2.setObjectName("groupBox_2")
self.textBrowser_service_info = QtWidgets.QTextBrowser(self.groupBox_2)
self.textBrowser_service_info.setGeometry(QtCore.QRect(10, 20, 371, 231))
self.textBrowser_service_info.setObjectName("textBrowser_service_info")
self.groupBox_3 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_3.setGeometry(QtCore.QRect(30, 10, 391, 101))
+ self.groupBox_3.setStyleSheet("color: rgb(255, 255, 255);")
self.groupBox_3.setObjectName("groupBox_3")
self.label_status_key = QtWidgets.QLabel(self.groupBox_3)
self.label_status_key.setGeometry(QtCore.QRect(270, 30, 61, 16))
@@ -58,12 +66,17 @@ def setupUi(self, MainWindow):
self.lineEdit_port.setObjectName("lineEdit_port")
self.pushButton_stop_server = QtWidgets.QPushButton(self.groupBox_3)
self.pushButton_stop_server.setGeometry(QtCore.QRect(160, 60, 71, 21))
+ self.pushButton_stop_server.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_stop_server.setObjectName("pushButton_stop_server")
self.pushButton_start_server = QtWidgets.QPushButton(self.groupBox_3)
self.pushButton_start_server.setGeometry(QtCore.QRect(160, 30, 71, 21))
+ self.pushButton_start_server.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_start_server.setObjectName("pushButton_start_server")
self.groupBox_4 = QtWidgets.QGroupBox(self.centralwidget)
self.groupBox_4.setGeometry(QtCore.QRect(30, 320, 391, 51))
+ self.groupBox_4.setStyleSheet("color: rgb(255, 255, 255);")
self.groupBox_4.setObjectName("groupBox_4")
self.lineEdit_add_new_client_login = QtWidgets.QLineEdit(self.groupBox_4)
self.lineEdit_add_new_client_login.setGeometry(QtCore.QRect(10, 20, 121, 20))
@@ -73,13 +86,17 @@ def setupUi(self, MainWindow):
self.lineEdit_add_new_client_password.setObjectName("lineEdit_add_new_client_password")
self.pushButton_add_new_client = QtWidgets.QPushButton(self.groupBox_4)
self.pushButton_add_new_client.setGeometry(QtCore.QRect(310, 20, 75, 21))
+ self.pushButton_add_new_client.setStyleSheet("background-color: rgb(255, 138, 21);\n"
+"border: none;")
self.pushButton_add_new_client.setObjectName("pushButton_add_new_client")
MainWindow.setCentralWidget(self.centralwidget)
self.menubar = QtWidgets.QMenuBar(MainWindow)
self.menubar.setGeometry(QtCore.QRect(0, 0, 451, 21))
+ self.menubar.setStyleSheet("color: rgb(255, 255, 255);")
self.menubar.setObjectName("menubar")
MainWindow.setMenuBar(self.menubar)
self.statusbar = QtWidgets.QStatusBar(MainWindow)
+ self.statusbar.setStyleSheet("color: rgb(255, 255, 255);")
self.statusbar.setObjectName("statusbar")
MainWindow.setStatusBar(self.statusbar)
@@ -110,4 +127,3 @@ def retranslateUi(self, MainWindow):
self.lineEdit_add_new_client_login.setPlaceholderText(_translate("MainWindow", "Login"))
self.lineEdit_add_new_client_password.setPlaceholderText(_translate("MainWindow", "Password"))
self.pushButton_add_new_client.setText(_translate("MainWindow", "Add client"))
-