Improve consistency of VM manager buttons.

assets/images/console.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- "console" by Austin Andrews @Templarian from materialdesignicons.com -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"  width="24" height="24" viewBox="0 0 24 24">
+    <path fill="#000000" d="M20,19V7H4V19H20M20,3A2,2 0 0,1 22,5V19A2,2 0 0,1 20,21H4A2,2 0 0,1 2,19V5C2,3.89 2.9,3 4,3H20M13,17V15H18V17H13M9.58,13L5.57,9H8.4L11.7,12.3C12.09,12.69 12.09,13.33 11.7,13.72L8.42,17H5.59L9.58,13Z" />
+</svg>

lib/src/pages/manager.dart

@@ -4,6 +4,7 @@ import 'dart:core';
 import 'package:flutter/material.dart';
 import 'package:path/path.dart' as path;
 import 'package:file_picker/file_picker.dart';
+import 'package:flutter_svg/flutter_svg.dart';
 import 'dart:io';
 
 import '../globals.dart';
@@ -143,6 +144,7 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
 
   Widget _buildVmList() {
     List<Widget> _widgetList = [];
+    final Color buttonColor = Theme.of(context).brightness == Brightness.dark ? Colors.white70 : Theme.of(context).colorScheme.primary;
     _widgetList.add(
       Row(
         mainAxisAlignment: MainAxisAlignment.center,
@@ -156,7 +158,7 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
           ElevatedButton(
             style: ElevatedButton.styleFrom(
               primary: Theme.of(context).canvasColor,
-              onPrimary: Theme.of(context).brightness == Brightness.dark ? Colors.white70 : Theme.of(context).colorScheme.primary,
+              onPrimary: buttonColor
             ),
             onPressed: () async {
               String? result = await FilePicker.platform.getDirectoryPath();
@@ -175,7 +177,7 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
       ),
     );
     List<List<Widget>> rows = _currentVms.map((vm) {
-      return _buildRow(vm);
+      return _buildRow(vm, buttonColor);
     }).toList();
     for (var row in rows) {
       _widgetList.addAll(row);
@@ -187,14 +189,16 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
     );
   }
 
-  List<Widget> _buildRow(String currentVm) {
+  List<Widget> _buildRow(String currentVm, Color buttonColor) {
     final bool active = _activeVms.containsKey(currentVm);
-    final bool spicy = _spicyVms.contains(currentVm);
     final bool sshy = _sshVms.contains(currentVm);
     VmInfo vmInfo = VmInfo();
     String connectInfo = '';
     if (active) {
       vmInfo = _activeVms[currentVm]!;
+      if (vmInfo.spicePort != null) {
+        connectInfo += context.t('SPICE port') + ': ' + vmInfo.spicePort! + ' ';
+      }
       if (vmInfo.sshPort != null && _terminalEmulator != null) {
         connectInfo += context.t('SSH port') + ': ' + vmInfo.sshPort! + ' ';
         _detectSsh(int.parse(vmInfo.sshPort!)).then((sshRunning) {
@@ -209,9 +213,6 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
           }
         });
       }
-      if (vmInfo.spicePort != null) {
-        connectInfo += context.t('SPICE port') + ': ' + vmInfo.spicePort! + ' ';
-      }
     }
     return <Widget>[
       ListTile(
@@ -222,7 +223,7 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
               IconButton(
                   icon: Icon(
                     active ? Icons.play_arrow : Icons.play_arrow_outlined,
-                    color: active ? Colors.green : null,
+                    color: active ? Colors.green : buttonColor,
                     semanticLabel: active ? 'Running' : 'Run',
                   ),
                   onPressed: active ? null : () async {
@@ -244,8 +245,7 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
                   color: active ? Colors.red : null,
                   semanticLabel: active ? 'Stop' : 'Not running',
                 ),
-                onPressed: () {
+                onPressed: !active ? null : () {
-                  if (active) {
                   showDialog<bool>(
                     context: context,
                     builder: (BuildContext context) => AlertDialog(
@@ -271,25 +271,37 @@ class _ManagerState extends State<Manager> with PreferencesMixin {
                       });
                     }
                   });
-                  }
                 },
               ),
             ],
           )),
       if (connectInfo.isNotEmpty)
         ListTile(
-          title: Text(connectInfo),
+          title: Text(
+            connectInfo,
+            style: TextStyle(fontSize: 12)
+          ),
           trailing: Row(
             mainAxisSize: MainAxisSize.min,
             children: <Widget>[
-              TextButton(
+              IconButton(
-                child: Text('Spice'),
+                icon: Icon(
-                onPressed: () {
+                  Icons.monitor,
+                  color: _spicy ? buttonColor : null,
+                  semanticLabel: 'Connect display with SPICE',
+                ),
+                tooltip: _spicy? 'Connect display with SPICE' : 'SPICE client not found',
+                onPressed: !_spicy? null : () {
                   Process.start('spicy', ['-p', vmInfo.spicePort!]);
                 },
               ),
-              TextButton(
+              IconButton(
-                child: Text('SSH'),
+                icon: SvgPicture.asset(
+                  'assets/images/console.svg',
+                  semanticsLabel: 'Connect with SSH',
+                  color: sshy ? buttonColor : Colors.grey
+                ),
+                tooltip: sshy ? 'Connect with SSH' : 'SSH server not detected on guest',
                 onPressed: !sshy ? null : () {
                   TextEditingController _usernameController = TextEditingController();
                   showDialog<bool>(

pubspec.yaml

@@ -51,6 +51,7 @@ dependencies:
   flutter_localizations: 
     sdk: flutter
   desktop_notifications: ^0.6.1
+  flutter_svg: ^0.23.0
 
 dev_dependencies:
   flutter_test: