`7f3ab12`

refactor stable

Authored by

espadonne 10 months ago

SHA: 7f3ab124ae32e06753fcae36babf8126623c44de
Parents: 864133f
Tree: 6034f3e

3 changed files

Status	File	+	-
M	`src/wulftp/ui/__init__.py`	6	2
M	`src/wulftp/ui/dialogs.py`	171	7
M	`src/wulftp/ui/main_window.py`	8	17

src/wulftp/ui/__init__.pymodified

  from .dialogs import (
      FastConfirmDialog,
      FastMessageDialog,
 +    FastInputDialog,
      InlineConfirmBar,
      fast_confirm,
 -    fast_message
 +    fast_message,
 +    fast_input
+ )
  from .main_window import WulFTPClient
      "FileContextMenu",
      "FastConfirmDialog",
      "FastMessageDialog",
 +    "FastInputDialog",
      "InlineConfirmBar",
      "fast_confirm",
      "fast_message",
 +    "fast_input",
      "WulFTPClient"
+ ]

src/wulftp/ui/dialogs.pymodified

  from PyQt6.QtCore import Qt, pyqtSignal, QTimer, QPropertyAnimation, QRect
  from PyQt6.QtWidgets import (
      QDialog, QVBoxLayout, QHBoxLayout, QLabel, QPushButton,
 -    QWidget, QFrame, QGraphicsOpacityEffect, QSizePolicy
 +    QWidget, QFrame, QGraphicsOpacityEffect, QSizePolicy, QLineEdit
+ )
  from PyQt6.QtGui import QKeyEvent
  import qtawesome as qta
          self.setModal(True)
          self.setWindowFlags(
              Qt.WindowType.Dialog |
 -            Qt.WindowType.FramelessWindowHint |
 -            Qt.WindowType.WindowStaysOnTopHint
 +            Qt.WindowType.FramelessWindowHint
+         )
          # Make it slightly transparent for modern look
          self.setModal(True)
          self.setWindowFlags(
              Qt.WindowType.Dialog |
 -            Qt.WindowType.FramelessWindowHint |
 -            Qt.WindowType.WindowStaysOnTopHint
 +            Qt.WindowType.FramelessWindowHint
+         )
          self.setWindowOpacity(0.95)
          self.accept()
 +class FastInputDialog(QDialog):
 +    """Fast input dialog for text entry."""
++
 +    def __init__(self, title: str, label: str, placeholder: str = "", parent=None):
 +        super().__init__(parent)
 +        self.setWindowTitle(title)
 +        self.setModal(True)
 +        self.setWindowFlags(
 +            Qt.WindowType.Dialog |
 +            Qt.WindowType.FramelessWindowHint
 +        )
++
 +        self.setWindowOpacity(0.95)
 +        self.input_text = ""
++
 +        self._setup_ui(title, label, placeholder)
++
 +        # Size and position
 +        self.setFixedSize(400, 180)
 +        if parent:
 +            parent_rect = parent.geometry()
 +            x = parent_rect.x() + (parent_rect.width() - self.width()) // 2
 +            y = parent_rect.y() + (parent_rect.height() - self.height()) // 2
 +            self.move(x, y)
++
 +    def _setup_ui(self, title: str, label: str, placeholder: str):
 +        """Set up the dialog UI."""
 +        layout = QVBoxLayout(self)
 +        layout.setContentsMargins(0, 0, 0, 0)
++
 +        # Frame
 +        frame = QFrame()
 +        frame.setObjectName("inputFrame")
 +        frame.setStyleSheet("""
 +            #inputFrame {
 +                background-color: #2b2b2b;
 +                border: 2px solid #555;
 +                border-radius: 8px;
 +            }
 +        """)
++
 +        frame_layout = QVBoxLayout(frame)
 +        frame_layout.setContentsMargins(20, 20, 20, 20)
 +        frame_layout.setSpacing(15)
++
 +        # Title
 +        title_label = QLabel(title)
 +        title_label.setStyleSheet("font-size: 16px; font-weight: bold; color: #fff;")
 +        frame_layout.addWidget(title_label)
++
 +        # Label
 +        label_widget = QLabel(label)
 +        label_widget.setStyleSheet("color: #ddd;")
 +        frame_layout.addWidget(label_widget)
++
 +        # Input field
 +        self.input_field = QLineEdit()
 +        self.input_field.setPlaceholderText(placeholder)
 +        self.input_field.setStyleSheet("""
 +            QLineEdit {
 +                background-color: #3a3a3a;
 +                color: #fff;
 +                border: 1px solid #555;
 +                border-radius: 4px;
 +                padding: 8px;
 +                font-size: 14px;
 +            }
 +            QLineEdit:focus {
 +                border-color: #0d7377;
 +            }
 +        """)
 +        self.input_field.returnPressed.connect(self.accept)
 +        frame_layout.addWidget(self.input_field)
++
 +        frame_layout.addStretch()
++
 +        # Buttons
 +        button_layout = QHBoxLayout()
 +        button_layout.addStretch()
