Index: mythtv/programs/mythlcdserver/lcdprocclient.cpp
===================================================================
--- mythtv/programs/mythlcdserver/lcdprocclient.cpp	(revision 19631)
+++ mythtv/programs/mythlcdserver/lcdprocclient.cpp	(working copy)
@@ -30,7 +30,6 @@
 #define LCD_TIME_TIME       5000
 #define LCD_SCROLLLIST_TIME 2000
 
-int lcdStartCol = LCD_START_COL;
 
 LCDProcClient::LCDProcClient(LCDServer *lparent) :
     QObject(NULL, "LCDProcClient")
@@ -56,11 +55,6 @@
     cellWidth = 1;
     cellHeight = 1;
     lcdStartCol = LCD_START_COL;
-    if (lcdWidth < 12)
-        if (lcdHeight == 1)
-           lcdStartCol = 0;
-        else
-           lcdStartCol = 1;
 
     hostname = "";
     port = 13666;
@@ -221,34 +215,36 @@
 void LCDProcClient::setPriority(const QString &screen, PRIORITY priority)
 {
     QString aString;
-
+    int err  = 0;
     aString = "screen_set ";
     aString += screen;
     aString += " priority ";
 
     switch (priority) {
     case TOP: 
-      aString += QString::number (prioTop);
+      aString += prioTop;
       break;
     case URGENT: 
-      aString += QString::number (prioUrgent);
+      aString += prioUrgent;
       break;
     case HIGH:
-      aString += QString::number (prioHigh);
+      aString += prioHigh;
       break;
     case MEDIUM: 
-      aString += QString::number (prioMedium);
+      aString += prioMedium;
       break;
     case LOW:
-      aString += QString::number (prioLow);
+      aString += prioLow;
       break;
     case OFF:
-      aString += QString::number (prioOff);
+      aString += prioOff;
       break;
-
+    default:
+      err = 1;
+      break;
     }
-
-    sendToServer (aString);
+    if (err == 0)
+      sendToServer (aString);
 }
 
 void LCDProcClient::setHeartbeat (const QString &screen, bool onoff) 
@@ -622,7 +618,18 @@
     if (x < 1 || x > 80)
         return;
     else
+    {
         lcdWidth = x;
+        if (lcdWidth < 12)
+        {  
+            if (lcdHeight == 1)
+               lcdStartCol = 0;
+            else
+               lcdStartCol = 1;
+        }
+        else
+            lcdStartCol = LCD_START_COL;
+    }
 }
 
 void LCDProcClient::setHeight(unsigned int x)
@@ -662,22 +669,22 @@
     {
         // Latest CVS versions of LCDd has priorities switched
         pVersion = LCD_VERSION_5;
-        prioTop = 252;
-        prioUrgent = 248;
-        prioHigh = 240;
-        prioMedium = 128;
-        prioLow = 64;
-        prioOff = 0;
+        prioTop = "input";
+        prioUrgent = "alert";
+        prioHigh = "foreground";
+        prioMedium = "info";
+        prioLow = "background";
+        prioOff = "hidden";
     }
     else
     {
         pVersion = LCD_VERSION_4;
-        prioTop = 64;
-        prioUrgent = 128;
-        prioHigh = 240;
-        prioMedium = 248;
-        prioLow = 252;
-        prioOff = 255;
+        prioTop = "64";
+        prioUrgent = "128";
+        prioHigh = "240";
+        prioMedium = "248";
+        prioLow = "252";
+        prioOff = "255";
     }
 }
 
@@ -1193,7 +1200,7 @@
 
     // Write out the app name
     if (lcdHeight > 1)
-    outputCenteredText("Menu", app_name, "topWidget", 1);
+        outputCenteredText("Menu", app_name, "topWidget", 1);
 
     QPtrListIterator<LCDMenuItem> it(*menuItems);
     LCDMenuItem *curItem;
@@ -1278,9 +1285,9 @@
                 {
                     switch (curItem->isChecked())
                     {
-                        case CHECKED: aString += "X "; break;
-                        case UNCHECKED: aString += "O "; break;
-                        case NOTCHECKABLE: aString += "  "; break;
+                        case CHECKED: aString += "X"; break;
+                        case UNCHECKED: aString += "O"; break;
+                        case NOTCHECKABLE: break;
                         default: break;
                     }
                 }
@@ -1347,13 +1354,26 @@
         else
             aString += " ";
 
-        switch (curItem->isChecked())
+        if (lcdStartCol == 1)  // small display -> don't waste space for additional spaces
         {
-            case CHECKED: aString += "X "; break;
-            case UNCHECKED: aString += "O "; break;
-            case NOTCHECKABLE: aString += "  "; break;
-            default: break;
+            switch (curItem->isChecked())
+            {
+                case CHECKED: aString += "X"; break;
+                case UNCHECKED: aString += "O"; break;
+                case NOTCHECKABLE: aString += ""; break;
+                default: break;
+            }
         }
+        else if (lcdStartCol != 0)
+        {
+            switch (curItem->isChecked())
+            {
+                case CHECKED: aString += "X "; break;
+                case UNCHECKED: aString += "O "; break;
+                case NOTCHECKABLE: aString += "  "; break;
+                default: break;
+            }
+        }
 
         aString += curItem->ItemName().left(lcdWidth - lcdStartCol) + "\"";
         sendToServer(aString);
@@ -1470,26 +1490,26 @@
 
                 if (lcdHeight == 2)
                 {
-                aString  = "widget_set Menu menuWidget1 1 2 \">";
+                    aString  = "widget_set Menu menuWidget1 1 2 \">";
                 }
                 else
                 {
                     aString  = "widget_set Menu menuWidget1 1 1 \"";
                 }
 
-                if (lcdWidth < 12)
+                if (lcdStartCol == 1)  // small display -> don't waste space for additional spaces
                 {
-                    switch(curItem->isChecked())
+                    switch (curItem->isChecked())
                     {
                         case CHECKED: aString += "X"; break;
                         case UNCHECKED: aString += "O"; break;
-                        case NOTCHECKABLE: aString += ""; break;
+                        case NOTCHECKABLE: break;
                         default: break;
                     }
                 }
-                else
+                else if (lcdStartCol != 0)
                 {
-                    switch(curItem->isChecked())
+                    switch (curItem->isChecked())
                     {
                         case CHECKED: aString += "X "; break;
                         case UNCHECKED: aString += "O "; break;
Index: mythtv/programs/mythlcdserver/lcdprocclient.h
===================================================================
--- mythtv/programs/mythlcdserver/lcdprocclient.h	(revision 19631)
+++ mythtv/programs/mythlcdserver/lcdprocclient.h	(working copy)
@@ -150,17 +150,18 @@
     void setVersion(const QString &, const QString &);
     void describeServer();
 
-    unsigned int prioTop;
-    unsigned int prioUrgent;
-    unsigned int prioHigh;
-    unsigned int prioMedium;
-    unsigned int prioLow;
-    unsigned int prioOff;
+    QString  prioTop;
+    QString  prioUrgent;
+    QString  prioHigh;
+    QString  prioMedium;
+    QString  prioLow;
+    QString  prioOff;
 
     unsigned int lcdWidth;
     unsigned int lcdHeight;
     unsigned int cellWidth;
     unsigned int cellHeight;
+    unsigned int lcdStartCol;
 
     QString serverVersion;
     QString protocolVersion;