virtui-manager 1.1.5__py3-none-any.whl → 1.3.0__py3-none-any.whl

vmanager/modals/network_modals.py

@@ -8,6 +8,7 @@ from textual.widgets.text_area import LanguageDoesNotExist
 from textual.containers import Vertical, Horizontal, ScrollableContainer
 from textual import on
 
+from ..constants import ErrorMessages, SuccessMessages, ButtonLabels, StaticText
 from .base_modals import BaseModal, BaseDialog
 from ..network_manager import (
     create_network, get_host_network_interfaces, get_existing_subnets
@@ -35,7 +36,7 @@ class AddEditNetworkInterfaceModal(BaseDialog[dict | None]):
         if self.is_edit and self.interface_info:
             network_value = self.interface_info.get("network")
             if network_value not in self.networks:
-                self.app.show_error_message(f"Network '{network_value}' not found. Please select an available network.")
+                self.app.show_error_message(ErrorMessages.NETWORK_NOT_FOUND_TEMPLATE.format(network=network_value))
                 network_value = self.networks[0] if self.networks else None # Set to first available network if any, otherwise None
             model_value = self.interface_info.get("model", "virtio")
             mac_value = self.interface_info.get("mac", "")
@@ -43,7 +44,7 @@ class AddEditNetworkInterfaceModal(BaseDialog[dict | None]):
             network_value = self.networks[0]
 
         with Vertical(id="add-edit-network-dialog"):
-            yield Label("Select network and model")
+            yield Label(StaticText.SELECT_NETWORK_AND_MODEL)
 
             if self.networks:
                 yield Select(network_options, id="network-select", prompt="Select a network", value=network_value)
@@ -60,8 +61,8 @@ class AddEditNetworkInterfaceModal(BaseDialog[dict | None]):
             )
 
             with Horizontal(id="dialog-buttons"):
-                yield Button("Save" if self.is_edit else "Add", variant="success", id="save")
-                yield Button("Cancel", variant="error", id="cancel")
+                yield Button(ButtonLabels.SAVE if self.is_edit else ButtonLabels.ADD, variant="success", id="save")
+                yield Button(ButtonLabels.CANCEL, variant="error", id="cancel")
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "save":
@@ -72,7 +73,7 @@ class AddEditNetworkInterfaceModal(BaseDialog[dict | None]):
             new_model = model_select.value
 
             if new_network is Select.BLANK:
-                self.app.show_error_message("Please select a network.")
+                self.app.show_error_message(ErrorMessages.SELECT_NETWORK)
                 return
 
             result = {"network": new_network, "model": new_model}
@@ -94,7 +95,7 @@ class AddEditNetworkModal(BaseModal[None]):
 
     def compose(self) -> ComposeResult:
         title = "Edit Network" if self.is_edit else "Create New Network"
-        button_label = "Save Changes" if self.is_edit else "Create Network"
+        button_label = ButtonLabels.SAVE_CHANGES if self.is_edit else ButtonLabels.CREATE_NETWORK
 
         name_val = ""
         forward_mode = "nat"
@@ -137,7 +138,6 @@ class AddEditNetworkModal(BaseModal[None]):
             dhcp_end_val = "192.168.11.30"
 
 
-
         with Vertical(id="create-network-dialog"):
             yield Label(title, id="create-network-title")
 
@@ -150,8 +150,8 @@ class AddEditNetworkModal(BaseModal[None]):
                         disabled=self.is_edit
                     )
                     with RadioSet(id="type-network", classes="type-network-radioset"):
-                        yield RadioButton("Nat network", id="type-network-nat", value=(forward_mode == "nat"))
-                        yield RadioButton("Routed network", id="type-network-routed", value=(forward_mode == "route"))
+                        yield RadioButton(StaticText.NAT_NETWORK, id="type-network-nat", value=(forward_mode == "nat"))
+                        yield RadioButton(StaticText.ROUTED_NETWORK, id="type-network-routed", value=(forward_mode == "route"))
                     yield Select(
                         [("Loading...", "")],
                         prompt="Select Forward Interface",
@@ -160,33 +160,33 @@ class AddEditNetworkModal(BaseModal[None]):
                         disabled=True
                     )
                     yield Input(
-                        placeholder="IPv4 Network (e.g., 192.168.100.0/24)", id="net-ip-input", value=ip_val
+                        placeholder=StaticText.IPV4_NETWORK_EXAMPLE, id="net-ip-input", value=ip_val
                     )
