aggiornati campi uso interno/esterno rdp

Author: buzzqw

PCM.py

@@ -31,6 +31,7 @@
 import shutil
 from functools import partial
 from vnc_widget import VncWebWidget
+from rdp_widget import RdpEmbedWidget
 
 from PyQt6.QtWidgets import (
     QApplication, QMainWindow, QWidget, QVBoxLayout, QHBoxLayout,
@@ -651,6 +652,21 @@ def _apri_sessione(self, nome: str, profilo: dict):
             return
 
         # ... [il resto di _apri_sessione rimane identico] ...
+        if modalita == "rdp_embedded":
+            # RDP pannello interno — RdpEmbedWidget gestisce xfreerdp
+            self._rimuovi_welcome_se_presente()
+            self.tabs.setTabsClosable(True)
+            widget = RdpEmbedWidget(profilo, parent=self)
+            idx = self.tabs.addTab(widget, _qi("monitor.png"), f" {nome}")
+            self.tabs.setCurrentIndex(idx)
+            self._profili_tab[id(widget)] = (nome, profilo)
+            widget.processo_terminato.connect(
+                lambda w=widget: self._on_processo_terminato(w)
+            )
+            self._set_status(t("session.connected", name=nome))
+            self._aggiorna_status()
+            return
+
         if modalita == "external":
 
 
@@ -1423,7 +1439,7 @@ def _riconnetti():
             if info:
                 nome, profilo = info
                 self._apri_sessione(nome, profilo)
-            else:
+            elif hasattr(term, 'avvia') and hasattr(term, '_comando_corrente'):
                 term.avvia(term._comando_corrente)
 
         btn.clicked.connect(_riconnetti)

session_command.py

@@ -63,6 +63,10 @@ def build_command(profilo: dict) -> Tuple[Optional[str], str]:
         else:  # Browser interno (default)
             return _build_ftp(profilo, modalita="browser_int"), "ftp_panel"
     elif proto == "rdp":
+        mode = profilo.get("rdp_open_mode", "Finestra esterna")
+        if mode.startswith("Pannello interno"):
+            # cmd=None: RdpEmbedWidget costruisce il comando internamente
+            return None, "rdp_embedded"
         return _build_rdp(profilo), "external"
     elif proto == "vnc":
         return _build_vnc(profilo), "external"

session_dialog.py

@@ -280,6 +280,16 @@ def _build_tab_connessione(self):
         rdp_layout.addRow("", self.chk_rdp_drives)
         layout.addRow(self.grp_rdp)
 
+        self.grp_rdp_open = QGroupBox(t("sd.grp.rdp_open"))
+        rdp_open_layout = QFormLayout(self.grp_rdp_open)
+        self.combo_rdp_open = QComboBox()
+        self.combo_rdp_open.addItems([
+            "Finestra esterna",
+            "Pannello interno",
+        ])
+        rdp_open_layout.addRow(t("sd.open_with"), self.combo_rdp_open)
+        layout.addRow(self.grp_rdp_open)
+
         self.grp_vnc = QGroupBox(t("sd.grp.vnc"))
         vnc_layout = QFormLayout(self.grp_vnc)
         self.chk_vnc_internal = QCheckBox(t("sd.vnc.integrated"))
@@ -987,6 +997,7 @@ def _aggiorna_tab(self):
 
         # Gruppi specifici
         self.grp_rdp.setVisible(proto == "rdp")
+        self.grp_rdp_open.setVisible(proto == "rdp")
         self.grp_vnc.setVisible(proto == "vnc")
         self.grp_ftp.setVisible(proto == "ftp")
         self.grp_tunnel.setVisible(proto == "ssh_tunnel")
@@ -1123,6 +1134,10 @@ def _popola(self, nome, dati):
         self.chk_rdp_clip.setChecked(dati.get("redirect_clipboard", True))
         self.chk_rdp_drives.setChecked(dati.get("redirect_drives", False))
         self.edit_rdp_domain.setText(dati.get("rdp_domain", ""))
+        rdp_open = dati.get("rdp_open_mode", "Finestra esterna")
+        idx_ro = self.combo_rdp_open.findText(rdp_open, Qt.MatchFlag.MatchStartsWith)
+        if idx_ro >= 0:
+            self.combo_rdp_open.setCurrentIndex(idx_ro)
 
         # VNC
         self.chk_vnc_internal.setChecked(dati.get("vnc_internal", True))
@@ -1246,6 +1261,7 @@ def get_data(self):
             "redirect_clipboard": self.chk_rdp_clip.isChecked(),
             "redirect_drives": self.chk_rdp_drives.isChecked(),
             "rdp_domain":     self.edit_rdp_domain.text().strip(),
+            "rdp_open_mode": self.combo_rdp_open.currentText(),
             "vnc_internal":   self.chk_vnc_internal.isChecked(), 
             "vnc_client":     self.combo_vnc_client.currentText(),
             "vnc_color":      self.combo_vnc_color.currentText(),

translations.py

@@ -566,6 +566,13 @@ def init_from_settings() -> None:
     "sd.rdp.fullscreen":        {"it": "Schermo intero",        "en": "Fullscreen",           "de": "Vollbild",              "fr": "Plein écran",           "es": "Pantalla completa"},
     "sd.rdp.clipboard":         {"it": "Condividi clipboard",   "en": "Share clipboard",      "de": "Zwischenablage teilen", "fr": "Partager le presse-papiers", "es": "Compartir portapapeles"},
     "sd.rdp.drives":            {"it": "Condividi cartelle locali", "en": "Share local folders", "de": "Lokale Ordner teilen", "fr": "Partager les dossiers locaux", "es": "Compartir carpetas locales"},
+    "sd.grp.rdp_open":           {"it": "Modalità apertura RDP", "en": "RDP open mode",        "de": "RDP-Öffnungsmodus",      "fr": "Mode d'ouverture RDP",  "es": "Modo apertura RDP"},
+    "sd.rdp.domain":            {"it": "Dominio:",                  "en": "Domain:",              "de": "Domäne:",                "fr": "Domaine :",               "es": "Dominio:"},
+    # ── RDP embedded widget ────────────────────────────────────────────────────
+    "rdp.embed.waiting":        {"it": "Connessione RDP in corso…",              "en": "Connecting RDP…",               "de": "RDP-Verbindung wird aufgebaut…",  "fr": "Connexion RDP en cours…",        "es": "Conectando RDP…"},
+    "rdp.embed.wayland_error":  {"it": "Pannello interno non supportato su Wayland. Usa 'Finestra esterna'.", "en": "Embedded panel not supported on Wayland. Use 'External window'.", "de": "Eingebetteter Modus wird unter Wayland nicht unterstützt. Verwende 'Externes Fenster'.", "fr": "Le panneau intégré n'est pas pris en charge sur Wayland. Utilisez 'Fenêtre externe'.", "es": "Panel interno no compatible con Wayland. Usa 'Ventana externa'."},
+    "rdp.embed.client_missing": {"it": "Client RDP '{client}' non trovato nel PATH.", "en": "RDP client '{client}' not found in PATH.", "de": "RDP-Client '{client}' nicht im PATH gefunden.", "fr": "Client RDP '{client}' introuvable dans le PATH.", "es": "Cliente RDP '{client}' no encontrado en el PATH."},
+    "sd.rdp.domain_ph":         {"it": "es. MAGGIOLI",              "en": "e.g. CORP",            "de": "z.B. FIRMA",             "fr": "ex. SOCIÉTÉ",             "es": "ej. EMPRESA"},
 
     "sd.grp.vnc":               {"it": "Opzioni VNC",           "en": "VNC options",          "de": "VNC-Optionen",          "fr": "Options VNC",           "es": "Opciones VNC"},
     "sd.vnc.integrated":        {"it": "Integra VNC in una scheda di PCM", "en": "Embed VNC in a PCM tab", "de": "VNC in einen PCM-Tab integrieren", "fr": "Intégrer VNC dans un onglet PCM", "es": "Integrar VNC en una pestaña de PCM"},