++
 +        # OK button
 +        self.ok_btn = QPushButton("OK")
 +        self.ok_btn.setDefault(True)
 +        self.ok_btn.setStyleSheet("""
 +            QPushButton {
 +                background-color: #0d7377;
 +                color: white;
 +                border: none;
 +                padding: 8px 20px;
 +                border-radius: 4px;
 +                font-weight: bold;
 +                min-width: 80px;
 +            }
 +            QPushButton:hover {
 +                background-color: #14b8bd;
 +            }
 +            QPushButton:pressed {
 +                background-color: #0a5d61;
 +            }
 +        """)
 +        self.ok_btn.clicked.connect(self.accept)
 +        button_layout.addWidget(self.ok_btn)
++
 +        # Cancel button
 +        self.cancel_btn = QPushButton("Cancel")
 +        self.cancel_btn.setStyleSheet("""
 +            QPushButton {
 +                background-color: #555;
 +                color: white;
 +                border: none;
 +                padding: 8px 20px;
 +                border-radius: 4px;
 +                font-weight: bold;
 +                min-width: 80px;
 +            }
 +            QPushButton:hover {
 +                background-color: #666;
 +            }
 +            QPushButton:pressed {
 +                background-color: #444;
 +            }
 +        """)
 +        self.cancel_btn.clicked.connect(self.reject)
 +        button_layout.addWidget(self.cancel_btn)
++
 +        frame_layout.addLayout(button_layout)
 +        layout.addWidget(frame)
++
 +        # Focus on input field
 +        self.input_field.setFocus()
++
 +    def accept(self):
 +        """Accept the dialog and store the input."""
 +        self.input_text = self.input_field.text()
 +        super().accept()
++
 +    def get_text(self) -> str:
 +        """Get the entered text."""
 +        return self.input_text
++
++
  def fast_confirm(parent, title: str, message: str) -> bool:
      """Show fast confirmation dialog and return result."""
      dialog = FastConfirmDialog(title, message, parent)
 -    return dialog.exec() == QDialog.DialogCode.Accepted
 +    result = dialog.exec() == QDialog.DialogCode.Accepted
++
 +    # Restore parent focus after dialog
 +    if parent and hasattr(parent, 'window'):
 +        parent.window().raise_()
 +        parent.window().activateWindow()
++
 +    return result
  def fast_message(parent, title: str, message: str, message_type: str = "info"):
      icon_name, icon_color = icon_configs.get(message_type, icon_configs["info"])
      dialog = FastMessageDialog(title, message, icon_name, icon_color, parent)
      dialog.exec()
++
 +    # Restore parent focus after dialog
 +    if parent and hasattr(parent, 'window'):
 +        parent.window().raise_()
 +        parent.window().activateWindow()
++
++
 +def fast_input(parent, title: str, label: str, placeholder: str = "") -> tuple[str, bool]:
 +    """Show fast input dialog and return (text, ok)."""
 +    dialog = FastInputDialog(title, label, placeholder, parent)
 +    ok = dialog.exec() == QDialog.DialogCode.Accepted
++
 +    # Restore parent focus after dialog
 +    if parent and hasattr(parent, 'window'):
 +        parent.window().raise_()
 +        parent.window().activateWindow()
++
 +    return dialog.get_text(), ok

src/wulftp/ui/main_window.pymodified

      QStatusBar,
      QVBoxLayout,
      QWidget,
 -    QInputDialog,
+ )
  from ..core import (
      RemoteFilePane,
      FileContextMenu
+ )
 -from ..ui.dialogs import fast_confirm, fast_message
 +from ..ui.dialogs import fast_confirm, fast_message, fast_input
  class WulFTPClient(QMainWindow):
      def _restore_focus(self):
          """Restore window focus - used after dialogs and operations."""
 -        QTimer.singleShot(100, lambda: (self.raise_(), self.activateWindow()))
 +        # Only restore focus if we don't currently have it
 +        if not self.isActiveWindow():
 +            self.raise_()
 +            self.activateWindow()
      def _create_status_bar(self):
          """Create the status bar."""
                  AppConfig.STATUS_MESSAGE_TIMEOUT
+             )
 -            # Defer focus restoration to ensure it happens after all UI updates
 -            # Using a slightly longer delay to ensure all connection-related
 -            # UI updates have completed
 -            QTimer.singleShot(200, lambda: (
 -                self.raise_(),
 -                self.activateWindow(),
 -                self.remote_pane.tree_view.setFocus()  # Also set focus to remote pane
 -            ))
+-
          except Exception as e:
              fast_message(self, "Connection Error", str(e), "error")
              self._update_connection_state(False)
          # Show menu at cursor position
          menu.exec(view.mapToGlobal(pos))
 -        # Restore focus after context menu
 -        QTimer.singleShot(100, lambda: self.activateWindow())
+-
      def upload_selected(self):
          """Upload selected local files and directories."""
          if not self.sftp or not self.transfer_manager:
          else:
              current_path = self.remote_pane.model.rootPath()
 -        name, ok = QInputDialog.getText(
 +        name, ok = fast_input(
              self,
              "Create Directory",
 -            "Directory name:"
 +            "Directory name:",
 +            "new_folder"
+         )
          if ok and name: