minecraft-pi-reborn
/
zenity
1
0
Fork 0
Code Pull Requests Activity

added attach option for transient window

This commit is contained in:
Weitian Leung 2013-08-23 09:15:07 +08:00 committed by Arx Cruz
parent e6021b4a22
commit 009523d5da
15 changed files with 37 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/about.c
View File

@ -308,7 +308,7 @@ zenity_about (ZenityData *data)
G_CALLBACK (zenity_zen_wisdom), NULL);
#endif
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
gtk_main ();
}

2
src/calendar.c
View File

@ -86,7 +86,7 @@ zenity_calendar (ZenityData *data, ZenityCalendarData *cal_data)
G_CALLBACK (zenity_calendar_double_click), data);
gtk_label_set_mnemonic_widget (GTK_LABEL (text), calendar);
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if (data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);

2
src/color.c
View File

@ -79,7 +79,7 @@ void zenity_colorselection (ZenityData *data, ZenityColorData *color_data)
gtk_color_selection_set_has_palette (GTK_COLOR_SELECTION (colorsel),
color_data->show_palette);
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if (data->timeout_delay > 0) {
g_timeout_add (data->timeout_delay * 1000,

2
src/entry.c
View File

@ -144,7 +144,7 @@ zenity_entry (ZenityData *data, ZenityEntryData *entry_data)
g_object_unref (builder);
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if(data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);

2
src/fileselection.c
View File

@ -136,7 +136,7 @@ void zenity_fileselection (ZenityData *data, ZenityFileData *file_data)
}
}
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if(data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);

2
src/msg.c
View File

@ -165,7 +165,7 @@ zenity_msg (ZenityData *data, ZenityMsgData *msg_data)
if (msg_data->no_wrap)
gtk_label_set_line_wrap (GTK_LABEL (text), FALSE);
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if(data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, NULL);

12
src/option.c
View File

@ -46,6 +46,7 @@ static gint zenity_general_timeout_delay;
static gchar *zenity_general_ok_button;
static gchar *zenity_general_cancel_button;
static gboolean zenity_general_modal;
static gint zenity_general_attach;
/* Calendar Dialog Options */
static gboolean zenity_calendar_active;
@ -222,6 +223,15 @@ static GOptionEntry general_options[] = {
N_("Set the modal hint"),
NULL
},
{
"attach",
'\0',
G_OPTION_FLAG_NOALIAS,
G_OPTION_ARG_INT,
&zenity_general_attach,
N_("Set the parent window to attach to"),
N_("WINDOW")
},
{
NULL
}
@ -1350,6 +1360,7 @@ zenity_general_pre_callback (GOptionContext *context,
zenity_general_dialog_no_markup = FALSE;
zenity_general_timeout_delay = -1;
zenity_general_modal = FALSE;
zenity_general_attach = 0;
return TRUE;
}
@ -1588,6 +1599,7 @@ zenity_general_post_callback (GOptionContext *context,
results->data->ok_label = zenity_general_ok_button;
results->data->cancel_label = zenity_general_cancel_button;
results->data->modal = zenity_general_modal;
results->data->attach = zenity_general_attach;
return TRUE;
}

2
src/password.c
View File

@ -141,7 +141,7 @@ void zenity_password_dialog (ZenityData *data, ZenityPasswordData *password_data
G_CALLBACK (zenity_password_dialog_response),
password_data);
gtk_widget_show_all(GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dialog))));
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if (data->timeout_delay > 0) {
g_timeout_add (data->timeout_delay * 1000,

2
src/progress.c
View File

@ -302,7 +302,7 @@ zenity_progress (ZenityData *data, ZenityProgressData *progress_data)
if (no_cancel && auto_close)
gtk_widget_hide(GTK_WIDGET(ok_button));
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
zenity_progress_read_info (progress_data);
if(data->timeout_delay > 0) {

2
src/scale.c
View File

@ -107,7 +107,7 @@ zenity_scale (ZenityData *data, ZenityScaleData *scale_data)
if (scale_data->hide_value)
gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if(data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);

2
src/text.c
View File

@ -326,7 +326,7 @@ zenity_text (ZenityData *data, ZenityTextData *text_data)
gtk_widget_show (GTK_WIDGET (web_kit));
}
#endif
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
g_object_unref (builder);

2
src/tree.c
View File

@ -562,7 +562,7 @@ zenity_tree (ZenityData *data, ZenityTreeData *tree_data)
zenity_tree_fill_entries_from_stdin (GTK_TREE_VIEW (tree_view), n_columns, FALSE, tree_data->editable);
}
zenity_util_show_dialog (dialog);
zenity_util_show_dialog (dialog, data->attach);
if(data->timeout_delay > 0) {
g_timeout_add_seconds (data->timeout_delay, (GSourceFunc) zenity_util_timeout_handle, dialog);

22
src/util.c
View File

@ -39,10 +39,6 @@
#include "util.h"
#include "zenity.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
#define ZENITY_OK_DEFAULT 0
#define ZENITY_CANCEL_DEFAULT 1
#define ZENITY_ESC_DEFAULT 1
@ -398,29 +394,27 @@ transient_get_xterm_toplevel (void)
}
static void
zenity_util_make_transient (GdkWindow *window)
zenity_util_make_transient (GdkWindow *window, Window parent)
{
Window xterm = transient_get_xterm_toplevel ();
if (xterm != None) {
GdkWindow *gdkxterm = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), xterm);
if (gdkxterm) {
gdk_window_set_transient_for (window, gdkxterm);
g_object_unref (G_OBJECT (gdkxterm));
}
Window parent_window = parent;
if (parent_window == 0)
parent_window = transient_get_xterm_toplevel ();
if (parent_window != None) {
XSetTransientForHint (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), GDK_WINDOW_XID(window), parent_window);
}
}
#endif /* GDK_WINDOWING_X11 */
void
zenity_util_show_dialog (GtkWidget *dialog)
zenity_util_show_dialog (GtkWidget *dialog, Window parent)
{
gtk_widget_realize (dialog);
#ifdef GDK_WINDOWING_X11
if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
{
g_assert (gtk_widget_get_window(dialog));
zenity_util_make_transient (gtk_widget_get_window(dialog));
zenity_util_make_transient (gtk_widget_get_window(dialog), parent);
}
#endif
gtk_widget_show (dialog);

6
src/util.h
View File

@ -4,6 +4,10 @@
#include <gtk/gtk.h>
#include "zenity.h"
#ifdef GDK_WINDOWING_X11
#include <gdk/gdkx.h>
#endif
G_BEGIN_DECLS
#define ZENITY_UI_FILE_FULLPATH ZENITY_DATADIR "/zenity.ui"
@ -28,7 +32,7 @@ void zenity_util_show_help (GError **error);
gint zenity_util_return_exit_code (ZenityExitCode value);
void zenity_util_exit_code_with_data (ZenityExitCode value,
ZenityData *data);
void zenity_util_show_dialog (GtkWidget *widget);
void zenity_util_show_dialog (GtkWidget *widget, Window parent);
gboolean zenity_util_timeout_handle (gpointer data);

1
src/zenity.h
View File

@ -33,6 +33,7 @@ typedef struct {
gint exit_code;
gint timeout_delay;
gboolean modal;
gint attach;
} ZenityData;
typedef enum {