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/themeeditor | |
parent | db1b823ac3ea524d80a83876c9c99593d29f3817 (diff) | |
download | rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.tar.gz rockbox-71b561e3dfb07edf3ccaee7f119167d6ec681a50.zip |
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/themeeditor')
-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 fda2bddbe5..d87cd70f2c 100644 --- a/utils/themeeditor/gui/devicestate.cpp +++ b/utils/themeeditor/gui/devicestate.cpp | |||
@@ -46,7 +46,6 @@ DeviceState::DeviceState(QWidget *parent) : | |||
46 | 46 | ||
47 | /* Loading the tabs */ | 47 | /* Loading the tabs */ |
48 | QScrollArea* currentArea = 0; | 48 | QScrollArea* currentArea = 0; |
49 | QHBoxLayout* subLayout; | ||
50 | QWidget* panel; | 49 | QWidget* panel; |
51 | 50 | ||
52 | QFile fin(":/resources/deviceoptions"); | 51 | QFile fin(":/resources/deviceoptions"); |
diff --git a/utils/themeeditor/models/parsetreenode.cpp b/utils/themeeditor/models/parsetreenode.cpp index 1ce3d098b9..25cae58762 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) | |||
616 | /* %ar */ | 616 | /* %ar */ |
617 | viewport->alignText(RBViewport::Right); | 617 | viewport->alignText(RBViewport::Right); |
618 | return true; | 618 | return true; |
619 | |||
620 | case 'x': | ||
621 | /* %ax */ | ||
622 | return true; | ||
623 | |||
624 | case 'L': | ||
625 | /* %aL */ | ||
626 | if(info.device()->data("rtl").toBool()) | ||
627 | viewport->alignText(RBViewport::Right); | ||
628 | else | ||
629 | viewport->alignText(RBViewport::Left); | ||
630 | return true; | ||
631 | |||
632 | case 'R': | ||
633 | /* %aR */ | ||
634 | if(info.device()->data("rtl").toBool()) | ||
635 | viewport->alignText(RBViewport::Left); | ||
636 | else | ||
637 | viewport->alignText(RBViewport::Right); | ||
638 | return true; | ||
619 | } | 639 | } |
620 | 640 | ||
621 | return false; | 641 | return false; |
@@ -811,7 +831,7 @@ bool ParseTreeNode::execTag(const RBRenderInfo& info, RBViewport* viewport) | |||
811 | case '\0': | 831 | case '\0': |
812 | /* %X */ | 832 | /* %X */ |
813 | filename = QString(element->params[0].data.text); | 833 | filename = QString(element->params[0].data.text); |
814 | if(info.sbsScreen()) | 834 | if(info.sbsScreen() && info.screen()->parentItem()) |
815 | info.sbsScreen()->setBackdrop(filename); | 835 | info.sbsScreen()->setBackdrop(filename); |
816 | else | 836 | else |
817 | info.screen()->setBackdrop(filename); | 837 | info.screen()->setBackdrop(filename); |
diff --git a/utils/themeeditor/resources/deviceoptions b/utils/themeeditor/resources/deviceoptions index d7dddb4c13..fa7885d9a5 100644 --- a/utils/themeeditor/resources/deviceoptions +++ b/utils/themeeditor/resources/deviceoptions | |||
@@ -37,6 +37,7 @@ remotewidth ; Remote Width ; spin(0,800) ; 100 | |||
37 | remoteheight ; Remote Height ; spin(0,800); 50 | 37 | remoteheight ; Remote Height ; spin(0,800); 50 |
38 | showviewports ; Show Viewports ; check ; false | 38 | showviewports ; Show Viewports ; check ; false |
39 | rendersbs ; Render SBS If Available ; check ; true | 39 | rendersbs ; Render SBS If Available ; check ; true |
40 | rtl ; Right-To-Left Language ; check ; false | ||
40 | 41 | ||
41 | [ID3 Info] | 42 | [ID3 Info] |
42 | ia ; Artist ; text ; Current Artist | 43 | ia ; Artist ; text ; Current Artist |