From: Marijn van Vliet <w.m.vanvliet@student.utwente.nl>
Date: Sat, 29 Jan 2011 16:04:08 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/wmvanvliet/Chimara
X-Git-Tag: v0.9~153^2~4
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=f945dd447b55c34d88683ff48d7ffb0b7c3c2ad8;p=projects%2Fchimara%2Fchimara.git

Merge branch 'master' of https://github.com/wmvanvliet/Chimara

Conflicts:
	libchimara/garglk.c
---

f945dd447b55c34d88683ff48d7ffb0b7c3c2ad8
diff --cc player/chimara.menus
index ec43fb9,ec43fb9..927bc82
--- a/player/chimara.menus
+++ b/player/chimara.menus
@@@ -3,7 -3,7 +3,7 @@@
    <menubar>
      <menu action="game">
        <menuitem action="open"/>
--      <menuitem action="recent"/>
++	  <!--  <menuitem action="recent"/>-->
        <separator/>
        <menuitem action="stop"/>
        <menuitem action="quit_chimara"/>
diff --cc player/main.c
index 860cdfb,860cdfb..7eef7f7
--- a/player/main.c
+++ b/player/main.c
@@@ -155,6 -155,6 +155,7 @@@ create_window(void
  	const gchar *patterns[] = {
  		"*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
  	};
++	
  	for(ptr = patterns; *ptr; ptr++)
  		gtk_recent_filter_add_pattern(filter, *ptr);
  	GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));
@@@ -214,7 -214,7 +215,7 @@@
  	g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window);
  	
  	/* Create preferences window */
--	preferences_create(CHIMARA_GLK(glk));
++	//preferences_create(CHIMARA_GLK(glk));
  }
  
  int
diff --cc player/style.css
index b012c76,b012c76..023e0aa
--- a/player/style.css
+++ b/player/style.css
@@@ -26,11 -26,11 +26,14 @@@
   * text-align (left/right/center)
   */
  grid {
--	font-size: 14;
++	font-size: 11;
++	font-family: "Liberation Mono";
  }
  
  buffer {
--	font-size: 14;
++	color: #303030;
++	font-size: 11;
++	margin-bottom: 5;
  }
  
  grid.user1 {
@@@ -38,6 -38,6 +41,10 @@@
  	background-color: #ffffff;
  }
  
++buffer.emphasized {
++	font-size: 14;
++}
++
  buffer.header {
  	font-weight: bold;
  	text-align: center;
diff --cc tests/plugin-loader.c
index 766305d,766305d..1c560ac
--- a/tests/plugin-loader.c
+++ b/tests/plugin-loader.c
@@@ -17,7 -17,7 +17,7 @@@
   *    contributor may be used to endorse or promote products derived
   *    from this software without specific prior written permission.
   * 
-- * main.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS
++ * plugin-loader.c IS PROVIDED BY Philip en Marijn ``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 Philip en Marijn OR ANY OTHER CONTRIBUTORS
diff --cc tests/style.css
index 2504e9f,2504e9f..0000000
deleted file mode 100644,100644
--- a/tests/style.css
+++ /dev/null
@@@ -1,80 -1,80 +1,0 @@@
--/* Possible windows:
-- * grid
-- * buffer
-- *
-- * Possible selectors:
-- * normal
-- * emphasized
-- * preformatted
-- * header
-- * subheader
-- * alert
-- * note
-- * block-quote
-- * input
-- * user1
-- * user2
-- * hyperlink
-- *
-- * Possible style hints:
-- * font-family (string)
-- * font-size (float)
-- * font-weight (normal/bold)
-- * font-style (normal/italic)
-- * color (#hex-value)
-- * background-color (#hex-value)
-- * text-align (left/right/center)
-- */
--grid.normal {
--	font-size: 10;
--}
--
--grid.user1 {
--	color: #303030;
--	background-color: #ffffff;
--}
--
--buffer.normal {
--	font-size: 10;
--}
--
--buffer.header {
--	font-size: 14;
--	font-weight: bold;
--	text-align: center;
--}
--
--buffer.subheader {
--	font-size: 12;
--	font-weight: bold;
--}
--
--buffer.alert {
--	color: #aa0000;
--	font-weight: bold;
--}
--
--buffer.note {
--	color: #aaaa00;
--	font-weight: bold;
--}
--
--buffer.block-quote {
--	text-align: center;
--	font-style: italic;
--}
--
--buffer.input {
--	color: #0000aa;
--	font-style: italic;
--}
--
--buffer.user1 {
--}
--
--buffer.user2 {
--}
--
--buffer.hyperlink {
--	color: #ff0000;
--}