[Xfce4-commits] [xfce/xfce4-panel] 01/01: Fix list of authors in about dialog
noreply at xfce.org
noreply at xfce.org
Thu Oct 18 00:40:40 CEST 2018
This is an automated email from the git hooks/post-receive script.
o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository xfce/xfce4-panel.
commit 6a3333087b5e7a6aa8fbeb9a802d90991c62833b
Author: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
Date: Thu Oct 18 00:39:52 2018 +0200
Fix list of authors in about dialog
---
panel/panel-dialogs.c | 66 ++++++++++++++++++++++++++++++++++++-----------
panel/panel-tic-tac-toe.c | 15 +++++------
2 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/panel/panel-dialogs.c b/panel/panel-dialogs.c
index 2e58ee0..7ae6d87 100644
--- a/panel/panel-dialogs.c
+++ b/panel/panel-dialogs.c
@@ -32,32 +32,68 @@
#include <panel/panel-dialogs.h>
#include <panel/panel-application.h>
+#include <panel/panel-tic-tac-toe.h>
+
+
+
+static gboolean
+panel_dialogs_show_about_email_hook (GtkAboutDialog *dialog,
+ const gchar *uri,
+ gpointer data)
+{
+ GError *error = NULL;
+
+ if (g_strcmp0 ("mailto:tictactoe%40xfce.org", uri) == 0)
+ {
+ /* open tic-tac-toe */
+ panel_tic_tac_toe_show ();
+ /* close the about dialog as its modality will otherwise prevent you from playing */
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ return TRUE;
+ }
+ else if (!gtk_show_uri_on_window (GTK_WINDOW (dialog),
+ uri, gtk_get_current_event_time (), &error))
+ {
+ xfce_dialog_show_error (GTK_WINDOW (dialog), error,
+ _("Unable to open the e-mail address"));
+ g_error_free (error);
+ return FALSE;
+ }
+ return TRUE;
+}
void
panel_dialogs_show_about (void)
{
+ GtkWidget *about_dialog;
gchar **authors;
- authors = g_new0 (gchar *, 3);
+ authors = g_new0 (gchar *, 6);
authors[0] = g_strdup ("Nick Schermer <nick at xfce.org>");
- authors[1] = g_strdup ("Jasper Huijsmans <jasper at xfce.org>");
-
- gtk_show_about_dialog (NULL,
- "authors", authors,
- "comments", _("The panel of the Xfce Desktop Environment"),
- "copyright", "Copyright \302\251 2004-2012 Xfce Development Team",
- "destroy-with-parent", TRUE,
- "license", XFCE_LICENSE_GPL,
- "program-name", PACKAGE_NAME,
- "translator-credits", _("translator-credits"),
- "version", PACKAGE_VERSION,
- "website", "http://www.xfce.org/",
- "logo-icon-name", PACKAGE_NAME,
- NULL);
+ authors[1] = g_strdup ("Andrzej Radecki <ndrwrdck at gmail.com>");
+ authors[2] = g_strdup ("Simon Steinbeiß <simon at xfce.org>");
+ authors[3] = g_strdup ("Jasper Huijsmans <jasper at xfce.org>");
+ authors[4] = g_strdup ("Tic-Tac-Toe <tictactoe at xfce.org>");
+ about_dialog = gtk_about_dialog_new ();
+ gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about_dialog), (const gchar**) authors);
g_strfreev (authors);
+ gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (about_dialog), _("The panel of the Xfce Desktop Environment"));
+ gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (about_dialog), "Copyright \302\251 2004-2018 Xfce Development Team");
+ gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (about_dialog), XFCE_LICENSE_GPL);
+ gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (about_dialog), PACKAGE_NAME);
+ gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG (about_dialog), _("translator-credits"));
+ gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about_dialog), PACKAGE_VERSION);
+ gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about_dialog), "http://www.xfce.org/");
+ gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG (about_dialog), PACKAGE_NAME);
+ gtk_window_set_destroy_with_parent (GTK_WINDOW (about_dialog), TRUE);
+ g_signal_connect (G_OBJECT (about_dialog), "activate-link",
+ G_CALLBACK (panel_dialogs_show_about_email_hook), NULL);
+ gtk_dialog_run (GTK_DIALOG (about_dialog));
+ if (GTK_IS_WIDGET (about_dialog))
+ gtk_widget_destroy (about_dialog);
}
diff --git a/panel/panel-tic-tac-toe.c b/panel/panel-tic-tac-toe.c
index 29f3e6d..895f5c7 100644
--- a/panel/panel-tic-tac-toe.c
+++ b/panel/panel-tic-tac-toe.c
@@ -119,7 +119,7 @@ panel_tic_tac_toe_init (PanelTicTacToe *dialog)
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
gtk_window_set_icon_name (GTK_WINDOW (dialog), "applications-games");
- button = xfce_gtk_button_new_mixed (GTK_STOCK_NEW, _("_New Game"));
+ button = xfce_gtk_button_new_mixed ("document-new", _("_New Game"));
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close"), GTK_RESPONSE_CLOSE);
@@ -142,22 +142,19 @@ panel_tic_tac_toe_init (PanelTicTacToe *dialog)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), _("Expert"));
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), LEVEL_EXPERIENCED);
- align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
-
grid = gtk_grid_new ();
gtk_grid_set_column_spacing (GTK_GRID (grid), 1);
gtk_grid_set_row_spacing (GTK_GRID (grid), 1);
- gtk_container_add (GTK_CONTAINER (align), grid);
+ gtk_container_add (GTK_CONTAINER (vbox), grid);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_grid_attach (GTK_GRID (grid), separator, 0, 5, 1, 2);
+ gtk_grid_attach (GTK_GRID (grid), separator, 0, 1, 5, 1);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_grid_attach (GTK_GRID (grid), separator, 0, 5, 3, 4);
+ gtk_grid_attach (GTK_GRID (grid), separator, 0, 3, 5, 1);
separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
- gtk_grid_attach (GTK_GRID (grid), separator, 1, 2, 0, 5);
+ gtk_grid_attach (GTK_GRID (grid), separator, 1, 0, 1, 5);
separator = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
- gtk_grid_attach (GTK_GRID (grid), separator, 3, 4, 0, 5);
+ gtk_grid_attach (GTK_GRID (grid), separator, 3, 0, 1, 5);
for (i = 0; i < 9; i++)
{
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list