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

Add chart loading progress bar

Browse Source
This commit is contained in:
Gergely Polonkai
2014-10-06 23:07:49 +02:00
parent 7a34010926
commit 85ee568c34
2 changed files with 56 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/ag-window.c
View File

@@ -44,6 +44,8 @@ struct _AgWindowPrivate {
GtkWidget *house_system; GtkWidget *house_system;
GtkWidget *display_theme; GtkWidget *display_theme;
GtkWidget *toolbar_aspect; GtkWidget *toolbar_aspect;
GtkProgressBar *load_progress;
GtkRevealer *load_progress_revealer;
GtkWidget *tab_list; GtkWidget *tab_list;
GtkWidget *tab_chart; GtkWidget *tab_chart;
@@ -75,12 +77,12 @@ enum {
}; };
typedef struct { typedef struct {
guint load_state; guint load_state;
guint load_id; guint load_id;
AgIconView *icon_view; AgWindowPrivate *priv;
gint n_items; gint n_items;
gint n_loaded; gint n_loaded;
GList *items; GList *items;
} LoadIdleData; } LoadIdleData;
enum { enum {
@@ -2166,6 +2168,16 @@ ag_window_class_init(AgWindowClass *klass)
AgWindow, AgWindow,
content_manager content_manager
); );
gtk_widget_class_bind_template_child_private(
widget_class,
AgWindow,
load_progress
);
gtk_widget_class_bind_template_child_private(
widget_class,
AgWindow,
load_progress_revealer
);
gtk_widget_class_bind_template_callback( gtk_widget_class_bind_template_callback(
widget_class, widget_class,
@@ -2395,17 +2407,22 @@ ag_window_add_chart(LoadIdleData *idle_data)
idle_data->load_state = PREVIEW_STATE_LOADING; idle_data->load_state = PREVIEW_STATE_LOADING;
} }
gtk_progress_bar_set_fraction(
idle_data->priv->load_progress,
(gdouble)idle_data->n_loaded / (gdouble)idle_data->n_items
);
save_data = g_list_nth_data(idle_data->items, idle_data->n_loaded); save_data = g_list_nth_data(idle_data->items, idle_data->n_loaded);
g_assert(save_data); g_assert(save_data);
ag_icon_view_add_chart(idle_data->icon_view, save_data); ag_icon_view_add_chart(idle_data->priv->chart_list, save_data);
idle_data->n_loaded++; idle_data->n_loaded++;
// TODO: maybe a progress bar should update somewhere during loading?
if (idle_data->n_loaded == idle_data->n_items) { if (idle_data->n_loaded == idle_data->n_items) {
g_debug("Finished loading");
idle_data->load_state = PREVIEW_STATE_COMPLETE; idle_data->load_state = PREVIEW_STATE_COMPLETE;
idle_data->n_loaded = 0; idle_data->n_loaded = 0;
idle_data->n_items = 0; idle_data->n_items = 0;
@@ -2423,6 +2440,13 @@ ag_window_cleanup_load_items(LoadIdleData *idle_data)
{ {
g_assert(idle_data->load_state == PREVIEW_STATE_COMPLETE); g_assert(idle_data->load_state == PREVIEW_STATE_COMPLETE);
g_debug("Cleaning up lazy loader");
gtk_revealer_set_reveal_child(
idle_data->priv->load_progress_revealer,
FALSE
);
g_free(idle_data); g_free(idle_data);
} }
@@ -2444,9 +2468,12 @@ ag_window_reload_chart_list(AgWindow *window)
idle_data->items = chart_list; idle_data->items = chart_list;
idle_data->n_items = 0; idle_data->n_items = 0;
idle_data->n_loaded = 0; idle_data->n_loaded = 0;
idle_data->icon_view = priv->chart_list; idle_data->priv = priv;
idle_data->load_state = PREVIEW_STATE_STARTED; idle_data->load_state = PREVIEW_STATE_STARTED;
gtk_progress_bar_set_fraction(priv->load_progress, 0.0);
gtk_revealer_set_reveal_child(priv->load_progress_revealer, TRUE);
idle_data->load_id = g_idle_add_full( idle_data->load_id = g_idle_add_full(
G_PRIORITY_DEFAULT_IDLE, G_PRIORITY_DEFAULT_IDLE,
(GSourceFunc)ag_window_add_chart, (GSourceFunc)ag_window_add_chart,

21
src/resources/ui/ag-window.ui
View File

@@ -100,10 +100,27 @@
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<child> <child>
<object class="GtkOverlay"> <object class="GtkOverlay">
<property name="hexpand">True</property> <child type="overlay">
<property name="vexpand">True</property> <object class="GtkRevealer" id="load_progress_revealer">
<property name="halign">center</property>
<property name="valign">start</property>
<child>
<object class="GtkFrame">
<style>
<class name="app-notification"/>
</style>
<child>
<object class="GtkProgressBar" id="load_progress">
</object>
</child>
</object>
</child>
</object>
</child>
<child> <child>
<object class="GtkScrolledWindow"> <object class="GtkScrolledWindow">
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child> <child>
<object class="AgIconView" id="chart_list"> <object class="AgIconView" id="chart_list">
<signal name="item-activated" handler="ag_window_list_item_activated_cb" object="AgWindow" swapped="no"/> <signal name="item-activated" handler="ag_window_list_item_activated_cb" object="AgWindow" swapped="no"/>