diff options
| author | Robert Bieber <robby@bieberphoto.com> | 2010-07-05 19:02:40 +0000 |
|---|---|---|
| committer | Robert Bieber <robby@bieberphoto.com> | 2010-07-05 19:02:40 +0000 |
| commit | 71b561e3dfb07edf3ccaee7f119167d6ec681a50 (patch) | |
| tree | eb36b33f08c658388a0e9dccd95a0a201ea992d5 /utils | |
| parent | db1b823ac3ea524d80a83876c9c99593d29f3817 (diff) | |
| download | rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.zip rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.tar.gz rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.tar.bz2 rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.tar.xz | |
Theme Editor: Fixed bug that caused WPS skins without SBS parents not to render their backdrops correctly. Added support for RTL-dependant text alignment
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27295 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/themeeditor/gui/devicestate.cpp | 1 | ||||
| -rw-r--r-- | utils/themeeditor/models/parsetreenode.cpp | 22 | ||||
| -rw-r--r-- | utils/themeeditor/resources/deviceoptions | 1 |
3 files changed, 22 insertions, 2 deletions
diff --git a/utils/themeeditor/gui/devicestate.cpp b/utils/themeeditor/gui/devicestate.cpp index fda2bdd..d87cd70 100644 --- a/utils/themeeditor/gui/devicestate.cpp +++ b/utils/themeeditor/gui/devicestate.cpp @@ -46,7 +46,6 @@ DeviceState::DeviceState(QWidget *parent) : /* Loading the tabs */ QScrollArea* currentArea = 0; - QHBoxLayout* subLayout; QWidget* panel; QFile fin(":/resources/deviceoptions"); diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 1ce3d09..25cae58 100644 --- a/utils/themeeditor/models/parsetreenode.cpp +++ b/utils/themeeditor/models/parsetreenode.cpp @@ -616,6 +616,26 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport) /* %ar */ viewport->alignText(RBViewport::Right); return true; + + case 'x': + /* %ax */ + return true; + + case 'L': + /* %aL */ + if(info.device()->data("rtl").toBool()) + viewport->alignText(RBViewport::Right); + else + viewport->alignText(RBViewport::Left); + return true; + + case 'R': + /* %aR */ + if(info.device()->data("rtl").toBool()) + viewport->alignText(RBViewport::Left); + else + viewport->alignText(RBViewport::Right); + return true; } return false; @@ -811,7 +831,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport) case '\0': /* %X */ filename = QString(element->params[0].data.text); - if(info.sbsScreen()) + if(info.sbsScreen() && info.screen()->parentItem()) info.sbsScreen()->setBackdrop(filename); else info.screen()->setBackdrop(filename); diff --git a/utils/themeeditor/resources/deviceoptions b/utils/themeeditor/resources/deviceoptions index d7dddb4..fa7885d 100644 --- a/utils/themeeditor/resources/deviceoptions +++ b/utils/themeeditor/resources/deviceoptions @@ -37,6 +37,7 @@ remotewidth ; Remote Width ; spin(0,800) ; 100 remoteheight ; Remote Height ; spin(0,800); 50 showviewports ; Show Viewports ; check ; false rendersbs ; Render SBS If Available ; check ; true +rtl ; Right-To-Left Language ; check ; false [ID3 Info] ia ; Artist ; text ; Current Artist |