X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fmain.c;h=3586ca1b3654ae1ecd17b6ebe6b8a32f8ae51132;hb=e2aad0fc9a4c2bc75db8f0b3f1d2d3c70e55e7bb;hp=8d9bb255d2a94cf38ab53d06e8507e8fc9eb4596;hpb=0c230096e95470b4c96141220d5be848cb47be39;p=rodin%2Fchimara.git

diff --git a/player/main.c b/player/main.c
index 8d9bb25..3586ca1 100644
--- a/player/main.c
+++ b/player/main.c
@@ -44,17 +44,19 @@
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
 
+#include "preferences.h"
+
 /* Static global pointers to widgets */
-static GtkBuilder *builder = NULL;
 static GtkUIManager *uimanager = NULL;
 static GtkWidget *window = NULL;
 static GtkWidget *glk = NULL;
 
 /* Global global pointers */
+GtkBuilder *builder = NULL;
 GtkWidget *aboutwindow = NULL;
 GtkWidget *prefswindow = NULL;
 
-static GObject *
+GObject *
 load_object(const gchar *name)
 {
 	GObject *retval;
@@ -65,6 +67,26 @@ load_object(const gchar *name)
 	return retval;
 }
 
+static void
+change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window)
+{
+	gchar *program_name, *story_name, *title;
+	g_object_get(glk, "program-name", &program_name, "story-name", &story_name, NULL);
+	if(!program_name) {
+		gtk_window_set_title(window, "Chimara");
+		return;
+	}
+	else if(!story_name)
+		title = g_strdup_printf("%s - Chimara", program_name);
+	else
+		title = g_strdup_printf("%s - %s - Chimara", program_name, story_name);
+		
+	g_free(program_name);
+	g_free(story_name);
+	gtk_window_set_title(window, title);
+	g_free(title);
+}
+
 static void
 create_window(void)
 {
@@ -88,6 +110,7 @@ create_window(void)
 	aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
 	prefswindow = GTK_WIDGET(load_object("prefswindow"));
 	GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
+	GtkActionGroup *style_actiongroup = GTK_ACTION_GROUP(load_object("style-actiongroup"));
 
 	/* Add all the actions to the action group. This for-loop is a temporary fix
 	and can be removed once Glade supports adding actions and accelerators to an
@@ -112,9 +135,20 @@ create_window(void)
 		"about", "",
 		NULL
 	};
+	const gchar *style_actions[] = { 
+		"align-left",
+		"align-justify",
+		"align-right",
+		"bold",
+		"italic",
+		"underline",
+		NULL
+	};
 	const gchar **ptr;
 	for(ptr = actions; *ptr; ptr += 2)
 		gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
+	for(ptr = style_actions; *ptr; ptr ++)
+		gtk_action_group_add_action(style_actiongroup, GTK_ACTION(load_object(*ptr)));
 	GtkRecentFilter *filter = gtk_recent_filter_new();
 	/* TODO: Use mimetypes and construct the filter dynamically depending on 
 	what plugins are installed */
@@ -142,6 +176,23 @@ create_window(void)
 	
 	glk = chimara_if_new();
 	g_object_set(glk, "ignore-errors", TRUE, NULL);
+	if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_DATA_DIR "/style.css", &error) ) {
+#ifdef DEBUG
+		g_error_free(error);
+		error = NULL;
+		if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/macstyle.css", &error) ) {
+#endif /* DEBUG */
+			error_dialog(NULL, error, "Couldn't open CSS file: ");
+			return;
+#ifdef DEBUG
+		}
+#endif /* DEBUG */
+	}
+	
+	/* DON'T UNCOMMENT THIS your eyes will burn
+	 but it is a good test of programmatically altering just one style
+	chimara_glk_set_css_from_string(CHIMARA_GLK(glk),
+	    "buffer.normal { font-family: 'Comic Sans MS'; }");*/
 	
 	GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );			
 	if(vbox == NULL)
@@ -152,13 +203,18 @@ create_window(void)
 
 	gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
 	GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
-	GtkWidget *toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
+	//GtkWidget *toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
 
 	gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
 	gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
-	gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
+	//gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
 	
 	gtk_builder_connect_signals(builder, glk);
+	g_signal_connect(glk, "notify::program-name", G_CALLBACK(change_window_title), window);
+	g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window);
+	
+	/* Create preferences window */
+	preferences_create(CHIMARA_GLK(glk));
 }
 
 int
@@ -180,7 +236,6 @@ main(int argc, char *argv[])
 	create_window();
 	gtk_widget_show_all(window);
 
-	g_object_unref( G_OBJECT(builder) );
 	g_object_unref( G_OBJECT(uimanager) );
 
 	if(argc >= 2) {
@@ -197,5 +252,7 @@ main(int argc, char *argv[])
 	chimara_glk_stop(CHIMARA_GLK(glk));
 	chimara_glk_wait(CHIMARA_GLK(glk));
 
+	g_object_unref( G_OBJECT(builder) );
+
 	return 0;
 }