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

vmanager/modals/server_prefs_modals.py

@@ -25,7 +25,11 @@ from ..network_manager import (
 from .. import storage_manager
 from ..storage_manager import list_storage_volumes
 
-from ..constants import AppCacheTimeout
+from ..constants import (
+        AppCacheTimeout, ErrorMessages, SuccessMessages,
+        ButtonLabels, WarningMessages,
+        StaticText
+        )
 from .base_modals import BaseModal
 from .network_modals import AddEditNetworkModal, NetworkXMLModal
 from .disk_pool_modals import (
@@ -51,7 +55,7 @@ class ServerPrefModal(BaseModal[None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="server-pref-dialog",):
-            yield Label("Server Preferences", id="server-pref-title")
+            yield Label(StaticText.SERVER_PREFERENCES, id="server-pref-title")
             yield Static(classes="button-separator")
             with TabbedContent(id="server-pref-tabs"):
                 with TabPane("Network", id="tab-network"):
@@ -65,19 +69,19 @@ class ServerPrefModal(BaseModal[None]):
         uri_to_connect = self.uri
         if uri_to_connect is None:
             if len(self.app.active_uris) == 0:
-                self.app.show_error_message("Not connected to any server.")
+                self.app.show_error_message(ErrorMessages.NOT_CONNECTED_TO_ANY_SERVER_PREFS)
                 self.dismiss()
                 return
             if len(self.app.active_uris) > 1:
                 # This should not happen if the app logic uses the server selection modal
-                self.app.show_error_message("Multiple servers active but none selected for preferences.")
+                self.app.show_error_message(ErrorMessages.MULTIPLE_SERVERS_ACTIVE_NONE_SELECTED)
                 self.dismiss()
                 return
             uri_to_connect = self.app.active_uris[0]
 
         self.conn = self.app.vm_service.connect(uri_to_connect)
         if not self.conn:
-            self.app.show_error_message(f"Failed to get connection for server preferences on {uri_to_connect}.")
+            self.app.show_error_message(ErrorMessages.FAILED_TO_GET_CONNECTION_PREFS_TEMPLATE.format(uri=uri_to_connect))
             self.dismiss()
             return
 
@@ -103,21 +107,21 @@ class ServerPrefModal(BaseModal[None]):
 
         button_container = Vertical(
             Horizontal(
-                Button("De/Active", id="toggle-net-active-btn", classes="toggle-detail-button",
+                Button(ButtonLabels.DE_ACTIVE, id="toggle-net-active-btn", classes="toggle-detail-button",
                        variant="primary", disabled=True, tooltip="Activate or Deactivate the selected network."),
-                Button("Autostart", id="toggle-net-autostart-btn", classes="toggle-detail-button",
+                Button(ButtonLabels.AUTOSTART, id="toggle-net-autostart-btn", classes="toggle-detail-button",
                        variant="primary", disabled=True, tooltip="Enable or Disable autostart for the selected network."),
             ),
             Horizontal(
-                Button("Add", id="add-net-btn", variant="success", classes="toggle-detail-button",
+                Button(ButtonLabels.ADD, id="add-net-btn", variant="success", classes="toggle-detail-button",
                        tooltip="Add a new network."),
-                Button("Edit", id="edit-net-btn", variant="success", classes="toggle-detail-button",
+                Button(ButtonLabels.EDIT, id="edit-net-btn", variant="success", classes="toggle-detail-button",
                        disabled=True, tooltip="Edit the selected network."),
-                Button("View", id="view-net-btn", variant="success", classes="toggle-detail-button",
+                Button(ButtonLabels.VIEW, id="view-net-btn", variant="success", classes="toggle-detail-button",
                        disabled=True, tooltip="View XML details of the selected network."),
-                Button("Delete", id="delete-net-btn", variant="error", classes="toggle-detail-button",
+                Button(ButtonLabels.DELETE, id="delete-net-btn", variant="error", classes="toggle-detail-button",
                        disabled=True, tooltip="Delete the selected network."),
-                Button("Help", id="help-net-btn", variant="success", classes="toggle-detail-button",
+                Button(ButtonLabels.HELP, id="help-net-btn", variant="success", classes="toggle-detail-button",
                        tooltip="Show network configuration help."),
             ),
             classes="server-pref-button"
@@ -145,9 +149,9 @@ class ServerPrefModal(BaseModal[None]):
 
 
             if num_vms > AppCacheTimeout.DONT_DISPLAY_DISK_USAGE:
-                self.app.show_warning_message(f"More than {AppCacheTimeout.DONT_DISPLAY_DISK_USAGE} VMs detected on this server.\nSkipping disk usage scan to prevent UI freeze.")
+                self.app.show_warning_message(WarningMessages.TOO_MANY_VMS_DISK_USAGE_WARNING_TEMPLATE.format(count=AppCacheTimeout.DONT_DISPLAY_DISK_USAGE))
             else:
-                self.app.show_warning_message(f"Runing disk usage scan, this can freeze the UI for larger numbers of VMs and disks.")
+                #self.app.show_warning_message(WarningMessages.RUNNING_DISK_USAGE_SCAN_WARNING)
                 disk_map = get_all_vm_disk_usage(self.conn)
                 nvram_map = get_all_vm_nvram_usage(self.conn)
                 #overlay_map = get_all_vm_overlay_usage(self.conn)
@@ -177,25 +181,25 @@ class ServerPrefModal(BaseModal[None]):
                 Button(id="toggle-autostart-pool-btn", variant="primary", classes="toggle-detail-button",
                        tooltip="Enable or Disable autostart for the selected storage pool."),
                 Vertical(
-                    Button("Add Pool", id="add-pool-btn", variant="success", classes="toggle-detail-button",
+                    Button(ButtonLabels.ADD_POOL, id="add-pool-btn", variant="success", classes="toggle-detail-button",
                            tooltip="Add a new storage pool."),
-                    Button("Delete Pool", id="del-pool-btn", variant="error", classes="toggle-detail-button",
+                    Button(ButtonLabels.DELETE_POOL, id="del-pool-btn", variant="error", classes="toggle-detail-button",
                            tooltip="Delete the selected storage pool."),
                 ),
                 Vertical(
-                    Button("New Volume", id="add-vol-btn", variant="success", classes="toggle-detail-button",
+                    Button(ButtonLabels.NEW_VOLUME, id="add-vol-btn", variant="success", classes="toggle-detail-button",
                            tooltip="Create a new volume in the selected pool."),
-                    Button("Attach Vol", id="attach-vol-btn", variant="success", classes="toggle-detail-button",
+                    Button(ButtonLabels.ATTACH_VOL, id="attach-vol-btn", variant="success", classes="toggle-detail-button",
                            tooltip="Attach an existing disk file as a volume."),
-                    Button("Move Volume", id="move-vol-btn", variant="success", classes="toggle-detail-button",
+                    Button(ButtonLabels.MOVE_VOLUME, id="move-vol-btn", variant="success", classes="toggle-detail-button",
                            tooltip="Move the selected volume to another pool."),
-                    Button("Delete Volume", id="del-vol-btn", variant="error", classes="toggle-detail-button",
+                    Button(ButtonLabels.DELETE_VOLUME, id="del-vol-btn", variant="error", classes="toggle-detail-button",
                            tooltip="Delete the selected volume."),
                 ),
                 Vertical(
-                    Button("View XML", id="view-storage-xml-btn", variant="primary", classes="toggle-detail-button",
+                    Button(ButtonLabels.VIEW_XML, id="view-storage-xml-btn", variant="primary", classes="toggle-detail-button",
                            tooltip="View XML details of the selected pool or volume."),
-                    Button("Edit XML", id="edit-pool-xml-btn", variant="primary", classes="toggle-detail-button",
+                    Button(ButtonLabels.EDIT_XML, id="edit-pool-xml-btn", variant="primary", classes="toggle-detail-button",
                            tooltip="Edit XML of the selected pool."),
                 ),
             ),
@@ -248,20 +252,28 @@ class ServerPrefModal(BaseModal[None]):
         pools = storage_manager.list_storage_pools(self.conn)
         node_to_select = None
         for pool_data in pools:
-            pool_name = pool_data['name']
-            status = pool_data['status']
-            autostart = "autostart" if pool_data['autostart'] else "no autostart"
-            label = f"{pool_name} [{status}, {autostart}]"
-            pool_node = tree.root.add(label, data=pool_data)
-            pool_node.data["type"] = "pool"
-            # Add a dummy node to make the pool node expandable
-            pool_node.add_leaf("Loading volumes...")
-
-            if expand_pools and pool_name in expand_pools:
-                self.app.call_later(pool_node.expand)
-
-            if select_pool and pool_name == select_pool:
-                node_to_select = pool_node
+            try:
+                pool_name = pool_data['name']
+                status = pool_data['status']
+                autostart = "autostart" if pool_data['autostart'] else "no autostart"
+                label = f"{pool_name} [{status}, {autostart}]"
+                pool_node = tree.root.add(label, data=pool_data)
+                pool_node.data["type"] = "pool"
+                # Add a dummy node to make the pool node expandable
+                pool_node.add_leaf("Loading volumes...")
+
+                if expand_pools and pool_name in expand_pools:
+                    self.app.call_later(pool_node.expand)
+
+                if select_pool and pool_name == select_pool:
+                    node_to_select = pool_node
+            except libvirt.libvirtError:
+                # Handle cases where pool might be listed but inaccessible (e.g. NFS down)
+                pool_name = pool_data.get('name', 'Unknown')
+                label = f"{pool_name} [unavailable]"
+                pool_node = tree.root.add(label, data=pool_data)
+                pool_node.data["type"] = "pool"
+                pool_node.add_leaf("Pool unavailable")
 
         if node_to_select:
             self.app.call_later(tree.select_node, node_to_select)
@@ -278,7 +290,7 @@ class ServerPrefModal(BaseModal[None]):
 
         table.clear()
 
-        self.app.show_warning_message(f"Runing network usage scan, this can freeze the UI for larger numbers of VMs.")
+        #self.app.show_warning_message(WarningMessages.RUNNING_NETWORK_USAGE_SCAN_WARNING)
         network_usage = get_all_network_usage(self.conn)
         self.networks_list = list_networks(self.conn)
 
@@ -308,7 +320,8 @@ class ServerPrefModal(BaseModal[None]):
         if len(node.children) == 1 and node.children[0].data is None:
             node.remove_children()
             pool = node_data.get('pool')
-            if pool and pool.isActive():
+            # Check cached status instead of calling pool.isActive() to avoid blocking
+            if pool and node_data.get('status') == 'active':
                 volumes = storage_manager.list_storage_volumes(pool)
                 for vol_data in volumes:
                     vol_name = vol_data['name']
@@ -379,14 +392,14 @@ class ServerPrefModal(BaseModal[None]):
             return
 
         if not target_obj:
-            self.app.show_error_message("Could not find object to display XML for.")
+            self.app.show_error_message(ErrorMessages.COULD_NOT_FIND_OBJECT_XML)
             return
 
         try:
             xml_content = target_obj.XMLDesc(0)
             self.app.push_screen(XMLDisplayModal(xml_content, read_only=True))
         except libvirt.libvirtError as e:
-            self.app.show_error_message(f"Error getting XML for {node_type}: {e}")
+            self.app.show_error_message(ErrorMessages.ERROR_GETTING_XML_FOR_TYPE_TEMPLATE.format(obj_type=node_type, error=e))
 
     @on(Button.Pressed, "#edit-pool-xml-btn")
     def on_edit_pool_xml_button_pressed(self, event: Button.Pressed) -> None:
@@ -401,11 +414,11 @@ class ServerPrefModal(BaseModal[None]):
 
         pool = node_data.get('pool')
         if not pool:
-            self.app.show_error_message("Could not find pool object to edit.")
+            self.app.show_error_message(ErrorMessages.COULD_NOT_FIND_POOL_EDIT)
             return
 
-        if pool.isActive():
-            self.app.show_error_message("Pool must be inactive to edit its XML definition.")
+        if node_data.get('status') == 'active':
+            self.app.show_error_message(ErrorMessages.POOL_MUST_BE_INACTIVE_FOR_XML_EDIT)
             return
 
         def on_edit_confirm(confirmed: bool) -> None:
@@ -415,7 +428,7 @@ class ServerPrefModal(BaseModal[None]):
             try:
                 xml_content = pool.XMLDesc(0)
             except libvirt.libvirtError as e:
-                self.app.show_error_message(f"Error getting XML for pool: {e}")
+                self.app.show_error_message(ErrorMessages.ERROR_GETTING_XML_FOR_POOL_TEMPLATE.format(error=e))
                 return
 
             def on_xml_save(new_xml: str | None) -> None:
@@ -425,21 +438,17 @@ class ServerPrefModal(BaseModal[None]):
                 try:
                     # Redefine the pool with the new XML
                     self.conn.storagePoolDefineXML(new_xml, 0)
-                    self.app.show_success_message(f"Storage pool '{pool.name()}' updated successfully.")
+                    self.app.show_success_message(SuccessMessages.STORAGE_POOL_UPDATED_SUCCESSFULLY_TEMPLATE.format(pool_name=pool.name()))
                     storage_manager.list_storage_pools.cache_clear()
                     self._load_storage_pools()  # Refresh the tree
                 except libvirt.libvirtError as e:
-                    self.app.show_error_message(f"Error updating pool XML: {e}")
+                    self.app.show_error_message(ErrorMessages.ERROR_UPDATING_POOL_XML_TEMPLATE.format(error=e))
                 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_XML.format(error=e))
 
             self.app.push_screen(XMLDisplayModal(xml_content, read_only=False), on_xml_save)
 
-        warning_message = (
-            "Editing a pool's XML definition is an advanced operation.\n"
-            "An invalid configuration may make its volumes inaccessible to VMs.\n\n"
-            "Are you sure you want to proceed?"
-        )
+        warning_message = ErrorMessages.EDIT_POOL_XML_WARNING
         self.app.push_screen(ConfirmationDialog(warning_message), on_edit_confirm)
 
     @on(Button.Pressed, "#toggle-active-pool-btn")
@@ -458,12 +467,13 @@ class ServerPrefModal(BaseModal[None]):
         is_active = node_data.get('status') == 'active'
         try:
             storage_manager.set_pool_active(pool, not is_active)
-            self.app.show_success_message(f"Pool '{pool.name()}' is now {'inactive' if is_active else 'active'}.")
+            status = 'inactive' if is_active else 'active'
+            self.app.show_success_message(SuccessMessages.POOL_ACTIVATION_CHANGE_TEMPLATE.format(pool_name=pool.name(), status=status))
             node_data['status'] = 'inactive' if is_active else 'active'
             storage_manager.list_storage_pools.cache_clear()
             self._load_storage_pools(select_pool=pool_name) # Refresh the tree
         except Exception as e:
-            self.app.show_error_message(str(e))
+            self.app.show_error_message(ErrorMessages.ERROR_TOGGLE_POOL_ACTIVE_TEMPLATE.format(error=e))
 
     @on(Button.Pressed, "#toggle-autostart-pool-btn")
     def on_toggle_autostart_pool_button_pressed(self, event: Button.Pressed) -> None:
@@ -481,12 +491,13 @@ class ServerPrefModal(BaseModal[None]):
         has_autostart = node_data.get('autostart', False)
         try:
             storage_manager.set_pool_autostart(pool, not has_autostart)
-            self.app.show_success_message(f"Autostart for pool '{pool.name()}' is now {'off' if has_autostart else 'on'}.")
+            status = 'off' if has_autostart else 'on'
+            self.app.show_success_message(SuccessMessages.POOL_AUTOSTART_CHANGE_TEMPLATE.format(pool_name=pool.name(), status=status))
             node_data['autostart'] = not has_autostart
             storage_manager.list_storage_pools.cache_clear()
             self._load_storage_pools(select_pool=pool_name) # Refresh the tree
         except Exception as e:
-            self.app.show_error_message(str(e))
+            self.app.show_error_message(ErrorMessages.ERROR_TOGGLE_POOL_AUTOSTART_TEMPLATE.format(error=e))
 
     @on(Button.Pressed, "#add-vol-btn")
     def on_add_volume_button_pressed(self, event: Button.Pressed) -> None:
@@ -510,7 +521,7 @@ class ServerPrefModal(BaseModal[None]):
                         result['size_gb'],
                         result['format']
                     )
-                    self.app.show_success_message(f"Volume [b]{result['name']} {result['size_gb']}Gb {result['format']}[/b] created successfully.")
+                    self.app.show_success_message(SuccessMessages.VOLUME_CREATED_SUCCESSFULLY_TEMPLATE.format(name=result['name'], size_gb=result['size_gb'], format=result['format']))
                     storage_manager.list_storage_volumes.cache_clear()
                     pool_node.add_leaf(result['name'])
 
@@ -527,7 +538,7 @@ class ServerPrefModal(BaseModal[None]):
 
             volume_path = result.get('path')
             if not volume_path or not os.path.exists(volume_path):
-                self.app.show_error_message(f"Invalid or non-existent path: {volume_path}")
+                self.app.show_error_message(ErrorMessages.INVALID_OR_NON_EXISTENT_PATH_TEMPLATE.format(path=volume_path))
                 return
 
             volume_dir = os.path.dirname(volume_path)
@@ -538,11 +549,10 @@ class ServerPrefModal(BaseModal[None]):
                     existing_pool.refresh(0)
                     storage_manager.list_storage_volumes.cache_clear()
                     self.app.show_success_message(
-                        f"A pool named '{existing_pool.name()}' already manages this directory.\n"
-                        "Refreshed pool to include the new volume."
+                        SuccessMessages.POOL_MANAGED_BY_EXISTING_POOL_TEMPLATE.format(pool_name=existing_pool.name())
                     )
                 except libvirt.libvirtError as e:
-                    self.app.show_error_message(f"Error refreshing pool: {e}")
+                    self.app.show_error_message(ErrorMessages.ERROR_REFRESHING_POOL_TEMPLATE.format(error=e))
                 
                 self._load_storage_pools(expand_pools=[existing_pool.name()])
                 return
@@ -554,17 +564,16 @@ class ServerPrefModal(BaseModal[None]):
                     try:
                         storage_manager.create_storage_pool(self.conn, new_pool_name, 'dir', volume_dir)
                         self.app.show_success_message(
-                            f"Storage pool '{new_pool_name}' created for directory:\n{volume_dir}"
+                            SuccessMessages.STORAGE_POOL_CREATED_TEMPLATE.format(name=new_pool_name)
                         )
                         storage_manager.list_storage_pools.cache_clear()
                         self._load_storage_pools(expand_pools=[new_pool_name])
                     except Exception as e:
-                        self.app.show_error_message(f"Error creating storage pool: {e}")
+                        self.app.show_error_message(ErrorMessages.ERROR_CREATING_STORAGE_POOL_FOR_DIR_TEMPLATE.format(error=e))
 
             self.app.push_screen(
                 ConfirmationDialog(
-                    f"No storage pool exists for the directory:\n'{volume_dir}'.\n\n"
-                    f"Create a new pool named '{new_pool_name}'?"
+                    ErrorMessages.NO_POOL_FOR_DIRECTORY_CONFIRM_TEMPLATE.format(directory=volume_dir, pool_name=new_pool_name)
                 ),
                 on_confirm_create
             )
@@ -597,14 +606,14 @@ class ServerPrefModal(BaseModal[None]):
             if confirmed:
                 try:
                     storage_manager.delete_storage_pool(pool)
-                    self.app.show_success_message(f"Storage pool '{pool_name}' deleted successfully.")
+                    self.app.show_success_message(SuccessMessages.STORAGE_POOL_DELETED_SUCCESSFULLY_TEMPLATE.format(pool_name=pool_name))
                     storage_manager.list_storage_pools.cache_clear()
                     self._load_storage_pools() # Refresh the tree
                 except Exception as e:
-                    self.app.show_error_message(str(e))
+                    self.app.show_error_message(ErrorMessages.UNEXPECTED_ERROR_OCCURRED_TEMPLATE_XML.format(error=e))
 
         self.app.push_screen(
-                ConfirmationDialog(f"Are you sure you want to delete storage pool:\n' {pool_name}'\nThis will delete the pool definition but not the data on it."), on_confirm)
+                ConfirmationDialog(ErrorMessages.DELETE_STORAGE_POOL_CONFIRMATION_TEMPLATE.format(pool_name=pool_name)), on_confirm)
 
     @on(Button.Pressed, "#del-vol-btn")
     def on_delete_volume_button_pressed(self, event: Button.Pressed) -> None:
@@ -623,7 +632,7 @@ class ServerPrefModal(BaseModal[None]):
             if confirmed:
                 try:
                     storage_manager.delete_volume(vol)
-                    self.app.show_success_message(f"Volume '{vol_name}' deleted successfully.")
+                    self.app.show_success_message(SuccessMessages.VOLUME_DELETED_SUCCESSFULLY_TEMPLATE.format(volume_name=vol_name))
                     # Clear the cache to force a refresh
                     list_storage_volumes.cache_clear()
                     # Refresh the parent node
@@ -633,10 +642,10 @@ class ServerPrefModal(BaseModal[None]):
                         parent_node.add_leaf("No volumes")
 
                 except Exception as e:
-                    self.app.show_error_message(str(e))
+                    self.app.show_error_message(ErrorMessages.UNEXPECTED_ERROR_OCCURRED_TEMPLATE_XML.format(error=e))
 
         self.app.push_screen(
-                ConfirmationDialog(f"Are you sure you want to delete volume:\n'{vol_name}'"),
+                ConfirmationDialog(ErrorMessages.DELETE_VOLUME_CONFIRMATION_TEMPLATE.format(vol_name=vol_name)),
             on_confirm
         )
 
@@ -652,7 +661,7 @@ class ServerPrefModal(BaseModal[None]):
 
         volume_name = node_data.get('name')
         if not tree.cursor_node.parent or not tree.cursor_node.parent.data:
-            self.app.show_error_message("Could not determine the source pool.")
+            self.app.show_error_message(ErrorMessages.COULD_NOT_DETERMINE_SOURCE_POOL)
             return
         source_pool_name = tree.cursor_node.parent.data.get('name')
 
@@ -708,7 +717,7 @@ class ServerPrefModal(BaseModal[None]):
                     self._load_storage_pools()
 
                     return {
-                        "message": f"Volume '{volume_name}' moved to pool '{dest_pool_name}'.",
+                        "message": SuccessMessages.VOLUME_MOVED_SUCCESSFULLY_TEMPLATE.format(volume_name=volume_name, dest_pool_name=dest_pool_name),
                         "source_pool": source_pool_name,
                         "dest_pool": dest_pool_name,
                         "updated_vms": updated_vms
@@ -750,10 +759,10 @@ class ServerPrefModal(BaseModal[None]):
                 updated_vms = result.get("updated_vms", [])
                 if updated_vms:
                     vm_list = ", ".join(updated_vms)
-                    self.app.show_success_message(f"Updated VM configurations for: {vm_list}")
+                    self.app.show_success_message(SuccessMessages.UPDATED_VM_CONFIGURATIONS_TEMPLATE.format(vm_list=vm_list))
                 self._load_storage_pools(expand_pools=[result["source_pool"], result["dest_pool"]])
         elif event.worker.state == "ERROR":
-            self.app.show_error_message(f"Move operation failed: {event.worker.error}")
+            self.app.show_error_message(ErrorMessages.MOVE_OPERATION_FAILED_TEMPLATE.format(error=event.worker.error))
             self._load_storage_pools()
 
     @on(DataTable.RowSelected, "#networks-table")
@@ -786,10 +795,12 @@ class ServerPrefModal(BaseModal[None]):
         if net_info:
             try:
                 set_network_active(self.conn, net_name, not net_info['active'])
-                self.app.show_success_message(f"Network '{net_name}' is now {'inactive' if net_info['active'] else 'active'}.")
+                status = 'inactive' if net_info['active'] else 'active'
+                self.app.show_success_message(SuccessMessages.NETWORK_ACTIVATION_CHANGE_TEMPLATE.format(net_name=net_name, status=status))
+                list_networks.cache_clear()
                 self._load_networks()
             except Exception as e:
-                self.app.show_error_message(str(e))
+                self.app.show_error_message(ErrorMessages.UNEXPECTED_ERROR_OCCURRED_TEMPLATE_XML.format(error=e))
 
     @on(Button.Pressed, "#toggle-net-autostart-btn")
     def on_toggle_net_autostart_pressed(self, event: Button.Pressed) -> None:
@@ -804,10 +815,12 @@ class ServerPrefModal(BaseModal[None]):
         if net_info:
             try:
                 set_network_autostart(self.conn, net_name, not net_info['autostart'])
-                self.app.show_success_message(f"Autostart for network '{net_name}' is now {'off' if net_info['autostart'] else 'on'}.")
+                status = 'off' if net_info['autostart'] else 'on'
+                self.app.show_success_message(SuccessMessages.NETWORK_AUTOSTART_CHANGE_TEMPLATE.format(net_name=net_name, status=status))
+                list_networks.cache_clear()
                 self._load_networks()
             except Exception as e:
-                self.app.show_error_message(str(e))
+                self.app.show_error_message(ErrorMessages.UNEXPECTED_ERROR_OCCURRED_TEMPLATE_XML.format(error=e))
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "close-btn":
@@ -822,15 +835,15 @@ class ServerPrefModal(BaseModal[None]):
             try:
                 conn = self.conn
                 if conn is None:
-                    self.app.show_error_message("Not connected to libvirt.")
+                    self.app.show_error_message(ErrorMessages.NOT_CONNECTED_TO_LIBVIRT)
                     return
                 net = conn.networkLookupByName(network_name)
                 network_xml = net.XMLDesc(0)
                 self.app.push_screen(NetworkXMLModal(network_name, network_xml))
             except libvirt.libvirtError as e:
-                self.app.show_error_message(f"Error getting network XML: {e}")
+                self.app.show_error_message(ErrorMessages.ERROR_GETTING_NETWORK_XML_TEMPLATE.format(error=e))
             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_XML.format(error=e))
 
         elif event.button.id == "edit-net-btn":
             table = self.query_one("#networks-table", DataTable)
@@ -842,17 +855,19 @@ class ServerPrefModal(BaseModal[None]):
 
             network_info = get_network_info(self.conn, network_name)
             if not network_info:
-                self.app.show_error_message(f"Could not retrieve info for network '{network_name}'.")
+                self.app.show_error_message(ErrorMessages.COULD_NOT_RETRIEVE_NETWORK_INFO_TEMPLATE.format(network_name=network_name))
                 return
 
             def on_create(success: bool):
                 if success:
+                    list_networks.cache_clear()
                     self._load_networks()
             self.app.push_screen(AddEditNetworkModal(self.conn, network_info=network_info), on_create)
 
         elif event.button.id == "add-net-btn":
             def on_create(success: bool):
                 if success:
+                    list_networks.cache_clear()
                     self._load_networks()
             self.app.push_screen(AddEditNetworkModal(self.conn), on_create)
 
@@ -865,19 +880,20 @@ class ServerPrefModal(BaseModal[None]):
             network_name = row_key.value
             vms_using_network = get_vms_using_network(self.conn, network_name)
 
-            confirm_message = f"Are you sure you want to delete network:\n'{network_name}'"
+            confirm_message = ErrorMessages.DELETE_NETWORK_CONFIRM_TEMPLATE.format(network_name=network_name)
             if vms_using_network:
                 vm_list = ", ".join(vms_using_network)
-                confirm_message += f"\nThis network is currently in use by the following VMs:\n{vm_list}."
+                confirm_message += ErrorMessages.NETWORK_IN_USE_WARNING_TEMPLATE.format(vm_list=vm_list)
 
             def on_confirm(confirmed: bool) -> None:
                 if confirmed:
                     try:
                         delete_network(self.conn, network_name)
-                        self.app.show_success_message(f"Network '{network_name}' deleted successfully.")
+                        self.app.show_success_message(SuccessMessages.NETWORK_DELETED_SUCCESSFULLY_TEMPLATE.format(network_name=network_name))
+                        list_networks.cache_clear()
                         self._load_networks()
                     except Exception as e:
-                        self.app.show_error_message(f"Error deleting network '{network_name}': {e}")
+                        self.app.show_error_message(ErrorMessages.ERROR_DELETING_NETWORK_TEMPLATE.format(network_name=network_name, error=e))
 
             self.app.push_screen(
                 ConfirmationDialog(confirm_message), on_confirm

vmanager/modals/utils_modals.py

@@ -20,6 +20,7 @@ from textual.widgets import (
 )
 
 from .base_modals import BaseDialog, BaseModal
+from ..constants import ButtonLabels
 
 
 def _sanitize_message(message: str) -> str:
@@ -93,11 +94,11 @@ class DirectorySelectionModal(BaseModal[str | None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="directory-selection-dialog"):
-            yield Label("Select a Directory")
+            yield Label(StaticText.SELECT_A_DIRECTORY)
             yield SafeDirectoryTree(self.start_path, id="dir-tree")
             with Horizontal():
-                yield Button("Select", variant="primary", id="select-btn", disabled=True)
-                yield Button("Cancel", variant="default", id="cancel-btn")
+                yield Button(ButtonLabels.SELECT, variant="primary", id="select-btn", disabled=True)
+                yield Button(ButtonLabels.CANCEL, variant="default", id="cancel-btn")
 
     def on_mount(self) -> None:
         self.query_one(SafeDirectoryTree).focus()
@@ -126,11 +127,11 @@ class FileSelectionModal(BaseModal[str | None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="file-selection-dialog", classes="file-selection-dialog"):
-            yield Label("Select a File")
+            yield Label(StaticText.SELECT_A_FILE)
             yield SafeDirectoryTree(self.start_path, id="file-tree")
             with Horizontal():
-                yield Button("Select", variant="primary", id="select-btn", disabled=True)
-                yield Button("Cancel", variant="default", id="cancel-btn")
+                yield Button(ButtonLabels.SELECT, variant="primary", id="select-btn", disabled=True)
+                yield Button(ButtonLabels.CANCEL, variant="default", id="cancel-btn")
 
     def on_mount(self) -> None:
         self.query_one(SafeDirectoryTree).focus()
@@ -207,8 +208,8 @@ class ConfirmationDialog(BaseDialog[bool]):
         yield Vertical(
             Markdown(self.prompt, id="question"),
             Horizontal(
-                Button("Yes", variant="error", id="yes", classes="dialog-buttons"),
-                Button("No", variant="primary", id="no", classes="dialog-buttons"),
+                Button(ButtonLabels.YES, variant="error", id="yes", classes="dialog-buttons"),
+                Button(ButtonLabels.NO, variant="primary", id="no", classes="dialog-buttons"),
                 id="dialog-buttons",
             ),
             id="dialog",
@@ -237,7 +238,7 @@ class InfoModal(BaseModal[None]):
             yield Label(self._title, classes="dialog-title")
             yield Markdown(self._message, classes="dialog-message")
             with Horizontal(classes="dialog-buttons"):
-                yield Button("OK", variant="primary", id="ok-btn")
+                yield Button(ButtonLabels.OK, variant="primary", id="ok-btn")
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         self.dismiss()

vmanager/modals/virsh_modals.py

@@ -11,6 +11,7 @@ from textual.widgets import (
 from textual.containers import Horizontal, Vertical
 from textual.screen import ModalScreen
 from textual import on
+from ..constants import StaticText
 
 class VirshShellScreen(ModalScreen):
     """Screen for an interactive virsh shell."""
@@ -26,8 +27,8 @@ class VirshShellScreen(ModalScreen):
     def compose(self) -> ComposeResult:
         with Vertical(id="virsh-shell-container"):
             yield Header()
-            yield Label("Virsh Interactive Shell (esc to quit)", id="virsh-shell-title")
-            yield Label("Note: This shell starts a new `virsh` process, which may require re-authentication for remote connections. Using SSH keys is recommended.", classes="virsh-shell-note")
+            yield Label(StaticText.VIRSH_SHELL_TITLE, id="virsh-shell-title")
+            yield Label(StaticText.VIRSH_SHELL_NOTE, classes="virsh-shell-note")
             yield TextArea(
                 id="virsh-output",
                 read_only=True,

vmanager/modals/virtiofs_modals.py

@@ -6,6 +6,7 @@ from textual.containers import Horizontal, Vertical
 from textual.widgets import (
         Button, Input, Label, Checkbox,
         )
+from ..constants import ErrorMessages, ButtonLabels, StaticText
 from .base_modals import BaseModal
 
 class AddEditVirtIOFSModal(BaseModal[dict | None]):
@@ -20,13 +21,13 @@ class AddEditVirtIOFSModal(BaseModal[dict | None]):
 
     def compose(self) -> ComposeResult:
         with Vertical(id="add-edit-virtiofs-dialog"):
-            yield Label("Edit VirtIO-FS Mount" if self.is_edit else "Add VirtIO-FS Mount")
+            yield Label(StaticText.EDIT_VIRTIOFS_MOUNT if self.is_edit else StaticText.ADD_VIRTIOFS_MOUNT)
             yield Input(placeholder="Source Path (e.g., /mnt/share)", id="virtiofs-source-input", value=self.source_path)
             yield Input(placeholder="Target Path (e.g., /share)", id="virtiofs-target-input", value=self.target_path)
-            yield Checkbox("Export filesystem as readonly mount", id="virtiofs-readonly-checkbox", value=self.readonly)
+            yield Checkbox(StaticText.EXPORT_READONLY_MOUNT, id="virtiofs-readonly-checkbox", value=self.readonly)
             with Horizontal():
-                yield Button("Save" if self.is_edit else "Add", variant="primary", id="save-add-btn", classes="Buttonpage")
-                yield Button("Cancel", variant="default", id="cancel-btn", classes="Buttonpage")
+                yield Button(ButtonLabels.SAVE if self.is_edit else ButtonLabels.ADD, variant="primary", id="save-add-btn", classes="Buttonpage")
+                yield Button(ButtonLabels.CANCEL, variant="default", id="cancel-btn", classes="Buttonpage")
 
     def on_button_pressed(self, event: Button.Pressed) -> None:
         if event.button.id == "save-add-btn":
@@ -35,7 +36,7 @@ class AddEditVirtIOFSModal(BaseModal[dict | None]):
             readonly = self.query_one("#virtiofs-readonly-checkbox", Checkbox).value
 
             if not source_path or not target_path:
-                self.app.show_error_message("Source Path and Target Path cannot be empty.")
+                self.app.show_error_message(ErrorMessages.VIRTIOFS_PATH_EMPTY)
                 return
 
             self.dismiss({'source_path': source_path, 'target_path': target_path, 'readonly': readonly})

vmanager/modals/vm_type_info_modal.py

@@ -6,6 +6,7 @@ from textual.containers import Vertical, Horizontal, ScrollableContainer
 from textual.widgets import Button, Markdown
 from textual import on
 from .base_modals import BaseModal
+from ..constants import ButtonLabels
 
 VM_TYPE_INFO_TEXT = """
 | [Storage Settings](https://www.qemu.org/docs/master/system/qemu-block-drivers.html) | Secure VM | Computation | Desktop (Linux) | Windows | Win Legacy | Server |
@@ -55,7 +56,7 @@ class VMTypeInfoModal(BaseModal[None]):
     def compose(self) -> ComposeResult:
         with ScrollableContainer(id="howto-vmtype-dialog", classes="howto-dialog"):
             yield Markdown(VM_TYPE_INFO_TEXT, id="howto-vmtype-markdown")
-            yield Button("Close", id="close-btn", variant="primary")
+            yield Button(ButtonLabels.CLOSE, id="close-btn", variant="primary")
 
     @on(Button.Pressed)
     def on_button_pressed(self, event: Button.Pressed) -> None: