rpms/mythtv/devel mythplugins-0.22-svnfixes.patch, NONE, 1.1 myththemes-0.22-svnfixes.patch, NONE, 1.1 mythtv-0.22-svnfixes.patch, NONE, 1.1

Author: jarod Update of /cvs/free/rpms/mythtv/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv27822 Added Files: mythplugins-0.22-svnfixes.patch myththemes-0.22-svnfixes.patch mythtv-0.22-svnfixes.patch Log Message: cvs sucks ass. mythplugins-0.22-svnfixes.patch: --- NEW FILE mythplugins-0.22-svnfixes.patch --- Index: mythplugins/mythvideo/mythvideo/scripts/jamu.py =================================================================== --- mythplugins/mythvideo/mythvideo/scripts/jamu.py (revision 22751) +++ mythplugins/mythvideo/mythvideo/scripts/jamu.py (working copy) @@ -1,32 +1,32 @@ -#!/usr/bin/env python +#!/usr/bin/env python # -*- coding: UTF-8 -*- # ---------------------- # Name: jamu.py Just.Another.Metadata.Utility # Python Script # Author: R.D. Vaughan -# Purpose: This python script is intended to perform a variety of utility functions on mythvideo +# Purpose: This python script is intended to perform a variety of utility functions on mythvideo # metadata and the associated video files. # # The primary movie source for graphics and data is themoviedb.com wiki. # The primary TV Series source for graphics and data is thetvdb.com wiki. -# Users of this script are encouraged to populate both themoviedb.com and thetvdb.com +# Users of this script are encouraged to populate both themoviedb.com and thetvdb.com # with posters, fan art and banners and meta data. The richer the source the more valuable # the script. -# This script uses the python module tvdb_api.py (v0.6DEV or higher) found at -# http://pypi.python.org/pypi?%3Aaction=search&term=tvnamer&submit=... thanks +# This script uses the python module tvdb_api.py (v0.6DEV or higher) found at +# http://pypi.python.org/pypi?%3Aaction=search&term=tvnamer&submit=... thanks # to the authors of this excellent module. # The tvdb_api.py module uses the full access XML api published by thetvdb.com see: # http://thetvdb.com/wiki/index.php?title=Programmers_API # This python script's functionality is enhanced if you have installed "tvnamer.py" created by -# "dbr/Ben" who is also the author of the "tvdb_api.py" module. -# "tvnamer.py" is used to rename avi files with series/episode information found at +# "dbr/Ben" who is also the author of the "tvdb_api.py" module. +# "tvnamer.py" is used to rename avi files with series/episode information found at # thetvdb.com -# Python access to the tmdb api started with a module from dbr/Ben and then enhanced for +# Python access to the tmdb api started with a module from dbr/Ben and then enhanced for # Jamu's needs. # The routines to select video files was copied and modified from tvnamer.py mentioned above. -# The routine "_save_video_metadata_to_mythdb" has been taken and modified from +# The routine "_save_video_metadata_to_mythdb" has been taken and modified from # "find_meta.py" author Pekka Jääskeläinen. -# The routine "_addCastGenre" was taken and modified from "tvdb-bulk-update.py" by +# The routine "_addCastGenre" was taken and modified from "tvdb-bulk-update.py" by # author David Shilvock <davels(a)telus.net&gt;. # # Command line examples: @@ -38,28 +38,28 @@ __title__ ="JAMU - Just.Another.Metadata.Utility"; __author__="R.D.Vaughan" __purpose__=''' -This python script is intended to perform a variety of utility functions on mythvideo metadata +This python script is intended to perform a variety of utility functions on mythvideo metadata and the associated video files. The primary movie source for graphics and data is themoviedb.com wiki. The primary TV Series source for graphics and data is thetvdb.com wiki. -Users of this script are encouraged to populate both themoviedb.com and thetvdb.com with posters, +Users of this script are encouraged to populate both themoviedb.com and thetvdb.com with posters, fan art and banners and meta data. The richer the source the more valuable the script. ''' -__version__=u"v0.5.5" - # 0.1.0 Initial development +__version__=u"v0.5.9" + # 0.1.0 Initial development # 0.2.0 Inital beta release # 0.3.0 Add mythvideo metadata updating including movie graphics through # the use of tmdb.pl when the perl script exists - # 0.3.1 Add mythvideo meta data add and update functionality. Intend use for - # maintenance cron jobs. + # 0.3.1 Add mythvideo meta data add and update functionality. Intend use for + # maintenance cron jobs. # Increase integration with mythtvideo download meta data and MythUI # Added the ability to movie video files while maintaining the metadata - # 0.3.2 Fixed bug where some poster downloads were unnecessary - # Fixed bug where the mythtv database was updated for no reason - # Fixed bug in jamu-example.conf "min_poster_size" variable had '=' not ':' - # Fixed bug where a unicode URL would abort the script + # 0.3.2 Fixed bug where some poster downloads were unnecessary + # Fixed bug where the mythtv database was updated for no reason + # Fixed bug in jamu-example.conf "min_poster_size" variable had '=' not ':' + # Fixed bug where a unicode URL would abort the script # Using ffmpeg added setting accurate video length in minutes. A hack but # lacked python method to find audio/video properties. # 0.3.3 Add logic to skip any video with a inetref of '99999999'. Meta data and @@ -69,24 +69,24 @@ # 0.3.4 Added logic to skip any secondary source meta data plot less than 10 words. # Properly initialized a new record so warning messages do not display. # In plot meta data replace line-feeds with a space (e.g. Space Cowboys - # plot contains line-feeds). Mythvideo does not expect line-feeds in a plot. - # Significant improvements in combining meta data between primary and + # plot contains line-feeds). Mythvideo does not expect line-feeds in a plot. + # Significant improvements in combining meta data between primary and # secondary data sources. # Remove 'tmdb.pl' calls and use the tmdb api directly. # Added detection of broken symbolic links and fixed those links. - # Fixed inconsistencies in graphics file extentions (as received from the - # sources), made all extentions lowercase and changed ".jpeg" to ".jpg". + # Fixed inconsistencies in graphics file extentions (as received from the + # sources), made all extentions lowercase and changed ".jpeg" to ".jpg". # 0.3.5 Fixed bug when themoviedb.com times out from an api request. - # A few documentation corrections. - # Fixed a bug with utf8 directory names. + # A few documentation corrections. + # Fixed a bug with utf8 directory names. # Added code to not abort script when themoviedb.com has problems. The issue - # is reported but the scripts continues processing. + # is reported but the scripts continues processing. # Added option "-W" to download graphics for Scheduled and Recorded videos. # Change the "-J" Janitor function to avoid deleting graphics for Scheduled # and Recorded videos. - # Fixed bug where a TMDB Poster image was not found when it was really + # Fixed bug where a TMDB Poster image was not found when it was really # available. - # 0.3.6 Fixed bug when searching themoviedb.com for a movie by title or + # 0.3.6 Fixed bug when searching themoviedb.com for a movie by title or # alternate title. # Increased accuracy of non-interactive TMDB movie searching and matching. # Set up for transition to TMDB's beta v2.1 api which adds language support. @@ -94,21 +94,21 @@ # If interactive mode is selected but an exact match is found for a movie # then the exact match is chosen and no interative session is initiated. # Added additional messages when access to MythTV python bindings has issues. - # 0.3.7 Removed some redundant code. + # 0.3.7 Removed some redundant code. # Sync up with v1.0 of tvdb_api and new way to assign tvdb api key # Added an option (-MG) to allow Jamu best guessing at a video's inetref # number. To guess accurately the video file name must be very close to - # those found on tmdb or imdb and tvdb web sites. + # those found on tmdb or imdb and tvdb web sites. # Remove all use of the MythVideo.py "pruneMetadata" routine as it deletes # records from the Mythvideo table for all video files with relative file # paths. - # Jamu will skip processing any videometadata which is using a Storage group. + # Jamu will skip processing any videometadata which is using a Storage group. # Jamu will now restrict itself to updating only videometadata records whose - # video files reside on the current host machine. In the case where a user + # video files reside on the current host machine. In the case where a user # has multiple backends jamu must run on each of those backends. - # The Janitor option (-MJ) now checks if the users has set the plugins + # The Janitor option (-MJ) now checks if the users has set the plugins # MythGallery, MythGame and MythMusic to use the same graphics directories as - # MythVideo. If they share directories the Janitor option will exit + # MythVideo. If they share directories the Janitor option will exit # without removing any graphics files. Messages indicating which directories # are in conflict will be displayed. # Added the detection of video or graphics on an NFS mount exiting jamu without @@ -118,16 +118,16 @@ # Fixed a bug when TMDB does not have a 'year' for a movie (e.g. 'Bambi') # Added compatibility with or without the MythTV.py Ticket #6678 # Fixed a bug when ffmpeg cannot find the true length in minutes of a video - # Cleaned up documenation consistency with Warning and Error messages. - # Added to the existing TV episode video file renaming (-MF) option. - # Now movie video files can also be renamed to the format "title (year)" + # Cleaned up documenation consistency with Warning and Error messages. + # Added to the existing TV episode video file renaming (-MF) option. + # Now movie video files can also be renamed to the format "title (year)" # e.g. "The Duchess (2008)". If tmdb.com has no year for the movie then only # the movie title will be used when renaming. Any existing metadata is # preserved. - # 0.3.8 Made changes to sync up with MythTV trunk change set [r21138]. + # 0.3.8 Made changes to sync up with MythTV trunk change set [r21138]. # Now handles TVDB's change from a 5 digit inetref number to 6 digits. # 0.3.9 Check accessability (Read and Write) to directories and files before - # including them in files/directories to process. + # including them in files/directories to process. # Add the ability to process Storage Groups for all Videos and graphics. # Jamu now uses MythVideo.py binding's Genre and Cast routines # Fixed a unicode bug with file paths. @@ -135,28 +135,28 @@ # Fixed a bug were a bad image file could avbort the script. # Changed all subdirectory cover art to a copied graphic file "folder.jpg/png" # to conform to the Storage Group standard. This also works for local subdirs. - # Fixed a bug where a TV series with out a season specific poster or - # banner would get repeatedly download. + # Fixed a bug where a TV series with out a season specific poster or + # banner would get repeatedly download. # 0.4.0 Removed a few lines of debugging code which should never have been left in a # distrubuted version. # Fixed the check that confirms that all Video and graphic directories are # read and writable. # Fixed a bug where under rare circumstances a graphic would be repeatedly - # downloaded. + # downloaded. # Made the installation of the python IMDbPy library manditory. - # For all movies IMDB numbers will be used instead of converting to TMDB + # For all movies IMDB numbers will be used instead of converting to TMDB # numbers. This is done to maintain consistency with MythVideo movie inetref # numbers. # 0.4.1 Fixed an obscure video file rename (-F option) error - # 0.4.2 Fixed a bug where bad data for either TMDB or TVDB would abort script - # 0.4.3 Recent changes in the MythVideo UI graphic hunts (cover art and fanart) - # have made Jamu's creation of "folder.xxx" graphics redundant. This - # feature has been turned off in Jamu. There is a new user option - # "folderart" that can reactivate this feature through the Jamu + # 0.4.2 Fixed a bug where bad data for either TMDB or TVDB would abort script + # 0.4.3 Recent changes in the MythVideo UI graphic hunts (cover art and fanart) + # have made Jamu's creation of "folder.xxx" graphics redundant. This [...2940 lines suppressed...] + lcd->setFunctionLEDs(FUNC_MOVIE, false); } QString VideoPlayerCommand::GetCommandDisplayName() const Index: mythplugins/mythnews/mythnews/mythnews.cpp =================================================================== --- mythplugins/mythnews/mythnews/mythnews.cpp (revision 22751) +++ mythplugins/mythnews/mythnews/mythnews.cpp (working copy) @@ -103,16 +103,16 @@ bool err = false; UIUtilE::Assign(this, m_sitesList, "siteslist", &err); UIUtilE::Assign(this, m_articlesList, "articleslist", &err); - - UIUtilW::Assign(this, m_nositesText, "nosites", &err); - UIUtilE::Assign(this, m_updatedText, "updated", &err); UIUtilE::Assign(this, m_titleText, "title", &err); UIUtilE::Assign(this, m_descText, "description", &err); - UIUtilE::Assign(this, m_thumbnailImage, "thumbnail", &err); - UIUtilE::Assign(this, m_enclosureImage, "enclosures", &err); - UIUtilE::Assign(this, m_downloadImage, "download", &err); - UIUtilE::Assign(this, m_podcastImage, "ispodcast", &err); + // these are all optional + UIUtilW::Assign(this, m_nositesText, "nosites", &err); + UIUtilW::Assign(this, m_updatedText, "updated", &err); + UIUtilW::Assign(this, m_thumbnailImage, "thumbnail", &err); + UIUtilW::Assign(this, m_enclosureImage, "enclosures", &err); + UIUtilW::Assign(this, m_downloadImage, "download", &err); + UIUtilW::Assign(this, m_podcastImage, "ispodcast", &err); if (err) { @@ -156,12 +156,19 @@ m_titleText->SetText(""); m_descText->SetText(""); + if (m_updatedText) m_updatedText->SetText(""); - m_downloadImage->Hide(); - m_enclosureImage->Hide(); - m_podcastImage->Hide(); + if (m_downloadImage) + m_downloadImage->Hide(); + + if (m_enclosureImage) + m_enclosureImage->Hide(); + + if (m_podcastImage) + m_podcastImage->Hide(); + if (m_thumbnailImage) m_thumbnailImage->Hide(); } @@ -352,31 +359,43 @@ } } - if (!article.enclosure().isEmpty()) + if (m_downloadImage) { - if (!m_downloadImage->IsVisible()) - m_downloadImage->Show(); + if (!article.enclosure().isEmpty()) + { + if (!m_downloadImage->IsVisible()) + m_downloadImage->Show(); + } + else + m_downloadImage->Hide(); } - else - m_downloadImage->Hide(); - if (!article.enclosure().isEmpty()) + if (m_enclosureImage) { - if (!m_enclosureImage->IsVisible()) - m_enclosureImage->Show(); + if (!article.enclosure().isEmpty()) + { + if (!m_enclosureImage->IsVisible()) + m_enclosureImage->Show(); + } + else + m_enclosureImage->Hide(); } - else - m_enclosureImage->Hide(); - m_podcastImage->Hide(); + if (m_podcastImage) + m_podcastImage->Hide(); } } else { - m_downloadImage->Hide(); - m_enclosureImage->Hide(); - m_podcastImage->Hide(); + if (m_downloadImage) + m_downloadImage->Hide(); + if (m_enclosureImage) + m_enclosureImage->Hide(); + + if (m_podcastImage) + m_podcastImage->Hide(); + if (site) { if (m_titleText) @@ -388,7 +407,7 @@ if (m_thumbnailImage && m_thumbnailImage->IsVisible()) m_thumbnailImage->Hide(); - if (site->podcast() == 1) + if (m_podcastImage && site->podcast() == 1) m_podcastImage->Show(); if (!site->imageURL().isEmpty()) @@ -715,7 +734,8 @@ .arg(formatSize(progress, 2)) .arg(formatSize(total, 2)) .arg(floor(fProgress*100)); - m_updatedText->SetText(text); + if (m_updatedText) + m_updatedText->SetText(text); } qApp->processEvents(); usleep(100000); Index: mythplugins/mythmusic/mythmusic/main.cpp =================================================================== --- mythplugins/mythmusic/mythmusic/main.cpp (revision 22880) +++ mythplugins/mythmusic/mythmusic/main.cpp (working copy) @@ -21,6 +21,7 @@ #include <mythtv/compat.h> #include <mythtv/libmythui/mythuihelper.h> #include <mythtv/libmythui/mythprogressdialog.h> +#include <mythtv/lcddevice.h> // MythMusic headers #include "decoder.h" @@ -527,6 +528,11 @@ gMusicData->startdir = startdir; gMusicData->all_playlists = all_playlists; gMusicData->all_music = all_music; + + if (LCD *lcd = LCD::Get()) + { + lcd->setFunctionLEDs(FUNC_MUSIC, true); + } } static void postMusic() @@ -548,6 +554,11 @@ gMusicData->all_music = NULL; delete gMusicData->all_playlists; gMusicData->all_playlists = NULL; + + if (LCD *lcd = LCD::Get()) + { + lcd->setFunctionLEDs(FUNC_MUSIC, false); + } } int mythplugin_run(void) Index: mythplugins/mythweather/mythweather/main.cpp =================================================================== --- mythplugins/mythweather/mythweather/main.cpp (revision 22880) +++ mythplugins/mythweather/mythweather/main.cpp (working copy) @@ -142,8 +142,10 @@ menu->setKillable(); if (menu->foundTheme()) { - if (LCD *lcd = LCD::Get()) + if (LCD *lcd = LCD::Get()) { + lcd->setFunctionLEDs(FUNC_NEWS, false); lcd->switchToTime(); + } GetMythMainWindow()->GetMainStack()->AddScreen(menu); return 0; Index: mythplugins/mythgallery/mythgallery/imageview.cpp =================================================================== --- mythplugins/mythgallery/mythgallery/imageview.cpp (revision 22880) +++ mythplugins/mythgallery/mythgallery/imageview.cpp (working copy) @@ -152,9 +152,11 @@ if (!item) { + lcd->setFunctionLEDs(FUNC_PHOTO, false); lcd->switchToTime(); return; } + lcd->setFunctionLEDs(FUNC_PHOTO, true); QString name = item->GetName(); QString desc = QString::number(m_pos + 1) + " / " + myththemes-0.22-svnfixes.patch: --- NEW FILE myththemes-0.22-svnfixes.patch --- Index: myththemes/metallurgy/htmls/notfound.html =================================================================== --- myththemes/metallurgy/htmls/notfound.html (revision 0) +++ myththemes/metallurgy/htmls/notfound.html (revision 22880) @@ -0,0 +1,63 @@ +<html> +<head> +<title>%1</title> +<style> +body { + padding: 3em 0em; + background: #eeeeee; +} +hr { + color: lightgray; + width: 100%; +} +img { + float: left; + opacity: .8; +} +#box { + background: white; + border: 1px solid lightgray; + width: 600px; + padding: 60px; + margin: auto; +} +h1 { + font-size: 130%; + font-weight: bold; + border-bottom: 1px solid lightgray; + margin-left: 48px; +} +h2 { + font-size: 100%; + font-weight: normal; + border-bottom: 1px solid lightgray; + margin-left: 48px; +} +ul { + font-size: 80%; + padding-left: 48px; + margin: 0; +} +#reloadButton { + padding-left: 48px; +} +</style> +</head> +<body> + <div id="box"> + <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE" width="32" height="32"/> + <h1>%2</h1> + <h2>When connecting to: %3.</h2> + <ul> + <li>Check the address for errors such as <b>ww</b>.mythtv.org + instead of <b>www</b>.mythtv.org</li> + <li>If the address is correct, try to check the network + connection.</li> + <li>If your computer or network is protected by a firewall or + proxy, make sure that MythFrontend/MythBrowser is permitted to access + the network.</li> + </ul> + <br/><br/> + </div> +</body> +</html> Property changes on: myththemes/metallurgy/htmls/notfound.html ___________________________________________________________________ Added: svn:executable + * Index: myththemes/metallurgy/htmls/progdetails_page1.html =================================================================== --- myththemes/metallurgy/htmls/progdetails_page1.html (revision 0) +++ myththemes/metallurgy/htmls/progdetails_page1.html (revision 22880) @@ -0,0 +1,34 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB"> +<head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <meta http-equiv="content-language" content="en-GB" /> + <style type="text/css"> + h1 {font-family:Arial;font-size:24pt;font-style: normal;color:#ffffff} + p {font-family:Arial;font-size:18pt;font-style: normal;color:#ffffff;margin-top: -10pt} + hr {border:1px solid #686350;background-color:#97997d;height:3px;margin-top: -10pt;margin-bottom: 15pt} + </style> +</head> + +<body> + <h1>%TITLE_LABEL%</h1> <p>%TITLE%</p> + <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p> + <h1>%DESCRIPTION_LABEL%</h1> <p>%DESCRIPTION%</p> + <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p> + <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p> + <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p> + <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p> + <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p> + <h1>%EXECUTIVE_PRODUCER_LABEL%</h1> <p>%EXECUTIVE_PRODUCER%</p> + <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p> + <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p> + <h1>%HOST_LABEL%</h1> <p>%HOST%</p> + <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p> + <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p> + <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p> + <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p> + <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p> + <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p> +</body> + +</html> Index: myththemes/metallurgy/htmls/progdetails_page2.html =================================================================== --- myththemes/metallurgy/htmls/progdetails_page2.html (revision 0) +++ myththemes/metallurgy/htmls/progdetails_page2.html (revision 22880) @@ -0,0 +1,51 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB"> +<head> + <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <meta http-equiv="content-language" content="en-GB" /> + <style type="text/css"> + h1 {font-family:Arial;font-size:24pt;font-style: normal;color:#ffffff} + p {font-family:Arial;font-size:18pt;font-style: normal;color:#ffffff;margin-top: -10pt} + hr {border:1px solid #686350;background-color:#97997d;height:3px;margin-top: -10pt;margin-bottom: 15pt} + </style> +</head> + +<body> + <h1>%TITLE_LABEL%</h1> <p>%TITLE%</p> + <h1>%TITLE_PRONOUNCE_LABEL%</h1> <p>%TITLE_PRONOUNCE%</p> + <h1>%DESCRIPTION_LABEL%</h1> <p>%DESCRIPTION%</p> + <h1>%EPISODE_LABEL%</h1> <p>%EPISODE%</p> + <h1>%ACTORS_LABEL%</h1> <p>%ACTORS%</p> + <h1>%DIRECTOR_LABEL%</h1> <p>%DIRECTOR%</p> + <h1>%PRODUCER_LABEL%</h1> <p>%PRODUCER%</p> + <h1>%EXECUTIVE_PRODUCER_LABEL%</h1> <p>%EXECUTIVE_PRODUCER%</p> + <h1>%WRITER_LABEL%</h1> <p>%WRITER%</p> + <h1>%GUEST_STAR_LABEL%</h1> <p>%GUEST_STAR%</p> + <h1>%HOST_LABEL%</h1> <p>%HOST%</p> + <h1>%ADAPTER_LABEL%</h1> <p>%ADAPTER%</p> + <h1>%PRESENTER_LABEL%</h1> <p>%PRESENTER%</p> + <h1>%COMMENTATOR_LABEL%</h1> <p>%COMMENTATOR%</p> + <h1>%GUEST_LABEL%</h1> <p>%GUEST%</p> + <h1>%CATEGORY_LABEL%</h1> <p>%CATEGORY%</p> + <h1>%CATEGORY_TYPE_LABEL%</h1> <p>%CATEGORY_TYPE%</p> + <h1>%ORIGINAL_AIRDATE_LABEL%</h1> <p>%ORIGINAL_AIRDATE%</p> + <h1>%PROGRAMID_LABEL%</h1> <p>%PROGRAMID%</p> + <h1>%MYTHTV_STATUS_LABEL%</h1> <p>%MYTHTV_STATUS%</p> + <h1>%RECORDING_RULE_LABEL%</h1> <p>%RECORDING_RULE%</p> + <h1>%LAST_RECORDED_LABEL%</h1> <p>%LAST_RECORDED%</p> + <h1>%NEXT_RECORDING_LABEL%</h1> <p>%NEXT_RECORDING%</p> + <h1>%AVERAGE_TIME_SHIFT_LABEL%</h1> <p>%AVERAGE_TIME_SHIFT%</p> + <h1>%WATCH_LIST_SCORE_LABEL%</h1> <p>%WATCH_LIST_SCORE%</p> + <h1>%WATCH_LIST_STATUS_LABEL%</h1> <p>%WATCH_LIST_STATUS%</p> + <h1>%SEARCH_PHRASE_LABEL%</h1> <p>%SEARCH_PHRASE%</p> + <h1>%FINDID_LABEL%</h1> <p>%FINDID%</p> + <h1>%RECORDING_HOST_LABEL%</h1> <p>%RECORDING_HOST%</p> + <h1>%RECORDED_FILE_NAME_LABEL%</h1> <p>%RECORDED_FILE_NAME%</p> + <h1>%RECORDED_FILE_SIZE_LABEL%</h1> <p>%RECORDED_FILE_SIZE%</p> + <h1>%RECORDING_PROFILE_LABEL%</h1> <p>%RECORDING_PROFILE%</p> + <h1>%RECORDING_GROUP_LABEL%</h1> <p>%RECORDING_GROUP%</p> + <h1>%STORAGE_GROUP_LABEL%</h1> <p>%STORAGE_GROUP%</p> + <h1>%PLAYBACK_GROUP_LABEL%</h1> <p>%PLAYBACK_GROUP%</p> +</body> + +</html> Index: myththemes/metallurgy/schedule-ui.xml =================================================================== --- myththemes/metallurgy/schedule-ui.xml (revision 22751) +++ myththemes/metallurgy/schedule-ui.xml (working copy) @@ -308,7 +308,6 @@ <buttonlist name="channellist"> <area>65,108,180,330</area> <buttonarea>0,0,180,330</buttonarea> - <align>allcenter</align> <spacing>1</spacing> <statetype name="buttonitem"> <state name="active"> @@ -318,7 +317,6 @@ </shape> <imagetype name="channelicon"> <area>5,7,40,40</area> - <align>allcenter</align> </imagetype> <textarea name="buttontext" from="basetextarea"> <area>48,0,130,54</area> @@ -357,7 +355,7 @@ <state name="inactive" from="active"/> </statetype> </buttonlist> - + <guidegrid name="guidegrid"> <area>246,108,966,330</area> <layout>horizontal</layout> @@ -386,26 +384,26 @@ <area>85,493,760,35</area> <font>extralargebold</font> </textarea> - + <textarea name="subtitle"> <area>85,529,760,25</area> <font>mediumbold</font> <template>%|"SUBTITLE|"%</template> </textarea> - + <textarea name="description"> <area>85,558,1115,90</area> <font>medium</font> <multiline>yes</multiline> <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template> </textarea> - + <textarea name="rectypestatus" from="basetextarea"> <area>860,503,325,60</area> <multiline>yes</multiline> <align>right</align> </textarea> - + </window> <window name="programguide-video"> @@ -421,29 +419,56 @@ <align>allcenter</align> </textarea> - <container name="chanbar"> - <area>63,109,182,272</area> - <bar name="chans" draworder="4"> - <area>0,0,180,272</area> - <textoffset>46,0</textoffset> - <iconoffset>5,-5</iconoffset> - <iconsize>40,40</iconsize> - <orientation>vertical</orientation> - <align>allcenter</align> - <font>small</font> - <imagefile>guide/gg-chans.png</imagefile> - </bar> - </container> + <buttonlist name="channellist"> + <area>65,108,180,330</area> + <buttonarea>0,0,180,330</buttonarea> + <spacing>1</spacing> + <statetype name="buttonitem"> + <state name="active"> + <shape name="background"> + <area>0,0,180,54</area> + <fill color="#CCCCCC" alpha="28" /> + </shape> + <imagetype name="channelicon"> + <area>5,7,40,40</area> + </imagetype> + <textarea name="buttontext" from="basetextarea"> + <area>48,0,130,54</area> + <multiline>true</multiline> + <cutdown>yes</cutdown> + <font state="favourite">basesmallyellow</font> + <font state="unavailable">basesmallblue</font> + <font state="favunavailable">basesmallpurple</font> + <align>allcenter</align> + </textarea> + </state> + <state name="selected" from="active"/> + <state name="inactive" from="active"/> + </statetype> + </buttonlist> - <container name="timebar"> - <area>245,80,963,29</area> - <bar name="times" draworder="4"> - <area>0,0,963,29</area> - <align>center</align> - <font>small</font> - <imagefile>guide/gg-times.png</imagefile> - </bar> - </container> + <buttonlist name="timelist"> + <area>246,79,966,30</area> + <layout>horizontal</layout> + <buttonarea>0,0,966,30</buttonarea> + <spacing>1</spacing> + <statetype name="buttonitem"> + <area>0,0,240,30</area> + <state name="active"> + <imagetype name="buttonbackground"> + <area>0,0,240,30</area> + <filename>guide/gg-times.png</filename> + </imagetype> + <textarea name="buttontext" from="basetextarea"> + <area>10,3,220,28</area> + <font>small</font> + <align>allcenter</align> + </textarea> + </state> + <state name="selected" from="active"/> + <state name="inactive" from="active"/> + </statetype> + </buttonlist> <guidegrid name="guidegrid"> <area>247,109,980,272</area> @@ -465,16 +490,6 @@ <font>small</font> </guidegrid> - <container name="current_info"> - <area>1135,25,101,30</area> - <textarea name="time" draworder="4" align="center"> - <area>0,0,101,30</area> - <cutdown>no</cutdown> - <font>mediumlightgrey</font> - <multiline>yes</multiline> - </textarea> - </container> - <textarea name="title"> <area>375,442,830,40</area> <font>extralargebold</font> @@ -493,9 +508,9 @@ <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template> </textarea> - <container name="current_video"> + <imagetype name="video"> <area>88,466,260,146</area> - </container> + </imagetype> </window> @@ -589,7 +604,7 @@ <area>85,532,1115,110</area> <font>medium</font> <multiline>yes</multiline> - <value>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</value> + <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template> </textarea> <textarea name="rectype" from="basetextarea"> @@ -609,4 +624,23 @@ </window> -</mythuitheme> \ No newline at end of file + <window name="progdetails"> + + <textarea name="title" from="baseheading"> + <value>Program Details</value> + </textarea> + + <imagetype name="background"> + <position>78,66</position> + <filename>backgrounds/menu_background.png</filename> + </imagetype> + + <webbrowser name="browser"> + <area>90,80,1090,560</area> + <zoom>1.0</zoom> + <background color="#000000" alpha="1"/> + </webbrowser> + + </window> + +</mythuitheme> Index: myththemes/metallurgy/recordings-ui.xml =================================================================== --- myththemes/metallurgy/recordings-ui.xml (revision 22751) +++ myththemes/metallurgy/recordings-ui.xml (working copy) @@ -207,7 +207,7 @@ <font>medium</font> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</value> + <template>%YEARSTARS% %DESCRIPTION% %LONGREPEAT%</template> </textarea> <imagetype name="video_background"> Index: myththemes/metallurgy/ui.xml =================================================================== --- myththemes/metallurgy/ui.xml (revision 22751) +++ myththemes/metallurgy/ui.xml (working copy) @@ -753,4 +753,170 @@ </container> </window> +<window name="schdiff"> + + <font name="active_font" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="inactive_font" face="Frutiger LT Std"> + <color>#aaaaaa</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="record_font" face="Frutiger LT Std"> + <color>#F7862B</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="recording_font" face="Frutiger LT Std"> + <color>#FF33FF</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="norecordfnt" face="Frutiger LT Std"> + <color>#999999</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="conflict_font" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="currenttitle" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>18</size> + <size:small>12</size:small> + </font> + + <font name="title" face="Frutiger LT Std"> + <color>#ffffff</color> + <dropcolor>#000000</dropcolor> + <size>27</size> + <size:small>13</size:small> + <shadow>3,3</shadow> + </font> + + <font name="info" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>17</size> + <size:small>8</size:small> + <shadow>1,1</shadow> + </font> + + <font name="message" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <font name="messagegray" face="Frutiger LT Std"> + <color>#999999</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <font name="messageyellow" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <container name="background"> + <textarea name="sched" draworder="0"> + <area>20,10,400,40</area> + <font>info</font> + <value>Preview Schedule Changes:</value> + </textarea> + <textarea name="view" align="right" draworder="0"> + <area>400,10,380,30</area> + <font>info</font> + </textarea> + <image name="filler" draworder="0" fleximage="no"> + <filename>conflicts/con-box.png</filename> + <position>0,39</position> + </image> + </container> + + <container name="selector"> + <area>0,39,800,290</area> + <listarea name="conflictlist" draworder="4"> + <area>20,12,760,265</area> + <fcnfont name="conflict_font" function="conflictingrecording"></fcnfont> + <fcnfont name="norecordfnt" function="disabledrecording"></fcnfont> + <fcnfont name="active_font" function="active"></fcnfont> + <fcnfont name="inactive_font" function="inactive"></fcnfont> + <fcnfont name="record_font" function="record"></fcnfont> + <fcnfont name="recording_font" function="recording"></fcnfont> + <fcnfont name="active_font" function="selected"></fcnfont> + <columnpadding>10</columnpadding> + <column number="1" width="160" context="-1"></column> + <column number="2" width="120" context="-1"></column> + <column number="3" width="370" context="-1"></column> + <column number="4" width="20" context="-1"></column> + <column number="5" width="20" context="-1"></column> + <items>9</items> + <image function="selectionbar" filename="shared/selectbar.png" location="-14,-5"></image> + <image function="uparrow" filename="shared/uparrow.png" location="755,22"></image> + <image function="downarrow" filename="shared/downarrow.png" location="755,230"></image> + </listarea> + <image name="showinglines" draworder="5" fleximage="no"> + <filename>cr-lines.png</filename> + <position>0,0</position> + </image> + </container> + + <container name="program_info"> + <area>0,360,800,210</area> + <textarea name="title" draworder="6"> + <area>20,0,800,40</area> + <font>title</font> + </textarea> + <textarea name="channel" draworder="6"> + <area>20,40,160,30</area> + <font>info</font> + </textarea> + <textarea name="timedate" draworder="6"> + <area>200,40,420,30</area> + <font>info</font> + </textarea> + <textarea name="subdescr" draworder="6"> + <area>20,70,720,140</area> + <font>info</font> + <multiline>yes</multiline> + <value>%SUBTITLE|"|"%%STARS%%DESCRIPTION%</value> + </textarea> + </container> + + <container name="status_info"> + <area>300,330,480,30</area> + <textarea name="recordingstatus" align="right" draworder="6"> + <area>0,0,480,30</area> + <font>message</font> + </textarea> + </container> + + + <container name="norecordings_list"> + <textarea name="msg" align="center" draworder="8"> + <area>0,110,800,70</area> + <font>info</font> + <value>The recording schedule would not be affected.</value> + <multiline>yes</multiline> + </textarea> + </container> + + </window> + </mythuitheme> Index: myththemes/Mythbuntu/music-ui.xml =================================================================== --- myththemes/Mythbuntu/music-ui.xml (revision 22751) +++ myththemes/Mythbuntu/music-ui.xml (working copy) @@ -1060,10 +1060,9 @@ <window name="miniplayer"> <area>-1,5,590,190</area> - <imagetype name="track_info_background"> - <filename>miniplayer_background.png</filename> + <shape name="track_info_background" from="basebackground"> <area>10,10,569,170</area> - </imagetype> + </shape> <imagetype name="mm_blackhole_border"> <filename>mm_blackhole_border.png</filename> Index: myththemes/Mythbuntu/schedule-ui.xml =================================================================== --- myththemes/Mythbuntu/schedule-ui.xml (revision 22751) +++ myththemes/Mythbuntu/schedule-ui.xml (working copy) @@ -189,7 +189,7 @@ <textarea name="description" from="basetextarea"> <area>50,130,1200,90</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -412,7 +412,7 @@ <textarea name="description" from="basetextarea"> <area>40,130,870,90</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -585,7 +585,7 @@ <area>20,530,1240,160</area> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</value> + <template>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> Index: myththemes/Mythbuntu/recordings-ui.xml =================================================================== --- myththemes/Mythbuntu/recordings-ui.xml (revision 22751) +++ myththemes/Mythbuntu/recordings-ui.xml (working copy) @@ -263,7 +263,7 @@ <align>justify</align> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</value> + <template>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</template> </textarea> <imagetype name="preview"> @@ -271,10 +271,9 @@ <preserveaspect>true</preserveaspect> </imagetype> - <textarea name="norecordings"> - <area>20,75,760,300</area> + <textarea name="norecordings"from="description"> <font>basemedium</font> - <value>No Recordings Available</value> + <value>No Recordings available, or screen loading...</value> <multiline>yes</multiline> <align>allcenter</align> </textarea> Index: myththemes/Mythbuntu/base.xml =================================================================== --- myththemes/Mythbuntu/base.xml (revision 22751) +++ myththemes/Mythbuntu/base.xml (working copy) @@ -630,6 +630,7 @@ <buttonlist name="list" from="basebuttonlist"> <area>18,225,470,250</area> + <spacing>4</spacing> <drawfrombottom>yes</drawfrombottom> <showarrow>no</showarrow> <wrapstyle>selection</wrapstyle> Index: myththemes/Graphite/schedule-ui.xml =================================================================== --- myththemes/Graphite/schedule-ui.xml (revision 22751) +++ myththemes/Graphite/schedule-ui.xml (working copy) @@ -162,7 +162,7 @@ <textarea name="description" from="basetextarea"> <area>40,150,1200,60</area> <multiline>yes</multiline> - <value>(%STARTTIME% - %ENDTIME%) %LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>(%STARTTIME% - %ENDTIME%) %LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -371,13 +371,13 @@ <area>150,54,550,50</area> <align>left,vcenter</align> <font>basesmall</font> - <value>%|"SUBTITLE|"%</value> + <template>%|"SUBTITLE|"%</template> </textarea> <textarea name="description" from="basetextarea"> <area>45,110,620,150</area> <multiline>yes</multiline> - <value>(%STARTTIME% - %ENDTIME%) %LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>(%STARTTIME% - %ENDTIME%) %LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="channelgroup" from="basetextarea"> @@ -630,7 +630,7 @@ <font>basesmaller</font> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"%</value> + <template>%|"SUBTITLE|"%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> Index: myththemes/Graphite/recordings-ui.xml =================================================================== --- myththemes/Graphite/recordings-ui.xml (revision 22751) +++ myththemes/Graphite/recordings-ui.xml (working copy) @@ -84,7 +84,7 @@ <font>basesmaller</font> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%DESCRIPTION%</value> + <template>%DESCRIPTION%</template> <align>justify</align> </textarea> Index: myththemes/Graphite/ui.xml =================================================================== --- myththemes/Graphite/ui.xml (revision 22751) +++ myththemes/Graphite/ui.xml (working copy) @@ -81,5 +81,172 @@ </container> </window> + +<window name="schdiff"> + + <font name="active_font" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="inactive_font" face="Frutiger LT Std"> + <color>#aaaaaa</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="record_font" face="Frutiger LT Std"> + <color>#F7862B</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="recording_font" face="Frutiger LT Std"> + <color>#FF33FF</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="norecordfnt" face="Frutiger LT Std"> + <color>#999999</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="conflict_font" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>16</size> + <size:small>11</size:small> + </font> + + <font name="currenttitle" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>18</size> + <size:small>12</size:small> + </font> + + <font name="title" face="Frutiger LT Std"> + <color>#ffffff</color> + <dropcolor>#000000</dropcolor> + <size>27</size> + <size:small>13</size:small> + <shadow>3,3</shadow> + </font> + + <font name="info" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>17</size> + <size:small>8</size:small> + <shadow>1,1</shadow> + </font> + + <font name="message" face="Frutiger LT Std"> + <color>#ffffff</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <font name="messagegray" face="Frutiger LT Std"> + <color>#999999</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <font name="messageyellow" face="Frutiger LT Std"> + <color>#ffff33</color> + <size>16</size> + <size:small>10</size:small> + <shadow>1,1</shadow> + </font> + + <container name="background"> + <textarea name="sched" draworder="0"> + <area>20,10,400,40</area> + <font>info</font> + <value>Preview Schedule Changes:</value> + </textarea> + <textarea name="view" align="right" draworder="0"> + <area>400,10,380,30</area> + <font>info</font> + </textarea> + <image name="filler" draworder="0" fleximage="no"> + <filename>conflicts/con-box.png</filename> + <position>0,39</position> + </image> + </container> + + <container name="selector"> + <area>0,39,800,290</area> + <listarea name="conflictlist" draworder="4"> + <area>20,12,760,265</area> + <fcnfont name="conflict_font" function="conflictingrecording"></fcnfont> + <fcnfont name="norecordfnt" function="disabledrecording"></fcnfont> + <fcnfont name="active_font" function="active"></fcnfont> + <fcnfont name="inactive_font" function="inactive"></fcnfont> + <fcnfont name="record_font" function="record"></fcnfont> + <fcnfont name="recording_font" function="recording"></fcnfont> + <fcnfont name="active_font" function="selected"></fcnfont> + <columnpadding>10</columnpadding> + <column number="1" width="160" context="-1"></column> + <column number="2" width="120" context="-1"></column> + <column number="3" width="370" context="-1"></column> + <column number="4" width="20" context="-1"></column> + <column number="5" width="20" context="-1"></column> + <items>9</items> + <image function="selectionbar" filename="shared/selectbar.png" location="-14,-5"></image> + <image function="uparrow" filename="shared/uparrow.png" location="755,22"></image> + <image function="downarrow" filename="shared/downarrow.png" location="755,230"></image> + </listarea> + <image name="showinglines" draworder="5" fleximage="no"> + <filename>cr-lines.png</filename> + <position>0,0</position> + </image> + </container> + + <container name="program_info"> + <area>0,360,800,210</area> + <textarea name="title" draworder="6"> + <area>20,0,800,40</area> + <font>title</font> + </textarea> + <textarea name="channel" draworder="6"> + <area>20,40,160,30</area> + <font>info</font> + </textarea> + <textarea name="timedate" draworder="6"> + <area>200,40,420,30</area> + <font>info</font> + </textarea> + <textarea name="subdescr" draworder="6"> + <area>20,70,720,140</area> + <font>info</font> + <multiline>yes</multiline> + <value>%SUBTITLE|"|"%%STARS%%DESCRIPTION%</value> + </textarea> + </container> + + <container name="status_info"> + <area>300,330,480,30</area> + <textarea name="recordingstatus" align="right" draworder="6"> + <area>0,0,480,30</area> + <font>message</font> + </textarea> + </container> + + + <container name="norecordings_list"> + <textarea name="msg" align="center" draworder="8"> + <area>0,110,800,70</area> + <font>info</font> + <value>The recording schedule would not be affected.</value> + <multiline>yes</multiline> + </textarea> + </container> + + </window> + </mythuitheme> mythtv-0.22-svnfixes.patch: --- NEW FILE mythtv-0.22-svnfixes.patch --- Index: mythtv/configure =================================================================== --- mythtv/configure (revision 22751) +++ mythtv/configure (working copy) @@ -3404,8 +3404,7 @@ enable qtwebkit else # For environments that don't have pkg-config, we do a compile test. - # Sadly, this requires some guesses about Qt's install location: - qt_inc="-I/usr/local/include/Qt -I/usr/include/Qt -I${prefix}/include/Qt -I${QTDIR}/include" + qt_inc="-I${sysroot}/$(${qmake} -query QT_INSTALL_HEADERS)" check_cxx ${qt_inc} <<EOF && enable qtwebkit #include <QtWebKit/QtWebKit> @@ -3415,7 +3414,7 @@ EOF fi -enabled qtwebkit || echo "Warning! QtWebkit headers not found, MythBrowser will not work." +enabled qtwebkit || die "Error! QtWebkit headers not found" if enabled firewire; then firewire="no" Index: mythtv/themes/default/schedule-ui.xml =================================================================== --- mythtv/themes/default/schedule-ui.xml (revision 22751) +++ mythtv/themes/default/schedule-ui.xml (working copy) @@ -145,7 +145,7 @@ <textarea name="description" from="basetextarea"> <area>30,110,740,60</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -362,7 +362,7 @@ <textarea name="description" from="basetextarea"> <area>30,140,520,80</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -524,7 +524,7 @@ <area>20,430,720,140</area> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</value> + <template>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> Index: mythtv/themes/default/recordings-ui.xml =================================================================== --- mythtv/themes/default/recordings-ui.xml (revision 22751) +++ mythtv/themes/default/recordings-ui.xml (working copy) @@ -204,7 +204,7 @@ <area>25,420,590,175</area> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</value> + <template>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</template> </textarea> <imagetype name="preview"> Index: mythtv/themes/default-wide/schedule-ui.xml =================================================================== --- mythtv/themes/default-wide/schedule-ui.xml (revision 22751) +++ mythtv/themes/default-wide/schedule-ui.xml (working copy) @@ -202,7 +202,7 @@ <textarea name="description" from="basetextarea"> <area>40,130,1200,90</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -425,7 +425,7 @@ <textarea name="description" from="basetextarea"> <area>40,130,870,90</area> <multiline>yes</multiline> - <value>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</value> + <template>%LONGREPEAT%%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> @@ -589,7 +589,7 @@ <area>20,530,1240,160</area> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</value> + <template>%|"SUBTITLE|"%\n%YEARSTARS%%DESCRIPTION%</template> </textarea> <textarea name="rectypestatus" from="basetextarea"> Index: mythtv/themes/default-wide/recordings-ui.xml =================================================================== --- mythtv/themes/default-wide/recordings-ui.xml (revision 22751) +++ mythtv/themes/default-wide/recordings-ui.xml (working copy) @@ -203,7 +203,7 @@ <area>25,485,890,220</area> <multiline>yes</multiline> <cutdown>yes</cutdown> - <value>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</value> + <template>%|"SUBTITLE|"% %STARS% %DESCRIPTION%</template> </textarea> <imagetype name="preview"> Index: mythtv/docs/mythtv-HOWTO.html =================================================================== --- mythtv/docs/mythtv-HOWTO.html (revision 22751) +++ mythtv/docs/mythtv-HOWTO.html (working copy) @@ -15,7 +15,7 @@ <H1>Installing and using MythTV</H1> <H2>Robert Kulagowski, -<A HREF="mailto:rkulagow@rocketmail.com">mailto:rkulagow@rocketmail.com</A></H2>2009-11-02, v0.22.00 +<A HREF="mailto:rkulagow@rocketmail.com">mailto:rkulagow@rocketmail.com</A></H2>2009-11-18, v0.22.02 <HR> <EM>Initially, installation of MythTV seems like a huge task. There are lots of dependencies, and various distributions seem to do the same thing Index: mythtv/docs/mythtv-HOWTO-5.html =================================================================== --- mythtv/docs/mythtv-HOWTO-5.html (revision 22751) +++ mythtv/docs/mythtv-HOWTO-5.html (working copy) @@ -67,9 +67,8 @@ <P> <BLOCKQUOTE><CODE> <PRE> -$ mkdir mythtv-release-0.22-fixes -$ svn co http://svn.mythtv.org/svn/branches/release-0-22-fixes/ mythtv-release-0.22-fixes -$ cd mythtv-release-0.22-fixes +$ svn co http://svn.mythtv.org/svn/branches/release-0-22-fixes/ mythtv-0.22 +$ cd mythtv-0.22 </PRE> </CODE></BLOCKQUOTE> </P> @@ -77,7 +76,6 @@ <P> <BLOCKQUOTE><CODE> <PRE> -$ mkdir mythtv-trunk $ svn co http://svn.mythtv.org/svn/trunk/ mythtv-trunk $ cd mythtv-trunk </PRE> @@ -86,7 +84,7 @@ <P><B>NOTE</B>: Using a svn version of the code allows you to stay up-to-date with changes. So, if there's an update to the 0.22 release and you originally obtained it using svn, you could enter the -mythtv-release-0.22-fixes directory and type "svn up", which will update your copy +mythtv-0.22 directory and type "svn up", which will update your copy with the fixed version from the website. You would then recompile and install the updated 0.22 code.</P> <P>If you are using the tarball, then unpack it: Index: mythtv/docs/mythtv-HOWTO.txt =================================================================== --- mythtv/docs/mythtv-HOWTO.txt (revision 22751) +++ mythtv/docs/mythtv-HOWTO.txt (working copy) @@ -1,7 +1,7 @@ Installing and using MythTV Robert Kulagowski, mailto:rkulagow@rocketmail.com <mailto:rkulagow@rocketmail.com> - 2009-11-02, v0.22.00 + 2009-11-18, v0.22.02 Initially, installation of MythTV seems like a huge task. There are lots of dependencies, and various distributions seem to do the same @@ -1431,9 +1431,8 @@ - $ mkdir mythtv-release-0.22-fixes - $ svn co http://svn.mythtv.org/svn/branches/release-0-22-fixes/ mythtv-release-0.22-fixes - $ cd mythtv-release-0.22-fixes + $ svn co http://svn.mythtv.org/svn/branches/release-0-22-fixes/ mythtv-0.22 + $ cd mythtv-0.22 @@ -1441,7 +1440,6 @@ - $ mkdir mythtv-trunk $ svn co http://svn.mythtv.org/svn/trunk/ mythtv-trunk $ cd mythtv-trunk @@ -1449,10 +1447,10 @@ NNOOTTEE: Using a svn version of the code allows you to stay up-to-date with changes. So, if there's an update to the 0.22 release and you - originally obtained it using svn, you could enter the mythtv- - release-0.22-fixes directory and type "svn up", which will update your - copy with the fixed version from the website. You would then recompile - and install the updated 0.22 code. + originally obtained it using svn, you could enter the mythtv-0.22 [...2762 lines suppressed...] # These records indicate that the MythTV user deleted the video from the Watched Recordings screen # or from MythVideo # These video items must also be deleted from Miro @@ -2521,7 +2563,7 @@ app.cli_interpreter.do_mythtv_updatewatched(u'') # - # Get the unwatched videos details from Miro + # Get the unwatched videos details from Miro # app.cli_interpreter.do_mythtv_getunwatched(u'') unwatched = app.cli_interpreter.videofiles @@ -2533,7 +2575,7 @@ watched = app.cli_interpreter.videofiles # - # Remove any duplicate Miro videoes from the unwatched or watched list of Miro videos + # Remove any duplicate Miro videoes from the unwatched or watched list of Miro videos # This means that Miro has duplicates due to a Miro/Channel website issue # These videos should not be added to the MythTV Watch Recordings screen # @@ -2546,7 +2588,7 @@ try: unwatched.remove(item) # Completely remove this duplicate video and item information from Miro - app.cli_interpreter.do_mythtv_item_remove(item[u'videoFilename']) + app.cli_interpreter.do_mythtv_item_remove(item[u'videoFilename']) displayMessage(u"Skipped adding a duplicate Miro video to the MythTV Watch Recordings screen (%s - %s) which is already in MythVideo.\nSometimes a Miro channel has the same video downloaded multiple times.\nThis is a Miro/Channel web site issue and often rectifies itself overtime." % (item[u'channelTitle'], item[u'title'])) except ValueError: pass @@ -2567,7 +2609,7 @@ try: unwatched.remove(duplicate) # Completely remove this duplicate video and item information from Miro - app.cli_interpreter.do_mythtv_item_remove(duplicate[u'videoFilename']) + app.cli_interpreter.do_mythtv_item_remove(duplicate[u'videoFilename']) displayMessage(u"Skipped adding a Miro video to the MythTV Watch Recordings screen (%s - %s) as there are duplicate 'new' video items.\nSometimes a Miro channel has the same video downloaded multiple times.\nThis is a Miro/Channel web site issue and often rectifies itself overtime." % (duplicate[u'channelTitle'], duplicate[u'title'])) except ValueError: pass @@ -2576,7 +2618,7 @@ # Deal with any Channel videos that are to be copied and removed from Miro # copy_items = [] - # Copy unwatched and watched Miro videos (all or only selected Channels) + # Copy unwatched and watched Miro videos (all or only selected Channels) if u'all' in channel_mythvideo_only: for array in [watched, unwatched]: for item in array: @@ -2586,11 +2628,11 @@ for video in array: if filter(is_not_punct_char, video[u'channelTitle'].lower()) in channel_mythvideo_only.keys(): copy_items.append(video) - # Copy ONLY watched Miro videos (all or only selected Channels) - if u'all' in channel_new_watch_copy: + # Copy ONLY watched Miro videos (all or only selected Channels) + if u'all' in channel_new_watch_copy: for video in watched: copy_items.append(video) - elif len(channel_new_watch_copy): + elif len(channel_new_watch_copy): for video in watched: if filter(is_not_punct_char, video[u'channelTitle'].lower()) in channel_new_watch_copy.keys(): copy_items.append(video) @@ -2600,7 +2642,7 @@ channels_to_copy[key] = channel_mythvideo_only[key] for key in channel_new_watch_copy.keys(): channels_to_copy[key] = channel_new_watch_copy[key] - + for video in copy_items: dir_key = filter(is_not_punct_char, video[u'channelTitle'].lower()) # Create the subdirectories to copy the video into @@ -2613,11 +2655,11 @@ directory_coverart = True # If the directory was just created it needs coverart else: if video[u'channel_icon']: - ext = getExtention(video[u'channel_icon']) + ext = getExtention(video[u'channel_icon']) if not os.path.isfile(u"%s%s.%s" % (channels_to_copy[dir_key], video[u'channelTitle'].lower(), ext)): directory_coverart = True # If the directory was just created it needs coverart elif video[u'item_icon']: - ext = getExtention(video[u'item_icon']) + ext = getExtention(video[u'item_icon']) if not os.path.isfile(u"%s%s - %s.%s" % (channels_to_copy[dir_key], video[u'channelTitle'].lower(), video[u'title'].lower(), ext)): directory_coverart = True # If the directory was just created it needs coverart @@ -2625,14 +2667,14 @@ if directory_coverart and video[u'channel_icon']: ext = getExtention(video[u'channel_icon']) tmp_path = channels_to_copy[dir_key][:-1] - foldername = tmp_path[tmp_path.rindex(u'/')+1:] + foldername = tmp_path[tmp_path.rindex(u'/')+1:] dirpath = u"%s%s" % (channels_to_copy[dir_key], u'folder.jpg') dirpath2 = u"%s%s" % (channels_to_copy[dir_key], u'folder.png') if os.path.isfile(dirpath) or os.path.isfile(dirpath2): # See if a folder cover already exists pass else: if simulation: - logger.info(u"Simulation: Copy a Channel Icon (%s) for directory (%s)." % (filepath, dirpath)) + logger.info(u"Simulation: Copy a Channel Icon (%s) for directory (%s)." % (video[u'channel_icon'], dirpath)) else: try: # Miro Channel icon copy for the new subdirectory useImageMagick(u'convert "%s" "%s"' % (video[u'channel_icon'], dirpath)) @@ -2655,7 +2697,7 @@ try: # Miro video copied into a MythVideo directory shutil.copy2(video[u'videoFilename'], filepath) statistics[u'Miros_MythVideos_copied']+=1 - if u'mythvideo' in storagegroups.keys(): + if u'mythvideo' in storagegroups.keys() and not local_only: video[u'videoFilename'] = filepath.replace(storagegroups[u'mythvideo'], u'') else: video[u'videoFilename'] = filepath @@ -2669,7 +2711,7 @@ # Copy the Channel or item's icon if video[u'channel_icon'] and not video[u'channelTitle'].lower() in channel_icon_override: pass - else: + else: if video[u'item_icon']: video[u'channel_icon'] = video[u'item_icon'] if video[u'channel_icon']: @@ -2689,7 +2731,7 @@ except OSError: pass shutil.copy2(video[u'channel_icon'], filepath) - if u'posterdir' in storagegroups.keys(): + if u'posterdir' in storagegroups.keys() and not local_only: video[u'channel_icon'] = filepath.replace(storagegroups[u'posterdir'], u'') else: video[u'channel_icon'] = filepath @@ -2700,14 +2742,14 @@ time.sleep(5) # Let the shutdown processing complete sys.exit(False) else: - if u'posterdir' in storagegroups.keys(): + if u'posterdir' in storagegroups.keys() and not local_only: video[u'channel_icon'] = filepath.replace(storagegroups[u'posterdir'], u'') else: video[u'channel_icon'] = filepath # There may already be a Screenshot available or it is a symlink which needs to be replaced if video[u'screenshot']: - ext = getExtention(video[u'screenshot']) + ext = getExtention(video[u'screenshot']) filepath = u"%s%s - %s%s.%s" % (vid_graphics_dirs[u'episodeimagedir'], video[u'channelTitle'], video[u'title'], graphic_suffix[u'episodeimagedir'], ext) else: filepath = u'' @@ -2724,7 +2766,7 @@ pass shutil.copy2(video[u'screenshot'], filepath) displayMessage(u"Copied Miro screenshot file (%s) to MythVideo (%s)" % (video[u'screenshot'], filepath)) - if u'episodeimagedir' in storagegroups.keys(): + if u'episodeimagedir' in storagegroups.keys() and not local_only: video[u'screenshot'] = filepath.replace(storagegroups[u'episodeimagedir'], u'') else: video[u'screenshot'] = filepath @@ -2735,17 +2777,16 @@ time.sleep(5) # Let the shutdown processing complete sys.exit(False) elif video[u'screenshot']: - if u'episodeimagedir' in storagegroups.keys(): + if u'episodeimagedir' in storagegroups.keys() and not local_only: video[u'screenshot'] = filepath.replace(storagegroups[u'episodeimagedir'], u'') else: video[u'screenshot'] = filepath - video[u'copied'] = True # Mark this video item as being copied # Completely remove the video and item information from Miro - app.cli_interpreter.do_mythtv_item_remove(save_video_filename) - + app.cli_interpreter.do_mythtv_item_remove(save_video_filename) + # Gracefully close the Miro database and shutdown the Miro Front and Back ends app.controller.shutdown() time.sleep(5) # Let the shutdown processing complete @@ -2756,7 +2797,7 @@ # # Check if the user does not want any channels Added to the "Watch Recordings" screen - if channel_mythvideo_only.has_key(u'all'): + if channel_mythvideo_only.has_key(u'all'): for video in unwatched: watched.append(video) unwatched = [] @@ -2780,7 +2821,7 @@ # # Add and delete MythVideo records for played Miro Videos # Add and delete symbolic links to Miro Videos and subdirectories - # Add and delete symbolic links to coverart/Miro icons and Miro screenshots/fanart + # Add and delete symbolic links to coverart/Miro icons and Miro screenshots/fanart # if len(channel_watch_only): # If the user does not want any channels moved to MythVideo exit if channel_watch_only[0].lower() == u'all': @@ -2808,4 +2849,3 @@ main() displayMessage(u"Miro Bridge Processing completed") -