* gnoemoe/dialog/gm-world-paste-dialog.c: close dialog after pasting
(fixes #4) *ui/gm-world-paste.glade: make labels right aligned
This commit is contained in:
parent
169f98af57
commit
894b4cab84
|
@ -299,26 +299,25 @@ gm_world_paste_dialog_do_paste() {
|
||||||
static void
|
static void
|
||||||
on_gm_world_paste_dialog_response(GtkDialog *dialog, gint response,
|
on_gm_world_paste_dialog_response(GtkDialog *dialog, gint response,
|
||||||
gpointer user_data) {
|
gpointer user_data) {
|
||||||
if (response == GTK_RESPONSE_APPLY) {
|
if (response == GTK_RESPONSE_APPLY)
|
||||||
gm_world_paste_dialog_do_paste();
|
gm_world_paste_dialog_do_paste();
|
||||||
} else {
|
|
||||||
if (gm_world_paste_dialog_instance->model != NULL) {
|
|
||||||
g_object_ref(gm_world_paste_dialog_instance->model);
|
|
||||||
g_object_remove_toggle_ref(
|
|
||||||
G_OBJECT(gm_world_paste_dialog_instance->model),
|
|
||||||
gm_world_paste_dialog_remove_model, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
g_signal_handlers_disconnect_by_func(
|
if (gm_world_paste_dialog_instance->model != NULL) {
|
||||||
gm_world_paste_dialog_instance->view,
|
g_object_ref(gm_world_paste_dialog_instance->model);
|
||||||
G_CALLBACK(on_gm_world_paste_dialog_active_world_changed),
|
g_object_remove_toggle_ref(
|
||||||
NULL);
|
G_OBJECT(gm_world_paste_dialog_instance->model),
|
||||||
|
gm_world_paste_dialog_remove_model, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
g_object_unref(gm_world_paste_dialog_instance->xml);
|
g_signal_handlers_disconnect_by_func(
|
||||||
gtk_widget_destroy(gm_world_paste_dialog_instance->dialog);
|
gm_world_paste_dialog_instance->view,
|
||||||
g_free(gm_world_paste_dialog_instance);
|
G_CALLBACK(on_gm_world_paste_dialog_active_world_changed),
|
||||||
gm_world_paste_dialog_instance = NULL;
|
NULL);
|
||||||
}
|
|
||||||
|
g_object_unref(gm_world_paste_dialog_instance->xml);
|
||||||
|
gtk_widget_destroy(gm_world_paste_dialog_instance->dialog);
|
||||||
|
g_free(gm_world_paste_dialog_instance);
|
||||||
|
gm_world_paste_dialog_instance = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -109,7 +109,7 @@
|
||||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
<property name="wrap">False</property>
|
<property name="wrap">False</property>
|
||||||
<property name="selectable">False</property>
|
<property name="selectable">False</property>
|
||||||
<property name="xalign">0</property>
|
<property name="xalign">1</property>
|
||||||
<property name="yalign">0.5</property>
|
<property name="yalign">0.5</property>
|
||||||
<property name="xpad">0</property>
|
<property name="xpad">0</property>
|
||||||
<property name="ypad">0</property>
|
<property name="ypad">0</property>
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||||
<property name="wrap">False</property>
|
<property name="wrap">False</property>
|
||||||
<property name="selectable">False</property>
|
<property name="selectable">False</property>
|
||||||
<property name="xalign">0</property>
|
<property name="xalign">1</property>
|
||||||
<property name="yalign">0.5</property>
|
<property name="yalign">0.5</property>
|
||||||
<property name="xpad">0</property>
|
<property name="xpad">0</property>
|
||||||
<property name="ypad">0</property>
|
<property name="ypad">0</property>
|
||||||
|
|
Reference in New Issue