Page MenuHome GnuPG
Files F34307441

No OneTemporary
Actions

View Options

diff --git a/src/gtktools.c b/src/gtktools.c
index 973d974..8bf2867 100644
--- a/src/gtktools.c
+++ b/src/gtktools.c
@@ -1,192 +1,162 @@
/* gtktools.c - The GNU Privacy Assistant
Copyright (C) 2000, 2001 G-N-U GmbH.
Copyright (C) 2008, 2014 g10 Code GmbH.
This file is part of GPA.
GPA 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 3 of the License, or
(at your option) any later version.
GPA 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.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
/* NOTE: Here are a lot of old GTK+ functions and wrappers. They
should be replaced by modern GTK+ code and some of the wrappers are
not needed anymore. */
#include <stdlib.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include "gpa.h"
#include "gtktools.h"
#include "gpawindowkeeper.h"
#include "icons.h"
-/* BEGIN of old unchecked code (wk 2008-03-07) */
-
-static char *
-make_box_title (const char *string)
+/* Deprecated - use gpa_show_warning instead. */
+void
+gpa_window_error (const gchar *message, GtkWidget *messenger)
{
- return g_strdup_printf ("%s %s", GPA_NAME, string);
+ gpa_show_warning (messenger, "%s", message);
}
+/* Deprecated - use gpa_show_info instead. */
void
-gpa_window_error (const gchar *message, GtkWidget *messenger)
+gpa_window_message (const gchar *message, GtkWidget * messenger)
+{
+ gpa_show_info (messenger, "%s", message);
+}
+
+
+static void
+show_gtk_message (GtkWidget *parent, GtkMessageType mtype,
+ const char *format, va_list arg_ptr)
{
- GtkWidget *windowError;
- GtkWidget *hboxError;
- GtkWidget *labelMessage;
- GtkWidget *pixmap;
- char *title;
-
- title = make_box_title (_("Error"));
- windowError = gtk_dialog_new_with_buttons (title,
- (messenger ?
- GTK_WINDOW(messenger) : NULL),
- GTK_DIALOG_MODAL,
- _("_Close"),
- GTK_RESPONSE_CLOSE,
- NULL);
- g_free (title);
- if (messenger)
- gtk_window_set_transient_for (GTK_WINDOW (windowError),
- GTK_WINDOW (messenger));
-
- gtk_container_set_border_width (GTK_CONTAINER (windowError), 5);
- gtk_dialog_set_default_response (GTK_DIALOG (windowError),
- GTK_RESPONSE_CLOSE);
- hboxError = gtk_hbox_new (FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hboxError), 5);
- gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (windowError)->vbox),
- hboxError);
- pixmap = gtk_image_new_from_stock (GTK_STOCK_DIALOG_ERROR,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hboxError), pixmap, TRUE, FALSE, 10);
- labelMessage = gtk_label_new (message);
- gtk_box_pack_start (GTK_BOX (hboxError), labelMessage, TRUE, FALSE, 10);
-
- gtk_widget_show_all (windowError);
- gtk_dialog_run (GTK_DIALOG (windowError));
- gtk_widget_destroy (windowError);
+ GtkWidget *dialog;
+ char *buffer;
+
+ buffer = g_strdup_vprintf (format, arg_ptr);
+ dialog = gtk_message_dialog_new (parent? GTK_WINDOW (parent):NULL,
+ GTK_DIALOG_MODAL,
+ mtype,
+ GTK_BUTTONS_CLOSE,
+ "%s", buffer);
+ g_free (buffer);
+
+ gtk_widget_show_all (dialog);
+ gtk_dialog_run (GTK_DIALOG (dialog));
+ gtk_widget_destroy (dialog);
}
+/* Show a modal info message. */
void
-gpa_window_message (gchar * message, GtkWidget * messenger)
+gpa_show_info (GtkWidget *parent, const char *format, ...)
{
- GtkWidget *window;
- GtkWidget *hbox;
- GtkWidget *labelMessage;
- GtkWidget *pixmap;
- char *title;
-
- title = make_box_title (_("Message"));
- window = gtk_dialog_new_with_buttons (title,
- (messenger ?
- GTK_WINDOW(messenger) : NULL),
- GTK_DIALOG_MODAL,
- _("_Close"),
- GTK_RESPONSE_CLOSE,
- NULL);
- g_free (title);
- gtk_container_set_border_width (GTK_CONTAINER (window), 5);
- gtk_dialog_set_default_response (GTK_DIALOG (window),
- GTK_RESPONSE_CLOSE);
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start_defaults (GTK_BOX (GTK_DIALOG (window)->vbox),
- hbox);
- pixmap = gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO,
- GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hbox), pixmap, TRUE, FALSE, 10);
- labelMessage = gtk_label_new (message);
- gtk_box_pack_start (GTK_BOX (hbox), labelMessage, TRUE, FALSE, 10);
-
- gtk_widget_show_all (window);
- gtk_dialog_run (GTK_DIALOG (window));
- gtk_widget_destroy (window);
+ va_list arg_ptr;
+
+ va_start (arg_ptr, format);
+ show_gtk_message (parent, GTK_MESSAGE_INFO, format, arg_ptr);
+ va_end (arg_ptr);
}
-/* END of old unchecked code (wk 2008-03-07) */
-
+/* Show a modal warning message. */
+void
+gpa_show_warning (GtkWidget *parent, const char *format, ...)
+{
+ va_list arg_ptr;
+
+ va_start (arg_ptr, format);
+ show_gtk_message (parent, GTK_MESSAGE_WARNING, format, arg_ptr);
+ va_end (arg_ptr);
+}
/* Set a tooltip TEXT to WIDGET. TEXT and WIDGET may both be NULL.
This function is useful so that GPA can be build with older GTK+
versions. */
void
gpa_add_tooltip (GtkWidget *widget, const char *text)
{
#if GTK_CHECK_VERSION (2, 12, 0)
if (widget && text && *text)
gtk_widget_set_tooltip_text (widget, text);
#endif
}
/* Set the title of COLUMN to TITLE and also set TOOLTIP. */
void
gpa_set_column_title (GtkTreeViewColumn *column,
const char *title, const char *tooltip)
{
GtkWidget *label;
label = gtk_label_new (title);
/* We need to show the label before setting the widget. */
gtk_widget_show (label);
gtk_tree_view_column_set_widget (column, label);
if (tooltip)
gpa_add_tooltip (gtk_tree_view_column_get_widget (column), tooltip);
}
static void
set_homogeneous (GtkWidget *widget, gpointer data)
{
gboolean *is_hom_p = data;
gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), *is_hom_p);
}
/* Set the homogeneous property for all children of TOOLBAR to IS_HOM. */
void
gpa_toolbar_set_homogeneous (GtkToolbar *toolbar, gboolean is_hom)
{
gtk_container_foreach (GTK_CONTAINER (toolbar),
(GtkCallback) set_homogeneous, &is_hom);
}
/* Customized set title function. */
void
gpa_window_set_title (GtkWindow *window, const char *string)
{
const char *prefix = GPA_LONG_NAME;
char *buffer;
if (!string || !*string)
{
gtk_window_set_title (window, prefix);
}
else
{
buffer = g_strdup_printf ("%s - %s", prefix, string);
gtk_window_set_title (window, buffer);
g_free (buffer);
}
}
diff --git a/src/gtktools.h b/src/gtktools.h
index 3a204ba..41fafc5 100644
--- a/src/gtktools.h
+++ b/src/gtktools.h
@@ -1,47 +1,57 @@
/* gtktools.h - The GNU Privacy Assistant
Copyright (C) 2000, 2001 G-N-U GmbH.
Copyright (C) 2008 g10 Code GmbH.
This file is part of GPA.
GPA 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 3 of the License, or
(at your option) any later version.
GPA 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.
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef GTK_TOOLS_H_
#define GTK_TOOLS_H_
#include <gtk/gtk.h>
-extern void gpa_window_error (const gchar * message, GtkWidget * messenger);
-extern void gpa_window_message (gchar * message, GtkWidget * messenger);
+/* Show a modal info message. */
+void gpa_show_info (GtkWidget *parent,
+ const char *format, ...) G_GNUC_PRINTF(2,3);
+/* Show a modal warning message. */
+void gpa_show_warning (GtkWidget *parent,
+ const char *format, ...) G_GNUC_PRINTF(2,3);
/* Set a tooltip TEXT to WIDGET. TEXT and WIDGET may both be NULL.
This function is useful so that GPA can be build with older GTK+
versions. */
void gpa_add_tooltip (GtkWidget *widget, const char *text);
/* Set the title of COLUMN to TITLE and also set TOOLTIP. */
void gpa_set_column_title (GtkTreeViewColumn *column,
const char *title, const char *tooltip);
/* Set the homogeneous property for all children of TOOLBAR to IS_HOM. */
void gpa_toolbar_set_homogeneous (GtkToolbar *toolbar, gboolean is_hom);
/* Customized set title function. */
void gpa_window_set_title (GtkWindow *window, const char *string);
+/* Deprecated functions. */
+void gpa_window_error (const gchar * message, GtkWidget * messenger);
+void gpa_window_message (const gchar * message, GtkWidget * messenger);
+
+
+
#endif /* GTK_TOOLS_H_ */

File Metadata

Mime Type
text/x-diff
Expires
Sun, Dec 28, 10:59 PM (6 h, 7 m)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
59/d1/098dc25596bd3de3ce227e1d4522

Event Timeline