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/6692 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6692: Messages from BOSS: State: review at 2012-09-06T09:21:48 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 @@ +* Tue Sep 04 2012 Philippe De Swert <[email protected]> - 0.21.13-2 +- Remove ovi-suite, add developer, MTP and charging only +- Remove restriction that the cable needs to be connected to change the configuration + new: ---- 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch 0005-Control-panel-with-charging-only-option-and-visual-f.patch spec files: ----------- --- meegotouch-controlpanelapplets.spec +++ meegotouch-controlpanelapplets.spec @@ -21,6 +21,8 @@ Patch1: meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch Patch2: 0001-Fix-tests-build.patch Patch3: 0002-Fix-landscape-button-layout-in-usbapplet.patch +Patch4: 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch +Patch5: 0005-Control-panel-with-charging-only-option-and-visual-f.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(libresourceqt1) @@ -195,6 +197,10 @@ %patch2 -p1 # 0002-Fix-landscape-button-layout-in-usbapplet.patch %patch3 -p1 +# 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch +%patch4 -p1 +# 0005-Control-panel-with-charging-only-option-and-visual-f.patch +%patch5 -p1 # >> setup # << setup other changes: -------------- ++++++ 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch (new) --- 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch +++ 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch @@ -0,0 +1,176 @@ +From 7b6001a4aa4653bc9747af9c3497bb55c1e830dd Mon Sep 17 00:00:00 2001 +From: Philippe De Swert <[email protected]> +Date: Mon, 3 Sep 2012 16:00:17 +0300 +Subject: [PATCH] Remove ovi-suite, add MTP mode and developer mode to USB + settings dialog + +Signed-off-by: Philippe De Swert <[email protected]> +--- + src/usbapplet/usbview.cpp | 63 +++++++++++------------------ + src/usbapplet/usbview.h | 8 ++-- + tests/stubs/displaybusinesslogic_stub.cpp | 2 +- + tests/stubs/qmusbmode.h | 4 +- + 4 files changed, 30 insertions(+), 47 deletions(-) + +diff --git a/src/usbapplet/usbview.cpp b/src/usbapplet/usbview.cpp +index 2d1dcfd..e186b89 100644 +--- a/src/usbapplet/usbview.cpp ++++ b/src/usbapplet/usbview.cpp +@@ -45,18 +45,11 @@ using namespace MeeGo; + + #define qtTrIdShort(id) qtTrId(id).split(QChar(0x9c)).last() + +-#ifndef MEEGO +-#define VALID_USB_MODE(modeType) \ +- ((modeType == UsbModeAsk || \ +- modeType == UsbModeMassStorage || \ +- modeType == UsbModeOviSuite || \ +- modeType == UsbModeSDK)) +-#else + #define VALID_USB_MODE(modeType) \ + ((modeType == UsbModeAsk || \ + modeType == UsbModeMassStorage || \ +- modeType == UsbModeOviSuite)) +-#endif ++ modeType == UsbModeMTP || \ ++ modeType == UsbModeDeveloper )) + + static const QString developerModeKey ("/Meego/System/DeveloperMode"); + static const QString usbModeKey ("/MeeGo/System/UsbMode"); +@@ -65,10 +58,8 @@ static const QString developerModeName ("windows_network"); + static QmUSBMode::Mode usbModes[] = { + QmUSBMode::Ask, + QmUSBMode::MassStorage, +- QmUSBMode::OviSuite, +-#ifndef MEEGO +- QmUSBMode::SDK, +-#endif ++ QmUSBMode::MTP, ++ QmUSBMode::Developer, + }; + + inline int +@@ -104,18 +95,18 @@ usbModeName (QmUSBMode::Mode mode) + case QmUSBMode::ChargingOnly: + return "QmUSBMode::ChargingOnly"; + +- case QmUSBMode::OviSuite: +- return "QmUSBMode::OviSuite"; ++ case QmUSBMode::Developer: ++ return "QmUSBMode::Developer"; + + case QmUSBMode::ModeRequest: + return "QmUSBMode::ModeRequest"; + + case QmUSBMode::Ask: + return "QmUSBMode::Ask"; +-#ifndef MEEGO +- case QmUSBMode::SDK: +- return "QmUSBMode::SDK"; +-#endif ++ ++ case QmUSBMode::MTP: ++ return "QmUSBMode::MTP"; ++ + case QmUSBMode::Undefined: + return "QmUSBMode::Undefined"; + +@@ -343,9 +334,6 @@ UsbView::addButtons () + for (int n = 0; n < UsbModeLastMode; ++n) { + MButton *button; + +- if (n == UsbModeSDK && !m_DeveloperMode) +- continue; +- + SYS_DEBUG ("*** n = %d", n); + button = new MButton (usbModeUIString(UsbModeType(n))); + +@@ -387,15 +375,13 @@ UsbView::currentText () const + return qtTrId ("qtn_usb_storage_active"); + break; + +- case QmUSBMode::OviSuite: +- //% "Sync and connect in use" +- return qtTrId ("qtn_usb_sync_active"); ++ case QmUSBMode::Developer: ++ //% "Developer mode in use" ++ return qtTrId ("Developer mode active"); + break; +-#ifndef MEEGO +- case QmUSBMode::SDK: +- return "SDK"; ++ case QmUSBMode::MTP: ++ return "MTP"; + break; +-#endif + case QmUSBMode::ModeRequest: + // Seems that the ChargingOnly comes late (30 sec or so), and we can + // show the chargingonly early. +@@ -532,12 +518,12 @@ UsbView::usbModeUIString ( + //% "Mass storage" + return qtTrId("qtn_usb_mass_storage"); + +- case UsbModeOviSuite: +- //% "Sync and connect" +- return qtTrId("qtn_usb_ovi_suite"); ++ case UsbModeDeveloper: ++ //% "Developer" ++ return qtTrId("Developer"); + +- case UsbModeSDK: +- return "SDK"; ++ case UsbModeMTP: ++ return "MTP"; + + default: + SYS_WARNING ("Invalid USB mode: %d", type); +@@ -557,13 +543,10 @@ UsbView::usbModeButtonStyle ( + case UsbModeMassStorage: + return "CommonVerticalCenterSplitButtonInverted"; + +- case UsbModeOviSuite: +- if (m_DeveloperMode) +- return "CommonVerticalCenterSplitButtonInverted"; +- +- return "CommonBottomSplitButtonInverted"; ++ case UsbModeMTP: ++ return "CommonVerticalCenterSplitButtonInverted"; + +- case UsbModeSDK: ++ case UsbModeDeveloper: + return "CommonBottomSplitButtonInverted"; + + default: +diff --git a/src/usbapplet/usbview.h b/src/usbapplet/usbview.h +index 3198cb8..e9844c8 100644 +--- a/src/usbapplet/usbview.h ++++ b/src/usbapplet/usbview.h +@@ -52,8 +50,8 @@ private: + typedef enum { + UsbModeAsk = 0, + UsbModeMassStorage = 1, +- UsbModeOviSuite = 2, +- UsbModeSDK = 3, ++ UsbModeDeveloper = 2, ++ UsbModeMTP = 3, + UsbModeLastMode = 4, + } UsbModeType; + +diff --git a/tests/stubs/qmusbmode.h b/tests/stubs/qmusbmode.h +index 259a5ff..7527755 100644 +--- a/tests/stubs/qmusbmode.h ++++ b/tests/stubs/qmusbmode.h +@@ -42,7 +42,9 @@ namespace MeeGo + ModeRequest, + Ask, + Undefined, +- SDK ++ SDK, ++ MTP, ++ Developer + }; + + QmUSBMode (QObject *parent = 0); +-- +1.7.10.4 + ++++++ 0005-Control-panel-with-charging-only-option-and-visual-f.patch (new) --- 0005-Control-panel-with-charging-only-option-and-visual-f.patch +++ 0005-Control-panel-with-charging-only-option-and-visual-f.patch @@ -0,0 +1,148 @@ +From 4da1b3075b735440dccb7a747e0eb2c29bf8b5a7 Mon Sep 17 00:00:00 2001 +From: Philippe De Swert <[email protected]> +Date: Tue, 4 Sep 2012 14:00:20 +0300 +Subject: [PATCH] Control panel with charging only option and visual fixes + +Signed-off-by: Philippe De Swert <[email protected]> +--- + src/usbapplet/usbview.cpp | 41 ++++++++++++++++++++--------------------- + src/usbapplet/usbview.h | 3 ++- + 2 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/src/usbapplet/usbview.cpp b/src/usbapplet/usbview.cpp +index e186b89..3afd5ca 100644 +--- a/src/usbapplet/usbview.cpp ++++ b/src/usbapplet/usbview.cpp +@@ -48,25 +48,25 @@ using namespace MeeGo; + #define VALID_USB_MODE(modeType) \ + ((modeType == UsbModeAsk || \ + modeType == UsbModeMassStorage || \ ++ modeType == UsbModeDeveloper || \ + modeType == UsbModeMTP || \ +- modeType == UsbModeDeveloper )) ++ modeType == UsbModeCharging )) + +-static const QString developerModeKey ("/Meego/System/DeveloperMode"); + static const QString usbModeKey ("/MeeGo/System/UsbMode"); +-static const QString developerModeName ("windows_network"); + + static QmUSBMode::Mode usbModes[] = { + QmUSBMode::Ask, + QmUSBMode::MassStorage, +- QmUSBMode::MTP, + QmUSBMode::Developer, ++ QmUSBMode::MTP, ++ QmUSBMode::ChargingOnly, + }; + + inline int + usbModeIndex (QmUSBMode::Mode mode) + { + int ret = 0; +- for (int i = 0; i < 4; i++) ++ for (int i = 0; i < 5; i++) + if (usbModes[i] == mode) + { + ret = i; +@@ -122,14 +122,8 @@ UsbView::UsbView (MeeGo::QmUSBMode *logic) : + DcpStylableWidget (0), + m_logic (logic), + m_policy (0), +- m_infoLabel (0), +- m_DeveloperMode (false) ++ m_infoLabel (0) + { +- MGConfItem developerModeItem (developerModeKey); +- +-#ifndef MEEGO +- m_DeveloperMode = developerModeItem.value().toBool(); +-#endif + setObjectName ("UsbView"); + initWidget (); + connect (m_logic, SIGNAL (modeChanged (MeeGo::QmUSBMode::Mode)), +@@ -144,12 +138,7 @@ UsbView::UsbView (void *logic) : + DcpStylableWidget (0), + m_policy (0), + m_infoLabel (0), +- m_DeveloperMode (false) + { +- MGConfItem developerModeItem (developerModeKey); +-#ifndef MEEGO +- m_DeveloperMode = developerModeItem.value().toBool(); +-#endif + setObjectName ("UsbView"); + initWidget (); + } +@@ -217,10 +206,11 @@ UsbView::usbModeActivated (int idx) + /* + * Do nothing if we just tapped on the + * currently selected one... +- */ + if (m_logic->getDefaultMode() == usbModes[idx]) + return; ++ */ + ++#ifdef NOCHANGE_WHEN_CONNECTED + QmUSBMode::Mode active = m_logic->getMode (); + + /* +@@ -246,13 +236,16 @@ UsbView::usbModeActivated (int idx) + MSceneWindow::DestroyWhenDone); + return; + } ++#endif /* NOCHANGE_WHEN_CONNECTED */ + + QmUSBMode::Mode newmode = usbModes[idx]; + + SYS_DEBUG ("Setting USB mode/default mode to %s", + SYS_STR(usbModeName(newmode))); ++ + m_logic->setDefaultMode (newmode); +- m_logic->setMode (newmode); ++ /* if we want to switch mode immediately we can use this */ ++ // m_logic->setMode (newmode); + #endif + } + +@@ -525,6 +518,9 @@ UsbView::usbModeUIString ( + case UsbModeMTP: + return "MTP"; + ++ case UsbModeCharging: ++ return ("Charging only"); ++ + default: + SYS_WARNING ("Invalid USB mode: %d", type); + } +@@ -543,10 +539,13 @@ UsbView::usbModeButtonStyle ( + case UsbModeMassStorage: + return "CommonVerticalCenterSplitButtonInverted"; + ++ case UsbModeDeveloper: ++ return "CommonVerticalCenterSplitButtonInverted"; ++ + case UsbModeMTP: + return "CommonVerticalCenterSplitButtonInverted"; + +- case UsbModeDeveloper: ++ case UsbModeCharging: + return "CommonBottomSplitButtonInverted"; + + default: +diff --git a/src/usbapplet/usbview.h b/src/usbapplet/usbview.h +index e9844c8..d2d6102 100644 +--- a/src/usbapplet/usbview.h ++++ b/src/usbapplet/usbview.h +@@ -52,7 +52,8 @@ private: + UsbModeMassStorage = 1, + UsbModeDeveloper = 2, + UsbModeMTP = 3, +- UsbModeLastMode = 4, ++ UsbModeCharging = 4, ++ UsbModeLastMode = 5, + } UsbModeType; + + void initWidget (); +-- +1.7.10.4 + ++++++ meegotouch-controlpanelapplets.yaml --- meegotouch-controlpanelapplets.yaml +++ meegotouch-controlpanelapplets.yaml @@ -12,6 +12,8 @@ - meegotouch-controlpanelapplets-0.21.5-wallpaperapplet-category.patch - 0001-Fix-tests-build.patch - 0002-Fix-landscape-button-layout-in-usbapplet.patch + - 0004-Remove-ovi-suite-add-MTP-mode-and-developer-mode-to-.patch + - 0005-Control-panel-with-charging-only-option-and-visual-f.patch Description: | Various Controlpanel applets for MeeGo Touch environment: - Offline switcher
