Re: [Bluez-devel] [PATCH] Beautify about dialog

["Jaap A. Haitsma" <jaap@haitsma.org>]

[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]

Hi Marcel,

>
> > Attached patch does the following
> >
> > * about dialog code is simpler
>
> you can't use gtk_dialog_run for the applet's about dialog. It will
> block and thus block all PIN requests. The current code is this way for
> a reason.

Didn't know that. I now use g_object_set which also reduces the amount
of code considerably.


> > * email address and URLs are clickable
>
> Send a separate patch for this.

It's still in the same patch, because the patches change stuff in the
same function

These two function calls in about_callback do the trick

	gtk_about_dialog_set_url_hook (about_dialog_handle_url_cb, NULL, NULL);
	gtk_about_dialog_set_email_hook (about_dialog_handle_email_cb, NULL, NULL);


> > * Makes sure that every window gets a bluetooth window icon
>
> This should be already working. And if it is missing somewhere, I need a
> separate patch for it.

The credits window didn't have it.

The call:
gtk_window_set_default_icon_name ("stock_bluetooth");
makes sure that any window at least gets an icon

        g_set_application_name (_("Bluetooth Applet"));
makes sure that the about dialog always says "Bluetooth Applet" no
matter which version of GTK you have installed. (In GTK 2.12 the name
attribute was changed)

I hope that with this info it is easy to review the patch. If not let
me know and I'll try to split it up

Kind regards

Jaap

Jaap

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnome-bluetooth-about-dialog2.patch --]
[-- Type: text/x-patch; name=gnome-bluetooth-about-dialog2.patch, Size: 5738 bytes --]

Index: applet/main.c
===================================================================
RCS file: /cvsroot/bluez/gnome/applet/main.c,v
retrieving revision 1.89
diff -u -r1.89 main.c
--- applet/main.c	4 Dec 2007 15:30:51 -0000	1.89
+++ applet/main.c	16 Dec 2007 22:31:35 -0000
@@ -1504,40 +1504,120 @@
 	gtk_widget_destroy(dialog);
 }
 
-static void about_callback(GtkWidget *item, gpointer user_data)
+static void 
+about_dialog_handle_url_cb (GtkAboutDialog *about, const gchar *url, gpointer data)
 {
-	const gchar *authors[] = {
-		"Marcel Holtmann <marcel@holtmann.org>",
-		"Bastien Nocera <hadess@hadess.net>",
-		NULL
-	};
-	GtkWidget *dialog;
+	GError *error = NULL;
+	gboolean ret;
+	char *cmdline;
+	GdkScreen *gscreen;
+	GtkWidget *error_dialog;
+
+	gscreen = gdk_screen_get_default();
+
+	cmdline = g_strconcat ("gnome-open ", url, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
 
-	dialog = gtk_about_dialog_new();
+	if (ret == TRUE)
+		return;
 
-	gtk_window_set_icon_name(GTK_WINDOW(dialog), "stock_bluetooth");
+	g_error_free (error);
+	error = NULL;
+
+	cmdline = g_strconcat ("xdg-open ", url, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
+	
+	if (ret == FALSE) {
+		error_dialog = gtk_message_dialog_new ( NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message); 
+		gtk_dialog_run (GTK_DIALOG (error_dialog));
+		g_error_free (error);
+	}
+
+}
+
+/* Make email in about dialog clickable */
+static void 
+about_dialog_handle_email_cb (GtkAboutDialog *about, const char *email_address, gpointer data)
+{
+	GError *error = NULL;
+	gboolean ret;
+	char *cmdline;
+	GdkScreen *gscreen;
+	GtkWidget *error_dialog;
+
+	gscreen = gdk_screen_get_default();
+
+	cmdline = g_strconcat ("gnome-open mailto:", email_address, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
+
+	if (ret == TRUE)
+		return;
 
-	gtk_about_dialog_set_name(GTK_ABOUT_DIALOG(dialog),
-						_("Bluetooth Applet"));
+	g_error_free (error);
+	error = NULL;
 
-	gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(dialog), VERSION);
+	cmdline = g_strconcat ("xdg-open mailto:", email_address, NULL);
+	ret = gdk_spawn_command_line_on_screen (gscreen, cmdline, &error);
+	g_free (cmdline);
+	
+	if (ret == FALSE) {
+		error_dialog = gtk_message_dialog_new ( NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Failed to show url %s", error->message); 
+		gtk_dialog_run (GTK_DIALOG (error_dialog));
+		g_error_free (error);
+	}
+}
 
-	gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(dialog),
-			"Copyright \xc2\xa9 2005-2007 Marcel Holtmann");
 
-	gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(dialog),
-			_("A Bluetooth manager for the GNOME desktop"));
+static void about_callback(GtkWidget *item, gpointer user_data)
+{
+	GtkWidget *dialog;
+
+	const gchar *authors[] = {
+		"Marcel Holtmann <marcel@holtmann.org>",
+		"Bastien Nocera <hadess@hadess.net>",
+		NULL
+	};
+        const char *translators;
+        translators = _("translator-credits");
 
-	gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(dialog),
-							"stock_bluetooth");
+        const char *license[] = {
+                N_("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.\n"),
+                N_("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.\n"),
+                N_("You should have received a copy of the GNU General Public License "
+                "along with this program. If not, see <http://www.gnu.org/licenses/>.")
+        };
+
+        char *license_trans;
+        
+        license_trans = g_strconcat (_(license[0]), "\n", _(license[1]), "\n",
+                                     _(license[2]), "\n", NULL);
 
-	gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(dialog),
-							"www.bluez.org");
+	gtk_about_dialog_set_url_hook (about_dialog_handle_url_cb, NULL, NULL);
+	gtk_about_dialog_set_email_hook (about_dialog_handle_email_cb, NULL, NULL);
 
-	gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(dialog), authors);
+	dialog = gtk_about_dialog_new();
 
-	gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(dialog),
-						_("translator-credits"));
+        g_object_set (G_OBJECT(dialog),
+                      "version", VERSION,
+                      "copyright", "Copyright \xc2\xa9 2005-2007 Marcel Holtmann",
+                      "comments", _("A Bluetooth manager for the GNOME desktop"),
+                      "authors", authors,
+                      "translator-credits", translators,
+                      "website", "http://www.bluez.org",
+	              "website-label", _("Bluez Website"),
+                      "logo-icon-name", "stock_bluetooth",
+                      "wrap-license", TRUE,
+                      "license", license_trans,
+                      NULL);
 
 	g_signal_connect(dialog, "close",
 				G_CALLBACK(close_callback), NULL);
@@ -1795,6 +1875,8 @@
 #ifdef HAVE_LIBNOTIFY
 	notify_init("bluetooth-manager");
 #endif
+        g_set_application_name (_("Bluetooth Applet"));
+        gtk_window_set_default_icon_name ("stock_bluetooth");
 
 	conn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
 	if (error != NULL) {

[-- Attachment #3: Type: text/plain, Size: 308 bytes --]

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace

[-- Attachment #4: Type: text/plain, Size: 164 bytes --]

_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel