[mythtv] [PATCH] OSD timeformat internationalization

Leandro Dardini ldardini at tiscali.it
Sun Jan 25 12:18:55 EST 2004


Internationalization of timeformat didn't apply to OSD, this because
timeformat is hardcoded in the osd.xml file.
This patch let osd::loadTheme to use the timeformat choosen in the TV
settings.

Leandro
-------------- next part --------------
Index: themes/blueosd/osd.xml
===================================================================
RCS file: /var/lib/mythcvs/mythtv/themes/blueosd/osd.xml,v
retrieving revision 1.6
diff -u -2 -r1.6 osd.xml
--- themes/blueosd/osd.xml      8 Nov 2003 21:04:31 -0000       1.6
+++ themes/blueosd/osd.xml      25 Jan 2004 17:12:26 -0000
@@ -1,5 +1,4 @@
 <mythosdtheme>

-  <timeformat>h:mm ap</timeformat>
   <fadeaway>30</fadeaway>

Index: themes/defaultosd/osd.xml
===================================================================
RCS file: /var/lib/mythcvs/mythtv/themes/defaultosd/osd.xml,v
retrieving revision 1.10
diff -u -2 -r1.10 osd.xml
--- themes/defaultosd/osd.xml   9 Nov 2003 23:05:23 -0000       1.10
+++ themes/defaultosd/osd.xml   25 Jan 2004 17:12:28 -0000
@@ -1,5 +1,4 @@
 <mythosdtheme>

-  <timeformat>hh:mm</timeformat>
   <fadeaway>30</fadeaway>

Index: libs/libmythtv/osd.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/osd.cpp,v
retrieving revision 1.92
diff -u -2 -r1.92 osd.cpp
--- libs/libmythtv/osd.cpp      25 Jan 2004 01:37:50 -0000      1.92
+++ libs/libmythtv/osd.cpp      25 Jan 2004 17:12:36 -0000
@@ -924,9 +924,5 @@
         if (!e.isNull())
         {
-            if (e.tagName() == "timeformat")
-            {
-                timeFormat = getFirstText(e);
-            }
-            else if (e.tagName() == "fadeaway")
+            if (e.tagName() == "fadeaway")
             {
                 totalfadetime = (getFirstText(e).toInt() * 1000000) / 30;
@@ -1702,4 +1698,5 @@
             if (timedisp)
             {
+                QString timeFormat = gContext->GetSetting("TimeFormat", "h:mm AP");
                 QString thetime = QTime::currentTime().toString(timeFormat);
                 timedisp->SetText(thetime);
Index: libs/libmythtv/osd.h
===================================================================
RCS file: /var/lib/mythcvs/mythtv/libs/libmythtv/osd.h,v
retrieving revision 1.55
diff -u -2 -r1.55 osd.h
--- libs/libmythtv/osd.h        25 Jan 2004 01:37:51 -0000      1.55
+++ libs/libmythtv/osd.h        25 Jan 2004 17:12:37 -0000
@@ -153,6 +153,4 @@
     int timeType;

-    QString timeFormat;
-
     QMap<QString, OSDSet *> setMap;
     vector<OSDSet *> *setList;


More information about the mythtv-dev mailing list