I have made the following changes intended for : CE:UX:MTF / meegotouch-controlpanelapplets
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/5857 Thank You, Marko Saukko [This message was auto-generated] --- Request # 5857: Messages from BOSS: State: review at 2012-08-17T07:43:11 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: Project:MTF:UX / meegotouch-controlpanelapplets -> CE:UX:MTF / meegotouch-controlpanelapplets changes files: -------------- --- meegotouch-controlpanelapplets.changes +++ meegotouch-controlpanelapplets.changes @@ -0,0 +1,4 @@ +* Thu Aug 09 2012 Kalle Lappalainen <[email protected]> - 0.21.13-1 +- Fixes NEMO#100: Fixed landscape button layout in USB applet +- Added: 0002-Fix-landscape-button-layout-in-usbapplet.patch + new: ---- 0002-Fix-landscape-button-layout-in-usbapplet.patch spec files: ----------- --- meegotouch-controlpanelapplets.spec +++ meegotouch-controlpanelapplets.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.24.1 +# Generated by: spectacle version 0.25 # Name: meegotouch-controlpanelapplets @@ -20,6 +20,7 @@ Patch0: add_ce_sounds_dir.patch Patch1: meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch Patch2: 0001-Fix-tests-build.patch +Patch3: 0002-Fix-landscape-button-layout-in-usbapplet.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(libresourceqt1) @@ -192,6 +193,8 @@ %patch1 -p1 # 0001-Fix-tests-build.patch %patch2 -p1 +# 0002-Fix-landscape-button-layout-in-usbapplet.patch +%patch3 -p1 # >> setup # << setup other changes: -------------- ++++++ 0002-Fix-landscape-button-layout-in-usbapplet.patch (new) --- 0002-Fix-landscape-button-layout-in-usbapplet.patch +++ 0002-Fix-landscape-button-layout-in-usbapplet.patch @@ -0,0 +1,50 @@ +From 87be074d2fbd0745daee97b1f8956fbc6de3f254 Mon Sep 17 00:00:00 2001 +From: Kalle Lappalainen <[email protected]> +Date: Thu, 9 Aug 2012 00:36:55 +0300 +Subject: [PATCH] Fix landscape button layout in usbapplet. + +--- + src/usbapplet/usbview.cpp | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +diff --git a/src/usbapplet/usbview.cpp b/src/usbapplet/usbview.cpp +index e014ca4..2d1dcfd 100644 +--- a/src/usbapplet/usbview.cpp ++++ b/src/usbapplet/usbview.cpp +@@ -336,6 +336,10 @@ UsbView::addButtons () + SYS_STR(usbModeName(m_logic->getDefaultMode ()))); + #endif + ++ MLayout* layout = new MLayout(); ++ MLinearLayoutPolicy* landscapePolicy = new MLinearLayoutPolicy (layout, Qt::Horizontal); ++ MLinearLayoutPolicy* portraitPolicy = new MLinearLayoutPolicy (layout, Qt::Vertical); ++ + for (int n = 0; n < UsbModeLastMode; ++n) { + MButton *button; + +@@ -349,8 +353,8 @@ UsbView::addButtons () + button->setStyleName (usbModeButtonStyle(UsbModeType(n))); + button->setViewType (MButton::groupType); + button->setCheckable (true); +- m_policy->addItem (button); +- m_policy->setAlignment (button, Qt::AlignCenter); ++ landscapePolicy->addItem (button); ++ portraitPolicy->addItem (button); + + m_Buttons.append (button); + +@@ -361,6 +365,11 @@ UsbView::addButtons () + connect (button, SIGNAL (toggled(bool)), + this, SLOT(buttonToggled (bool))); + } ++ ++ layout->setLandscapePolicy (landscapePolicy); ++ layout->setPortraitPolicy (portraitPolicy); ++ m_policy->addItem (layout); ++ m_policy->setAlignment (layout, Qt::AlignCenter); + } + + QString +-- +1.7.9.5 + ++++++ meegotouch-controlpanelapplets.yaml --- meegotouch-controlpanelapplets.yaml +++ meegotouch-controlpanelapplets.yaml @@ -11,6 +11,7 @@ - add_ce_sounds_dir.patch - meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch - 0001-Fix-tests-build.patch + - 0002-Fix-landscape-button-layout-in-usbapplet.patch Description: | Various Controlpanel applets for MeeGo Touch environment: - Offline switcher
