Ticket #4885: osd.rtl.v5.patch

mythtv/libs/libmythtv/osdlistbtntype.cpp

@@ -65 +65 @@
     m_hmult        = (hmult == 0.0f) ? 1.0f : hmult;
     m_unbiasedarea = unbias(area,      wmult, hmult);
     m_unbiasedsize = unbias(levelsize, wmult, hmult);
+
+    if (gContext->GetLanguage()=="he")
+        m_isRtl = true;
+    else
+        m_isRtl = false;
 }
 
 OSDListTreeType::~OSDListTreeType()
@@ -140 +145 @@
     {
         QString levelname = QString("level%1").arg(i + 1);
         QRect curlevelarea = m_levelsize;
-        curlevelarea.moveBy(m_totalarea.x(), m_totalarea.y());
-        curlevelarea.moveBy((m_levelsize.width() + m_levelspacing) * i, 0);
+        
+// if we are left to right
+        if (false == m_isRtl)
+        {
+                curlevelarea.moveBy(m_totalarea.x(), m_totalarea.y());  
+                curlevelarea.moveBy((m_levelsize.width() + m_levelspacing) * i, 0);
+        }
+        
+// if we are right to left
+        else
+        {
+                curlevelarea.moveBy(m_totalarea.width(), m_totalarea.y());
+                curlevelarea.moveBy( ((-1 - i) * m_levelsize.width()) - m_levelspacing,0);
+        }
 
         OSDListBtnType *newlevel = new OSDListBtnType(
             levelname, curlevelarea, m_wmult, m_hmult, true);
@@ -214 +231 @@
         GetLevel(m_levelnum)->MovePageDown();
         EnterItem();
     }
-    else if (has_action("LEFT", actions) && (m_levelnum > 0))
+    else if (!m_isRtl && has_action("LEFT", actions) && (m_levelnum > 0))
     {
         GetLevel(m_levelnum)->Reset();
         GetLevel(m_levelnum)->SetVisible(false);
@@ -222 +239 @@
         m_levelnum--;
         EnterItem();
     }
-    else if ((has_action("LEFT", actions) && m_arrowAccel) ||
+    else if (m_isRtl && has_action("LEFT",actions))
+        {
+                // Right to left - left acts as select / advance one stage
+                if ((m_levelnum + 1 < m_depth) &&
+                    (currentpos->childCount() > 0))     
+                {
+                        GetLevel(m_levelnum)->SetActive(false);
+                        m_levelnum++;
+                
+                        FillLevelFromTree(currentpos, m_levelnum);
+                        GetLevel(m_levelnum)->SetVisible(true);
+                        EnterItem();
+                }
+                else
+                {
+                        SelectItem();
+                }
+        }       
+    else if ((!m_isRtl &&  has_action("LEFT", actions) && m_arrowAccel) ||
              has_action("ESCAPE",   actions) ||
              has_action("CLEAROSD", actions) ||
              has_action("MENU",     actions))
     {
         m_visible = false;
     }
-    else if (has_action("RIGHT", actions) &&
+    else if (!m_isRtl && has_action("RIGHT", actions) &&
              (m_levelnum + 1 < m_depth) &&
              (currentpos->childCount() > 0))
     {
@@ -240 +275 @@
         GetLevel(m_levelnum)->SetVisible(true);
         EnterItem();
     }
-    else if ((has_action("RIGHT", actions) && m_arrowAccel) ||
+    else if ((!m_isRtl && has_action("RIGHT", actions) && m_arrowAccel) ||
              has_action("SELECT", actions))
     {
         SelectItem();
     }
+    else if ((true ==m_isRtl) && has_action("RIGHT",actions) && (m_levelnum > 0))
+        {
+                GetLevel(m_levelnum)->Reset();
+                GetLevel(m_levelnum)->SetVisible(false);
+        
+                m_levelnum--;
+                EnterItem();
+        }
+
     else
     {
         return false;
@@ -662 +706 @@
     LoadPixmap(m_checkNonePix, "check-empty");
     LoadPixmap(m_checkHalfPix, "check-half");
     LoadPixmap(m_checkFullPix, "check-full");
-    LoadPixmap(m_arrowPix, "arrow");
+    if (gContext->GetLanguage()=="he")
+       LoadPixmap(m_arrowPix, "ltarrow");
+    else
+       LoadPixmap(m_arrowPix, "arrow");
 
     uint itemWidth = (m_rect.width() + 1) & (~1);
 
@@ -751 +798 @@
     if (m_checkable) 
         m_checkRect  = QRect(margin, (height - ch)/2, cw, ch);
 
-    if (m_showArrow) 
-        m_arrowRect  = QRect(width - aw - margin, (height - ah)/2, aw, ah);
+    if (m_showArrow)
+        if (gContext->GetLanguage() == "he")
+                m_arrowRect  = QRect(m_parent->m_contentsRect.x() + margin, (height - ah)/2, aw, ah);
+        else
+                m_arrowRect  = QRect(width - aw - margin, (height - ah)/2, aw, ah);
+        
 
     if (m_pixmap)
     {
@@ -765 +816 @@
     tx += (m_pixmap)    ? m_pixmapRect.width() + margin : 0;
     tw -= (m_checkable) ? m_checkRect.width()  + margin : 0;
     tw -= (m_showArrow) ? m_arrowRect.width()  + margin : 0;
+    
+    if (gContext->GetLanguage()=="he")
+        tx += (m_showArrow) ? m_arrowRect.width()  + margin : 0;
+
     tw -= (m_pixmap)    ? m_pixmapRect.width() + margin : 0;
     m_textRect = QRect(tx, 0, tw, height);
     rtl=new RTL();

mythtv/libs/libmythtv/osdlistbtntype.h

@@ -152 +152 @@
     int       m_levelnum;
     bool      m_visible;
     bool      m_arrowAccel;
+    bool      m_isRtl;
 };
  
 class OSDListBtnType : public OSDType