Merge branch 'master' into utc

Conflicts:
	mythtv/programs/mythtranscode/mpeg2fix.cpp

mythplugins/mytharchive/i18n/themestrings.h

@@ -6,41 +6,36 @@ void strings_null() {
     ThemeUI::tr("A standard play profile giving approx. 2 hour of video on a single layer DVD");
     ThemeUI::tr("A long play profile giving approx. 4 hour of video on a single layer DVD");
     ThemeUI::tr("A extended play profile giving approx. 6 hour of video on a single layer DVD");
-    ThemeUI::tr("%DATE%, %TIME%");
     ThemeUI::tr("Select Destination");
-    ThemeUI::tr("Choose where you would like your files archived.");
-    ThemeUI::tr("Output Type:");
-    ThemeUI::tr("Destination:");
+    ThemeUI::tr("Find");
     ThemeUI::tr("Free Space:");
-    ThemeUI::tr("Click here to find an output location...");
     ThemeUI::tr("Make ISO Image");
     ThemeUI::tr("Burn to DVD");
-    ThemeUI::tr("Erase DVD-RW before burning");
+    ThemeUI::tr("Force Overwrite of DVD-RW Media");
     ThemeUI::tr("Cancel");
-    ThemeUI::tr("Previous");
+    ThemeUI::tr("Prev");
     ThemeUI::tr("Next");
-    ThemeUI::tr("Filter:");
+    ThemeUI::tr("Select Recordings");
+    ThemeUI::tr("Show Recordings");
     ThemeUI::tr("OK");
     ThemeUI::tr("File Finder");
-    ThemeUI::tr("Select the file you wish to use.");
     ThemeUI::tr("Back");
     ThemeUI::tr("Home");
+    ThemeUI::tr("Select Videos");
+    ThemeUI::tr("Video Category");
+    ThemeUI::tr("PL:");
     ThemeUI::tr("No videos available");
     ThemeUI::tr("Log Viewer");
-    ThemeUI::tr("See logs from your archive runs.");
     ThemeUI::tr("Update");
     ThemeUI::tr("Exit");
     ThemeUI::tr("Change Encoding Profile");
-    ThemeUI::tr("12.34 GB");
     ThemeUI::tr("DVD Menu Theme");
-    ThemeUI::tr("Choose the appearance of your DVD.");
-    ThemeUI::tr("Theme:");
+    ThemeUI::tr("Select a theme");
     ThemeUI::tr("Intro");
     ThemeUI::tr("Main Menu");
     ThemeUI::tr("Chapter Menu");
     ThemeUI::tr("Details");
     ThemeUI::tr("Select Archive Items");
-    ThemeUI::tr("Select the recordings and videos you wish to save.");
     ThemeUI::tr("No files are selected for archive");
     ThemeUI::tr("Add Recording");
     ThemeUI::tr("Add Video");
@@ -53,11 +48,12 @@ void strings_null() {
     ThemeUI::tr("Description:");
     ThemeUI::tr("Thumb Image Selector");
     ThemeUI::tr("Current Position");
-    ThemeUI::tr("0:00:00.00");
     ThemeUI::tr("Seek Amount");
     ThemeUI::tr("Frame");
     ThemeUI::tr("Save");
-    ThemeUI::tr("Up Level");
+    ThemeUI::tr("Add video");
+    ThemeUI::tr("File Finder To Import");
+    ThemeUI::tr("Start Time:");
     ThemeUI::tr("Select Associated Channel");
     ThemeUI::tr("Archived Channel");
     ThemeUI::tr("Chan. ID:");
@@ -68,28 +64,33 @@ void strings_null() {
     ThemeUI::tr("Search Channel");
     ThemeUI::tr("Search Callsign");
     ThemeUI::tr("Search Name");
-    ThemeUI::tr("Prev");
     ThemeUI::tr("Finish");
+    ThemeUI::tr("%DATE%, %TIME%");
+    ThemeUI::tr("Choose where you would like your files archived.");
+    ThemeUI::tr("Output Type:");
+    ThemeUI::tr("Destination:");
+    ThemeUI::tr("Click here to find an output location...");
+    ThemeUI::tr("Erase DVD-RW before burning");
+    ThemeUI::tr("Previous");
+    ThemeUI::tr("Filter:");
+    ThemeUI::tr("Select the file you wish to use.");
+    ThemeUI::tr("See logs from your archive runs.");
+    ThemeUI::tr("12.34 GB");
+    ThemeUI::tr("Choose the appearance of your DVD.");
+    ThemeUI::tr("Theme:");
+    ThemeUI::tr("Select the recordings and videos you wish to save.");
+    ThemeUI::tr("0:00:00.00");
+    ThemeUI::tr("Up Level");
     ThemeUI::tr("description goes here.");
-    ThemeUI::tr("Find");
     ThemeUI::tr("0.00 GB");
-    ThemeUI::tr("Force Overwrite of DVD-RW Media");
-    ThemeUI::tr("Select Recordings");
-    ThemeUI::tr("Show Recordings");
-    ThemeUI::tr("Select Videos");
     ThemeUI::tr("Video Category:");
     ThemeUI::tr("title goes here");
-    ThemeUI::tr("PL:");
     ThemeUI::tr("1");
-    ThemeUI::tr("Select a theme");
     ThemeUI::tr("xxxxx MB");
     ThemeUI::tr("0 MB");
     ThemeUI::tr("sep 13, 2004 11:00 pm (1h 15m)");
     ThemeUI::tr("x.xx GB");
-    ThemeUI::tr("File Finder To Import");
-    ThemeUI::tr("Start Time:");
     ThemeUI::tr("Ok");
-    ThemeUI::tr("Video Category");
     ThemeUI::tr("x.xx Gb");
     ThemeUI::tr("Select Destination:");
     ThemeUI::tr("Parental level: %1");
@@ -100,8 +101,8 @@ void strings_null() {
     ThemeUI::tr("Chapter");
     ThemeUI::tr("Detail");
     ThemeUI::tr("Select File to Import");
-    ThemeUI::tr("Search");
-    ThemeUI::tr("Add video");
+    ThemeUI::tr("Channel ID:");
+    ThemeUI::tr("Channel Number:");
     ThemeUI::tr("Create DVD");
     ThemeUI::tr("Create Archive");
     ThemeUI::tr("Encode Video File");

mythplugins/mytharchive/i18n/translate.pro

@@ -1,6 +1,7 @@
 SOURCES += ../mytharchive/*.cpp
 SOURCES += ../mytharchive/*.h
 SOURCES += ./themestrings.h
+SOURCES += ../mythburn/themes/burnthemestrings.h
 
 TRANSLATIONS  = mytharchive_de.ts mytharchive_sl.ts mytharchive_fr.ts
 TRANSLATIONS += mytharchive_sv.ts mytharchive_nl.ts mytharchive_nb.ts

mythplugins/mytharchive/mytharchive/archivesettings.cpp

@@ -19,7 +19,7 @@ static HostLineEdit *MythArchiveTempDir()
     gc->setLabel(QObject::tr("MythArchive Temp Directory"));
     gc->setValue("");
     gc->setHelpText(QObject::tr("Location where MythArchive should create its "
-            "temporory work files. LOTS of free space required here."));
+            "temporary work files. LOTS of free space required here."));
     return gc;
 };
 

mythplugins/mytharchive/mytharchive/themeselector.cpp

@@ -9,6 +9,7 @@
 #include <QFileInfo>
 #include <QKeyEvent>
 #include <QTextStream>
+#include <QCoreApplication>
 
 // myth
 #include <mythcontext.h>
@@ -211,10 +212,11 @@ void DVDThemeSelector::themeChanged(MythUIButtonListItem *item)
     if (QFile::exists(themeDir + theme_list[itemNo] + "/description.txt"))
     {
         QString desc = loadFile(themeDir + theme_list[itemNo] + "/description.txt");
-        themedesc_text->SetText(desc);
+        themedesc_text->SetText(QCoreApplication::translate("BurnThemeUI", 
+                                desc.toUtf8().constData()));
     }
     else
-        themedesc_text->SetText("No description found!");
+        themedesc_text->SetText(tr("No theme description file found!"));
 }
 
 QString DVDThemeSelector::loadFile(const QString &filename)
@@ -224,20 +226,28 @@ QString DVDThemeSelector::loadFile(const QString &filename)
     QFile file(filename);
 
     if (!file.exists())
-        return "";
-
-    if (file.open( QIODevice::ReadOnly ))
     {
-        QTextStream stream(&file);
-
-        while ( !stream.atEnd() )
+        res = tr("No theme description file found!");
+    }
+    else {
+        if (file.open(QIODevice::ReadOnly))
         {
-            res = res + stream.readLine();
+            QTextStream stream(&file);
+
+            if (!stream.atEnd())
+            {
+                res = stream.readAll();
+                res = res.replace("\n", " ").trimmed();
+            }
+            else {
+                res = tr("Empty theme description!");
+            }
+            file.close();
+        }
+        else {
+           res = tr("Unable to open theme description file!");
         }
-        file.close();
     }
-    else
-        return "";
 
     return res;
 }

mythplugins/mytharchive/mytharchivehelper/main.cpp

@@ -456,14 +456,23 @@ int NativeArchive::doNativeArchive(const QString &jobFile)
     return 0;
 }
 
+static QRegExp badChars = QRegExp("(/|\\\\|:|\'|\"|\\?|\\|)");
+
+static QString fixFilename(const QString &filename)
+{
+    QString ret = filename;
+    ret.replace(badChars, "_");
+    return ret;
+}
+
 int NativeArchive::exportRecording(QDomElement   &itemNode,
                                    const QString &saveDirectory)
 {
     QString chanID, startTime, title = "", filename = "";
     bool doDelete = false;
     QString dbVersion = gCoreContext->GetSetting("DBSchemaVer", "");
 
-    title = itemNode.attribute("title");
+    title = fixFilename(itemNode.attribute("title"));
     filename = itemNode.attribute("filename");
     doDelete = (itemNode.attribute("delete", "0") == "0");
     LOG(VB_JOBQUEUE, LOG_INFO, QString("Archiving %1 (%2), do delete: %3")
@@ -853,7 +862,7 @@ int NativeArchive::exportVideo(QDomElement   &itemNode,
     int intID = 0, categoryID = 0;
     QString coverFile = "";
 
-    title = itemNode.attribute("title");
+    title = fixFilename(itemNode.attribute("title"));
     filename = itemNode.attribute("filename");
     doDelete = (itemNode.attribute("delete", "0") == "0");
     LOG(VB_JOBQUEUE, LOG_INFO, QString("Archiving %1 (%2), do delete: %3")

mythplugins/mytharchive/mythburn/themes/burnthemestrings.h

@@ -0,0 +1,14 @@
+// This is an automatically generated file
+// Do not edit
+
+void strings_null() {
+    BurnThemeUI::tr("Has an intro and contains a main menu with 4 recordings per page. Does not have a chapter selection submenu.");
+    BurnThemeUI::tr("Has an intro and contains a summary main menu with 10 recordings per page. Does not have a chapter selection submenu, recording titles, dates or category.");
+    BurnThemeUI::tr("Has an intro and contains a main menu with 6 recordings per page. Does not have a scene selection submenu.");
+    BurnThemeUI::tr("Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording.");
+    BurnThemeUI::tr("Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. Shows a program details page before each recording. Uses animated thumb images.");
+    BurnThemeUI::tr("Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points.");
+    BurnThemeUI::tr("Has an intro and contains a main menu with 3 recordings per page and a scene selection submenu with 8 chapters points. All the thumb images are animated.");
+    BurnThemeUI::tr("Creates an auto play DVD with no menus. Shows an intro movie then for each title shows a details page followed by the video in sequence.");
+    BurnThemeUI::tr("Creates an auto play DVD with no menus and no intro.");
+}

mythplugins/mytharchive/theme/default-wide/mythburn-ui.xml

@@ -10,10 +10,10 @@ MythArchive GUI theme
     <window name="profilepopup">
         <area>-1,-1,413,426</area>
 
-        <shape name="background" from="basebackground">
+        <imagetype name="backimg">
             <area>0,0,413,426</area>
-            <fill color="#000000" alpha="220" />
-        </shape>
+            <filename>mythdialogbox-background.png</filename>
+        </imagetype>
 
         <textarea name="title" from="basetextarea">
             <area>20,20,360,40</area>
@@ -362,12 +362,11 @@ MythArchive GUI theme
       *******************************************************************
   -->
 
-  <window name="edit_metadata">
+    <window name="edit_metadata">
 
-        <textarea name="title" from="basetextarea">
-            <area>0,15,800,50</area>
+        <textarea name="screentitle">
+            <area>15,5,800,50</area>
             <font>baselarge</font>
-            <align>allcenter</align>
             <value>Archive Item Details</value>
         </textarea>
 
@@ -376,29 +375,29 @@ MythArchive GUI theme
         -->
 
         <textarea name="title_label" from="basetextarea">
-            <area>45,70,170,50</area>
-            <font>basesmallyellow</font>
+            <area>45,70,370,50</area>
+            <font>basesmall</font>
             <align>right,vcenter</align>
             <value>Title:</value>
         </textarea>
 
         <textarea name="subtitle_label" from="title_label">
-            <area>45,135,170,50</area>
+            <area>45,135,370,50</area>
             <value>Subtitle:</value>
         </textarea>
 
         <textarea name="startdate_label" from="title_label">
-            <area>45,200,170,50</area>
+            <area>45,200,370,50</area>
             <value>Start Date:</value>
         </textarea>
 
         <textarea name="starttime_label" from="title_label">
-            <area>45,265,170,50</area>
+            <area>45,265,370,50</area>
             <value>Time:</value>
         </textarea>
 
         <textarea name="description_label" from="title_label">
-            <area>45,330,170,50</area>
+            <area>45,330,370,50</area>
             <value>Description:</value>
         </textarea>
 
@@ -407,40 +406,40 @@ MythArchive GUI theme
         -->
 
         <textedit name="title_edit" from="basetextedit">
-            <position>225,70</position>
+            <area>425,70,600,50</area>
         </textedit>
 
         <textedit name="subtitle_edit" from="basetextedit">
-            <position>225,135</position>
+            <area>425,135,600,50</area>
         </textedit>
 
         <textedit name="startdate_edit" from="basetextedit">
-            <position>225,200</position>
+            <position>425,200</position>
         </textedit>
 
         <textedit name="starttime_edit" from="basetextedit">
-            <position>225,265</position>
+            <position>425,265</position>
         </textedit>
 
-        <textedit name="description_edit" from="basetextedit">
-            <position>225,330</position>
+        <textedit name="description_edit" from="basemultilinetextedit">
+            <area>425,330,600,300</area>
         </textedit>
 
         <!--
             Push buttons
         -->
         <button name="ok_button" from="basebutton">
-            <position>250,540</position>
+            <position>480,650</position>
             <value>OK</value>
         </button>
 
         <button name="cancel_button" from="basebutton">
-            <position>450,540</position>
+            <position>650,650</position>
             <value>Cancel</value>
         </button>
     </window>
 
-  <window name="thumbfinder">
+    <window name="thumbfinder">
 
         <textarea name="title" from="basetextarea">
             <area>0,10,800,45</area>

mythplugins/mytharchive/theme/default/mythburn-ui.xml

@@ -10,10 +10,10 @@ MythArchive GUI theme
     <window name="profilepopup">
         <area>-1,-1,413,426</area>
 
-        <shape name="background" from="basebackground">
+        <imagetype name="backimg">
             <area>0,0,413,426</area>
-            <fill color="#000000" alpha="220" />
-        </shape>
+            <filename>mythdialogbox-background.png</filename>
+        </imagetype>
 
         <textarea name="title" from="basetextarea">
             <area>20,20,360,40</area>