localizate patch
This commit is contained in:
parent
c1307aca0d
commit
365e3a0bd2
@ -1,6 +1,7 @@
|
|||||||
DEBUG = True
|
DEBUG = True
|
||||||
BASE_URL = "https://api.yobble.org"
|
BASE_URL = "https://api.yobble.org"
|
||||||
APP_NAME = "yobble messenger"
|
|
||||||
APP_VERSION = "0.1_login_screen_windows"
|
APP_VERSION = "0.1_login_screen_windows"
|
||||||
|
APP_NAME = "yobble messenger"
|
||||||
APP_HEADER = f"{APP_NAME}"
|
APP_HEADER = f"{APP_NAME}"
|
||||||
|
if DEBUG: APP_HEADER=f"{APP_HEADER} ({APP_VERSION})"
|
||||||
UPDATE_URL = "https://ТУТ_БУДЕТ_САЙТ/releases/yobble_messenger/windows"
|
UPDATE_URL = "https://ТУТ_БУДЕТ_САЙТ/releases/yobble_messenger/windows"
|
||||||
|
|||||||
BIN
app/icons/logo1.png
Normal file
BIN
app/icons/logo1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.3 MiB |
BIN
app/icons/logo2.png
Normal file
BIN
app/icons/logo2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 MiB |
BIN
app/icons/logo3.jpg
Normal file
BIN
app/icons/logo3.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 83 KiB |
BIN
app/icons/logo3.png
Normal file
BIN
app/icons/logo3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 174 KiB |
@ -10,11 +10,12 @@ from common_lib.utils.validators import (
|
|||||||
)
|
)
|
||||||
from app.core.localizer import localizer
|
from app.core.localizer import localizer
|
||||||
from app.core.theme import theme_manager
|
from app.core.theme import theme_manager
|
||||||
|
import app.core.config as config
|
||||||
|
|
||||||
def validate_username(username, is_login=False):
|
def validate_username(username, is_login=False):
|
||||||
if is_login:
|
if is_login:
|
||||||
if len(username) < 3 or len(username) > 32:
|
if len(username) < 3 or len(username) > 32:
|
||||||
msg = localizer.translate("Неверный логин или пароль (валидатор)")
|
msg = localizer.translate("Неверный логин или пароль")
|
||||||
return False, msg
|
return False, msg
|
||||||
return True, username
|
return True, username
|
||||||
|
|
||||||
@ -31,7 +32,7 @@ def validate_invite_code(invite_code):
|
|||||||
def validate_password(password, is_login=False):
|
def validate_password(password, is_login=False):
|
||||||
if is_login:
|
if is_login:
|
||||||
if len(password) < 8 or len(password) > 128:
|
if len(password) < 8 or len(password) > 128:
|
||||||
msg = localizer.translate("Неверный логин или пароль (валидатор)")
|
msg = localizer.translate("Неверный логин или пароль")
|
||||||
return False, msg
|
return False, msg
|
||||||
return True, password
|
return True, password
|
||||||
|
|
||||||
@ -54,7 +55,7 @@ class LoginView(QWidget):
|
|||||||
self.on_login = on_login
|
self.on_login = on_login
|
||||||
self.is_dark_theme = theme_manager.is_dark()
|
self.is_dark_theme = theme_manager.is_dark()
|
||||||
print("self.is_dark_theme", self.is_dark_theme)
|
print("self.is_dark_theme", self.is_dark_theme)
|
||||||
self.setWindowTitle("yobble messenger")
|
self.setWindowTitle(config.APP_HEADER)
|
||||||
self.setFixedSize(400, 550)
|
self.setFixedSize(400, 550)
|
||||||
|
|
||||||
self.lang_combo = None
|
self.lang_combo = None
|
||||||
@ -222,7 +223,7 @@ class LoginView(QWidget):
|
|||||||
QMessageBox.warning(self, localizer.translate("Ошибка"), error_msg)
|
QMessageBox.warning(self, localizer.translate("Ошибка"), error_msg)
|
||||||
return
|
return
|
||||||
|
|
||||||
if login == "root" and password == "123":
|
if login == "root" and password == "12341234":
|
||||||
self.on_login(login)
|
self.on_login(login)
|
||||||
else:
|
else:
|
||||||
QMessageBox.warning(self, localizer.translate("Ошибка"), localizer.translate("Неверный логин или пароль"))
|
QMessageBox.warning(self, localizer.translate("Ошибка"), localizer.translate("Неверный логин или пароль"))
|
||||||
@ -340,10 +341,10 @@ class LoginView(QWidget):
|
|||||||
self.title.setText(localizer.translate("Регистрация"))
|
self.title.setText(localizer.translate("Регистрация"))
|
||||||
self.register_button.setText(localizer.translate("Зарегистрироваться"))
|
self.register_button.setText(localizer.translate("Зарегистрироваться"))
|
||||||
self.login_switch.setText(localizer.translate("Уже есть аккаунт? Войти"))
|
self.login_switch.setText(localizer.translate("Уже есть аккаунт? Войти"))
|
||||||
self.reg_login_input.set_label(localizer.translate("Логин"))
|
self.reg_login_input.input.setPlaceholderText(localizer.translate("Логин"))
|
||||||
self.reg_password_input.set_label(localizer.translate("Пароль"))
|
self.reg_password_input.input.setPlaceholderText(localizer.translate("Пароль"))
|
||||||
self.confirm_password_input.set_label(localizer.translate("Повторите пароль"))
|
self.confirm_password_input.input.setPlaceholderText(localizer.translate("Повторите пароль"))
|
||||||
self.invite_code_input.set_label(localizer.translate("Инвайт-код"))
|
self.invite_code_input.input.setPlaceholderText(localizer.translate("Инвайт-код"))
|
||||||
else:
|
else:
|
||||||
self.title.setText(localizer.translate("Авторизация"))
|
self.title.setText(localizer.translate("Авторизация"))
|
||||||
self.login_button.setText(localizer.translate("Войти"))
|
self.login_button.setText(localizer.translate("Войти"))
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
from PySide6.QtWidgets import QWidget, QLineEdit, QLabel, QHBoxLayout, QVBoxLayout
|
from PySide6.QtWidgets import QWidget, QLineEdit, QLabel, QHBoxLayout, QVBoxLayout, QSizePolicy
|
||||||
from PySide6.QtCore import Qt, Signal
|
from PySide6.QtCore import Qt, Signal
|
||||||
|
|
||||||
|
|
||||||
@ -32,8 +32,13 @@ class ValidationInput(QWidget):
|
|||||||
input_layout.addWidget(self.input)
|
input_layout.addWidget(self.input)
|
||||||
# input_layout.addWidget(self.status_label)
|
# input_layout.addWidget(self.status_label)
|
||||||
|
|
||||||
|
# self.error_label = QLabel()
|
||||||
|
# self.error_label.setStyleSheet("color: red;")
|
||||||
|
# self.error_label.hide()
|
||||||
self.error_label = QLabel()
|
self.error_label = QLabel()
|
||||||
self.error_label.setStyleSheet("color: red;")
|
self.error_label.setWordWrap(True)
|
||||||
|
self.error_label.setStyleSheet("color: red; font-size: 12px;")
|
||||||
|
self.error_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
|
||||||
self.error_label.hide()
|
self.error_label.hide()
|
||||||
|
|
||||||
self.main_layout.addLayout(input_layout)
|
self.main_layout.addLayout(input_layout)
|
||||||
|
|||||||
14
main.py
14
main.py
@ -1,12 +1,26 @@
|
|||||||
from PySide6.QtWidgets import QApplication
|
from PySide6.QtWidgets import QApplication
|
||||||
|
from PySide6.QtGui import QIcon
|
||||||
from app.controllers.main_controller import MainController
|
from app.controllers.main_controller import MainController
|
||||||
import sys
|
import sys
|
||||||
|
import ctypes
|
||||||
|
|
||||||
|
def is_admin():
|
||||||
|
"""Проверяет, запущена ли программа с правами администратора"""
|
||||||
|
try:
|
||||||
|
return ctypes.windll.shell32.IsUserAnAdmin()
|
||||||
|
except:
|
||||||
|
return False
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
app = QApplication(sys.argv)
|
app = QApplication(sys.argv)
|
||||||
|
app.setWindowIcon(QIcon("app/icons/logo3.png"))
|
||||||
controller = MainController()
|
controller = MainController()
|
||||||
controller.show_login()
|
controller.show_login()
|
||||||
sys.exit(app.exec())
|
sys.exit(app.exec())
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
if not is_admin():
|
||||||
|
# Попытка перезапуска с правами администратора
|
||||||
|
ctypes.windll.shell32.ShellExecuteW(None, "runas", sys.executable, " ".join(sys.argv), None, 1)
|
||||||
|
sys.exit()
|
||||||
main()
|
main()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user