pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 23:00:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Turn VirtViewer into a VirtViewerApp object

Browse Source
This commit is contained in:
Marc-André Lureau 2011-07-14 17:28:39 +02:00 committed by Daniel P. Berrange
parent 9dcb071166
commit e2c09a876b
5 changed files with 716 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/virt-viewer-about.xml
View File

@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
</property>
<property name="authors">Daniel P. Berrange</property>
<property name="translator_credits" translatable="yes">The Fedora Translation Team</property>
<signal name="response" handler="virt_viewer_about_close"/>
<signal name="delete_event" handler="virt_viewer_about_delete"/>
<signal name="response" handler="virt_viewer_app_about_close"/>
<signal name="delete_event" handler="virt_viewer_app_about_delete"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>

9
src/virt-viewer-main.c
View File

@ -51,6 +51,7 @@ int main(int argc, char **argv)
gboolean waitvm = FALSE;
gboolean reconnect = FALSE;
gboolean fullscreen = FALSE;
VirtViewerApp *viewer = NULL;
const char *help_msg = N_("Run '" PACKAGE " --help' to see a full list of available command line options");
const GOptionEntry options [] = {
{ "version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
@ -107,13 +108,15 @@ int main(int argc, char **argv)
goto cleanup;
}
ret = virt_viewer_start(uri, args[0], zoom, direct, waitvm, reconnect, verbose, debug, fullscreen, NULL);
if (ret != 0)
return ret;
viewer = virt_viewer_start(uri, args[0], zoom, direct, waitvm, reconnect, verbose, debug, fullscreen, NULL);
if (viewer == NULL)
goto cleanup;
gtk_main();
cleanup:
if (viewer)
g_object_unref(viewer);
g_free(uri);
g_strfreev(args);

1171
src/virt-viewer.c
View File

File diff suppressed because it is too large Load Diff

53
src/virt-viewer.h
View File

@ -23,19 +23,50 @@
#ifndef VIRT_VIEWER_H
#define VIRT_VIEWER_H
#include <glib-object.h>
#include "virt-viewer-util.h"
typedef struct _VirtViewer VirtViewer;
G_BEGIN_DECLS
extern int virt_viewer_start(const char *uri,
const char *name,
gint zoom,
gboolean direct,
gboolean waitvm,
gboolean reconnect,
gboolean verbose,
gboolean debug,
gboolean fullscreen,
GtkWidget *container);
#define VIRT_TYPE_VIEWER_APP virt_viewer_app_get_type()
#define VIRT_VIEWER_APP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), VIRT_TYPE_VIEWER_APP, VirtViewerApp))
#define VIRT_VIEWER_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), VIRT_TYPE_VIEWER_APP, VirtViewerAppClass))
#define VIRT_IS_VIEWER_APP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), VIRT_TYPE_VIEWER_APP))
#define VIRT_IS_VIEWER_APP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), VIRT_TYPE_VIEWER_APP))
#define VIRT_VIEWER_APP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), VIRT_TYPE_VIEWER_APP, VirtViewerAppClass))
typedef struct _VirtViewerAppPrivate VirtViewerAppPrivate;
typedef struct {
GObject parent;
VirtViewerAppPrivate *priv;
} VirtViewerApp;
typedef struct {
GObjectClass parent_class;
} VirtViewerAppClass;
GType virt_viewer_app_get_type (void);
VirtViewerApp *
virt_viewer_app_new(gint zoom,
gboolean direct,
gboolean verbose,
gboolean fullscreen,
GtkWidget *container);
VirtViewerApp *
virt_viewer_start(const char *uri,
const char *name,
gint zoom,
gboolean direct,
gboolean waitvm,
gboolean reconnect,
gboolean verbose,
gboolean debug,
gboolean fullscreen,
GtkWidget *container);
G_END_DECLS
#endif /* VIRT_VIEWER_H */

48
src/virt-viewer.xml
View File

@ -5,7 +5,7 @@
<object class="GtkWindow" id="viewer">
<property name="default_width">400</property>
<property name="default_height">400</property>
<signal name="delete_event" handler="virt_viewer_delete"/>
<signal name="delete_event" handler="virt_viewer_app_delete"/>
<child>
<object class="GtkVBox" id="viewer-box">
<property name="visible">True</property>
@ -26,7 +26,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Screenshot</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_file_screenshot"/>
<signal name="activate" handler="virt_viewer_app_menu_file_screenshot"/>
</object>
</child>
<child>
@ -40,7 +40,7 @@
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="virt_viewer_menu_file_quit"/>
<signal name="activate" handler="virt_viewer_app_menu_file_quit"/>
<accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK|GDK_SHIFT_MASK"/>
</object>
</child>
@ -62,7 +62,7 @@
<property name="label" translatable="yes">Full screen</property>
<property name="use_underline">True</property>
<accelerator key="F11" signal="activate"/>
<signal name="toggled" handler="virt_viewer_menu_view_fullscreen"/>
<signal name="toggled" handler="virt_viewer_app_menu_view_fullscreen"/>
</object>
</child>
<child>
@ -80,7 +80,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="plus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="virt_viewer_menu_view_zoom_in"/>
<signal name="activate" handler="virt_viewer_app_menu_view_zoom_in"/>
</object>
</child>
<child>
@ -90,7 +90,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="minus" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="virt_viewer_menu_view_zoom_out"/>
<signal name="activate" handler="virt_viewer_app_menu_view_zoom_out"/>
</object>
</child>
<child>
@ -105,7 +105,7 @@
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="0" signal="activate" modifiers="GDK_CONTROL_MASK"/>
<signal name="activate" handler="virt_viewer_menu_view_zoom_reset"/>
<signal name="activate" handler="virt_viewer_app_menu_view_zoom_reset"/>
</object>
</child>
</object>
@ -117,7 +117,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Automatically resize</property>
<property name="use_underline">True</property>
<signal name="toggled" handler="virt_viewer_menu_view_resize"/>
<signal name="toggled" handler="virt_viewer_app_menu_view_resize"/>
</object>
</child>
</object>
@ -137,7 +137,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+_Del</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -145,7 +145,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+_Backspace</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -158,7 +158,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_1</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -166,7 +166,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_2</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -174,7 +174,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_3</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -182,7 +182,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_4</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -190,7 +190,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_5</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -198,7 +198,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_6</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -206,7 +206,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_7</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -214,7 +214,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_8</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -222,7 +222,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F_9</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -230,7 +230,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F1_0</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -238,7 +238,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F11</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -246,7 +246,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Ctrl+Alt+F12</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
<child>
@ -259,7 +259,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">_PrintScreen</property>
<property name="use_underline">True</property>
<signal name="activate" handler="virt_viewer_menu_send"/>
<signal name="activate" handler="virt_viewer_app_menu_send"/>
</object>
</child>
</object>
@ -280,7 +280,7 @@
<property name="visible">True</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<signal name="activate" handler="virt_viewer_menu_help_about"/>
<signal name="activate" handler="virt_viewer_app_menu_help_about"/>
</object>
</child>
</object>