Index: mythweather/mythweather/weather.cpp
===================================================================
--- mythweather/mythweather/weather.cpp	(revision 8999)
+++ mythweather/mythweather/weather.cpp	(working copy)
@@ -827,19 +827,8 @@
     // locale starts with "US" or locale is a zip code
     if (locale.left(2) == "US" || locale.left(5).contains(QRegExp("[0-9]{5,5}")) > 0)
     {
-        // update page to show US radar images
-        if (AnimatedImage)
-        {
-            AnimatedImage->SetSize(765, 500);
-            AnimatedImage->SetSkip(0, 58);
-        }
-
         if (container)
         {
-            texttype = (UITextType *) container->GetType("header5");
-            if (texttype)
-                texttype->SetText(tr("doppler radar"));
-
             for (int x = 1; x <= 9; x++)
             {
                 texttype = (UITextType *) container->GetType(QString("maplabel-%1")
@@ -855,37 +844,12 @@
                 if (texttype)
                     texttype->hide();
             }
-
-            imagetype = (UIImageType *) container->GetType("logo");
-            if (imagetype)
-            {
-                imagetype->SetSize(80, 60);
-                imagetype->LoadImage();
-            }
-
-            imagetype = (UIImageType *) container->GetType("radarbk");
-            if (imagetype)
-            {
-                imagetype->SetImage("mw-map.png");
-                imagetype->LoadImage();
-            }
         }
     }
     else
     {
-       // show satellite images
-       if (AnimatedImage)
-        {
-            AnimatedImage->SetSize(765, 500 - 58);
-            AnimatedImage->SetSkip(0, 0);
-        }
-
         if (container)
         {
-            texttype = (UITextType *) container->GetType("header5");
-            if (texttype)
-                texttype->SetText(tr("satellite image"));
-
             for (int x = 1; x <= 9; x++)
             {
                 texttype = (UITextType *) container->GetType(QString("maplabel-%1")
@@ -902,13 +866,6 @@
                     texttype->show();
             }
 
-            imagetype = (UIImageType *) container->GetType("logo");
-            if (imagetype)
-            {
-                imagetype->SetSize(100, 80);
-                imagetype->LoadImage();
-            }
-
             imagetype = (UIImageType *) container->GetType("radarbk");
             if (imagetype)
             {
Index: mythvideo/mythvideo/globalsettings.cpp
===================================================================
--- mythvideo/mythvideo/globalsettings.cpp	(revision 8999)
+++ mythvideo/mythvideo/globalsettings.cpp	(working copy)
@@ -215,7 +215,7 @@
 
 static HostSpinBox *VideoGalleryColumns()
 {
-    HostSpinBox *gc = new HostSpinBox("VideoGalleryColsPerPage", 2, 5, 1);
+    HostSpinBox *gc = new HostSpinBox("VideoGalleryColsPerPage", 2, 6, 1);
     gc->setLabel(QObject::tr("Columns to display"));
     gc->setValue(4);
     return gc;
Index: mythvideo/mythvideo/videomanager.cpp
===================================================================
--- mythvideo/mythvideo/videomanager.cpp	(revision 8999)
+++ mythvideo/mythvideo/videomanager.cpp	(working copy)
@@ -647,13 +647,18 @@
 
 void VideoManager::grayOut(QPainter *tmp)
 {
-   int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
-   if (transparentFlag == 0)
-       tmp->fillRect(QRect(QPoint(0, 0), size()), QBrush(QColor(10, 10, 10), 
-                     Dense4Pattern));
-   else if (transparentFlag == 1)
-       tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, (int)(800*wmult), 
-                       (int)(600*hmult));
+    int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
+    if (transparentFlag == 0)
+        tmp->fillRect(QRect(QPoint(0, 0), size()), QBrush(QColor(10, 10, 10),
+            Dense4Pattern));
+    else if (transparentFlag == 1)
+    {
+        int ww, hh;
+        float wm, hm;
+
+        gContext->GetScreenSettings(ww, wm, hh, hm);
+        tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, ww, hh);
+    }
 }
 
 void VideoManager::paintEvent(QPaintEvent *e)
@@ -1809,3 +1814,5 @@
     RefreshMovieList();
     update(infoRect);
 }
+
+/* vim: set sw=4 expandtab: */
Index: mythvideo/mythvideo/videobrowser.cpp
===================================================================
--- mythvideo/mythvideo/videobrowser.cpp	(revision 8999)
+++ mythvideo/mythvideo/videobrowser.cpp	(working copy)
@@ -165,11 +165,17 @@
 
 void VideoBrowser::grayOut(QPainter *tmp)
 {
-   int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
-   if (transparentFlag == 0)
-       tmp->fillRect(QRect(QPoint(0, 0), size()), QBrush(QColor(10, 10, 10), Dense4Pattern));
-   else if (transparentFlag == 1)
-       tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, (int)(800*wmult), (int)(600*hmult));
+    int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
+    if (transparentFlag == 0)
+        tmp->fillRect(QRect(QPoint(0, 0), size()), QBrush(QColor(10, 10, 10), Dense4Pattern));
+    else if (transparentFlag == 1)
+    {
+        int ww, hh;
+        float wm, hm;
+
+        gContext->GetScreenSettings(ww, wm, hh, hm);
+        tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, ww, hh);
+    }
 }
 
 void VideoBrowser::paintEvent(QPaintEvent *e)
Index: mythvideo/mythvideo/videoselected.cpp
===================================================================
--- mythvideo/mythvideo/videoselected.cpp	(revision 8999)
+++ mythvideo/mythvideo/videoselected.cpp	(working copy)
@@ -126,11 +126,17 @@
 
 void VideoSelected::grayOut(QPainter *tmp)
 {
-   int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
-   if (transparentFlag == 0)
+    int transparentFlag = gContext->GetNumSetting("PlayBoxShading", 0);
+    if (transparentFlag == 0)
        tmp->fillRect(QRect(QPoint(0, 0), size()), QBrush(QColor(10, 10, 10), Dense4Pattern));
-   else if (transparentFlag == 1)
-       tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, (int)(800*wmult), (int)(600*hmult));
+    else if (transparentFlag == 1)
+    {
+        int ww, hh;
+        float wm, hm;
+
+        gContext->GetScreenSettings(ww, wm, hh, hm);
+        tmp->drawPixmap(0, 0, *bgTransBackup, 0, 0, ww, hh);
+    }
 }
 
 void VideoSelected::paintEvent(QPaintEvent *e)
@@ -478,3 +484,5 @@
     m_state = 1;
     update(fullRect);
 }
+
+/* vim: set sw=4 expandtab: */