[labyrinth commit] r342 - in trunk: . src

[codesite...@google.com]

Author: mas...@ma-scha.de
Date: Mon Jul 21 10:44:44 2008
New Revision: 342

Modified:
trunk/ChangeLog
trunk/src/MMapArea.py
trunk/src/MainWindow.py
trunk/src/utils.py

Log:
2008-07-21 Martin Schaaf <mas...@ma-scha.de>

* src/utils.py
* src/MainWindow.py
* src/MMapArea.py
o fix issue 86 by setting gnome theme default font

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog (original)
+++ trunk/ChangeLog Mon Jul 21 10:44:44 2008
@@ -1,5 +1,12 @@
2008-07-21 Martin Schaaf <mas...@ma-scha.de>

+ * src/utils.py
+ * src/MainWindow.py
+ * src/MMapArea.py
+ o fix issue 86 by setting gnome theme default font
+
+2008-07-21 Martin Schaaf <mas...@ma-scha.de>
+
* ChangeLog
o add missing entries

Modified: trunk/src/MMapArea.py
==============================================================================
--- trunk/src/MMapArea.py (original)
+++ trunk/src/MMapArea.py Mon Jul 21 10:44:44 2008
@@ -177,6 +177,7 @@
style = w.get_style()
self.pango_context.set_font_description(style.font_desc)
self.font_name = style.font_desc.to_string()
+ utils.default_font = self.font_name

utils.default_colors["text"] = utils.gtk_to_cairo_color(style.text[gtk.STATE_NORMAL])
utils.default_colors["base"] = utils.gtk_to_cairo_color(style.base[gtk.STATE_NORMAL])

Modified: trunk/src/MainWindow.py
==============================================================================
--- trunk/src/MainWindow.py (original)
+++ trunk/src/MainWindow.py Mon Jul 21 10:44:44 2008
@@ -381,7 +381,7 @@
self.font_widget.set_font_name (font_name)
self.MainArea.set_font(font_name)
else:
- self.font_widget.set_font_name ("Sans 12")
+ self.font_widget.set_font_name (utils.default_font)

def translate (self, box, arg1, direction):
self.orig_translate = [self.MainArea.translation[0], self.MainArea.translation[1]]

Modified: trunk/src/utils.py
==============================================================================
--- trunk/src/utils.py (original)
+++ trunk/src/utils.py Mon Jul 21 10:44:44 2008
@@ -43,9 +43,10 @@
default_colors = {
"text" : (0.0, 0.0, 0.0),
"fg" : (0.0, 0.0, 0.0),
- "bg" : (0.0, 0.0, 0.0)
+ "bg" : (0.0, 0.0, 0.0),
+ "base" : (0.0, 0.0, 0.0)
}
-
+
selected_colors = {
"text" : (0.0, 0.0, 0.0),
"fg" : (0.0, 0.0, 0.0),
@@ -53,6 +54,8 @@
"border" : (0.0, 0.0, 0.0), # bounding box
"fill" : (0.0, 0.0, 0.0) # bounding box
}
+
+default_font = None

def get_save_dir ():
''' Returns the path to the directory to save the maps to '''