[gnome-software] Make a proper GtkApplication subclass
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-software] Make a proper GtkApplication subclass
- Date: Sat, 24 Aug 2013 07:00:06 +0000 (UTC)
commit 98673b4f2512494982e22155358d67667a8dd684
Author: Matthias Clasen <mclasen redhat com>
Date: Sat Aug 24 02:57:47 2013 -0400
Make a proper GtkApplication subclass
Introduce GsApplication, and move all of the startup code
there. main() is now pretty clean and essentially just a
small wrapper around g_application_run().
On of the advantages of the commandline handling here is that
you can now call gnome-software --mode=updates to switch tabs
in an existing gnome-software instance, which will become
important when we start gnome-software from notifications.
src/Makefile.am | 2 +
src/gs-application.c | 271 ++++++++++++++++++++++++
src/gs-application.h | 40 ++++
src/gs-main.c | 565 +-------------------------------------------------
src/gs-shell.c | 10 +-
src/gs-shell.h | 2 +-
6 files changed, 323 insertions(+), 567 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 9398aaf..347a0bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,6 +52,8 @@ gnome_software_SOURCES = \
gs-plugin-loader-sync.h \
ch-markdown.c \
ch-markdown.h \
+ gs-application.c \
+ gs-application.h \
gs-main.c
gnome_software_LDADD = \
diff --git a/src/gs-application.c b/src/gs-application.c
new file mode 100644
index 0000000..5567107
--- /dev/null
+++ b/src/gs-application.c
@@ -0,0 +1,271 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2013 Matthias Clasen <mclasen redhat com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include "gs-application.h"
+
+#include <stdlib.h>
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+#include <packagekit-glib2/packagekit.h>
+
+#include "gs-shell.h"
+#include "gs-plugin-loader.h"
+
+struct _GsApplication {
+ GtkApplication parent;
+
+ GCancellable *cancellable;
+ GtkApplication *application;
+ PkTask *task;
+ GtkCssProvider *provider;
+ GsPluginLoader *plugin_loader;
+ gint pending_apps;
+ GsShell *shell;
+};
+
+struct _GsApplicationClass {
+ GtkApplicationClass parent_class;
+};
+
+G_DEFINE_TYPE (GsApplication, gs_application, GTK_TYPE_APPLICATION);
+
+static void
+gs_application_init (GsApplication *application)
+{
+}
+
+static void
+about_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
+{
+ const gchar *authors[] = {
+ "Richard Hughes",
+ "Matthias Clasen",
+ "Allan Day",
+ "Ryan Lerch",
+ "William Jon McCann",
+ NULL
+ };
+ const gchar *copyright = "Copyright \xc2\xa9 2013 Richard Hughes, Matthias Clasen";
+ GtkIconTheme *icon_theme;
+ GdkPixbuf *logo;
+ GList *windows;
+ GtkWindow *parent = NULL;
+
+ windows = gtk_application_get_windows (GTK_APPLICATION (app));
+ if (windows)
+ parent = windows->data;
+
+ icon_theme = gtk_icon_theme_get_default ();
+ logo = gtk_icon_theme_load_icon (icon_theme, "system-software-install", 256, 0, NULL);
+
+ gtk_show_about_dialog (parent,
+ "title", _("About GNOME Software"),
+ "program-name", _("GNOME Software"),
+ "authors", authors,
+ "comments", _("A nice way to manager the software on your system."),
+ "copyright", copyright,
+ "license-type", GTK_LICENSE_GPL_2_0,
+ "logo", logo,
+ "translator-credits", _("translator-credits"),
+ "version", VERSION,
+ NULL);
+
+ g_object_unref (logo);
+}
+
+static void
+quit_activated (GSimpleAction *action,
+ GVariant *parameter,
+ gpointer app)
+{
+ g_application_quit (G_APPLICATION (app));
+}
+
+static GActionEntry actions[] = {
+ { "about", about_activated, NULL, NULL, NULL },
+ { "quit", quit_activated, NULL, NULL, NULL }
+};
+
+static void
+gs_application_startup (GApplication *application)
+{
+ GsApplication *app = GS_APPLICATION (application);
+ GtkBuilder *builder;
+ GMenuModel *app_menu;
+ GtkWindow *window;
+ GFile *file;
+ GError *error = NULL;
+
+ G_APPLICATION_CLASS (gs_application_parent_class)->startup (application);
+
+ /* set up the app menu */
+ g_action_map_add_action_entries (G_ACTION_MAP (app),
+ actions, G_N_ELEMENTS (actions),
+ application);
+ builder = gtk_builder_new_from_resource ("/org/gnome/software/app-menu.ui");
+ app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
+ gtk_application_set_app_menu (GTK_APPLICATION (app), app_menu);
+ g_object_unref (builder);
+
+ /* get CSS */
+ app->provider = gtk_css_provider_new ();
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (app->provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+ file = g_file_new_for_uri ("resource:///org/gnome/software/gtk-style.css");
+ gtk_css_provider_load_from_file (app->provider, file, NULL);
+ g_object_unref (file);
+
+ /* setup pk */
+ app->task = pk_task_new ();
+ g_object_set (app->task, "background", FALSE, NULL);
+
+ /* setup plugins */
+ app->plugin_loader = gs_plugin_loader_new ();
+ gs_plugin_loader_set_location (app->plugin_loader, NULL);
+ if (!gs_plugin_loader_setup (app->plugin_loader, &error)) {
+ g_warning ("Failed to setup plugins: %s", error->message);
+ exit (1);
+ }
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-descriptions", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-featured", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-kind", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-popular", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-ratings", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "hardcoded-screenshots", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "local-ratings", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "packagekit-refine", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "desktopdb", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-apps", TRUE);
+ gs_plugin_loader_set_enabled (app->plugin_loader, "datadir-filename", TRUE);
+
+ /* setup UI */
+ app->shell = gs_shell_new ();
+
+ app->cancellable = g_cancellable_new ();
+
+ window = gs_shell_setup (app->shell, app->plugin_loader, app->cancellable);
+ gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window));
+}
+
+static void
+gs_application_activate (GApplication *application)
+{
+ gs_shell_activate (GS_APPLICATION (application)->shell);
+}
+
+static int
+gs_application_command_line (GApplication *application,
+ GApplicationCommandLine *cmdline)
+{
+ GsApplication *app = GS_APPLICATION (application);
+ GOptionContext *context;
+ gchar *mode = NULL;
+ gboolean help = FALSE;
+ const GOptionEntry options[] = {
+ { "mode", '\0', 0, G_OPTION_ARG_STRING, &mode,
+ _("Start up mode, either 'updates', 'installed' or 'overview'"), _("MODE") },
+ { "help", '?', 0, G_OPTION_ARG_NONE, &help, NULL, NULL },
+
+ { NULL}
+ };
+ gchar **args, **argv;
+ gint argc;
+ gint i;
+ GError *error = NULL;
+
+ args = g_application_command_line_get_arguments (cmdline, &argc);
+ /* We have to make an extra copy of the array, since g_option_context_parse()
+ * assumes that it can remove strings from the array without freeing them.
+ */
+ argv = g_new (gchar*, argc + 1);
+ for (i = 0; i <= argc; i++)
+ argv[i] = args[i];
+
+ context = g_option_context_new ("");
+ g_option_context_set_help_enabled (context, FALSE);
+ g_option_context_add_main_entries (context, options, NULL);
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
+ g_application_command_line_printerr (cmdline, "%s\n", error->message);
+ g_error_free (error);
+ g_application_command_line_set_exit_status (cmdline, 1);
+ }
+ else if (help) {
+ gchar *text;
+ text = g_option_context_get_help (context, FALSE, NULL);
+ g_application_command_line_print (cmdline, "%s", text);
+ g_free (text);
+ }
+ if (mode) {
+ if (g_strcmp0 (mode, "updates") == 0) {
+ gs_shell_set_mode (app->shell, GS_SHELL_MODE_UPDATES);
+ } else if (g_strcmp0 (mode, "installed") == 0) {
+ gs_shell_set_mode (app->shell, GS_SHELL_MODE_INSTALLED);
+ } else if (g_strcmp0 (mode, "overview") == 0) {
+ gs_shell_set_mode (app->shell, GS_SHELL_MODE_OVERVIEW);
+ } else {
+ g_warning ("Mode '%s' not recognised", mode);
+ }
+ }
+
+ g_free (argv);
+ g_strfreev (args);
+
+ g_option_context_free (context);
+
+ return 0;
+}
+
+static void
+gs_application_finalize (GObject *object)
+{
+ GsApplication *app = GS_APPLICATION (object);
+
+ g_clear_object (&app->plugin_loader);
+ g_clear_object (&app->task);
+ g_clear_object (&app->cancellable);
+ g_clear_object (&app->shell);
+ g_clear_object (&app->provider);
+ G_OBJECT_CLASS (gs_application_parent_class)->finalize (object);
+}
+
+static void
+gs_application_class_init (GsApplicationClass *class)
+{
+ G_OBJECT_CLASS (class)->finalize = gs_application_finalize;
+ G_APPLICATION_CLASS (class)->startup = gs_application_startup;
+ G_APPLICATION_CLASS (class)->activate = gs_application_activate;
+ G_APPLICATION_CLASS (class)->command_line = gs_application_command_line;
+}
+
+GsApplication *
+gs_application_new (void)
+{
+ return g_object_new (GS_APPLICATION_TYPE,
+ "application-id", "org.gnome.Software",
+ "flags", G_APPLICATION_HANDLES_COMMAND_LINE,
+ NULL);
+}
diff --git a/src/gs-application.h b/src/gs-application.h
new file mode 100644
index 0000000..874b5f3
--- /dev/null
+++ b/src/gs-application.h
@@ -0,0 +1,40 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+ *
+ * Copyright (C) 2013 Matthias Clasen <mclasen redhat com>
+ *
+ * Licensed under the GNU General Public License Version 2
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __GS_APPLICATION_H
+#define __GS_APPLICATION_H
+
+#include <gtk/gtk.h>
+
+
+#define GS_APPLICATION_TYPE (gs_application_get_type ())
+#define GS_APPLICATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GS_APPLICATION_TYPE, GsApplication))
+
+
+typedef struct _GsApplication GsApplication;
+typedef struct _GsApplicationClass GsApplicationClass;
+
+
+GType gs_application_get_type (void);
+GsApplication *gs_application_new (void);
+
+
+#endif /* __GS_APPLICATION_H */
diff --git a/src/gs-main.c b/src/gs-main.c
index b37ec8f..0542297 100644
--- a/src/gs-main.c
+++ b/src/gs-main.c
@@ -24,487 +24,14 @@
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <locale.h>
-#include <packagekit-glib2/packagekit.h>
-#include "gs-app-widget.h"
-#include "gs-resources.h"
-#include "gs-shell.h"
-#include "gs-plugin-loader.h"
+#include "gs-application.h"
-typedef struct {
- GCancellable *cancellable;
- GtkApplication *application;
- PkTask *task;
- guint waiting_tab_id;
- GtkCssProvider *provider;
- GsPluginLoader *plugin_loader;
- gint pending_apps;
- GsShell *shell;
-} GsMainPrivate;
-
-#if 0
-/**
- * gs_main_get_app_widget_for_id:
- **/
-static GsAppWidget *
-gs_main_get_app_widget_for_id (GtkListBox *list_box, const gchar *id)
-{
- GList *list, *l;
- GsAppWidget *tmp;
- GsApp *app;
-
- /* look for this widget */
- list = gtk_container_get_children (GTK_CONTAINER (list_box));
- for (l = list; l != NULL; l = l->next) {
- tmp = GS_APP_WIDGET (l->data);
- app = gs_app_widget_get_app (tmp);
- if (g_strcmp0 (gs_app_get_id (app), id) == 0)
- goto out;
- }
- tmp = NULL;
-out:
- g_list_free (list);
- return tmp;
-}
-#endif
-
-#if 0
-/**
- * gs_main_progress_cb:
- **/
-static void
-gs_main_progress_cb (PkProgress *progress,
- PkProgressType type,
- GsMainPrivate *priv)
-{
- const gchar *status_text = NULL;
- gboolean allow_cancel;
- gint percentage;
- GsAppWidget *app_widget;
- GtkWidget *widget;
- PkItemProgress *item_progress;
- PkRoleEnum role;
- PkStatusEnum status;
-
- /* don't flicker between GetUpdates and GetUpdateDetails */
- g_object_get (progress,
- "status", &status,
- "role", &role,
- NULL);
- if (role == PK_ROLE_ENUM_GET_UPDATES &&
- status == PK_STATUS_ENUM_FINISHED) {
- return;
- }
-
- /* action item, so no waiting panel */
- if (role == PK_ROLE_ENUM_INSTALL_PACKAGES ||
- role == PK_ROLE_ENUM_UPDATE_PACKAGES ||
- role == PK_ROLE_ENUM_REMOVE_PACKAGES) {
-
- /* update this item in situ */
- if (type == PK_PROGRESS_TYPE_ITEM_PROGRESS) {
- g_object_get (progress,
- "item-progress", &item_progress,
- "status", &status,
- NULL);
- g_warning ("need to find %s and update",
- pk_item_progress_get_package_id (item_progress));
-// app_widget = gs_main_get_app_widget_for_id (priv->list_box_installed,
-// pk_item_progress_get_package_id
(item_progress));
-// if (app_widget != NULL) {
-// gs_app_widget_set_status (app_widget, pk_status_enum_to_string (status));
-// }
- }
- return;
- }
-
- g_object_get (progress,
- "percentage", &percentage,
- "allow-cancel", &allow_cancel,
- NULL);
- g_debug ("%s : %i (allow-cancel:%i",
- pk_status_enum_to_string (status),
- percentage,
- allow_cancel);
-
- /* set label */
- switch (status) {
- case PK_STATUS_ENUM_SETUP:
- case PK_STATUS_ENUM_FINISHED:
- case PK_STATUS_ENUM_UNKNOWN:
- break;
- case PK_STATUS_ENUM_WAIT:
- case PK_STATUS_ENUM_WAITING_FOR_LOCK:
- /* TRANSLATORS: this is the transaction status */
- status_text = _("Waiting for package manager...");
- break;
- case PK_STATUS_ENUM_LOADING_CACHE:
- /* TRANSLATORS: this is the transaction status */
- status_text = _("Loading list of packages...");
- break;
- case PK_STATUS_ENUM_DOWNLOAD:
- case PK_STATUS_ENUM_DOWNLOAD_REPOSITORY:
- case PK_STATUS_ENUM_DOWNLOAD_PACKAGELIST:
- case PK_STATUS_ENUM_DOWNLOAD_FILELIST:
- case PK_STATUS_ENUM_DOWNLOAD_CHANGELOG:
- case PK_STATUS_ENUM_DOWNLOAD_GROUP:
- case PK_STATUS_ENUM_DOWNLOAD_UPDATEINFO:
- /* TRANSLATORS: this is the transaction status */
- status_text = _("Downloading...");
- break;
- case PK_STATUS_ENUM_QUERY:
- case PK_STATUS_ENUM_INFO:
- /* TRANSLATORS: this is the transaction status */
- status_text = _("Querying...");
- break;
- default:
- status_text = pk_status_enum_to_string (status);
- g_warning ("no translation for %s", status_text);
- break;
- }
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_waiting"));
- if (status_text != NULL) {
- gtk_label_set_markup (GTK_LABEL (widget), status_text);
- gtk_widget_show (widget);
- } else {
- gtk_widget_hide (widget);
- }
-
- /* show the waiting panel if the delay is significant */
- if (status == PK_STATUS_ENUM_SETUP ||
- status == PK_STATUS_ENUM_FINISHED) {
- gs_main_set_overview_mode_ui (priv, priv->mode, NULL);
- if (priv->waiting_tab_id > 0) {
- g_source_remove (priv->waiting_tab_id);
- priv->waiting_tab_id = 0;
- }
- } else {
- if (priv->waiting_tab_id == 0) {
- priv->waiting_tab_id = g_timeout_add (500,
- gs_main_show_waiting_tab_cb,
- priv);
- }
- }
-}
-#endif
-
-#if 0
-/**
- * gs_main_progress_cb:
- **/
-static void
-gs_main_plugin_loader_status_changed_cb (GsPluginLoader *plugin_loader,
- GsApp *app,
- GsPluginStatus status,
- GsMainPrivate *priv)
-{
- GtkWidget *widget;
- const gchar *status_text = NULL;
-
- /* translate */
- switch (status) {
- case GS_PLUGIN_STATUS_WAITING:
- /* TRANSLATORS: we're waiting for something to happen */
- status_text = _("Waiting...");
- break;
- case GS_PLUGIN_STATUS_SETUP:
- /* TRANSLATORS: we're waiting for something to happen */
- status_text = _("Setting up...");
- break;
- case GS_PLUGIN_STATUS_DOWNLOADING:
- /* TRANSLATORS: we're waiting for something to happen */
- status_text = _("Downloading...");
- break;
- case GS_PLUGIN_STATUS_QUERYING:
- /* TRANSLATORS: we're waiting for something to happen */
- status_text = _("Querying...");
- break;
- default:
- break;
- }
-
- /* update the label */
- widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "label_waiting"));
- if (status_text != NULL) {
- gtk_label_set_markup (GTK_LABEL (widget), status_text);
- gtk_widget_show (widget);
- } else {
- gtk_widget_hide (widget);
- }
-
- /* show the waiting panel if the delay is significant */
- if (status == GS_PLUGIN_STATUS_FINISHED) {
- gs_main_set_overview_mode_ui (priv, priv->mode, NULL);
- if (priv->waiting_tab_id > 0) {
- g_source_remove (priv->waiting_tab_id);
- priv->waiting_tab_id = 0;
- }
- } else {
- if (priv->waiting_tab_id == 0) {
- priv->waiting_tab_id = g_timeout_add (50,
- gs_main_show_waiting_tab_cb,
- priv);
- }
- }
-}
-#endif
-
-#if 0
-typedef struct {
- GsAppWidget *app_widget;
- GsMainPrivate *priv;
- GsAppWidgetKind original_kind;
- const gchar *package_id;
-} GsMainMethodData;
-
-/**
- * gs_main_remove_packages_cb:
- **/
-static void
-gs_main_remove_packages_cb (PkClient *client,
- GAsyncResult *res,
- GsMainMethodData *data)
-{
- GError *error = NULL;
- GPtrArray *array = NULL;
- guint i;
- PkError *error_code = NULL;
- PkPackage *package;
- PkResults *results;
- GsAppWidget *app_widget;
-
- /* get the results */
- results = pk_client_generic_finish (client, res, &error);
- if (results == NULL) {
- /* reset this back to what it was before */
- gs_app_widget_set_kind (data->app_widget, data->original_kind);
- g_warning ("failed to remove packages: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- /* check error code */
- error_code = pk_results_get_error_code (results);
- if (error_code != NULL) {
- /* reset this back to what it was before */
- gs_app_widget_set_kind (data->app_widget, data->original_kind);
- g_warning ("failed to remove packages: %s, %s",
- pk_error_enum_to_string (pk_error_get_code (error_code)),
- pk_error_get_details (error_code));
- goto out;
- }
-
- /* get data */
- array = pk_results_get_package_array (results);
- for (i = 0; i < array->len; i++) {
- package = g_ptr_array_index (array, i);
- g_debug ("removed %s", pk_package_get_id (package));
-// app_widget = gs_main_get_app_widget_for_id (data->priv->list_box_installed,
-// pk_package_get_id (package));
-// if (app_widget != NULL) {
-// gtk_container_remove (GTK_CONTAINER (data->priv->list_box_installed),
-// GTK_WIDGET (app_widget));
-// }
-// app_widget = gs_main_get_app_widget_for_id (data->priv->list_box_updates,
-// pk_package_get_id (package));
-// if (app_widget != NULL) {
-// gtk_container_remove (GTK_CONTAINER (data->priv->list_box_updates),
-// GTK_WIDGET (app_widget));
-// }
- }
-out:
- g_free (data);
- if (error_code != NULL)
- g_object_unref (error_code);
- if (array != NULL)
- g_ptr_array_unref (array);
- if (results != NULL)
- g_object_unref (results);
-}
-#endif
-
-#if 0
-/**
- * gs_main_app_widget_button_clicked_cb:
- **/
-static void
-gs_main_app_widget_button_clicked_cb (GsAppWidget *app_widget, GsMainPrivate *priv)
-{
- const gchar *package_id;
- GsAppWidgetKind kind;
- GsApp *app;
- const gchar *to_array[] = { NULL, NULL };
- GsMainMethodData *data;
-
- app = gs_app_widget_get_app (app_widget);
- package_id = gs_app_get_id (app);
-
- /* save, so we can recover a failed action */
- data = g_new0 (GsMainMethodData, 1);
- data->original_kind = kind;
- data->app_widget = app_widget;
- data->package_id = package_id;
- data->priv = priv;
-
- if (kind == GS_APP_STATE_UPDATE) {
- } else if (kind == GS_APP_STATE_INSTALL) {
- g_debug ("install %s", package_id);
- to_array[0] = package_id;
- pk_task_install_packages_async (priv->task,
- (gchar**)to_array,
- priv->cancellable,
- (PkProgressCallback) gs_main_progress_cb,
- priv,
- (GAsyncReadyCallback) gs_main_remove_packages_cb,
- data);
- }
-}
-#endif
-
-static void
-about_activated (GSimpleAction *action,
- GVariant *parameter,
- gpointer app)
-{
- const gchar *authors[] = {
- "Richard Hughes",
- "Matthias Clasen",
- "Allan Day",
- "Ryan Lerch",
- "William Jon McCann",
- NULL
- };
- const gchar *copyright = "Copyright \xc2\xa9 2013 Richard Hughes, Matthias Clasen";
- GtkIconTheme *icon_theme;
- GdkPixbuf *logo;
- GList *windows;
- GtkWindow *parent = NULL;
-
- windows = gtk_application_get_windows (GTK_APPLICATION (app));
- if (windows)
- parent = windows->data;
-
- icon_theme = gtk_icon_theme_get_default ();
- logo = gtk_icon_theme_load_icon (icon_theme, "system-software-install", 256, 0, NULL);
-
- gtk_show_about_dialog (parent,
- "title", _("About GNOME Software"),
- "program-name", _("GNOME Software"),
- "authors", authors,
- "comments", _("A nice way to manager the software on your system."),
- "copyright", copyright,
- "license-type", GTK_LICENSE_GPL_2_0,
- "logo", logo,
- "translator-credits", _("translator-credits"),
- "version", VERSION,
- NULL);
-
- g_object_unref (logo);
-}
-
-static void
-quit_activated (GSimpleAction *action,
- GVariant *parameter,
- gpointer app)
-{
- g_application_quit (G_APPLICATION (app));
-}
-
-static GActionEntry actions[] = {
- { "about", about_activated, NULL, NULL, NULL },
- { "quit", quit_activated, NULL, NULL, NULL }
-};
-
-/**
- * gs_main_startup_cb:
- **/
-static void
-gs_main_startup_cb (GApplication *application, GsMainPrivate *priv)
-{
- GBytes *data = NULL;
- GError *error = NULL;
- gboolean ret;
- GtkWindow *window;
- GtkBuilder *builder;
- GMenuModel *app_menu;
-
- /* set up the app menu */
- g_action_map_add_action_entries (G_ACTION_MAP (application),
- actions, G_N_ELEMENTS (actions),
- application);
- builder = gtk_builder_new_from_resource ("/org/gnome/software/app-menu.ui");
- app_menu = G_MENU_MODEL (gtk_builder_get_object (builder, "appmenu"));
- gtk_application_set_app_menu (GTK_APPLICATION (application), app_menu);
- g_object_unref (builder);
-
- /* get CSS */
- if (priv->provider == NULL) {
- priv->provider = gtk_css_provider_new ();
- gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
- GTK_STYLE_PROVIDER (priv->provider),
- G_MAXUINT);
- data = g_resource_lookup_data (gs_get_resource (),
- "/org/gnome/software/gtk-style.css",
- G_RESOURCE_LOOKUP_FLAGS_NONE,
- &error);
- if (data == NULL) {
- g_warning ("failed to load stylesheet data: %s",
- error->message);
- g_error_free (error);
- goto out;
- }
- ret = gtk_css_provider_load_from_data (priv->provider,
- g_bytes_get_data (data, NULL),
- g_bytes_get_size (data),
- &error);
- if (!ret) {
- g_warning ("failed to load stylesheet: %s",
- error->message);
- g_error_free (error);
- goto out;
- }
- }
-
- /* setup UI */
- window = gs_shell_setup (priv->shell, priv->plugin_loader, priv->cancellable);
- gtk_application_add_window (priv->application, GTK_WINDOW (window));
-
- /* show the status on a different page */
-// g_signal_connect (priv->plugin_loader, "status-changed",
-// G_CALLBACK (gs_main_plugin_loader_status_changed_cb), priv);
-out:
- if (data != NULL)
- g_bytes_unref (data);
-}
-
-/**
- * gs_main_activate_cb:
- **/
-static void
-gs_main_activate_cb (GApplication *application, GsMainPrivate *priv)
-{
- gs_shell_activate (priv->shell);
-}
-
-
-/**
- * main:
- **/
int
main (int argc, char **argv)
{
- gboolean ret;
- gchar *mode = NULL;
- GError *error = NULL;
- GOptionContext *context;
- GsMainPrivate *priv = NULL;
int status = 0;
-
- const GOptionEntry options[] = {
- { "mode", '\0', 0, G_OPTION_ARG_STRING, &mode,
- _("Start up mode, either 'updates', 'installed' or 'overview'"), _("MODE") },
- { NULL}
- };
+ GsApplication *application;
setlocale (LC_ALL, "");
@@ -512,91 +39,9 @@ main (int argc, char **argv)
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- gtk_init (&argc, &argv);
-
- context = g_option_context_new ("");
- g_option_context_add_main_entries (context, options, NULL);
- g_option_context_add_group (context, gtk_get_option_group (TRUE));
- ret = g_option_context_parse (context, &argc, &argv, &error);
- if (!ret) {
- g_warning ("failed to parse options: %s", error->message);
- g_error_free (error);
- goto out;
- }
- g_option_context_free (context);
-
- priv = g_new0 (GsMainPrivate, 1);
-
- /* ensure single instance */
- priv->application = gtk_application_new ("org.gnome.Software", 0);
- g_signal_connect (priv->application, "startup",
- G_CALLBACK (gs_main_startup_cb), priv);
- g_signal_connect (priv->application, "activate",
- G_CALLBACK (gs_main_activate_cb), priv);
-
- /* use PackageKit */
- priv->cancellable = g_cancellable_new ();
- priv->task = pk_task_new ();
- g_object_set (priv->task,
- "background", FALSE,
- NULL);
-
- /* specified what page to open */
- priv->shell = gs_shell_new ();
- if (mode != NULL) {
- if (g_strcmp0 (mode, "updates") == 0) {
- gs_shell_set_default_mode (priv->shell, GS_SHELL_MODE_UPDATES);
- } else if (g_strcmp0 (mode, "installed") == 0) {
- gs_shell_set_default_mode (priv->shell, GS_SHELL_MODE_INSTALLED);
- } else if (g_strcmp0 (mode, "overview") == 0) {
- gs_shell_set_default_mode (priv->shell, GS_SHELL_MODE_OVERVIEW);
- } else {
- g_warning ("Mode '%s' not recognised", mode);
- }
- } else {
- gs_shell_set_default_mode (priv->shell, GS_SHELL_MODE_OVERVIEW);
- }
-
- /* load the plugins */
- priv->plugin_loader = gs_plugin_loader_new ();
- gs_plugin_loader_set_location (priv->plugin_loader, NULL);
- ret = gs_plugin_loader_setup (priv->plugin_loader, &error);
- if (!ret) {
- g_warning ("Failed to setup plugins: %s", error->message);
- g_error_free (error);
- goto out;
- }
-
- /* FIXME: use GSettings key rather than hard-coding this */
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-descriptions", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-featured", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-kind", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-popular", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-ratings", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "hardcoded-screenshots", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "local-ratings", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "packagekit", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "packagekit-refine", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "desktopdb", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "datadir-apps", TRUE);
- gs_plugin_loader_set_enabled (priv->plugin_loader, "datadir-filename", TRUE);
+ application = gs_application_new ();
+ status = g_application_run (G_APPLICATION (application), argc, argv);
+ g_object_unref (application);
- /* wait */
- status = g_application_run (G_APPLICATION (priv->application), argc, argv);
-out:
- g_free (mode);
- if (priv != NULL) {
- g_object_unref (priv->plugin_loader);
- g_object_unref (priv->task);
- g_object_unref (priv->cancellable);
- g_object_unref (priv->application);
- if (priv->shell != NULL)
- g_object_unref (priv->shell);
- if (priv->provider != NULL)
- g_object_unref (priv->provider);
- if (priv->waiting_tab_id > 0)
- g_source_remove (priv->waiting_tab_id);
- g_free (priv);
- }
return status;
}
diff --git a/src/gs-shell.c b/src/gs-shell.c
index 725f4a1..552d8b0 100644
--- a/src/gs-shell.c
+++ b/src/gs-shell.c
@@ -40,7 +40,6 @@ struct GsShellPrivate
GCancellable *cancellable;
GsPluginLoader *plugin_loader;
GsShellInstalled *shell_installed;
- GsShellMode app_startup_mode;
GsShellMode mode;
GsShellOverview *shell_overview;
GsShellUpdates *shell_updates;
@@ -345,18 +344,18 @@ gs_shell_setup (GsShell *shell, GsPluginLoader *plugin_loader, GCancellable *can
/* show main UI */
gtk_widget_show (main_window);
- gs_shell_set_overview_mode (shell, priv->app_startup_mode, NULL, NULL);
+ gs_shell_set_mode (shell, GS_SHELL_MODE_OVERVIEW);
return GTK_WINDOW (main_window);
}
/**
- * gs_shell_set_default_mode:
+ * gs_shell_set_mode:
**/
void
-gs_shell_set_default_mode (GsShell *shell, GsShellMode mode)
+gs_shell_set_mode (GsShell *shell, GsShellMode mode)
{
- shell->priv->app_startup_mode = mode;
+ gs_shell_set_overview_mode (shell, mode, NULL, NULL);
}
/**
@@ -382,7 +381,6 @@ gs_shell_init (GsShell *shell)
shell->priv->shell_installed = gs_shell_installed_new ();
shell->priv->shell_overview = gs_shell_overview_new ();
shell->priv->shell_details = gs_shell_details_new ();
- shell->priv->app_startup_mode = GS_SHELL_MODE_OVERVIEW;
shell->priv->ignore_primary_buttons = FALSE;
}
diff --git a/src/gs-shell.h b/src/gs-shell.h
index 3847c3a..512aa1c 100644
--- a/src/gs-shell.h
+++ b/src/gs-shell.h
@@ -63,7 +63,7 @@ GsShell *gs_shell_new (void);
void gs_shell_activate (GsShell *shell);
void gs_shell_refresh (GsShell *shell,
GCancellable *cancellable);
-void gs_shell_set_default_mode (GsShell *shell,
+void gs_shell_set_mode (GsShell *shell,
GsShellMode mode);
GtkWindow *gs_shell_setup (GsShell *shell,
GsPluginLoader *plugin_loader,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
