Menu
▾
▴
[Performous-commit] Xaldyz : Fixed SVGs that causes font problems under Windows. Changed default font if not found to arial, to avoid trouble under Windows
|
From: Stefano A. <xa...@us...> - 2010-01-10 00:12:40
|
Module: performous
Branch: master
Commit: 6e85708518ad6ae093f8ab741d42e9966d6c674c
Author: Xaldyz <xa...@us...>
Date: Sun Jan 10 01:11:50 2010 +0100
Fixed SVGs that causes font problems under Windows. Changed default font if not found to arial, to avoid trouble under Windows
---
game/opengl_text.cc | 2 +-
themes/default/configuration_item.svg | 15 +++++++++------
themes/default/menu_comment.svg | 14 +++++++-------
themes/default/menu_short_comment.svg | 14 +++++++-------
themes/default/sing_pause.svg | 6 ++++--
5 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/game/opengl_text.cc b/game/opengl_text.cc
index 7652a82..290d572 100644
--- a/game/opengl_text.cc
+++ b/game/opengl_text.cc
@@ -8,7 +8,7 @@
#include <sstream>
OpenGLText::OpenGLText(TThemeTxtOpenGL& _text, double m) {
- if (_text.fontfamily.empty()) _text.fontfamily = "Sans";
+ if (_text.fontfamily.empty()) _text.fontfamily = "Arial";
PangoAlignment alignment = PANGO_ALIGN_LEFT;
if (_text.fontalign == "start") alignment = PANGO_ALIGN_LEFT;
diff --git a/themes/default/configuration_item.svg b/themes/default/configuration_item.svg
index 01a272d..0e71280 100644
--- a/themes/default/configuration_item.svg
+++ b/themes/default/configuration_item.svg
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Sodipodi ("http://www.sodipodi.com/") -->
+
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
@@ -15,9 +16,8 @@
height="600.000000"
id="svg559"
sodipodi:version="0.32"
- inkscape:version="0.46"
+ inkscape:version="0.47 r22583"
sodipodi:docname="configuration_item.svg"
- sodipodi:docbase="/home/yoda/UltraStar/sf/UltraStar-ng/themes/lima"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs2513">
@@ -58,15 +58,18 @@
inkscape:window-x="5"
inkscape:window-y="73"
inkscape:current-layer="svg559"
- showgrid="false" />
+ showgrid="false"
+ inkscape:window-maximized="0" />
<text
xml:space="preserve"
- style="font-size:32px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;text-anchor:middle;text-align:center"
+ style="font-size:32px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial;text-anchor:middle;text-align:center;-inkscape-font-specification:Arial;font-stretch:normal;font-variant:normal;writing-mode:lr;line-height:125%"
x="400"
y="213"
- id="text1990"><tspan
+ id="text1990"
+ sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan1992"
x="400"
- y="213">item</tspan></text>
+ y="213"
+ style="-inkscape-font-specification:Arial;font-family:Arial;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:32px;text-anchor:middle;text-align:center;writing-mode:lr;line-height:125%">item</tspan></text>
</svg>
diff --git a/themes/default/menu_comment.svg b/themes/default/menu_comment.svg
index a42342b..be0fe6d 100755
--- a/themes/default/menu_comment.svg
+++ b/themes/default/menu_comment.svg
@@ -16,7 +16,7 @@
height="20"
id="svg559"
sodipodi:version="0.32"
- inkscape:version="0.47pre4 r22446"
+ inkscape:version="0.47 r22583"
sodipodi:docname="menu_comment.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
@@ -42,8 +42,8 @@
</rdf:RDF>
</metadata>
<sodipodi:namedview
- inkscape:window-height="726"
- inkscape:window-width="1280"
+ inkscape:window-height="1000"
+ inkscape:window-width="1680"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
@@ -56,15 +56,15 @@
inkscape:zoom="3.5638182"
inkscape:cx="63.312761"
inkscape:cy="28.662714"
- inkscape:window-x="0"
- inkscape:window-y="25"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
inkscape:current-layer="svg559"
showgrid="false"
inkscape:window-maximized="1" />
<text
x="1.2611415"
y="16.780357"
- style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+ style="font-size:17.99999994px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
id="text10203"
xml:space="preserve"
sodipodi:linespacing="125%"
@@ -72,5 +72,5 @@
x="1.2611415"
y="16.780357"
id="tspan10205"
- style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter">Comment</tspan></text>
+ style="font-size:17.99999994px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr;line-height:125%">Comment</tspan></text>
</svg>
diff --git a/themes/default/menu_short_comment.svg b/themes/default/menu_short_comment.svg
index a74618f..49c34b2 100644
--- a/themes/default/menu_short_comment.svg
+++ b/themes/default/menu_short_comment.svg
@@ -37,13 +37,13 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- <dc:title></dc:title>
+ <dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
- inkscape:window-height="725"
- inkscape:window-width="1280"
+ inkscape:window-height="1000"
+ inkscape:window-width="1680"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
guidetolerance="10.0"
@@ -56,15 +56,15 @@
inkscape:zoom="3.5638182"
inkscape:cx="63.312761"
inkscape:cy="28.101518"
- inkscape:window-x="0"
- inkscape:window-y="25"
+ inkscape:window-x="-8"
+ inkscape:window-y="-8"
inkscape:current-layer="svg559"
showgrid="false"
inkscape:window-maximized="1" />
<text
x="1.4361764"
y="16.829205"
- style="font-size:13.92942142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter"
+ style="font-size:13.92899985px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;display:inline;font-family:Arial;-inkscape-font-specification:Arial"
id="text10203"
xml:space="preserve"
sodipodi:linespacing="125%"
@@ -72,5 +72,5 @@
x="1.4361764"
y="16.829205"
id="tspan10205"
- style="font-size:13.92942142px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Bitstream Charter;-inkscape-font-specification:Bitstream Charter">Comment</tspan></text>
+ style="font-size:13.92899985px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#060000;fill-opacity:1;stroke:none;font-family:Arial;-inkscape-font-specification:Arial;writing-mode:lr;line-height:125%">Comment</tspan></text>
</svg>
diff --git a/themes/default/sing_pause.svg b/themes/default/sing_pause.svg
index 016bc84..53391b7 100644
--- a/themes/default/sing_pause.svg
+++ b/themes/default/sing_pause.svg
@@ -87,7 +87,8 @@
sodipodi:role="line"
id="tspan3181"
x="127.49952"
- y="10.672979">QUIT NOW?</tspan></text>
+ y="10.672979"
+ style="-inkscape-font-specification:arial;font-family:arial">QUIT NOW?</tspan></text>
<text
xml:space="preserve"
style="font-size:28px;font-style:normal;font-weight:normal;text-align:center;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
@@ -97,7 +98,8 @@
sodipodi:role="line"
x="139.50516"
y="255.35054"
- id="tspan2823">Enter/Start to quit</tspan><tspan
+ id="tspan2823"
+ style="-inkscape-font-specification:arial;font-family:arial">Enter/Start to quit</tspan><tspan
sodipodi:role="line"
x="139.50516"
y="290.35056"
|