-                    yield Checkbox("Enable DHCPv4", id="dhcp-checkbox", value=dhcp_val)
+                    yield Checkbox(StaticText.ENABLE_DHCPV4, id="dhcp-checkbox", value=dhcp_val)
                     with Vertical(id="dhcp-inputs-horizontal"):
                         dhcp_options_classes = "" if dhcp_val else "hidden"
                         with Horizontal(id="dhcp-options", classes=dhcp_options_classes):
                             yield Input(
-                                placeholder="DHCP Start (e.192.168.100.100)",
+                                placeholder=StaticText.DHCP_START_EXAMPLE,
                                 id="dhcp-start-input",
                                 classes="dhcp-input",
                                 value=dhcp_start_val
                             )
                             yield Input(
-                                placeholder="DHCP End (e.g., 192.168.100.254)",
+                                placeholder=StaticText.DHCP_END_EXAMPLE,
                                 id="dhcp-end-input",
                                 classes="dhcp-input",
                                 value=dhcp_end_val
                             )
                     with RadioSet(id="dns-domain-radioset", classes="dns-domain-radioset"):
                         yield RadioButton(
-                            "Use Network Name for DNS Domain", id="dns-use-net-name", value=not use_custom_domain
+                            StaticText.USE_NETWORK_NAME_FOR_DNS, id="dns-use-net-name", value=not use_custom_domain
                         )
-                        yield RadioButton("Use Custom DNS Domain", id="dns-use-custom", value=use_custom_domain)
+                        yield RadioButton(StaticText.USE_CUSTOM_DNS_DOMAIN, id="dns-use-custom", value=use_custom_domain)
 
                     custom_domain_classes = "hidden" if not use_custom_domain else ""
                     yield Input(
-                        placeholder="Custom DNS Domain",
+                        placeholder=StaticText.CUSTOM_DNS_DOMAIN,
                         id="dns-custom-domain-input",
                         value=domain_name,
                         classes=custom_domain_classes
@@ -195,9 +195,9 @@ class AddEditNetworkModal(BaseModal[None]):
                         with Horizontal(classes="action-buttons"):
                             yield Button(
                                 button_label, variant="primary", id="create-net-btn", classes="create-net-btn"
-                            )
-            yield Button("Close", variant="default", id="close-btn", classes="close-button")
-
+                                )
+            yield Button(ButtonLabels.CLOSE, variant="default", id="close-btn", classes="close-button")
+                            
     def on_mount(self) -> None:
         """Called when the modal is mounted to populate network interfaces."""
         self.run_worker(self.populate_interfaces, thread=True)
@@ -225,7 +225,7 @@ class AddEditNetworkModal(BaseModal[None]):
                         else:
                             select.clear()
                             self.app.show_error_message(
-                                f"Warning: Forward device '{forward_dev}' not found on host."
+                                ErrorMessages.FORWARD_DEVICE_NOT_FOUND_TEMPLATE.format(device=forward_dev)
                             )
                     else:
                         select.clear()
@@ -234,7 +234,7 @@ class AddEditNetworkModal(BaseModal[None]):
         except Exception as e:
             self.app.call_from_thread(
                 self.app.show_error_message,
-                f"Error getting host interfaces: {e}"
+                ErrorMessages.ERROR_GETTING_HOST_INTERFACES_TEMPLATE.format(error=e)
             )
 
     @on(Checkbox.Changed, "#dhcp-checkbox")
@@ -270,13 +270,13 @@ class AddEditNetworkModal(BaseModal[None]):
             dhcp_end = self.query_one("#dhcp-end-input", Input).value
 
             domain_radio = self.query_one("#dns-domain-radioset", RadioSet).pressed_button.id
-            
+
             try:
                 name, name_modified = _sanitize_input(name_raw)
                 if name_modified:
-                    self.app.show_success_message(f"Network name sanitized: '{name_raw}' changed to '{name}'")
+                    self.app.show_success_message(SuccessMessages.INPUT_SANITIZED.format(original_input=name_raw, sanitized_input=name))
             except ValueError as e:
-                self.app.show_error_message(f"Invalid Network Name: {e}")
+                self.app.show_error_message(ErrorMessages.INVALID_NETWORK_NAME_TEMPLATE.format(error=e))
                 return
 
             domain_name_raw = self.query_one("#dns-custom-domain-input", Input).value
