deskkit 1.2.2__tar.gz → 1.2.4__tar.gz

{deskkit-1.2.2 → deskkit-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deskkit
-Version: 1.2.2
+Version: 1.2.4
 Summary: Конструктор десктоп-приложений на Qt и MySQL с модульной сборкой и экспортом проекта
 Author: DeskKit Team
 License-Expression: MIT

{deskkit-1.2.2 → deskkit-1.2.4}/deskkit/__init__.py

@@ -16,7 +16,7 @@ from deskkit.qt_backend import backend_name, init_qt
 from deskkit.roles import ADMIN, CLIENT, GUEST, MANAGER
 from deskkit.tips import generate_tips
 
-__version__ = "1.2.2"
+__version__ = "1.2.4"
 
 __all__ = [
     "ShopApp",

{deskkit-1.2.2 → deskkit-1.2.4}/deskkit/generator/export.py

@@ -204,9 +204,8 @@ def _patch_ui(source: str, *, rename_main: str | None = None) -> str:
     source = source.replace("self.config.column_labels", "settings.COLUMN_LABELS")
     source = source.replace("self.config.format_rules", "settings.FORMAT_RULES")
     source = source.replace("self.features = config.features", "self.features = settings.FEATURES")
-    source = source.replace("self.config.features.", "self.features.")
+    source = source.replace("self.config.features.", "settings.FEATURES.")
     source = source.replace("self.config.sort_field", "settings.SORT_FIELD")
-    source = source.replace("if self.config.features.", "if settings.FEATURES.")
     source = source.replace("load_pixmap(self.config,", "load_pixmap(")
     source = source.replace("ProductFormDialog(self.config, self.db,", "ProductFormDialog(self.db,")
     source = source.replace("LoginWindow(self.config, self.auth,", "LoginWindow(self.auth,")
@@ -214,7 +213,6 @@ def _patch_ui(source: str, *, rename_main: str | None = None) -> str:
         "save_product_image(\n                    self.config,\n                    self._new_photo_path,\n                    self.product.get(\"photo_url\"),\n                )",
         "save_product_image(self._new_photo_path, self.product.get(\"photo_url\"))",
     )
-    source = source.replace("qt.get_open_filename(", "qt.open_file_dialog(")
 
     if rename_main:
         source = source.replace(

{deskkit-1.2.2 → deskkit-1.2.4}/deskkit/ui/login_window.py

@@ -26,73 +26,118 @@ class LoginWindow(QtWidgets.QDialog):
     ):
         super().__init__()
         self.config = config
+        self.features = config.features
         self.auth = auth
         self.on_success = on_success
 
         self.setWindowTitle(f"{config.title} — Вход")
-        self.setFixedSize(450, 520)
+        self.setFixedSize(420, 480)
         self.setStyleSheet(APP_STYLE)
 
-        layout = QtWidgets.QVBoxLayout(self)
-        layout.setContentsMargins(0, 0, 0, 0)
+        root = QtWidgets.QVBoxLayout(self)
+        root.setContentsMargins(0, 0, 0, 0)
+        root.setSpacing(0)
 
         header = QtWidgets.QFrame()
-        header.setStyleSheet(f"background: {PRIMARY};")
+        header.setObjectName("loginHeader")
+        header.setStyleSheet(
+            f"#loginHeader {{ background-color: {PRIMARY}; border: none; }}"
+        )
         header_layout = QtWidgets.QVBoxLayout(header)
+        header_layout.setContentsMargins(20, 28, 20, 24)
+        header_layout.setSpacing(6)
+
         title = QtWidgets.QLabel(config.title)
         title.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
-        title.setStyleSheet("color: white; font-size: 22px; font-weight: bold; padding: 20px;")
+        title.setStyleSheet(
+            "color: white; font-size: 22px; font-weight: bold; background: transparent;"
+        )
         subtitle = QtWidgets.QLabel("Система управления каталогом")
         subtitle.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
-        subtitle.setStyleSheet("color: #E8F5E9; font-size: 13px; padding-bottom: 16px;")
+        subtitle.setStyleSheet(
+            "color: #E8F5E9; font-size: 13px; background: transparent;"
+        )
         header_layout.addWidget(title)
         header_layout.addWidget(subtitle)
-        layout.addWidget(header)
+        root.addWidget(header)
+
+        body = QtWidgets.QWidget()
+        body_layout = QtWidgets.QVBoxLayout(body)
+        body_layout.setContentsMargins(28, 24, 28, 16)
+        body_layout.setSpacing(12)
 
         form_frame = QtWidgets.QFrame()
-        form_frame.setStyleSheet(f"background: {WHITE}; margin: 24px; border-radius: 8px;")
+        form_frame.setObjectName("loginCard")
+        form_frame.setStyleSheet(
+            f"#loginCard {{"
+            f"  background-color: {WHITE};"
+            f"  border: 1px solid #E0E0E0;"
+            f"  border-radius: 8px;"
+            f"}}"
+        )
         form_layout = QtWidgets.QVBoxLayout(form_frame)
-        form_layout.setContentsMargins(32, 24, 32, 24)
+        form_layout.setContentsMargins(24, 20, 24, 20)
+        form_layout.setSpacing(8)
+
+        lbl_login = QtWidgets.QLabel("Логин")
+        lbl_login.setStyleSheet("color: #333; font-weight: 600; background: transparent;")
+        form_layout.addWidget(lbl_login)
 
-        form_layout.addWidget(QtWidgets.QLabel("Логин:"))
         self.login_edit = QtWidgets.QLineEdit()
         self.login_edit.setPlaceholderText("Введите логин (email)")
+        self.login_edit.setMinimumHeight(36)
         form_layout.addWidget(self.login_edit)
 
-        form_layout.addWidget(QtWidgets.QLabel("Пароль:"))
+        form_layout.addSpacing(6)
+
+        lbl_password = QtWidgets.QLabel("Пароль")
+        lbl_password.setStyleSheet("color: #333; font-weight: 600; background: transparent;")
+        form_layout.addWidget(lbl_password)
+
         self.password_edit = QtWidgets.QLineEdit()
         self.password_edit.setEchoMode(QtWidgets.QLineEdit.EchoMode.Password)
         self.password_edit.setPlaceholderText("Введите пароль")
+        self.password_edit.setMinimumHeight(36)
         form_layout.addWidget(self.password_edit)
 
         self.error_label = QtWidgets.QLabel("")
-        self.error_label.setStyleSheet("color: #E74C3C;")
+        self.error_label.setStyleSheet("color: #E74C3C; background: transparent;")
         self.error_label.setWordWrap(True)
         self.error_label.hide()
         form_layout.addWidget(self.error_label)
 
+        form_layout.addSpacing(10)
+
         btn_login = QtWidgets.QPushButton("Войти")
         btn_login.setObjectName("primary")
+        btn_login.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+        btn_login.setMinimumHeight(40)
         qt_backend.signal_connect(btn_login, "clicked", self._do_login)
         form_layout.addWidget(btn_login)
 
-        if self.config.features.guest_login:
+        if self.features.guest_login:
             btn_guest = QtWidgets.QPushButton("Продолжить без авторизации")
             btn_guest.setObjectName("secondary")
+            btn_guest.setCursor(QtCore.Qt.CursorShape.PointingHandCursor)
+            btn_guest.setMinimumHeight(40)
             qt_backend.signal_connect(btn_guest, "clicked", self._do_guest)
             form_layout.addWidget(btn_guest)
 
-        layout.addWidget(form_frame)
-        layout.addStretch()
+        body_layout.addWidget(form_frame)
+        body_layout.addStretch(1)
 
         hint = QtWidgets.QLabel(
             "Для входа используйте учётную запись из таблицы users."
         )
         hint.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
-        hint.setStyleSheet("color: #666; font-size: 11px; padding: 12px;")
-        layout.addWidget(hint)
+        hint.setWordWrap(True)
+        hint.setStyleSheet("color: #666; font-size: 11px; background: transparent;")
+        body_layout.addWidget(hint)
+
+        root.addWidget(body, 1)
 
         self.password_edit.returnPressed.connect(self._do_login)
+        self.login_edit.setFocus()
 
     def _show_error(self, message: str) -> None:
         self.error_label.setText(message)

{deskkit-1.2.2 → deskkit-1.2.4}/deskkit/ui/styles.py

@@ -9,26 +9,41 @@ WHITE = "#FFFFFF"
 ERROR = "#E74C3C"
 
 APP_STYLE = f"""
-QMainWindow, QDialog {{
+QMainWindow, QDialog, QWidget {{
     background-color: {BG};
     font-family: "Segoe UI", Arial, sans-serif;
     font-size: 13px;
+    color: #222222;
+}}
+QLabel {{
+    background: transparent;
+    color: #222222;
 }}
 QPushButton {{
     padding: 8px 16px;
-    border-radius: 4px;
+    border-radius: 6px;
     border: none;
-    min-height: 32px;
+    min-height: 36px;
+    font-size: 13px;
 }}
 QPushButton#primary {{
     background-color: {ACCENT};
     color: white;
     font-weight: bold;
 }}
+QPushButton#primary:hover {{
+    background-color: #2980B9;
+}}
+QPushButton#primary:pressed {{
+    background-color: #1F6AA5;
+}}
 QPushButton#secondary {{
     background-color: {GRAY};
     color: white;
 }}
+QPushButton#secondary:hover {{
+    background-color: #7F8C8D;
+}}
 QPushButton#success {{
     background-color: {PRIMARY};
     color: white;
@@ -38,14 +53,20 @@ QPushButton#danger {{
     color: white;
 }}
 QLineEdit, QComboBox, QSpinBox, QDoubleSpinBox, QTextEdit {{
-    padding: 6px;
-    border: 1px solid #CCC;
-    border-radius: 4px;
+    padding: 8px 10px;
+    border: 1px solid #CCCCCC;
+    border-radius: 6px;
     background: white;
+    color: #222222;
+    min-height: 20px;
+    selection-background-color: {PRIMARY_LIGHT};
+}}
+QLineEdit:focus, QComboBox:focus, QSpinBox:focus, QDoubleSpinBox:focus, QTextEdit:focus {{
+    border: 1px solid {ACCENT};
 }}
 QTableWidget {{
     background: white;
-    gridline-color: #DDD;
+    gridline-color: #DDDDDD;
     selection-background-color: {PRIMARY_LIGHT};
 }}
 QHeaderView::section {{

{deskkit-1.2.2 → deskkit-1.2.4}/deskkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deskkit
-Version: 1.2.2
+Version: 1.2.4
 Summary: Конструктор десктоп-приложений на Qt и MySQL с модульной сборкой и экспортом проекта
 Author: DeskKit Team
 License-Expression: MIT

{deskkit-1.2.2 → deskkit-1.2.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "deskkit"
-version = "1.2.2"
+version = "1.2.4"
 description = "Конструктор десктоп-приложений на Qt и MySQL с модульной сборкой и экспортом проекта"
 readme = "README.md"
 license = "MIT"