diff options
| author | Cole Robinson <crobinso@redhat.com> | 2020-08-24 14:10:49 -0400 |
|---|---|---|
| committer | Cole Robinson <crobinso@redhat.com> | 2020-08-26 15:20:05 -0400 |
| commit | ea49c1d932975d8e305dbf27d789245ff78f47b9 (patch) | |
| tree | d166176bf6834556466ffcc4378191fb2ed14658 /ui | |
| parent | 0283f26ace7178ef84db266dfe4bcb3f7bd5ff4f (diff) | |
| download | virt-manager-ea49c1d932975d8e305dbf27d789245ff78f47b9.tar.gz | |
netlist: Rework the 'no network' case
Always force a network selection. If we have to fall back to
manual bridge UI because nothing else exists, show a warning.
Signed-off-by: Cole Robinson <crobinso@redhat.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/createvm.ui | 44 | ||||
| -rw-r--r-- | ui/netlist.ui | 38 |
2 files changed, 31 insertions, 51 deletions
diff --git a/ui/createvm.ui b/ui/createvm.ui index dbc949cd..879d4326 100644 --- a/ui/createvm.ui +++ b/ui/createvm.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.36.0 --> <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkAdjustment" id="adjustment2"> @@ -25,9 +25,6 @@ <property name="resizable">False</property> <property name="type_hint">dialog</property> <signal name="delete-event" handler="on_vmm_newcreate_delete_event" swapped="no"/> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkBox" id="vbox1"> <property name="visible">True</property> @@ -2349,42 +2346,6 @@ connections is not yet supported.</small></property> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox" id="netdev-warn-box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="netdev-warn-label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><small>pxe warning</small></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> @@ -2522,5 +2483,8 @@ connections is not yet supported.</small></property> </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> diff --git a/ui/netlist.ui b/ui/netlist.ui index ac711e00..61e68999 100644 --- a/ui/netlist.ui +++ b/ui/netlist.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.36.0 --> <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkGrid" id="net-source-box"> @@ -19,7 +19,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -32,7 +32,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -73,22 +73,34 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">3</property> <property name="width">2</property> </packing> </child> <child> - <object class="GtkBox" id="box2"> + <object class="GtkComboBox" id="net-source"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="hexpand">False</property> + <signal name="changed" handler="on_net_source_changed" swapped="no"/> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="net-default-warn-box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="spacing">6</property> <child> - <object class="GtkComboBox" id="net-source"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="hexpand">False</property> - <signal name="changed" handler="on_net_source_changed" swapped="no"/> + <property name="stock">gtk-dialog-warning</property> </object> <packing> <property name="expand">False</property> @@ -97,10 +109,14 @@ </packing> </child> <child> - <object class="GtkImage" id="net-source-warn"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="stock">gtk-dialog-warning</property> + <property name="halign">start</property> + <property name="label" translatable="yes"><small>Failed to find a suitable default network.</small></property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + <property name="max_width_chars">35</property> </object> <packing> <property name="expand">False</property> |