@@ -285,13 +285,13 @@ class AddEditNetworkModal(BaseModal[None]):
                 try:
                     domain_name, domain_name_modified = _sanitize_domain_name(domain_name_raw)
                     if domain_name_modified:
-                        self.app.show_success_message(f"Custom DNS Domain sanitized: '{domain_name_raw}' changed to '{domain_name}'")
+                        self.app.show_success_message(SuccessMessages.INPUT_SANITIZED.format(original_input=domain_name_raw, sanitized_input=domain_name))
                 except ValueError as e:
-                    self.app.show_error_message(f"Invalid Custom DNS Domain: {e}")
+                    self.app.show_error_message(ErrorMessages.INVALID_CUSTOM_DNS_DOMAIN_TEMPLATE.format(error=e))
                     return
 
             if not name:
-                self.app.show_error_message("Network Name cannot be empty.")
+                self.app.show_error_message(ErrorMessages.NETWORK_NAME_REQUIRED)
                 return
 
             if ip:
@@ -302,16 +302,16 @@ class AddEditNetworkModal(BaseModal[None]):
                         dhcp_start_ip = ipaddress.ip_address(dhcp_start)
                         dhcp_end_ip = ipaddress.ip_address(dhcp_end)
                         if dhcp_start_ip not in ip_network or dhcp_end_ip not in ip_network:
-                            self.app.show_error_message(f"DHCP IPs are not in the network {ip_network}")
+                            self.app.show_error_message(ErrorMessages.DHCP_IPS_NOT_IN_NETWORK_TEMPLATE.format(network=ip_network))
                             return
                         if dhcp_start_ip >= dhcp_end_ip:
-                            self.app.show_error_message("DHCP start IP must be before the end IP.")
+                            self.app.show_error_message(ErrorMessages.DHCP_START_BEFORE_END)
                             return
                 except ValueError as e:
-                    self.app.show_error_message(f"Invalid IP address or network: {e}")
+                    self.app.show_error_message(ErrorMessages.INVALID_IP_OR_NETWORK_TEMPLATE.format(error=e))
                     return
             elif dhcp:
-                self.app.show_error_message("DHCP cannot be enabled without an IP network.")
+                self.app.show_error_message(ErrorMessages.DHCP_REQUIRES_IP)
                 return
 
             def do_create_or_update_network():
@@ -344,20 +344,29 @@ class AddEditNetworkModal(BaseModal[None]):
                             if ip_network.overlaps(existing_subnet):
                                 self.app.call_from_thread(
                                     self.app.show_error_message,
-                                    f"Subnet {ip_network} overlaps with an existing network."
+                                    ErrorMessages.SUBNET_OVERLAPS_TEMPLATE.format(subnet=ip_network)
                                 )
                                 return
 
                     uuid = self.network_info.get('uuid') if self.is_edit and self.network_info else None
                     create_network(self.conn, name, typenet, forward, ip, dhcp, dhcp_start, dhcp_end, domain_name, uuid=uuid)
 
-                    message = f"Network {name} {'updated' if self.is_edit else 'created'} successfully."
+                    if self.is_edit:
+                        message = SuccessMessages.NETWORK_UPDATED_TEMPLATE.format(name=name)
+                    else:
+                        message = SuccessMessages.NETWORK_CREATED_TEMPLATE.format(name=name)
+
                     self.app.call_from_thread(self.app.show_success_message, message)
                     self.app.call_from_thread(self.dismiss, True)
                 except Exception as e:
