shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-21 18:03:43 +03:00
Code Issues Projects Releases Wiki Activity

ui: Rename UI files to .ui (instead of .xml)

Browse Source 
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@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
This commit is contained in:
Fabiano Fidêncio 2016-06-13 21:38:08 +02:00
parent 0e98f93b0e
commit 1315f0aa3d
15 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
po/POTFILES.in
View File

@ -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

16
src/Makefile.am
View File

@ -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 = \

2
src/remote-viewer-connect.c
View File

@ -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"));

0
src/remote-viewer-connect.xml → src/remote-viewer-connect.ui
View File

0
src/virt-viewer-about.xml → src/virt-viewer-about.ui
View File

2
src/virt-viewer-app.c
View File

@ -2465,7 +2465,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;

2
src/virt-viewer-auth.c
View File

@ -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;

0
src/virt-viewer-auth.xml → src/virt-viewer-auth.ui
View File

0
src/virt-viewer-guest-details.xml → src/virt-viewer-guest-details.ui
View File

0
src/virt-viewer-preferences.xml → src/virt-viewer-preferences.ui
View File

2
src/virt-viewer-vm-connection.c
View File

@ -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"));

0
src/virt-viewer-vm-connection.xml → src/virt-viewer-vm-connection.ui
View File

6
src/virt-viewer-window.c
View File

@ -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);
@ -986,7 +986,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;
@ -1036,7 +1036,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"));

14
src/virt-viewer.gresource.xml
View File

@ -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>

0
src/virt-viewer.xml → src/virt-viewer.ui
View File