gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent AgApp for opening a new window for imports unless necessary

Browse Source 
It checks the current window, then all the other windows if there is a
usable among them. Only if there is none, it will create a new window.
This commit is contained in:
Gergely Polonkai 2014-09-21 13:23:19 +02:00
parent 6fe03c5a52
commit 86e6b7e4e5
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ag-app.c
View File

@ -60,6 +60,36 @@ ag_app_create_window(AgApp *app)
return window;
}
static GtkWidget *
ag_app_get_usable_window(AgApp *app)
{
GtkWidget *window;
GList *l;
// Favour current window
window = GTK_WIDGET(gtk_application_get_active_window(GTK_APPLICATION(app)));
if (AG_IS_WINDOW(window) && ag_window_is_usable(AG_WINDOW(window))) {
return window;
}
// Otherwise, let’s use the first existing, usable window
for (
l = gtk_application_get_windows(GTK_APPLICATION(app));
l;
l = g_list_next(l)
) {
if (AG_IS_WINDOW(l->data) && ag_window_is_usable(AG_WINDOW(l->data))) {
return l->data;
}
}
// If we are still here, no usable windows were found. Let’s create one
window = ag_app_create_window(app);
return window;
}
static void
new_window_cb(GSimpleAction *action, GVariant *parameter, gpointer user_data)
{
@ -165,11 +195,12 @@ ag_app_import_file(AgApp *app, GFile *file, AgAppImportType type)
return;
}
window = ag_app_create_window(app);
window = ag_app_get_usable_window(app);
ag_window_set_chart(AG_WINDOW(window), chart);
ag_window_update_from_chart(AG_WINDOW(window));
g_action_group_activate_action(G_ACTION_GROUP(window), "save", NULL);
ag_window_change_tab(AG_WINDOW(window), "chart");
gtk_window_present(GTK_WINDOW(window));
}
static void