+                    if self.is_edit:
+                        err_msg = ErrorMessages.ERROR_UPDATING_NETWORK_TEMPLATE.format(error=e)
+                    else:
+                        err_msg = ErrorMessages.ERROR_CREATING_NETWORK_TEMPLATE.format(error=e)
+
                     self.app.call_from_thread(
                         self.app.show_error_message,
-                        f"Error {'updating' if self.is_edit else 'creating'} network: {e}"
+                        err_msg
                     )
 
             self.app.worker_manager.run(
@@ -374,7 +383,7 @@ class NetworkXMLModal(BaseModal[None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="network-detail-dialog"):
-            yield Label(f"Network Details: {self.network_name}", id="title")
+            yield Label(StaticText.NETWORK_DETAILS.format(network_name=self.network_name), id="title")
             with ScrollableContainer():
                 text_area = TextArea(self.network_xml, read_only=True)
                 try:
@@ -384,7 +393,7 @@ class NetworkXMLModal(BaseModal[None]):
                 text_area.styles.height = "auto"
                 yield text_area
             with Horizontal():
-                yield Button("Close", variant="default", id="close-btn", classes="close-btn")
+                yield Button(ButtonLabels.CLOSE, variant="default", id="close-btn", classes="close-btn")
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "close-btn":

vmanager/modals/provisioning_modals.py

@@ -12,7 +12,7 @@ from textual import on, work
 
 import libvirt
 from ..config import load_config
-from ..constants import AppInfo
+from ..constants import AppInfo, ErrorMessages, SuccessMessages, ButtonLabels, StaticText
 from ..vm_provisioner import VMProvisioner, VMType, OpenSUSEDistro
 from ..storage_manager import list_storage_pools
 from ..vm_service import VMService
@@ -43,16 +43,16 @@ class InstallVMModal(BaseModal[str | None]):
         default_pool = 'default' if any(p[0] == 'default' for p in active_pools) else (active_pools[0][1] if active_pools else None)
 
         with ScrollableContainer(id="install-dialog"):
-            yield Label(f"Install OpenSUSE VM on {self.uri}", classes="title")
-            yield Label("VM Name:", classes="label")
+            yield Label(StaticText.INSTALL_OPENSUSE_VM.format(uri=self.uri), classes="title")
+            yield Label(StaticText.VM_NAME, classes="label")
             yield Input(placeholder="my-new-vm", id="vm-name")
 
-            yield Label("VM Type:", classes="label")
+            yield Label(StaticText.VM_TYPE, classes="label")
             with Horizontal(classes="label-row"):
                 yield Select([(t.value, t) for t in VMType], value=VMType.DESKTOP, id="vm-type", allow_blank=False)
-                yield Button("Info", id="vm-type-info-btn", variant="primary")
+                yield Button(ButtonLabels.INFO, id="vm-type-info-btn", variant="primary")
 
-            yield Label("Distribution:", classes="label")
+            yield Label(StaticText.DISTRIBUTION, classes="label")
             distro_options = [(d.value, d) for d in OpenSUSEDistro]
             distro_options.insert(0, ("Cached ISOs", "cached"))
             custom_repos = self.provisioner.get_custom_repos()
@@ -70,58 +70,58 @@ class InstallVMModal(BaseModal[str | None]):
 
             # Container for ISO selection (Repo)
             with Vertical(id="repo-iso-container"):
-                yield Label("ISO Image (Repo):", classes="label")
+                yield Label(StaticText.ISO_IMAGE_REPO, classes="label")
                 config = load_config()
                 iso_path = Path(config.get('ISO_DOWNLOAD_PATH', str(Path.home() / ".cache" / AppInfo.name / "isos")))
-                yield Label(f"ISOs will be downloaded to: {iso_path}", classes="info-text", id="iso-path-label")
+                yield Label(StaticText.ISOS_DOWNLOAD_PATH.format(iso_path=iso_path), classes="info-text", id="iso-path-label")
                 yield Select([], prompt="Select ISO...", id="iso-select", disabled=True)
 
             # Container for Custom ISO
             with Vertical(id="custom-iso-container"):
-                yield Label("Custom ISO (Local Path):", classes="label")
+                yield Label(StaticText.CUSTOM_ISO_LOCAL_PATH, classes="label")
                 with Horizontal(classes="input-row"):
                     yield Input(placeholder="/path/to/local.iso", id="custom-iso-path", classes="path-input")
-                    yield Button("Browse", id="browse-iso-btn")
+                    yield Button(ButtonLabels.BROWSE, id="browse-iso-btn")
 
                 with Vertical(id="checksum-container"):
-                    yield Checkbox("Validate Checksum", id="validate-checksum", value=False)
+                    yield Checkbox(StaticText.VALIDATE_CHECKSUM, id="validate-checksum", value=False)
                     yield Input(placeholder="SHA256 Checksum (Optional)", id="checksum-input", disabled=True)
-                    yield Label("", id="checksum-status", classes="status-text")
-            
+                    yield Label(StaticText.EMPTY_LABEL, id="checksum-status", classes="status-text")
+
             # Container for ISO selection from Storage Pools
             with Vertical(id="pool-iso-container"):
-                yield Label("Select Storage Pool:", classes="label")
+                yield Label(StaticText.SELECT_STORAGE_POOL, classes="label")
                 yield Select(active_pools, prompt="Select Pool...", id="storage-pool-select", allow_blank=False)
-                yield Label("Select ISO Volume:", classes="label")
+                yield Label(StaticText.SELECT_ISO_VOLUME, classes="label")
                 yield Select([], prompt="Select ISO Volume...", id="iso-volume-select", disabled=True)
 
-            yield Label("Storage Pool:", id="vminstall-storage-label")
+            yield Label(StaticText.STORAGE_POOL, id="vminstall-storage-label")
             yield Select(active_pools, value=default_pool, id="pool", allow_blank=False)
             with Collapsible(title="Expert Mode", id="expert-mode-collapsible"):
                 with Horizontal(id="expert-mode"):
                     with Vertical(id="expert-mem"):
-                        yield Label(" Memory (GB)", classes="label")
+                        yield Label(StaticText.MEMORY_GB_LABEL, classes="label")
                         yield Input("4", id="memory-input", type="integer")
                     with Vertical(id="expert-cpu"):
-                        yield Label(" CPUs", classes="label")
+                        yield Label(StaticText.CPUS_LABEL, classes="label")
                         yield Input("2", id="cpu-input", type="integer")
                     with Vertical(id="expert-disk-size"):
-                        yield Label(" Disk Size(GB)", classes="label")
+                        yield Label(StaticText.DISK_SIZE_GB_LABEL, classes="label")
                         yield Input("8", id="disk-size-input", type="integer")
                     with Vertical(id="expert-disk-format"):
-                        yield Label(" Disk Format", classes="label")
+                        yield Label(StaticText.DISK_FORMAT_LABEL, classes="label")
                         yield Select([("Qcow2", "qcow2"), ("Raw", "raw")], value="qcow2", id="disk-format")
                     with Vertical(id="expert-firmware"):
-                        yield Label(" Firmware", classes="label")
-                        yield Checkbox("UEFI", id="boot-uefi-checkbox", value=True, tooltip="Unchecked means legacy boot")
+                        yield Label(StaticText.FIRMWARE_LABEL, classes="label")
+                        yield Checkbox(StaticText.UEFI, id="boot-uefi-checkbox", value=True, tooltip="Unchecked means legacy boot")
 
-            yield Checkbox("Configure before install", id="configure-before-install-checkbox", value=False, tooltip="Show VM configuration before starting")
+            yield Checkbox(StaticText.CONFIGURE_BEFORE_INSTALL, id="configure-before-install-checkbox", value=False, tooltip="Show VM configuration before starting")
             yield ProgressBar(total=100, show_eta=False, id="progress-bar")
-            yield Label("", id="status-label")
+            yield Label(StaticText.EMPTY_LABEL, id="status-label")
 
             with Horizontal(classes="buttons"):
-                yield Button("Install", variant="primary", id="install-btn", disabled=True)
-                yield Button("Cancel", variant="default", id="cancel-btn")
+                yield Button(ButtonLabels.INSTALL, variant="primary", id="install-btn", disabled=True)
+                yield Button(ButtonLabels.CANCEL, variant="default", id="cancel-btn")
 
     def on_mount(self):
         """Called when modal is mounted."""
@@ -270,7 +270,7 @@ class InstallVMModal(BaseModal[str | None]):
             self.app.call_from_thread(update_iso_volume_select)
 
         except Exception as e:
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to fetch ISO volumes from {pool_name}: {e}")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_FETCH_ISO_VOLUMES_TEMPLATE.format(pool_name=pool_name, error=e))
             self.app.call_from_thread(self._update_iso_status, "Error fetching volumes", False)
             self.app.call_from_thread(iso_volume_select.clear)
             self.app.call_from_thread(lambda: setattr(iso_volume_select, 'disabled', True))
@@ -311,7 +311,7 @@ class InstallVMModal(BaseModal[str | None]):
             self.app.call_from_thread(update_select)
 
         except Exception as e:
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to fetch ISOs: {e}")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_FETCH_ISOS_TEMPLATE.format(error=e))
             self.app.call_from_thread(self._update_iso_status, "Error fetching ISOs", False)
 
     def _update_iso_status(self, message, loading):
@@ -385,24 +385,24 @@ class InstallVMModal(BaseModal[str | None]):
             return
 
         if was_modified:
-            self.app.show_quick_message(f"VM name sanitized: '{vm_name_raw}' -> '{vm_name}'")
+            self.app.show_quick_message(SuccessMessages.VM_NAME_SANITIZED_TEMPLATE.format(original=vm_name_raw, sanitized=vm_name))
             self.query_one("#vm-name", Input).value = vm_name
 
         if not vm_name:
-            self.app.show_error_message("VM name cannot be empty.")
+            self.app.show_error_message(ErrorMessages.VM_NAME_CANNOT_BE_EMPTY)
             return
 
         # 2. Check if VM exists
         try:
             self.conn.lookupByName(vm_name)
-            self.app.show_error_message(f"A VM with the name '{vm_name}' already exists. Please choose a different name.")
+            self.app.show_error_message(ErrorMessages.VM_NAME_ALREADY_EXISTS_TEMPLATE.format(vm_name=vm_name))
             return
         except libvirt.libvirtError as e:
             if e.get_error_code() != libvirt.VIR_ERR_NO_DOMAIN:
-                self.app.show_error_message(f"Error checking VM name: {e}")
+                self.app.show_error_message(ErrorMessages.ERROR_CHECKING_VM_NAME_TEMPLATE.format(error=e))
                 return
         except Exception as e:
-            self.app.show_error_message(f"An unexpected error occurred: {e}")
+            self.app.show_error_message(ErrorMessages.UNEXPECTED_ERROR_OCCURRED_TEMPLATE.format(error=e))
             return
 
         vm_type = self.query_one("#vm-type", Select).value
@@ -412,7 +412,7 @@ class InstallVMModal(BaseModal[str | None]):
 
         # Validate storage pool
         if not pool_name or pool_name == Select.BLANK:
-            self.app.show_error_message("Please select a valid storage pool.")
+            self.app.show_error_message(ErrorMessages.PLEASE_SELECT_VALID_STORAGE_POOL)
             return
 
         iso_url = None
@@ -428,11 +428,11 @@ class InstallVMModal(BaseModal[str | None]):
         elif distro == "pool_volumes":
             iso_url = self.query_one("#iso-volume-select", Select).value
             if not iso_url or iso_url == Select.BLANK:
-                self.app.show_error_message("Please select a valid ISO volume from the storage pool.")
+                self.app.show_error_message(ErrorMessages.SELECT_VALID_ISO_VOLUME)
                 return
             # Validate that the volume path exists and is accessible
             if not os.path.exists(iso_url):
-                self.app.show_error_message(f"Selected ISO volume does not exist: {iso_url}")
+                self.app.show_error_message(ErrorMessages.ISO_VOLUME_NOT_FOUND_TEMPLATE.format(iso_url=iso_url))
                 return
         else:
             iso_url = self.query_one("#iso-select", Select).value
@@ -446,27 +446,27 @@ class InstallVMModal(BaseModal[str | None]):
             disk_format = self.query_one("#disk-format", Select).value
             boot_uefi = self.query_one("#boot-uefi-checkbox", Checkbox).value
         except ValueError:
-            self.app.show_error_message("Invalid input for expert settings. Using defaults.")
+            self.app.show_error_message(ErrorMessages.INVALID_EXPERT_SETTINGS)
             return
 
         # Validate expert mode inputs
         if memory_gb < 1 or memory_gb > 8192:
-            self.app.show_error_message("Memory must be between 1 and 8192 GB.")
+            self.app.show_error_message(ErrorMessages.MEMORY_RANGE_ERROR)
             return
         if vcpu < 1 or vcpu > 768:
-            self.app.show_error_message("CPU count must be between 1 and 768.")
+            self.app.show_error_message(ErrorMessages.CPU_RANGE_ERROR)
             return
         if disk_size < 1 or disk_size > 10000:
-            self.app.show_error_message("Disk size must be between 1 and 10000 GB.")
+            self.app.show_error_message(ErrorMessages.DISK_SIZE_RANGE_ERROR)
             return
 
         try:
             pool = self.conn.storagePoolLookupByName(pool_name)
             if not pool.isActive():
-                self.app.show_error_message(f"Storage pool '{pool_name}' is not active. Please activate it first.")
+                self.app.show_error_message(ErrorMessages.STORAGE_POOL_NOT_ACTIVE_TEMPLATE.format(pool_name=pool_name))
                 return
         except Exception as e:
-            self.app.show_error_message(f"Error accessing storage pool '{pool_name}': {e}")
+            self.app.show_error_message(ErrorMessages.ERROR_ACCESSING_STORAGE_POOL_TEMPLATE.format(pool_name=pool_name, error=e))
             return
 
         # Disable inputs
@@ -494,17 +494,17 @@ class InstallVMModal(BaseModal[str | None]):
             if custom_path:
                 # Validate custom path exists
                 if not os.path.exists(custom_path):
-                    raise Exception(f"Custom ISO path does not exist: {custom_path}")
+                    raise Exception(ErrorMessages.CUSTOM_ISO_PATH_NOT_EXIST_TEMPLATE.format(path=custom_path))
                 if not os.path.isfile(custom_path):
-                    raise Exception(f"Custom ISO path is not a file: {custom_path}")
+                    raise Exception(ErrorMessages.CUSTOM_ISO_NOT_FILE_TEMPLATE.format(path=custom_path))
 
                 # 1. Validate Checksum
                 if validate:
                     if not checksum:
-                        raise Exception("Checksum validation enabled but no checksum provided")
+                        raise Exception(ErrorMessages.CHECKSUM_MISSING)
                     progress_cb("Validating Checksum...", 0)
                     if not self.provisioner.validate_iso(custom_path, checksum):
-                        raise Exception("Checksum validation failed!")
+                        raise Exception(ErrorMessages.CHECKSUM_VALIDATION_FAILED)
                     progress_cb("Checksum Validated", 10)
 
                 # 2. Upload
@@ -514,7 +514,7 @@ class InstallVMModal(BaseModal[str | None]):
 
                 final_iso_url = self.provisioner.upload_iso(custom_path, pool_name, upload_progress)
                 if not final_iso_url:
-                    raise Exception("No ISO URL specified for provisioning")
+                    raise Exception(ErrorMessages.NO_ISO_URL_SPECIFIED)
 
             # 3. Provision
             # Suspend global updates to prevent UI freeze during heavy provisioning ops
@@ -544,7 +544,7 @@ class InstallVMModal(BaseModal[str | None]):
                                     try:
                                         if not domain_obj.isActive():
                                             domain_obj.create()
-                                            app.call_from_thread(app.show_success_message, f"VM '{vm_name}' started.")
+                                            app.call_from_thread(app.show_success_message, SuccessMessages.VM_STARTED_TEMPLATE.format(vm_name=vm_name))
                                         # Launch viewer
                                         domain_name = domain_obj.name()
                                         cmd = remote_viewer_cmd(self.uri, domain_name, app.r_viewer)
@@ -555,10 +555,10 @@ class InstallVMModal(BaseModal[str | None]):
                                             preexec_fn=os.setsid,
                                         )
                                         logging.info(f"{app.r_viewer} started with PID {proc.pid} for {domain_name}")
-                                        app.call_from_thread(app.show_quick_message, f"Remote viewer {app.r_viewer} started for {domain_name}")
+                                        app.call_from_thread(app.show_quick_message, SuccessMessages.REMOTE_VIEWER_STARTED_TEMPLATE.format(viewer=app.r_viewer, vm_name=domain_name))
                                     except Exception as e:
                                         logging.error(f"Failed to start VM or viewer: {e}")
-                                        app.call_from_thread(app.show_error_message, f"Failed to start VM or viewer: {e}")
+                                        app.call_from_thread(app.show_error_message, ErrorMessages.FAILED_TO_START_VM_OR_VIEWER_TEMPLATE.format(error=e))
 
                                 app.worker_manager.run(start_and_view, name=f"start_view_{vm_name}")
 
@@ -567,7 +567,7 @@ class InstallVMModal(BaseModal[str | None]):
                                 on_details_closed
                             )
                         else:
