applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

universal-access: Parent zoom options to panel

Browse source
This commit is contained in:
Bastien Nocera 2012-01-21 14:25:45 +00:00
parent 77abe0eced
commit f60e2fa4ae
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
panels/universal-access/cc-ua-panel.c
View file

@ -49,7 +49,7 @@ struct _CcUaPanelPrivate
GSettings *application_settings; GSettings *application_settings;
GSettings *mediakeys_settings; GSettings *mediakeys_settings;
GObject *zoom_options; ZoomOptions *zoom_options;
}; };
@ -205,10 +205,11 @@ static void
zoom_options_launch_cb (GtkWidget *options_button, CcUaPanel *self) zoom_options_launch_cb (GtkWidget *options_button, CcUaPanel *self)
{ {
if (self->priv->zoom_options == NULL) if (self->priv->zoom_options == NULL)
self->priv->zoom_options = g_object_new (ZOOM_TYPE_OPTIONS, NULL); self->priv->zoom_options = zoom_options_new ();
if (self->priv->zoom_options != NULL) if (self->priv->zoom_options != NULL)
zoom_options_present_dialog (ZOOM_OPTIONS (self->priv->zoom_options)); zoom_options_set_parent (self->priv->zoom_options,
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (self))));
} }
static void static void

22
panels/universal-access/zoom-options.c
View file

@ -475,8 +475,7 @@ zoom_options_init (ZoomOptions *self)
/* ... Window itself ... */ /* ... Window itself ... */
priv->dialog = WID ("magPrefsDialog"); priv->dialog = WID ("magPrefsDialog");
gtk_window_set_position (GTK_WINDOW (priv->dialog),
GTK_WIN_POS_CENTER);
w = WID ("closeButton"); w = WID ("closeButton");
g_signal_connect (G_OBJECT (w), "clicked", g_signal_connect (G_OBJECT (w), "clicked",
G_CALLBACK (zoom_option_close_dialog_cb), G_CALLBACK (zoom_option_close_dialog_cb),
@ -486,21 +485,28 @@ zoom_options_init (ZoomOptions *self)
NULL); NULL);
pango_attr_list_unref (pango_attrs); pango_attr_list_unref (pango_attrs);
zoom_options_present_dialog (self);
} }
/** /**
* zoom_options_present_dialog: * zoom_options_set_parent:
* @self: the #ZoomOptions object * @self: the #ZoomOptions object
* @parent: the parent #GtkWindow
* *
* Activate the dialog associated with this ZoomOptions. * Activate the dialog associated with this ZoomOptions.
*/ */
void void
zoom_options_present_dialog (ZoomOptions *self) zoom_options_set_parent (ZoomOptions *self,
GtkWindow *parent)
{ {
g_return_if_fail (ZOOM_IS_OPTIONS (self)); g_return_if_fail (ZOOM_IS_OPTIONS (self));
if (self->priv->dialog != NULL) gtk_window_set_transient_for (GTK_WINDOW (self->priv->dialog), parent);
gtk_window_present (GTK_WINDOW (self->priv->dialog)); gtk_window_set_modal (GTK_WINDOW (self->priv->dialog), TRUE);
gtk_widget_show (self->priv->dialog);
}
ZoomOptions *
zoom_options_new (void)
{
return g_object_new (ZOOM_TYPE_OPTIONS, NULL);
} }

4
panels/universal-access/zoom-options.h
View file

@ -66,7 +66,9 @@ struct _ZoomOptions
GType zoom_options_get_type (void) G_GNUC_CONST; GType zoom_options_get_type (void) G_GNUC_CONST;
void zoom_options_present_dialog (ZoomOptions *self); ZoomOptions *zoom_options_new (void);
void zoom_options_set_parent (ZoomOptions *self,
GtkWindow *parent);
G_END_DECLS G_END_DECLS

2
panels/universal-access/zoom-options.ui
View file

@ -21,8 +21,6 @@
<property name="border_width">5</property> <property name="border_width">5</property>
<property name="title" translatable="yes">Zoom Options</property> <property name="title" translatable="yes">Zoom Options</property>
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">normal</property>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="visible">True</property> <property name="visible">True</property>