The checkbox to create the root FS should be aligned with the label of the root FS folder. --- ui/create.ui | 317 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 166 insertions(+), 151 deletions(-)
diff --git a/ui/create.ui b/ui/create.ui
index 142a7356..ae9d47d3 100644
--- a/ui/create.ui
+++ b/ui/create.ui
@@ -1600,11 +1600,13 @@ User shouldn't see this.</property>
<object class="GtkAlignment"
id="alignment27">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="left_padding">12</property>
<child>
<object class="GtkBox" id="vbox21">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property
name="valign">start</property>
<property
name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
@@ -1651,107 +1653,180 @@ User shouldn't see this.</property>
<property
name="position">0</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="install-oscontainer">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox"
id="install-oscontainer-notsupport">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox"
id="install-oscontainer-notsupport">
+ <object class="GtkImage" id="image3">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="spacing">6</property>
- <child>
- <object class="GtkImage"
id="image3">
- <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="label46">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property name="label"
translatable="yes"><small>The OS directory tree must already exist. To
enable OS directory tree creation,
+ <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="label46">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes"><small>The OS directory tree must already exist. To
enable OS directory tree creation,
please install <a
href="https://github.com/virt-manager/virt-bootstrap">virt-bootrap</a></small></property>
- <property
name="use_markup">True</property>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
- </child>
+ <property
name="use_markup">True</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="install-oscontainer-notsupport-conn">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="image8">
+ <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="label1">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes"><small>The OS directory tree must already exist.
Creating an OS directory tree for remote
+connections is not yet supported.</small></property>
+ <property
name="use_markup">True</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
<property
name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="install-oscontainer-bootstrap">
+ <property name="label"
translatable="yes">Create OS directory tree from container image</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="on_install_container_source_toggle" swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="install-oscontainer-source">
+ <property
name="visible">True</property>
+ <property
name="sensitive">False</property>
+ <property
name="can_focus">False</property>
+ <property
name="border_width">10</property>
+ <property
name="orientation">vertical</property>
+ <property name="spacing">10</property>
<child>
- <object class="GtkBox"
id="install-oscontainer-notsupport-conn">
+ <object class="GtkGrid">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="spacing">6</property>
<child>
- <object class="GtkImage"
id="image8">
+ <object class="GtkLabel">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="stock">gtk-dialog-warning</property>
+ <property name="label"
translatable="yes">Source URI:</property>
</object>
<packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">0</property>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel"
id="label1">
+ <object class="GtkComboBox"
id="install-oscontainer-source-url-combo">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property name="label"
translatable="yes"><small>The OS directory tree must already exist.
Creating an OS directory tree for remote
-connections is not yet supported.</small></property>
- <property
name="use_markup">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry"
id="install-oscontainer-source-url-entry">
+ <property
name="can_focus">True</property>
+ <property
name="placeholder_text"
translatable="yes">docker://srv:1234/myimg:tag</property>
+ </object>
+ </child>
</object>
<packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">2</property>
+ <property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="install-oscontainer-bootstrap">
- <property name="label"
translatable="yes">Create OS directory tree from container image</property>
+ <object class="GtkCheckButton"
id="install-oscontainer-source-insecure">
+ <property name="label"
translatable="yes">Do not verify TLS certificates of registry</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">False</property>
<property
name="draw_indicator">True</property>
- <signal name="toggled"
handler="on_install_container_source_toggle" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">3</property>
+ <property
name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkBox"
id="install-oscontainer-source">
+ <object class="GtkExpander"
id="install-oscontainer-auth-options">
<property
name="visible">True</property>
- <property
name="sensitive">False</property>
- <property
name="can_focus">False</property>
- <property
name="border_width">10</property>
- <property
name="orientation">vertical</property>
- <property
name="spacing">10</property>
+ <property
name="can_focus">True</property>
<child>
<object class="GtkGrid">
<property
name="visible">True</property>
@@ -1760,7 +1835,8 @@ connections is not yet supported.</small></property>
<object class="GtkLabel">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Source URI:</property>
+ <property
name="margin_right">10</property>
+ <property name="label"
translatable="yes">Username:</property>
</object>
<packing>
<property
name="left_attach">0</property>
@@ -1768,129 +1844,68 @@ connections is not yet
supported.</small></property>
</packing>
</child>
<child>
- <object class="GtkComboBox"
id="install-oscontainer-source-url-combo">
+ <object class="GtkLabel">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="hexpand">True</property>
- <property
name="has_entry">True</property>
- <child
internal-child="entry">
- <object class="GtkEntry"
id="install-oscontainer-source-url-entry">
- <property
name="can_focus">True</property>
- <property
name="placeholder_text"
translatable="yes">docker://srv:1234/myimg:tag</property>
- </object>
- </child>
+ <property
name="margin_right">10</property>
+ <property name="label"
translatable="yes">Password:</property>
</object>
<packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
+ <property
name="left_attach">0</property>
+ <property
name="top_attach">1</property>
</packing>
</child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="install-oscontainer-source-insecure">
- <property name="label"
translatable="yes">Do not verify TLS certificates of registry</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="draw_indicator">True</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkExpander"
id="install-oscontainer-auth-options">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkEntry"
id="install-oscontainer-source-user">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <child>
- <object class="GtkLabel">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="margin_right">10</property>
- <property name="label"
translatable="yes">Username:</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="margin_right">10</property>
- <property name="label"
translatable="yes">Password:</property>
- </object>
- <packing>
- <property
name="left_attach">0</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="install-oscontainer-source-user">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="install-oscontainer-source-passwd">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="visibility">False</property>
- <property
name="invisible_char">*</property>
- <property
name="input_purpose">password</property>
- </object>
- <packing>
- <property
name="left_attach">1</property>
- <property
name="top_attach">1</property>
- </packing>
- </child>
+ <property
name="can_focus">True</property>
</object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">0</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel">
+ <child>
+ <object class="GtkEntry"
id="install-oscontainer-source-passwd">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Credentials for accessing the source registry</property>
+ <property
name="can_focus">True</property>
+ <property
name="visibility">False</property>
+ <property
name="invisible_char">*</property>
+ <property
name="input_purpose">password</property>
</object>
+ <packing>
+ <property
name="left_attach">1</property>
+ <property
name="top_attach">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">2</property>
- </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Credentials for accessing the source registry</property>
+ </object>
</child>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
--
2.15.1
_______________________________________________
virt-tools-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/virt-tools-list
