From d46b97cfa5741ff6a1c91ac3b5790cfcbd34c395 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Sun, 3 Mar 2019 11:12:06 +0000 Subject: [PATCH 1/8] src/gs-details-page.c: Adding context to loading page. The loading page was just a blank page with a spinner in the middle. This isn't great because it isn't clear what's happening. I added the dialog "Loading details" and it get iterated everytime GS_DETAILS_PAGE_STATE_LOADING is called. Fixes #608 --- src/gs-details-page.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 30b796420..f1dd3d315 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -1895,8 +1895,10 @@ gs_details_page_url_to_app_cb (GObject *source, void gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); + str = _("Loading details"); g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP, "file", file, @@ -1928,8 +1930,10 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) void gs_details_page_set_url (GsDetailsPage *self, const gchar *url) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); + str = _("Loading details"); g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP, "search", url, @@ -1963,11 +1967,13 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) static void gs_details_page_load_stage1 (GsDetailsPage *self) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; /* update UI */ gs_page_switch_to (GS_PAGE (self), TRUE); gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); + str = _("Loading details"); /* get extra details about the app */ plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, -- GitLab From bf4df7d896b257902bd8befdd55ba2d53f4f0812 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 04:46:02 +0000 Subject: [PATCH 2/8] Update commit d46b97cf --- src/gs-details-page.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index f1dd3d315..861358728 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -43,6 +43,7 @@ struct _GsDetailsPage GsPage parent_instance; GsPluginLoader *plugin_loader; + GSPluginStatus status; GtkBuilder *builder; GCancellable *cancellable; GCancellable *app_cancellable; @@ -1898,7 +1899,9 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - str = _("Loading details"); + if(status == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP, "file", file, @@ -1933,7 +1936,9 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - str = _("Loading details"); + if(status == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP, "search", url, @@ -1965,7 +1970,7 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) /* refines a GsApp */ static void -gs_details_page_load_stage1 (GsDetailsPage *self) +gs_details_page_load_stage1 (GsDetailsPage *self,) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; @@ -1973,8 +1978,10 @@ gs_details_page_load_stage1 (GsDetailsPage *self) /* update UI */ gs_page_switch_to (GS_PAGE (self), TRUE); gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - str = _("Loading details"); - + if(status == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } + /* get extra details about the app */ plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, "app", self->app, -- GitLab From 373a901d8e1b7092de175ce5002bcaab885686a0 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 05:03:07 +0000 Subject: [PATCH 3/8] Update src/gs-details-page.c --- src/gs-details-page.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 861358728..77fc08402 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -43,7 +43,7 @@ struct _GsDetailsPage GsPage parent_instance; GsPluginLoader *plugin_loader; - GSPluginStatus status; + GsPluginStatus status; GtkBuilder *builder; GCancellable *cancellable; GCancellable *app_cancellable; @@ -1970,7 +1970,7 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) /* refines a GsApp */ static void -gs_details_page_load_stage1 (GsDetailsPage *self,) +gs_details_page_load_stage1 (GsDetailsPage *self) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; -- GitLab From cdb8b97c154febe61b23af9796892b49850c6268 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 08:08:07 +0000 Subject: [PATCH 4/8] Update src/gs-details-page.c --- src/gs-details-page.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 77fc08402..6c8f82e36 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -43,7 +43,6 @@ struct _GsDetailsPage GsPage parent_instance; GsPluginLoader *plugin_loader; - GsPluginStatus status; GtkBuilder *builder; GCancellable *cancellable; GCancellable *app_cancellable; @@ -1894,7 +1893,8 @@ gs_details_page_url_to_app_cb (GObject *source, } void -gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) +gs_details_page_set_local_file (GsDetailsPage *self, GFile *file, + GsPluginStatus status) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; @@ -1931,7 +1931,8 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) } void -gs_details_page_set_url (GsDetailsPage *self, const gchar *url) +gs_details_page_set_url (GsDetailsPage *self, const gchar *url, + GsPluginStatus status) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; @@ -1970,7 +1971,8 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) /* refines a GsApp */ static void -gs_details_page_load_stage1 (GsDetailsPage *self) +gs_details_page_load_stage1 (GsDetailsPage *self, + GsPluginStatus status) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; -- GitLab From 7f7963217a1af62de334c30a5cf1f357d2258126 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 08:52:01 +0000 Subject: [PATCH 5/8] Update src/gs-details-page.c --- src/gs-details-page.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 6c8f82e36..0635844aa 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -1893,8 +1893,7 @@ gs_details_page_url_to_app_cb (GObject *source, } void -gs_details_page_set_local_file (GsDetailsPage *self, GFile *file, - GsPluginStatus status) +gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; @@ -1931,8 +1930,7 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file, } void -gs_details_page_set_url (GsDetailsPage *self, const gchar *url, - GsPluginStatus status) +gs_details_page_set_url (GsDetailsPage *self, const gchar *url) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; @@ -1971,8 +1969,7 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url, /* refines a GsApp */ static void -gs_details_page_load_stage1 (GsDetailsPage *self, - GsPluginStatus status) +gs_details_page_load_stage1 (GsDetailsPage *self) { const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; -- GitLab From f8dd43d5910e56864cebbdb5f71c7e91600f1682 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 09:07:16 +0000 Subject: [PATCH 6/8] Update src/gs-details-page.c --- src/gs-details-page.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 0635844aa..02ba09087 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -1898,7 +1898,7 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - if(status == GS_DETAILS_PAGE_STATE_LOADING) { + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { str = _("Loading details"); } g_clear_object (&self->app_local_file); @@ -1935,7 +1935,7 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - if(status == GS_DETAILS_PAGE_STATE_LOADING) { + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { str = _("Loading details"); } g_clear_object (&self->app_local_file); @@ -1977,7 +1977,7 @@ gs_details_page_load_stage1 (GsDetailsPage *self) /* update UI */ gs_page_switch_to (GS_PAGE (self), TRUE); gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); - if(status == GS_DETAILS_PAGE_STATE_LOADING) { + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { str = _("Loading details"); } -- GitLab From b15e6e7f2524e5dd9ae009e4dbfd407f80ce62eb Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Mon, 4 Mar 2019 09:07:16 +0000 Subject: [PATCH 7/8] Update src/gs-details-page.c --- src/gs-details-page.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index f1dd3d315..11127f237 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -1898,7 +1898,13 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } +>>>>>>> f8dd43d5... Update src/gs-details-page.c g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP, "file", file, @@ -1933,7 +1939,13 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } +>>>>>>> f8dd43d5... Update src/gs-details-page.c g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP, "search", url, @@ -1973,8 +1985,15 @@ gs_details_page_load_stage1 (GsDetailsPage *self) /* update UI */ gs_page_switch_to (GS_PAGE (self), TRUE); gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } + +>>>>>>> f8dd43d5... Update src/gs-details-page.c /* get extra details about the app */ plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, "app", self->app, -- GitLab From e51d3dbe2e0822f1dc4627d4280ea5f5df820264 Mon Sep 17 00:00:00 2001 From: Veerasamy Sevagen Date: Sun, 3 Mar 2019 11:12:06 +0000 Subject: [PATCH 8/8] src/gs-details-page.c: Adding context to loading page. The loading page was just a blank page with a spinner in the middle. This isn't great because it isn't clear what's happening. I added the dialog "Loading details" and it get iterated everytime GS_DETAILS_PAGE_STATE_LOADING is called. Fixes #608 --- src/gs-details-page.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/gs-details-page.c b/src/gs-details-page.c index 30b796420..11127f237 100644 --- a/src/gs-details-page.c +++ b/src/gs-details-page.c @@ -1895,8 +1895,16 @@ gs_details_page_url_to_app_cb (GObject *source, void gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD + str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } +>>>>>>> f8dd43d5... Update src/gs-details-page.c g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_FILE_TO_APP, "file", file, @@ -1928,8 +1936,16 @@ gs_details_page_set_local_file (GsDetailsPage *self, GFile *file) void gs_details_page_set_url (GsDetailsPage *self, const gchar *url) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD + str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } +>>>>>>> f8dd43d5... Update src/gs-details-page.c g_clear_object (&self->app_local_file); plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_URL_TO_APP, "search", url, @@ -1963,12 +1979,21 @@ gs_details_page_set_url (GsDetailsPage *self, const gchar *url) static void gs_details_page_load_stage1 (GsDetailsPage *self) { + const gchar *str = NULL; g_autoptr(GsPluginJob) plugin_job = NULL; /* update UI */ gs_page_switch_to (GS_PAGE (self), TRUE); gs_details_page_set_state (self, GS_DETAILS_PAGE_STATE_LOADING); +<<<<<<< HEAD + str = _("Loading details"); +======= + if(gs_details_page_set_state == GS_DETAILS_PAGE_STATE_LOADING) { + str = _("Loading details"); + } + +>>>>>>> f8dd43d5... Update src/gs-details-page.c /* get extra details about the app */ plugin_job = gs_plugin_job_newv (GS_PLUGIN_ACTION_REFINE, "app", self->app, -- GitLab