From c381d9484e849f80b0acf27821daa555ce9ceb2c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 11 Oct 2012 01:50:29 -0500 Subject: Use GtkAboutDialog Also, use stock About menu item. Signed-off-by: Yaakov Selkowitz --- data/xoo.ui | 95 +++------------------------------------------------------ src/callbacks.c | 9 +++++- src/fakedev.h | 1 - src/main.c | 13 -------- 4 files changed, 13 insertions(+), 105 deletions(-) diff --git a/data/xoo.ui b/data/xoo.ui index 3219d17..58a74bd 100644 --- a/data/xoo.ui +++ b/data/xoo.ui @@ -1,92 +1,6 @@ - - - - False - Xoo - False - dialog - - - - True - False - 8 - 8 - - - True - False - <span size="xx-large"><b>Xoo</b></span> - True - - - False - False - 0 - - - - - True - False - A tool for simulating X-based small-screen devices. - center - True - - - False - False - 1 - - - - - True - False - <small>Copyright © 2004 OpenedHand Ltd -info@o-hand.com</small> - True - center - - - False - False - 2 - - - - - True - False - - - gtk-close - True - True - True - False - False - True - - - - False - False - 0 - - - - - True - False - 3 - - - - - + True False @@ -452,12 +366,13 @@ info@o-hand.com</small> False - + + gtk-about + False True False - False - _About True + True diff --git a/src/callbacks.c b/src/callbacks.c index 499b584..c941633 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -116,7 +116,14 @@ on_show_decorations_toggle (GtkCheckMenuItem * menuitem, FakeApp * app) void on_about_activate (GtkMenuItem * menuitem, FakeApp * app) { - gtk_window_present (GTK_WINDOW (app->about_window)); + gtk_show_about_dialog (NULL, + "program-name", "Xoo", + "version", VERSION, + "copyright", "Copyright © 2004 OpenedHand Ltd\ninfo@o-hand.com", + "comments", "A tool for simulating X-based small-screen devices", + "logo-icon-name", "xoo", + "license-type", GTK_LICENSE_GPL_2_0, + NULL); } gboolean diff --git a/src/fakedev.h b/src/fakedev.h index b5fd137..c211869 100644 --- a/src/fakedev.h +++ b/src/fakedev.h @@ -44,7 +44,6 @@ struct FakeApp GtkWidget *prefs_window; GtkWidget *entry_display, *entry_server, *entry_options, *entry_start; - GtkWidget *about_window; int device_width; int device_height; diff --git a/src/main.c b/src/main.c index f85114e..83a0e31 100644 --- a/src/main.c +++ b/src/main.c @@ -106,18 +106,10 @@ fakeapp_new (void) g_signal_connect (G_OBJECT (widget), "activate", G_CALLBACK (on_show_decorations_toggle), app); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "aboutwindow")); - g_signal_connect (G_OBJECT (widget), "delete_event", - G_CALLBACK (on_delete_event_hide), app); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "prefswindow")); g_signal_connect (G_OBJECT (widget), "delete_event", G_CALLBACK (on_delete_event_hide), app); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "aboutwindow")); - g_signal_connect (G_OBJECT (widget), "delete_event", - G_CALLBACK (on_delete_event_hide), app); - widget = GTK_WIDGET (gtk_builder_get_object (builder, "select_device")); g_signal_connect (G_OBJECT (widget), "activate", G_CALLBACK (on_select_device), app); @@ -174,11 +166,6 @@ fakeapp_new (void) app->debug_menu = widget; widget = GTK_WIDGET (gtk_builder_get_object (builder, "popupmenu_menu")); app->popupmenu = widget; - widget = GTK_WIDGET (gtk_builder_get_object (builder, "aboutwindow")); - app->about_window = widget; - - gtk_window_set_transient_for (GTK_WINDOW (app->about_window), - GTK_WINDOW (app->window)); widget = GTK_WIDGET (gtk_builder_get_object (builder, "button_about_close")); g_signal_connect_swapped (widget, "clicked", -- cgit v1.2.3