[virt-tools-list] [virt-viewer 4/5] ui: Rename UI files to .ui (instead of .xml)
Jonathon Jongsma
jjongsma at redhat.com
Fri Jun 17 21:49:00 UTC 2016
Acked-by: Jonathon Jongsma <jjongsma at redhat.com>
On Tue, 2016-06-14 at 23:40 +0200, Fabiano Fidêncio wrote:
> When using GtkApplication, Gtk automatically searches for the menus of
> the application at "org/example/app/gtk/menus.ui".
>
> Currently we don't have a "menus.ui", but try to see this commit is a
> first step in order to use app-menu.
>
> For now, let's standardize that all our UI files will have the ".ui"
> extension instead of the ".xml" one.
>
> Signed-off-by: Fabiano Fidêncio <fidencio at redhat.com>
> ---
> po/POTFILES.in | 14 +--
> src/Makefile.am | 16 +--
> src/remote-viewer-connect.c | 2 +-
> src/remote-viewer-connect.ui | 152 ++++++++++++++++++++++
> src/remote-viewer-connect.xml | 152 ----------------------
> src/virt-viewer-about.ui | 66 ++++++++++
> src/virt-viewer-about.xml | 66 ----------
> src/virt-viewer-app.c | 2 +-
> src/virt-viewer-auth.c | 2 +-
> src/virt-viewer-auth.ui | 160 ++++++++++++++++++++++++
> src/virt-viewer-auth.xml | 160 ------------------------
> src/virt-viewer-guest-details.ui | 120 ++++++++++++++++++
> src/virt-viewer-guest-details.xml | 120 ------------------
> src/virt-viewer-preferences.ui | 134 ++++++++++++++++++++
> src/virt-viewer-preferences.xml | 134 --------------------
> src/virt-viewer-vm-connection.c | 2 +-
> src/virt-viewer-vm-connection.ui | 117 +++++++++++++++++
> src/virt-viewer-vm-connection.xml | 117 -----------------
> src/virt-viewer-window.c | 6 +-
> src/virt-viewer.gresource.xml | 14 +--
> src/virt-viewer.ui | 256
> ++++++++++++++++++++++++++++++++++++++
> src/virt-viewer.xml | 256 -----------------------------------
> ---
> 22 files changed, 1034 insertions(+), 1034 deletions(-)
> create mode 100644 src/remote-viewer-connect.ui
> delete mode 100644 src/remote-viewer-connect.xml
> create mode 100644 src/virt-viewer-about.ui
> delete mode 100644 src/virt-viewer-about.xml
> create mode 100644 src/virt-viewer-auth.ui
> delete mode 100644 src/virt-viewer-auth.xml
> create mode 100644 src/virt-viewer-guest-details.ui
> delete mode 100644 src/virt-viewer-guest-details.xml
> create mode 100644 src/virt-viewer-preferences.ui
> delete mode 100644 src/virt-viewer-preferences.xml
> create mode 100644 src/virt-viewer-vm-connection.ui
> delete mode 100644 src/virt-viewer-vm-connection.xml
> create mode 100644 src/virt-viewer.ui
> delete mode 100644 src/virt-viewer.xml
>
> diff --git a/po/POTFILES.in b/po/POTFILES.in
> index 9916deb..adf8fa7 100644
> --- a/po/POTFILES.in
> +++ b/po/POTFILES.in
> @@ -2,11 +2,11 @@ data/remote-viewer.desktop.in
> data/virt-viewer-mime.xml.in
> src/remote-viewer-main.c
> src/remote-viewer.c
> -[type: gettext/glade] src/remote-viewer-connect.xml
> -[type: gettext/glade] src/virt-viewer-about.xml
> +[type: gettext/glade] src/remote-viewer-connect.ui
> +[type: gettext/glade] src/virt-viewer-about.ui
> src/virt-viewer-app.c
> src/virt-viewer-auth.c
> -[type: gettext/glade] src/virt-viewer-auth.xml
> +[type: gettext/glade] src/virt-viewer-auth.ui
> src/virt-viewer-display-vnc.c
> src/virt-viewer-file-transfer-dialog.c
> src/virt-viewer-main.c
> @@ -16,7 +16,7 @@ src/virt-viewer-vm-connection.c
> src/virt-viewer-window.c
> src/virt-viewer-file.c
> src/virt-viewer.c
> -[type: gettext/glade] src/virt-viewer.xml
> -[type: gettext/glade] src/virt-viewer-guest-details.xml
> -[type: gettext/glade] src/virt-viewer-vm-connection.xml
> -[type: gettext/glade] src/virt-viewer-preferences.xml
> +[type: gettext/glade] src/virt-viewer.ui
> +[type: gettext/glade] src/virt-viewer-guest-details.ui
> +[type: gettext/glade] src/virt-viewer-vm-connection.ui
> +[type: gettext/glade] src/virt-viewer-preferences.ui
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 115d73d..a93c24b 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -5,14 +5,14 @@ bin_PROGRAMS =
>
> noinst_LTLIBRARIES = libvirt-viewer-util.la libvirt-viewer.la
>
> -noinst_DATA = \
> - virt-viewer.xml \
> - virt-viewer-about.xml \
> - virt-viewer-auth.xml \
> - virt-viewer-guest-details.xml \
> - virt-viewer-vm-connection.xml \
> - virt-viewer-preferences.xml \
> - remote-viewer-connect.xml \
> +noinst_DATA = \
> + virt-viewer.ui \
> + virt-viewer-about.ui \
> + virt-viewer-auth.ui \
> + virt-viewer-guest-details.ui \
> + virt-viewer-vm-connection.ui \
> + virt-viewer-preferences.ui \
> + remote-viewer-connect.ui \
> $(NULL)
>
> EXTRA_DIST = \
> diff --git a/src/remote-viewer-connect.c b/src/remote-viewer-connect.c
> index d929b21..2fbc5ff 100644
> --- a/src/remote-viewer-connect.c
> +++ b/src/remote-viewer-connect.c
> @@ -188,7 +188,7 @@ remote_viewer_connect_dialog(gchar **uri)
> g_return_val_if_fail(uri && *uri == NULL, FALSE);
>
> /* Create the widgets */
> - builder = virt_viewer_util_load_ui("remote-viewer-connect.xml");
> + builder = virt_viewer_util_load_ui("remote-viewer-connect.ui");
> g_return_val_if_fail(builder != NULL, GTK_RESPONSE_NONE);
>
> window = GTK_WIDGET(gtk_builder_get_object(builder, "remote-viewer-
> connection-window"));
> diff --git a/src/remote-viewer-connect.ui b/src/remote-viewer-connect.ui
> new file mode 100644
> index 0000000..dcd14cf
> --- /dev/null
> +++ b/src/remote-viewer-connect.ui
> @@ -0,0 +1,152 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!-- Generated with glade 3.18.3 -->
> +<interface>
> + <object class="GtkWindow" id="remote-viewer-connection-window">
> + <property name="can_focus">False</property>
> + <property name="title" translatable="yes">Connection details</property>
> + <child>
> + <object class="GtkVBox" id="main-box">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="border_width">10</property>
> + <property name="spacing">20</property>
> + <child>
> + <object class="GtkVBox" id="connection-address-box">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="connection-address-label">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="label" translatable="yes">Connection
> Address</property>
> + <property name="xalign">0</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkEntry" id="connection-address-entry">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="example-label">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="sensitive">False</property>
> + <property name="label" translatable="yes">For example,
> spice://foo.example.org:5900</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">2</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="GtkVBox" id="recent-chooser-box">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="recent-chooser-label">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="label" translatable="yes">Recent
> connections</property>
> + <property name="xalign">0</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkRecentChooserWidget" id="recent-chooser">
> + <property name="can_focus">False</property>
> + <property name="limit">20</property>
> + <property name="local_only">False</property>
> + <property name="show_icons">False</property>
> + <property name="sort_type">mru</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">True</property>
> + <property name="fill">True</property>
> + <property name="position">2</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkHButtonBox" id="button-box">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="resize_mode">immediate</property>
> + <property name="spacing">6</property>
> + <property name="layout_style">end</property>
> + <child>
> + <object class="GtkButton" id="cancel-button">
> + <property name="label" translatable="yes">Cancel</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkButton" id="connect-button">
> + <property name="label" translatable="yes">Connect</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">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">False</property>
> + <property name="pack_type">end</property>
> + <property name="position">3</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + </object>
> +</interface>
> diff --git a/src/remote-viewer-connect.xml b/src/remote-viewer-connect.xml
> deleted file mode 100644
> index dcd14cf..0000000
> --- a/src/remote-viewer-connect.xml
> +++ /dev/null
> @@ -1,152 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!-- Generated with glade 3.18.3 -->
> -<interface>
> - <object class="GtkWindow" id="remote-viewer-connection-window">
> - <property name="can_focus">False</property>
> - <property name="title" translatable="yes">Connection details</property>
> - <child>
> - <object class="GtkVBox" id="main-box">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="border_width">10</property>
> - <property name="spacing">20</property>
> - <child>
> - <object class="GtkVBox" id="connection-address-box">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="spacing">6</property>
> - <child>
> - <object class="GtkLabel" id="connection-address-label">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="label" translatable="yes">Connection
> Address</property>
> - <property name="xalign">0</property>
> - <attributes>
> - <attribute name="weight" value="bold"/>
> - </attributes>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkEntry" id="connection-address-entry">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">1</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="example-label">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="sensitive">False</property>
> - <property name="label" translatable="yes">For example,
> spice://foo.example.org:5900</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">2</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="GtkVBox" id="recent-chooser-box">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="spacing">6</property>
> - <child>
> - <object class="GtkLabel" id="recent-chooser-label">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="label" translatable="yes">Recent
> connections</property>
> - <property name="xalign">0</property>
> - <attributes>
> - <attribute name="weight" value="bold"/>
> - </attributes>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkRecentChooserWidget" id="recent-chooser">
> - <property name="can_focus">False</property>
> - <property name="limit">20</property>
> - <property name="local_only">False</property>
> - <property name="show_icons">False</property>
> - <property name="sort_type">mru</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">True</property>
> - <property name="fill">True</property>
> - <property name="position">2</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkHButtonBox" id="button-box">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="resize_mode">immediate</property>
> - <property name="spacing">6</property>
> - <property name="layout_style">end</property>
> - <child>
> - <object class="GtkButton" id="cancel-button">
> - <property name="label" translatable="yes">Cancel</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="receives_default">True</property>
> - </object>
> - <packing>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkButton" id="connect-button">
> - <property name="label" translatable="yes">Connect</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="receives_default">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">False</property>
> - <property name="pack_type">end</property>
> - <property name="position">3</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-about.ui b/src/virt-viewer-about.ui
> new file mode 100644
> index 0000000..28e38c8
> --- /dev/null
> +++ b/src/virt-viewer-about.ui
> @@ -0,0 +1,66 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<interface>
> + <!-- interface-requires gtk+ 2.12 -->
> + <object class="GtkAboutDialog" id="about">
> + <property name="can_focus">False</property>
> + <property name="border_width">5</property>
> + <property name="title" translatable="yes">About Virt-Viewer</property>
> + <property name="resizable">False</property>
> + <property name="modal">True</property>
> + <property name="window_position">center-on-parent</property>
> + <property name="destroy_with_parent">True</property>
> + <property name="type_hint">dialog</property>
> + <property name="skip_taskbar_hint">True</property>
> + <property name="skip_pager_hint">True</property>
> + <property name="program_name">Virtual Machine Viewer</property>
> + <property name="copyright" translatable="yes">Copyright (C) 2007-2012
> Daniel P. Berrange
> +Copyright (C) 2007-2014 Red Hat, Inc.</property>
> + <property name="comments" translatable="yes">A remote desktop client
> built with GTK-VNC, SPICE-GTK and libvirt</property>
> + <property name="website">http://virt-manager.org/</property>;
> + <property name="website_label" translatable="yes">virt-
> manager.org</property>
> + <property name="license" translatable="yes">This program is free
> software; you can redistribute it and/or modify
> +it under the terms of the GNU General Public License as published by
> +the Free Software Foundation; either version 2 of the License, or
> +(at your option) any later version.
> +
> +This program is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> +GNU General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with this program; if not, write to the Free Software
> +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> +</property>
> + <property name="authors">Daniel P. Berrange
> +Marc-André Lureau
> +</property>
> + <property name="translator_credits" translatable="yes">The Fedora
> Translation Team</property>
> + <signal name="delete-event" handler="virt_viewer_app_about_delete"
> swapped="no"/>
> + <signal name="response" handler="virt_viewer_app_about_close"
> swapped="no"/>
> + <child internal-child="vbox">
> + <object class="GtkBox" id="dialog-vbox1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">2</property>
> + <child internal-child="action_area">
> + <object class="GtkButtonBox" id="dialog-action_area1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + </object>
> + </child>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer-about.xml b/src/virt-viewer-about.xml
> deleted file mode 100644
> index 28e38c8..0000000
> --- a/src/virt-viewer-about.xml
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<interface>
> - <!-- interface-requires gtk+ 2.12 -->
> - <object class="GtkAboutDialog" id="about">
> - <property name="can_focus">False</property>
> - <property name="border_width">5</property>
> - <property name="title" translatable="yes">About Virt-Viewer</property>
> - <property name="resizable">False</property>
> - <property name="modal">True</property>
> - <property name="window_position">center-on-parent</property>
> - <property name="destroy_with_parent">True</property>
> - <property name="type_hint">dialog</property>
> - <property name="skip_taskbar_hint">True</property>
> - <property name="skip_pager_hint">True</property>
> - <property name="program_name">Virtual Machine Viewer</property>
> - <property name="copyright" translatable="yes">Copyright (C) 2007-2012
> Daniel P. Berrange
> -Copyright (C) 2007-2014 Red Hat, Inc.</property>
> - <property name="comments" translatable="yes">A remote desktop client
> built with GTK-VNC, SPICE-GTK and libvirt</property>
> - <property name="website">http://virt-manager.org/</property>;
> - <property name="website_label" translatable="yes">virt-
> manager.org</property>
> - <property name="license" translatable="yes">This program is free
> software; you can redistribute it and/or modify
> -it under the terms of the GNU General Public License as published by
> -the Free Software Foundation; either version 2 of the License, or
> -(at your option) any later version.
> -
> -This program is distributed in the hope that it will be useful,
> -but WITHOUT ANY WARRANTY; without even the implied warranty of
> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> -GNU General Public License for more details.
> -
> -You should have received a copy of the GNU General Public License
> -along with this program; if not, write to the Free Software
> -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> -</property>
> - <property name="authors">Daniel P. Berrange
> -Marc-André Lureau
> -</property>
> - <property name="translator_credits" translatable="yes">The Fedora
> Translation Team</property>
> - <signal name="delete-event" handler="virt_viewer_app_about_delete"
> swapped="no"/>
> - <signal name="response" handler="virt_viewer_app_about_close"
> swapped="no"/>
> - <child internal-child="vbox">
> - <object class="GtkBox" id="dialog-vbox1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="orientation">vertical</property>
> - <property name="spacing">2</property>
> - <child internal-child="action_area">
> - <object class="GtkButtonBox" id="dialog-action_area1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="layout_style">end</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <placeholder/>
> - </child>
> - </object>
> - </child>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
> index d9f46ab..53ab286 100644
> --- a/src/virt-viewer-app.c
> +++ b/src/virt-viewer-app.c
> @@ -2467,7 +2467,7 @@ static GtkWidget *
> virt_viewer_app_get_preferences(VirtViewerApp *self)
> {
> VirtViewerSession *session = virt_viewer_app_get_session(self);
> - GtkBuilder *builder = virt_viewer_util_load_ui("virt-viewer-
> preferences.xml");
> + GtkBuilder *builder = virt_viewer_util_load_ui("virt-viewer-
> preferences.ui");
> gboolean can_share_folder =
> virt_viewer_session_can_share_folder(session);
> GtkWidget *preferences = self->priv->preferences;
> gchar *path;
> diff --git a/src/virt-viewer-auth.c b/src/virt-viewer-auth.c
> index 03c27cf..67c770c 100644
> --- a/src/virt-viewer-auth.c
> +++ b/src/virt-viewer-auth.c
> @@ -52,7 +52,7 @@ virt_viewer_auth_collect_credentials(GtkWindow *window,
> char **password)
> {
> GtkWidget *dialog = NULL;
> - GtkBuilder *creds = virt_viewer_util_load_ui("virt-viewer-auth.xml");
> + GtkBuilder *creds = virt_viewer_util_load_ui("virt-viewer-auth.ui");
> GtkWidget *credUsername;
> GtkWidget *credPassword;
> GtkWidget *promptUsername;
> diff --git a/src/virt-viewer-auth.ui b/src/virt-viewer-auth.ui
> new file mode 100644
> index 0000000..2920780
> --- /dev/null
> +++ b/src/virt-viewer-auth.ui
> @@ -0,0 +1,160 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<interface>
> + <!-- interface-requires gtk+ 2.12 -->
> + <object class="GtkDialog" id="auth">
> + <property name="can_focus">False</property>
> + <property name="border_width">5</property>
> + <property name="title" translatable="yes">Authentication
> required</property>
> + <property name="modal">True</property>
> + <property name="window_position">center-on-parent</property>
> + <property name="destroy_with_parent">True</property>
> + <property name="type_hint">dialog</property>
> + <property name="skip_taskbar_hint">True</property>
> + <property name="skip_pager_hint">True</property>
> + <child internal-child="vbox">
> + <object class="GtkBox" id="dialog-vbox1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">2</property>
> + <child internal-child="action_area">
> + <object class="GtkButtonBox" id="dialog-action_area1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + <child>
> + <object class="GtkButton" id="button-cancel">
> + <property name="label" translatable="yes">_Cancel</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_action_appearance">False</property>
> + <property name="use_underline">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkButton" id="button-ok">
> + <property name="label" translatable="yes">_OK</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="can_default">True</property>
> + <property name="has_default">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_action_appearance">False</property>
> + <property name="use_underline">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="position">3</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="message">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0</property>
> + <property name="label" translatable="yes">label</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>
> + <child>
> + <object class="GtkTable" id="table1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="column_spacing">6</property>
> + <property name="row_spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="prompt-password">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">1</property>
> + <property name="label"
> translatable="yes">Password:</property>
> + </object>
> + <packing>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="prompt-username">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">1</property>
> + <property name="label"
> translatable="yes">Username:</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkEntry" id="cred-username">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkEntry" id="cred-password">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="visibility">False</property>
> + <property name="activates_default">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkCheckButton" id="show-password">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="active">False</property>
> + <property name="label" translatable="yes">Show
> password</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">2</property>
> + <property name="bottom_attach">3</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">2</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <action-widgets>
> + <action-widget response="-6">button-cancel</action-widget>
> + <action-widget response="-5">button-ok</action-widget>
> + </action-widgets>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer-auth.xml b/src/virt-viewer-auth.xml
> deleted file mode 100644
> index 2920780..0000000
> --- a/src/virt-viewer-auth.xml
> +++ /dev/null
> @@ -1,160 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<interface>
> - <!-- interface-requires gtk+ 2.12 -->
> - <object class="GtkDialog" id="auth">
> - <property name="can_focus">False</property>
> - <property name="border_width">5</property>
> - <property name="title" translatable="yes">Authentication
> required</property>
> - <property name="modal">True</property>
> - <property name="window_position">center-on-parent</property>
> - <property name="destroy_with_parent">True</property>
> - <property name="type_hint">dialog</property>
> - <property name="skip_taskbar_hint">True</property>
> - <property name="skip_pager_hint">True</property>
> - <child internal-child="vbox">
> - <object class="GtkBox" id="dialog-vbox1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="orientation">vertical</property>
> - <property name="spacing">2</property>
> - <child internal-child="action_area">
> - <object class="GtkButtonBox" id="dialog-action_area1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="layout_style">end</property>
> - <child>
> - <object class="GtkButton" id="button-cancel">
> - <property name="label" translatable="yes">_Cancel</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="receives_default">True</property>
> - <property name="use_action_appearance">False</property>
> - <property name="use_underline">True</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkButton" id="button-ok">
> - <property name="label" translatable="yes">_OK</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="can_default">True</property>
> - <property name="has_default">True</property>
> - <property name="receives_default">True</property>
> - <property name="use_action_appearance">False</property>
> - <property name="use_underline">True</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="position">3</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="message">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0</property>
> - <property name="label" translatable="yes">label</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>
> - <child>
> - <object class="GtkTable" id="table1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> - <property name="column_spacing">6</property>
> - <property name="row_spacing">6</property>
> - <child>
> - <object class="GtkLabel" id="prompt-password">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">1</property>
> - <property name="label"
> translatable="yes">Password:</property>
> - </object>
> - <packing>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="prompt-username">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">1</property>
> - <property name="label"
> translatable="yes">Username:</property>
> - </object>
> - </child>
> - <child>
> - <object class="GtkEntry" id="cred-username">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkEntry" id="cred-password">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="visibility">False</property>
> - <property name="activates_default">True</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkCheckButton" id="show-password">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="active">False</property>
> - <property name="label" translatable="yes">Show
> password</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">2</property>
> - <property name="bottom_attach">3</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">2</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - <action-widgets>
> - <action-widget response="-6">button-cancel</action-widget>
> - <action-widget response="-5">button-ok</action-widget>
> - </action-widgets>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-guest-details.ui b/src/virt-viewer-guest-
> details.ui
> new file mode 100644
> index 0000000..209272f
> --- /dev/null
> +++ b/src/virt-viewer-guest-details.ui
> @@ -0,0 +1,120 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!-- Generated with glade 3.16.0 on Thu Jan 16 16:13:38 2014 -->
> +<interface>
> + <!-- interface-requires gtk+ 3.0 -->
> + <object class="GtkDialog" id="guestdetailsdialog">
> + <property name="can_focus">False</property>
> + <property name="title" translatable="yes">Guest Details</property>
> + <property name="resizable">True</property>
> + <property name="default_width">400</property>
> + <property name="type_hint">dialog</property>
> + <signal name="response"
> handler="virt_viewer_window_guest_details_response" swapped="no"/>
> + <child internal-child="vbox">
> + <object class="GtkBox" id="dialog-vbox2">
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">2</property>
> + <child internal-child="action_area">
> + <object class="GtkButtonBox" id="dialog-action_area2">
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + <child>
> + <object class="GtkButton" id="button1">
> + <property name="label" translatable="yes">_Close</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_underline">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkTable" id="grid1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="border_width">6</property>
> + <property name="row_spacing">6</property>
> + <property name="column_spacing">6</property>
> + <property name="n_rows">2</property>
> + <child>
> + <object class="GtkLabel" id="label1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">1</property>
> + <property name="label" translatable="yes">Name:</property>
> + </object>
> + <packing>
> + <property name="x_options">GTK_SHRINK | GTK_FILL</property>
> + <property name="y_options">GTK_FILL</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label2">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">1</property>
> + <property name="label" translatable="yes">GUID:</property>
> + </object>
> + <packing>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + <property name="x_options">GTK_SHRINK | GTK_FILL</property>
> + <property name="y_options">GTK_FILL</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="namevaluelabel">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">label</property>
> + <property name="selectable">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="y_options">GTK_FILL</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="guidvaluelabel">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">label</property>
> + <property name="selectable">True</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + <property name="y_options">GTK_FILL</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <action-widgets>
> + <action-widget response="-7">button1</action-widget>
> + </action-widgets>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer-guest-details.xml b/src/virt-viewer-guest-
> details.xml
> deleted file mode 100644
> index 209272f..0000000
> --- a/src/virt-viewer-guest-details.xml
> +++ /dev/null
> @@ -1,120 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!-- Generated with glade 3.16.0 on Thu Jan 16 16:13:38 2014 -->
> -<interface>
> - <!-- interface-requires gtk+ 3.0 -->
> - <object class="GtkDialog" id="guestdetailsdialog">
> - <property name="can_focus">False</property>
> - <property name="title" translatable="yes">Guest Details</property>
> - <property name="resizable">True</property>
> - <property name="default_width">400</property>
> - <property name="type_hint">dialog</property>
> - <signal name="response"
> handler="virt_viewer_window_guest_details_response" swapped="no"/>
> - <child internal-child="vbox">
> - <object class="GtkBox" id="dialog-vbox2">
> - <property name="can_focus">False</property>
> - <property name="orientation">vertical</property>
> - <property name="spacing">2</property>
> - <child internal-child="action_area">
> - <object class="GtkButtonBox" id="dialog-action_area2">
> - <property name="can_focus">False</property>
> - <property name="layout_style">end</property>
> - <child>
> - <object class="GtkButton" id="button1">
> - <property name="label" translatable="yes">_Close</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="receives_default">True</property>
> - <property name="use_underline">True</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkTable" id="grid1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="border_width">6</property>
> - <property name="row_spacing">6</property>
> - <property name="column_spacing">6</property>
> - <property name="n_rows">2</property>
> - <child>
> - <object class="GtkLabel" id="label1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">1</property>
> - <property name="label" translatable="yes">Name:</property>
> - </object>
> - <packing>
> - <property name="x_options">GTK_SHRINK | GTK_FILL</property>
> - <property name="y_options">GTK_FILL</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="label2">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">1</property>
> - <property name="label" translatable="yes">GUID:</property>
> - </object>
> - <packing>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="x_options">GTK_SHRINK | GTK_FILL</property>
> - <property name="y_options">GTK_FILL</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="namevaluelabel">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="label" translatable="yes">label</property>
> - <property name="selectable">True</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="y_options">GTK_FILL</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="guidvaluelabel">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="label" translatable="yes">label</property>
> - <property name="selectable">True</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - <property name="y_options">GTK_FILL</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">1</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - <action-widgets>
> - <action-widget response="-7">button1</action-widget>
> - </action-widgets>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-preferences.ui b/src/virt-viewer-preferences.ui
> new file mode 100644
> index 0000000..f9738c5
> --- /dev/null
> +++ b/src/virt-viewer-preferences.ui
> @@ -0,0 +1,134 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<interface>
> + <!-- interface-requires gtk+ 2.6 -->
> + <!-- interface-naming-policy toplevel-contextual -->
> + <object class="GtkDialog" id="preferences">
> + <property name="can_focus">False</property>
> + <property name="border_width">5</property>
> + <property name="title" translatable="yes">Preferences</property>
> + <property name="type_hint">normal</property>
> + <signal name="delete-event" handler="gtk_widget_hide_on_delete"
> swapped="no"/>
> + <child internal-child="vbox">
> + <object class="GtkVBox" id="dialog-vbox1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <child internal-child="action_area">
> + <object class="GtkHButtonBox" id="dialog-action_area1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + <child>
> + <placeholder/>
> + </child>
> + <child>
> + <placeholder/>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkNotebook" id="notebook1">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <child>
> + <object class="GtkVBox" id="vbox1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="border_width">18</property>
> + <property name="spacing">6</property>
> + <child>
> + <object class="GtkLabel" id="label2">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="label" translatable="yes">Folder
> sharing</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkTable" id="table1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="border_width">6</property>
> + <property name="n_rows">2</property>
> + <property name="n_columns">2</property>
> + <property name="column_spacing">12</property>
> + <property name="row_spacing">6</property>
> + <child>
> + <object class="GtkCheckButton" id="cbsharefolder">
> + <property name="label" translatable="yes">Share
> folder</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="x_options"/>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkCheckButton" id="cbsharefolderro">
> + <property name="label" translatable="yes">Read-
> only</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="right_attach">2</property>
> + <property name="top_attach">1</property>
> + <property name="bottom_attach">2</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkFileChooserButton"
> id="fcsharefolder">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="action">select-folder</property>
> + </object>
> + <packing>
> + <property name="left_attach">1</property>
> + <property name="right_attach">2</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">False</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <child type="tab">
> + <object class="GtkLabel" id="label1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="label" translatable="yes">Spice</property>
> + </object>
> + <packing>
> + <property name="tab_fill">False</property>
> + </packing>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer-preferences.xml b/src/virt-viewer-preferences.xml
> deleted file mode 100644
> index f9738c5..0000000
> --- a/src/virt-viewer-preferences.xml
> +++ /dev/null
> @@ -1,134 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<interface>
> - <!-- interface-requires gtk+ 2.6 -->
> - <!-- interface-naming-policy toplevel-contextual -->
> - <object class="GtkDialog" id="preferences">
> - <property name="can_focus">False</property>
> - <property name="border_width">5</property>
> - <property name="title" translatable="yes">Preferences</property>
> - <property name="type_hint">normal</property>
> - <signal name="delete-event" handler="gtk_widget_hide_on_delete"
> swapped="no"/>
> - <child internal-child="vbox">
> - <object class="GtkVBox" id="dialog-vbox1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <child internal-child="action_area">
> - <object class="GtkHButtonBox" id="dialog-action_area1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="layout_style">end</property>
> - <child>
> - <placeholder/>
> - </child>
> - <child>
> - <placeholder/>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkNotebook" id="notebook1">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <child>
> - <object class="GtkVBox" id="vbox1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="border_width">18</property>
> - <property name="spacing">6</property>
> - <child>
> - <object class="GtkLabel" id="label2">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="label" translatable="yes">Folder
> sharing</property>
> - <attributes>
> - <attribute name="weight" value="bold"/>
> - </attributes>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkTable" id="table1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="border_width">6</property>
> - <property name="n_rows">2</property>
> - <property name="n_columns">2</property>
> - <property name="column_spacing">12</property>
> - <property name="row_spacing">6</property>
> - <child>
> - <object class="GtkCheckButton" id="cbsharefolder">
> - <property name="label" translatable="yes">Share
> folder</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="x_options"/>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkCheckButton" id="cbsharefolderro">
> - <property name="label" translatable="yes">Read-
> only</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="right_attach">2</property>
> - <property name="top_attach">1</property>
> - <property name="bottom_attach">2</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkFileChooserButton"
> id="fcsharefolder">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="action">select-folder</property>
> - </object>
> - <packing>
> - <property name="left_attach">1</property>
> - <property name="right_attach">2</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">False</property>
> - <property name="position">1</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - <child type="tab">
> - <object class="GtkLabel" id="label1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="label" translatable="yes">Spice</property>
> - </object>
> - <packing>
> - <property name="tab_fill">False</property>
> - </packing>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - <property name="position">1</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-vm-connection.c b/src/virt-viewer-vm-connection.c
> index 35d10ff..ebaa92b 100644
> --- a/src/virt-viewer-vm-connection.c
> +++ b/src/virt-viewer-vm-connection.c
> @@ -65,7 +65,7 @@ virt_viewer_vm_connection_choose_name_dialog(GtkWindow
> *main_window,
> return NULL;
> }
>
> - vm_connection = virt_viewer_util_load_ui("virt-viewer-vm-
> connection.xml");
> + vm_connection = virt_viewer_util_load_ui("virt-viewer-vm-connection.ui");
> g_return_val_if_fail(vm_connection != NULL, NULL);
>
> dialog = GTK_WIDGET(gtk_builder_get_object(vm_connection, "vm-connection-
> dialog"));
> diff --git a/src/virt-viewer-vm-connection.ui b/src/virt-viewer-vm-
> connection.ui
> new file mode 100644
> index 0000000..f190c92
> --- /dev/null
> +++ b/src/virt-viewer-vm-connection.ui
> @@ -0,0 +1,117 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!-- Generated with glade 3.16.1 -->
> +<interface>
> + <object class="GtkDialog" id="vm-connection-dialog">
> + <property name="can_focus">False</property>
> + <property name="border_width">5</property>
> + <property name="title" translatable="yes">Choose a virtual
> machine</property>
> + <property name="modal">True</property>
> + <property name="window_position">center-on-parent</property>
> + <property name="default_height">200</property>
> + <property name="destroy_with_parent">True</property>
> + <property name="type_hint">dialog</property>
> + <child internal-child="vbox">
> + <object class="GtkBox" id="dialog-vbox1">
> + <property name="can_focus">False</property>
> + <property name="orientation">vertical</property>
> + <property name="spacing">6</property>
> + <child internal-child="action_area">
> + <object class="GtkButtonBox" id="dialog-action_area1">
> + <property name="can_focus">False</property>
> + <property name="layout_style">end</property>
> + <child>
> + <object class="GtkButton" id="button-cancel">
> + <property name="label"
> translatable="yes">_Cancel</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_underline">True</property>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkButton" id="button-connect">
> + <property name="label" translatable="yes">C_onnect</property>
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="can_default">True</property>
> + <property name="has_default">True</property>
> + <property name="receives_default">True</property>
> + <property name="use_underline">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="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkTreeView" id="treeview">
> + <property name="visible">True</property>
> + <property name="can_focus">True</property>
> + <property name="headers_visible">False</property>
> + <property name="search_column">0</property>
> + <property name="enable_grid_lines">horizontal</property>
> + <child internal-child="selection">
> + <object class="GtkTreeSelection" id="treeview-selection"/>
> + </child>
> + <child>
> + <object class="GtkTreeViewColumn" id="treeviewcolumn1">
> + <property name="title" translatable="yes">Name</property>
> + <child>
> + <object class="GtkCellRendererText"
> id="cellrenderertext1"/>
> + <attributes>
> + <attribute name="text">0</attribute>
> + </attributes>
> + </child>
> + </object>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">True</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">1</property>
> + </packing>
> + </child>
> + <child>
> + <object class="GtkLabel" id="label">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="xalign">0</property>
> + <property name="yalign">0</property>
> + <property name="xpad">4</property>
> + <property name="label" translatable="yes">Available virtual
> machines</property>
> + <property name="ellipsize">end</property>
> + <property name="width_chars">26</property>
> + <attributes>
> + <attribute name="weight" value="bold"/>
> + </attributes>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="pack_type">end</property>
> + <property name="position">2</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + <action-widgets>
> + <action-widget response="-6">button-cancel</action-widget>
> + <action-widget response="-3">button-connect</action-widget>
> + </action-widgets>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer-vm-connection.xml b/src/virt-viewer-vm-
> connection.xml
> deleted file mode 100644
> index f190c92..0000000
> --- a/src/virt-viewer-vm-connection.xml
> +++ /dev/null
> @@ -1,117 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<!-- Generated with glade 3.16.1 -->
> -<interface>
> - <object class="GtkDialog" id="vm-connection-dialog">
> - <property name="can_focus">False</property>
> - <property name="border_width">5</property>
> - <property name="title" translatable="yes">Choose a virtual
> machine</property>
> - <property name="modal">True</property>
> - <property name="window_position">center-on-parent</property>
> - <property name="default_height">200</property>
> - <property name="destroy_with_parent">True</property>
> - <property name="type_hint">dialog</property>
> - <child internal-child="vbox">
> - <object class="GtkBox" id="dialog-vbox1">
> - <property name="can_focus">False</property>
> - <property name="orientation">vertical</property>
> - <property name="spacing">6</property>
> - <child internal-child="action_area">
> - <object class="GtkButtonBox" id="dialog-action_area1">
> - <property name="can_focus">False</property>
> - <property name="layout_style">end</property>
> - <child>
> - <object class="GtkButton" id="button-cancel">
> - <property name="label"
> translatable="yes">_Cancel</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="receives_default">True</property>
> - <property name="use_underline">True</property>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkButton" id="button-connect">
> - <property name="label" translatable="yes">C_onnect</property>
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="can_default">True</property>
> - <property name="has_default">True</property>
> - <property name="receives_default">True</property>
> - <property name="use_underline">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="expand">False</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkTreeView" id="treeview">
> - <property name="visible">True</property>
> - <property name="can_focus">True</property>
> - <property name="headers_visible">False</property>
> - <property name="search_column">0</property>
> - <property name="enable_grid_lines">horizontal</property>
> - <child internal-child="selection">
> - <object class="GtkTreeSelection" id="treeview-selection"/>
> - </child>
> - <child>
> - <object class="GtkTreeViewColumn" id="treeviewcolumn1">
> - <property name="title" translatable="yes">Name</property>
> - <child>
> - <object class="GtkCellRendererText"
> id="cellrenderertext1"/>
> - <attributes>
> - <attribute name="text">0</attribute>
> - </attributes>
> - </child>
> - </object>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">True</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">1</property>
> - </packing>
> - </child>
> - <child>
> - <object class="GtkLabel" id="label">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="xalign">0</property>
> - <property name="yalign">0</property>
> - <property name="xpad">4</property>
> - <property name="label" translatable="yes">Available virtual
> machines</property>
> - <property name="ellipsize">end</property>
> - <property name="width_chars">26</property>
> - <attributes>
> - <attribute name="weight" value="bold"/>
> - </attributes>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="pack_type">end</property>
> - <property name="position">2</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - <action-widgets>
> - <action-widget response="-6">button-cancel</action-widget>
> - <action-widget response="-3">button-connect</action-widget>
> - </action-widgets>
> - </object>
> -</interface>
> diff --git a/src/virt-viewer-window.c b/src/virt-viewer-window.c
> index ef62d9a..9db379a 100644
> --- a/src/virt-viewer-window.c
> +++ b/src/virt-viewer-window.c
> @@ -303,7 +303,7 @@ virt_viewer_window_init (VirtViewerWindow *self)
> g_value_init(&priv->accel_setting, G_TYPE_STRING);
>
> priv->notebook = virt_viewer_notebook_new();
> - priv->builder = virt_viewer_util_load_ui("virt-viewer.xml");
> + priv->builder = virt_viewer_util_load_ui("virt-viewer.ui");
>
> gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv-
> >builder, "menu-send")), FALSE);
> gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv-
> >builder, "menu-view-zoom")), FALSE);
> @@ -984,7 +984,7 @@ G_MODULE_EXPORT void
> virt_viewer_window_menu_help_guest_details(GtkWidget *menu G_GNUC_UNUSED,
> VirtViewerWindow *self)
> {
> - GtkBuilder *ui = virt_viewer_util_load_ui("virt-viewer-guest-
> details.xml");
> + GtkBuilder *ui = virt_viewer_util_load_ui("virt-viewer-guest-
> details.ui");
> char *name = NULL;
> char *uuid = NULL;
>
> @@ -1034,7 +1034,7 @@ virt_viewer_window_menu_help_about(GtkWidget *menu
> G_GNUC_UNUSED,
> GtkWidget *dialog;
> GdkPixbuf *icon;
>
> - about = virt_viewer_util_load_ui("virt-viewer-about.xml");
> + about = virt_viewer_util_load_ui("virt-viewer-about.ui");
>
> dialog = GTK_WIDGET(gtk_builder_get_object(about, "about"));
>
> diff --git a/src/virt-viewer.gresource.xml b/src/virt-viewer.gresource.xml
> index 596889a..019678f 100644
> --- a/src/virt-viewer.gresource.xml
> +++ b/src/virt-viewer.gresource.xml
> @@ -1,13 +1,13 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <gresources>
> <gresource prefix="/org/virt-manager/virt-viewer">
> - <file>remote-viewer-connect.xml</file>
> - <file>virt-viewer-about.xml</file>
> - <file>virt-viewer-auth.xml</file>
> - <file>virt-viewer-guest-details.xml</file>
> - <file>virt-viewer-preferences.xml</file>
> - <file>virt-viewer-vm-connection.xml</file>
> - <file>virt-viewer.xml</file>
> + <file>remote-viewer-connect.ui</file>
> + <file>virt-viewer-about.ui</file>
> + <file>virt-viewer-auth.ui</file>
> + <file>virt-viewer-guest-details.ui</file>
> + <file>virt-viewer-preferences.ui</file>
> + <file>virt-viewer-vm-connection.ui</file>
> + <file>virt-viewer.ui</file>
> <file alias="icons/16x16/virt-viewer.png">../icons/16x16/virt-
> viewer.png</file>
> <file alias="icons/22x22/virt-viewer.png">../icons/22x22/virt-
> viewer.png</file>
> <file alias="icons/24x24/virt-viewer.png">../icons/24x24/virt-
> viewer.png</file>
> diff --git a/src/virt-viewer.ui b/src/virt-viewer.ui
> new file mode 100644
> index 0000000..830a451
> --- /dev/null
> +++ b/src/virt-viewer.ui
> @@ -0,0 +1,256 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<interface>
> + <!-- interface-requires gtk+ 2.6 -->
> + <object class="GtkAccelGroup" id="accelgroup"/>
> + <object class="GtkApplicationWindow" id="viewer">
> + <property name="can_focus">False</property>
> + <property name="default_width">1024</property>
> + <property name="default_height">768</property>
> + <signal name="delete-event" handler="virt_viewer_window_delete"
> swapped="no"/>
> + <child>
> + <object class="GtkVBox" id="viewer-box">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <child>
> + <object class="GtkMenuBar" id="top-menu">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <child>
> + <object class="GtkMenuItem" id="menu-file">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_File</property>
> + <property name="use_underline">True</property>
> + <child type="submenu">
> + <object class="GtkMenu" id="menu1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="accel_group">accelgroup</property>
> + <child>
> + <object class="GtkMenuItem" id="menu-file-screenshot">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="label"
> translatable="yes">_Screenshot</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_file_screenshot" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-file-usb-device-
> selection">
> + <property name="visible">True</property>
> + <property name="sensitive">False</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_USB device
> selection</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_file_usb_device_selection" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-file-smartcard-
> insert">
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="accel_path"><virt-
> viewer>/file/smartcard-insert</property>
> + <property name="label" translatable="yes">Smartcard
> insertion</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_file_smartcard_insert" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-file-smartcard-
> remove">
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="accel_path"><virt-
> viewer>/file/smartcard-remove</property>
> + <property name="label" translatable="yes">Smartcard
> removal</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_file_smartcard_remove" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-preferences">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="label"
> translatable="yes">_Preferences</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_preferences_cb" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkSeparatorMenuItem"
> id="separatormenuitem1">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="imagemenuitem5">
> + <property name="label"
> translatable="yes">_Quit</property>
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="use_underline">True</property>
> + <accelerator key="q" signal="activate"
> modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
> + <signal name="activate"
> handler="virt_viewer_window_menu_file_quit" swapped="no"/>
> + </object>
> + </child>
> + </object>
> + </child>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-view">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_View</property>
> + <property name="use_underline">True</property>
> + <child type="submenu">
> + <object class="GtkMenu" id="menu2">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="accel_group">accelgroup</property>
> + <child>
> + <object class="GtkCheckMenuItem" id="menu-view-
> fullscreen">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="accel_path"><virt-
> viewer>/view/toggle-fullscreen</property>
> + <property name="label" translatable="yes">_Full
> screen</property>
> + <property name="use_underline">True</property>
> + <signal name="toggled"
> handler="virt_viewer_window_menu_view_fullscreen" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-view-zoom">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="label"
> translatable="yes">_Zoom</property>
> + <property name="use_underline">True</property>
> + <child type="submenu">
> + <object class="GtkMenu" id="menu4">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="accel_group">accelgroup</property>
> + <child>
> + <object class="GtkMenuItem" id="menu-view-zoom-
> in">
> + <property name="accel_path"><virt-
> viewer>/view/zoom-in</property>
> + <property name="label"
> translatable="yes">Zoom _In</property>
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property
> name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_in" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-view-zoom-
> out">
> + <property name="accel_path"><virt-
> viewer>/view/zoom-out</property>
> + <property name="label"
> translatable="yes">Zoom _Out</property>
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property
> name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_out" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkSeparatorMenuItem"
> id="separatormenuitem4">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-view-zoom-
> reset">
> + <property name="accel_path"><virt-
> viewer>/view/zoom-reset</property>
> + <property name="label"
> translatable="yes">_Normal Size</property>
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property
> name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_reset" swapped="no"/>
> + </object>
> + </child>
> + </object>
> + </child>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-displays">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="label"
> translatable="yes">_Displays</property>
> + <property name="use_underline">True</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-view-release-
> cursor">
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="accel_path"><virt-
> viewer>/view/release-cursor</property>
> + <property name="label" translatable="yes">Release
> cursor</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_view_release_cursor" swapped="no"/>
> + </object>
> + </child>
> + </object>
> + </child>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-send">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_Send
> key</property>
> + <property name="use_underline">True</property>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="menu-help">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_Help</property>
> + <property name="use_underline">True</property>
> + <child type="submenu">
> + <object class="GtkMenu" id="menu3">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <child>
> + <object class="GtkMenuItem" id="menu-help-guest-
> details">
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="label" translatable="yes">_Guest
> Details</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_help_guest_details" swapped="no"/>
> + </object>
> + </child>
> + <child>
> + <object class="GtkMenuItem" id="imagemenuitem10">
> + <property name="label"
> translatable="yes">_About</property>
> + <property name="visible">True</property>
> + <property name="can_focus">False</property>
> + <property
> name="use_action_appearance">False</property>
> + <property name="use_underline">True</property>
> + <signal name="activate"
> handler="virt_viewer_window_menu_help_about" swapped="no"/>
> + </object>
> + </child>
> + </object>
> + </child>
> + </object>
> + </child>
> + </object>
> + <packing>
> + <property name="expand">False</property>
> + <property name="fill">True</property>
> + <property name="position">0</property>
> + </packing>
> + </child>
> + </object>
> + </child>
> + </object>
> +</interface>
> diff --git a/src/virt-viewer.xml b/src/virt-viewer.xml
> deleted file mode 100644
> index 830a451..0000000
> --- a/src/virt-viewer.xml
> +++ /dev/null
> @@ -1,256 +0,0 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> -<interface>
> - <!-- interface-requires gtk+ 2.6 -->
> - <object class="GtkAccelGroup" id="accelgroup"/>
> - <object class="GtkApplicationWindow" id="viewer">
> - <property name="can_focus">False</property>
> - <property name="default_width">1024</property>
> - <property name="default_height">768</property>
> - <signal name="delete-event" handler="virt_viewer_window_delete"
> swapped="no"/>
> - <child>
> - <object class="GtkVBox" id="viewer-box">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <child>
> - <object class="GtkMenuBar" id="top-menu">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <child>
> - <object class="GtkMenuItem" id="menu-file">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_File</property>
> - <property name="use_underline">True</property>
> - <child type="submenu">
> - <object class="GtkMenu" id="menu1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="accel_group">accelgroup</property>
> - <child>
> - <object class="GtkMenuItem" id="menu-file-screenshot">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="label"
> translatable="yes">_Screenshot</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_file_screenshot" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-file-usb-device-
> selection">
> - <property name="visible">True</property>
> - <property name="sensitive">False</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_USB device
> selection</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_file_usb_device_selection" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-file-smartcard-
> insert">
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="accel_path"><virt-
> viewer>/file/smartcard-insert</property>
> - <property name="label" translatable="yes">Smartcard
> insertion</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_file_smartcard_insert" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-file-smartcard-
> remove">
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="accel_path"><virt-
> viewer>/file/smartcard-remove</property>
> - <property name="label" translatable="yes">Smartcard
> removal</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_file_smartcard_remove" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-preferences">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="label"
> translatable="yes">_Preferences</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_preferences_cb" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkSeparatorMenuItem"
> id="separatormenuitem1">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="imagemenuitem5">
> - <property name="label"
> translatable="yes">_Quit</property>
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="use_underline">True</property>
> - <accelerator key="q" signal="activate"
> modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK"/>
> - <signal name="activate"
> handler="virt_viewer_window_menu_file_quit" swapped="no"/>
> - </object>
> - </child>
> - </object>
> - </child>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-view">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_View</property>
> - <property name="use_underline">True</property>
> - <child type="submenu">
> - <object class="GtkMenu" id="menu2">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="accel_group">accelgroup</property>
> - <child>
> - <object class="GtkCheckMenuItem" id="menu-view-
> fullscreen">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="accel_path"><virt-
> viewer>/view/toggle-fullscreen</property>
> - <property name="label" translatable="yes">_Full
> screen</property>
> - <property name="use_underline">True</property>
> - <signal name="toggled"
> handler="virt_viewer_window_menu_view_fullscreen" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-view-zoom">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="label"
> translatable="yes">_Zoom</property>
> - <property name="use_underline">True</property>
> - <child type="submenu">
> - <object class="GtkMenu" id="menu4">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="accel_group">accelgroup</property>
> - <child>
> - <object class="GtkMenuItem" id="menu-view-zoom-
> in">
> - <property name="accel_path"><virt-
> viewer>/view/zoom-in</property>
> - <property name="label"
> translatable="yes">Zoom _In</property>
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property
> name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_in" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-view-zoom-
> out">
> - <property name="accel_path"><virt-
> viewer>/view/zoom-out</property>
> - <property name="label"
> translatable="yes">Zoom _Out</property>
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property
> name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_out" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkSeparatorMenuItem"
> id="separatormenuitem4">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-view-zoom-
> reset">
> - <property name="accel_path"><virt-
> viewer>/view/zoom-reset</property>
> - <property name="label"
> translatable="yes">_Normal Size</property>
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property
> name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_view_zoom_reset" swapped="no"/>
> - </object>
> - </child>
> - </object>
> - </child>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-displays">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="label"
> translatable="yes">_Displays</property>
> - <property name="use_underline">True</property>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-view-release-
> cursor">
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="accel_path"><virt-
> viewer>/view/release-cursor</property>
> - <property name="label" translatable="yes">Release
> cursor</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_view_release_cursor" swapped="no"/>
> - </object>
> - </child>
> - </object>
> - </child>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-send">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_Send
> key</property>
> - <property name="use_underline">True</property>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="menu-help">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_Help</property>
> - <property name="use_underline">True</property>
> - <child type="submenu">
> - <object class="GtkMenu" id="menu3">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <child>
> - <object class="GtkMenuItem" id="menu-help-guest-
> details">
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="label" translatable="yes">_Guest
> Details</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_help_guest_details" swapped="no"/>
> - </object>
> - </child>
> - <child>
> - <object class="GtkMenuItem" id="imagemenuitem10">
> - <property name="label"
> translatable="yes">_About</property>
> - <property name="visible">True</property>
> - <property name="can_focus">False</property>
> - <property
> name="use_action_appearance">False</property>
> - <property name="use_underline">True</property>
> - <signal name="activate"
> handler="virt_viewer_window_menu_help_about" swapped="no"/>
> - </object>
> - </child>
> - </object>
> - </child>
> - </object>
> - </child>
> - </object>
> - <packing>
> - <property name="expand">False</property>
> - <property name="fill">True</property>
> - <property name="position">0</property>
> - </packing>
> - </child>
> - </object>
> - </child>
> - </object>
> -</interface>
More information about the virt-tools-list
mailing list