-                            app.show_error_message(f"Could not get details for {vm_name}")
+                            app.show_error_message(ErrorMessages.COULD_NOT_GET_VM_DETAILS_TEMPLATE.format(vm_name=vm_name))
                     self.app.call_from_thread(push_details)
 
                 dom = self.provisioner.provision_vm(
@@ -591,10 +591,10 @@ class InstallVMModal(BaseModal[str | None]):
                 self.app.call_from_thread(self.app.on_vm_data_update)
 
             if configure_before_install:
-                self.app.call_from_thread(self.app.show_success_message, f"VM '{name}' defined. Please configure and start it.")
+                self.app.call_from_thread(self.app.show_success_message, SuccessMessages.VM_DEFINED_CONFIGURE_TEMPLATE.format(vm_name=name))
                 return
 
-            self.app.call_from_thread(self.app.show_success_message, f"VM '{name}' created successfully!")
+            self.app.call_from_thread(self.app.show_success_message, SuccessMessages.VM_CREATED_SUCCESSFULLY_TEMPLATE.format(vm_name=name))
 
             # 4. Auto-connect Remote Viewer
             def launch_viewer():
@@ -608,12 +608,12 @@ class InstallVMModal(BaseModal[str | None]):
                         preexec_fn=os.setsid,
                     )
                     logging.info(f"{self.app.r_viewer} started with PID {proc.pid} for {domain_name}")
