+/*
+ * Copyright (C) 2008, 2009, 2010, 2011 Philip Chimento and Marijn van Vliet.
+ * All rights reserved.
+ *
+ * Chimara is free software copyrighted by Philip Chimento and Marijn van Vliet.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 3. Neither of the names Philip Chimento or Marijn van Vliet, nor the name of
+ * any other contributor may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
#include <sys/types.h>
#include <sys/stat.h>
#include <glib-object.h>
#include <config.h>
#include <libchimara/chimara-if.h>
#include "app.h"
+#include "browser.h"
#include "error.h"
-#include "preferences.h"
#include "player.h"
+#include "preferences.h"
+#include "util.h"
typedef struct _ChimaraAppPrivate {
GtkActionGroup *action_group;
{
/* Override methods of parent classes */
GObjectClass *object_class = G_OBJECT_CLASS(klass);
- //object_class->set_property = chimara_if_set_property;
- //object_class->get_property = chimara_if_get_property;
object_class->finalize = chimara_app_finalize;
-
- /* Signals */
-
- /* Properties */
/* Private data */
g_type_class_add_private(klass, sizeof(ChimaraAppPrivate));
}
-static GObject *
-load_object(GtkBuilder *builder, const gchar *name)
-{
- GObject *retval;
- if( (retval = gtk_builder_get_object(builder, name)) == NULL) {
- error_dialog(NULL, NULL, "Error while getting object '%s'", name);
- g_error("Error while getting object '%s'", name);
- }
- return retval;
-}
-
static void
chimara_app_init(ChimaraApp *self)
{
CHIMARA_APP_USE_PRIVATE;
- GError *error = NULL;
/* Create configuration dir ~/.chimara */
gchar *configdir = g_build_filename(g_get_home_dir(), ".chimara", NULL);
g_free(keyfile);
/* Build user interface */
- GtkBuilder *builder = gtk_builder_new();
char *object_ids[] = {
"app_group",
"aboutwindow",
NULL
};
-
- if( !gtk_builder_add_objects_from_file(builder, PACKAGE_DATA_DIR "/chimara.ui", object_ids, &error) ) {
-#ifdef DEBUG
- g_error_free(error);
- error = NULL;
- if( !gtk_builder_add_objects_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", object_ids, &error) ) {
-#endif /* DEBUG */
- error_dialog(NULL, error, "Error while building interface: ");
- return;
-#ifdef DEBUG
- }
-#endif /* DEBUG */
- }
+ GtkBuilder *builder = new_builder_with_objects(object_ids);
self->aboutwindow = GTK_WIDGET(load_object(builder, "aboutwindow"));
priv->action_group = GTK_ACTION_GROUP(load_object(builder, "app_group"));
if(G_UNLIKELY(theapp == NULL)) {
theapp = CHIMARA_APP(g_object_new(CHIMARA_TYPE_APP, NULL));
- /* Create preferences window */
+ /* Create one-per-application windows */
theapp->prefswindow = chimara_prefs_new();
+ theapp->browser_window = chimara_browser_new();
}
return theapp;