-                    self.app.show_quick_message(f"Remote viewer {self.app.r_viewer} started for {domain_name}")
+                    self.app.show_quick_message(SuccessMessages.REMOTE_VIEWER_STARTED_TEMPLATE.format(viewer=self.app.r_viewer, vm_name=domain_name))
                 except Exception as e:
                     logging.error(f"Failed to spawn {self.app.r_viewer} for {domain_name}: {e}")
                     self.app.call_from_thread(
                         self.app.show_error_message,
-                        f"{self.app.r_viewer} failed to start for {domain_name}: {e}"
+                        ErrorMessages.REMOTE_VIEWER_FAILED_TO_START_TEMPLATE.format(viewer=self.app.r_viewer, domain_name=domain_name, error=e)
                     )
                     return
 
@@ -621,5 +621,5 @@ class InstallVMModal(BaseModal[str | None]):
             self.app.call_from_thread(self.dismiss, True)
 
         except Exception as e:
-            self.app.call_from_thread(self.app.show_error_message, f"Provisioning failed: {e}")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.PROVISIONING_FAILED_TEMPLATE.format(error=e))
             self.app.call_from_thread(self.dismiss)

vmanager/modals/select_server_modals.py

@@ -12,6 +12,7 @@ from textual.screen import ModalScreen
 from .base_modals import BaseModal
 from .utils_modals import LoadingModal
 from ..connection_manager import ConnectionManager
+from ..constants import ErrorMessages, StaticText, ButtonLabels
 
 
 class SelectServerModal(BaseModal[None]):
@@ -26,7 +27,7 @@ class SelectServerModal(BaseModal[None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="select-server-container", classes="info-details"):
-            yield Label("Select Servers to Display")
+            yield Label(StaticText.SELECT_SERVERS_TO_DISPLAY)
             
             checkboxes = []
             for i, server in enumerate(self.servers):
@@ -44,8 +45,8 @@ class SelectServerModal(BaseModal[None]):
             yield grid
 
             with Horizontal(classes="button-details"):
-                yield Button("Done", id="done-servers", variant="primary", classes="done-button")
-                yield Button("Cancel", id="cancel-servers", classes="cancel-button")
+                yield Button(ButtonLabels.DONE, id="done-servers", variant="primary", classes="done-button")
+                yield Button(ButtonLabels.CANCEL, id="cancel-servers", classes="cancel-button")
 
     @on(Checkbox.Changed)
     def on_checkbox_changed(self, event: Checkbox.Changed) -> None:
@@ -57,7 +58,7 @@ class SelectServerModal(BaseModal[None]):
             return
 
         if event.value:  # If checkbox is checked
-            loading_modal = LoadingModal(f"Connecting to {uri}...")
+            loading_modal = LoadingModal(ErrorMessages.CONNECTING_TO_SERVER_TEMPLATE.format(uri=uri))
             self.app.push_screen(loading_modal)
 
             def connect_and_update():
@@ -66,7 +67,7 @@ class SelectServerModal(BaseModal[None]):
                 if conn is None:
                     self.app.call_from_thread(
                         self.app.show_error_message,
-                        f"Failed to connect to {uri}"
+                        ErrorMessages.FAILED_TO_CONNECT_TO_SERVER_TEMPLATE.format(uri=uri)
                     )
                     # Revert checkbox state on failure
                     checkbox = self.query(f"#{checkbox_id}").first()
@@ -104,10 +105,10 @@ class SelectOneServerModal(BaseModal[str]):
         with Vertical(id="select-one-server-container"):
             yield Label(self.title_text)
             yield Select(self.server_options, prompt="Select server...", id="server-select")
-            yield Label("")
+            yield Label(StaticText.EMPTY_LABEL)
             with Horizontal():
                 yield Button(self.button_label, id="launch-btn", variant="primary", disabled=True)
-                yield Button("Cancel", id="cancel-btn")
+                yield Button(ButtonLabels.CANCEL, id="cancel-btn")
 
     @on(Select.Changed, "#server-select")
     def on_server_select_changed(self, event: Select.Changed) -> None: