I have made the following changes intended for : CE:UX:MTF / meegotouch-systemui CE:UX:MTF / usb-moded CE:UX:MTF / usb-moded-config-n900 CE:UX:MTF / usb-moded-config-n950-n9
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/6017 Thank You, Marko Saukko [This message was auto-generated] --- Request # 6017: Messages from BOSS: State: review at 2012-08-22T07:39:30 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-systemui -> CE:UX:MTF / meegotouch-systemui changes files: -------------- --- meegotouch-systemui.changes +++ meegotouch-systemui.changes @@ -0,0 +1,4 @@ +* Tue Aug 21 2012 Philippe De Swert <[email protected]> - 1.3.2-2 +- Change USB dialog to support MTP and developer mode. Remove Nokia + specific ovi-suite mode + new: ---- systemui-show-Developer-MTP-mode.patch spec files: ----------- --- meegotouch-systemui.spec +++ meegotouch-systemui.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-systemui @@ -13,7 +13,7 @@ Release: 1 Group: System/Desktop License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-systemui +URL: https://github.com/nemomobile/meegotouch-systemui Source0: meegotouch-%{name}-%{version}-1.tar.gz Source1: boss.conf Source2: meegotouch-systemui.desktop @@ -35,6 +35,7 @@ Patch13: NEMO_12_fix_statusmenu_top.patch Patch14: meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch Patch15: Add-shutdown-dialog-to-status-indicator-menu.patch +Patch16: systemui-show-Developer-MTP-mode.patch Requires: contextkit-meego-cellular Requires: contextkit-meego-internet BuildRequires: pkgconfig(libpulse) @@ -165,7 +166,8 @@ %patch14 -p1 # Add-shutdown-dialog-to-status-indicator-menu.patch %patch15 -p1 - +# systemui-show-Developer-MTP-mode.patch +%patch16 -p1 # >> setup # << setup other changes: -------------- ++++++ meegotouch-systemui.yaml --- meegotouch-systemui.yaml +++ meegotouch-systemui.yaml @@ -4,7 +4,7 @@ Release: 1 Group: System/Desktop License: LGPLv2.1 -URL: http://meego.gitorious.org/meegotouch/meegotouch-systemui +URL: https://github.com/nemomobile/meegotouch-systemui Sources: - "meegotouch-%{name}-%{version}-1.tar.gz" - "boss.conf" @@ -28,6 +28,7 @@ - NEMO_12_fix_statusmenu_top.patch - meegotouch-systemui-1.2.20-1-add-missing-libs-for-linking.patch - Add-shutdown-dialog-to-status-indicator-menu.patch + - systemui-show-Developer-MTP-mode.patch Description: | This package contains the system UI daemon. PkgBR: ++++++ systemui-show-Developer-MTP-mode.patch (new) --- systemui-show-Developer-MTP-mode.patch +++ systemui-show-Developer-MTP-mode.patch @@ -0,0 +1,464 @@ +From 05745b12fa9b634be9bfc71ba84c4b610b174173 Mon Sep 17 00:00:00 2001 +From: Philippe De Swert <[email protected]> +Date: Tue, 21 Aug 2012 15:57:41 +0300 +Subject: [PATCH] Show developer and MTP mode, stop showing Nokia ovi-suite + +Signed-off-by: Philippe De Swert <[email protected]> +--- + src/systemui/usbui.cpp | 82 ++++++++++++++++++++++++++++++++++++++++--- + src/systemui/usbui.h | 31 +++++++++++++--- + tests/stubs/usbui_stub.h | 56 ++++++++++++++++++++--------- + tests/ut_usbui/ut_usbui.cpp | 15 ++++++-- + tests/ut_usbui/ut_usbui.h | 2 ++ + 5 files changed, 158 insertions(+), 28 deletions(-) + +diff --git a/src/systemui/usbui.cpp b/src/systemui/usbui.cpp +index ba48799..9ef6292 100644 +--- a/src/systemui/usbui.cpp ++++ b/src/systemui/usbui.cpp +@@ -49,8 +49,13 @@ UsbUi::UsbUi(QObject *parent) : MDialog(), + layout(new QGraphicsLinearLayout(Qt::Vertical)), + chargingLabel(new MLabel()), + massStorageItem(new MBasicListItem(MBasicListItem::SingleTitle)), ++#ifdef NOKIA + oviSuiteItem(new MBasicListItem(MBasicListItem::SingleTitle)), + sdkItem(new MBasicListItem(MBasicListItem::SingleTitle)) ++#endif /* NOKIA */ ++ MTPItem(new MBasicListItem(MBasicListItem::SingleTitle)), ++ DeveloperItem(new MBasicListItem(MBasicListItem::SingleTitle)) ++ + { + setParent(parent); + setModal(false); +@@ -92,6 +97,7 @@ UsbUi::UsbUi(QObject *parent) : MDialog(), + connect(massStorageItem, SIGNAL(clicked()), this, SLOT(setMassStorageMode())); + layout->addItem(massStorageItem); + ++#ifdef NOKIA + oviSuiteItem->setStyleName("CommonSmallPanelInverted"); + connect(oviSuiteItem, SIGNAL(clicked()), this, SLOT(setOviSuiteMode())); + layout->addItem(oviSuiteItem); +@@ -100,7 +106,39 @@ UsbUi::UsbUi(QObject *parent) : MDialog(), + connect(sdkItem, SIGNAL(clicked()), this, SLOT(setSDKMode())); + connect(developerMode, SIGNAL(valueChanged()), this, SLOT(updateSDKItemVisibility())); + updateSDKItemVisibility(); ++#endif /* NOKIA */ + ++ MTPItem->setStyleName("CommonSmallPanelInverted"); ++ connect(MTPItem, SIGNAL(clicked()), this, SLOT(setMTPMode())); ++ layout->addItem(MTPItem); ++ ++ DeveloperItem->setStyleName("CommonSmallPanelInverted"); ++ connect(DeveloperItem, SIGNAL(clicked()), this, SLOT(setDeveloperMode())); ++ layout->addItem(DeveloperItem); ++ ++ MWidget *centralWidget = new MWidget; ++ centralWidget->setLayout(layout); ++ setCentralWidget(centralWidget); ++ ++ connect(qApp, SIGNAL(localeSettingsChanged()), this, SLOT(retranslateUi())); ++ retranslateUi(); ++ ++ if (errorCodeToTranslationID.isEmpty()) { ++ errorCodeToTranslationID.insert("qtn_usb_filessystem_inuse", "qtn_usb_filessystem_inuse"); ++ errorCodeToTranslationID.insert("mount_failed", "qtn_usb_mount_failed"); ++ } ++ ++#ifdef HAVE_QMSYSTEM ++ connect(usbMode, SIGNAL(modeChanged(MeeGo::QmUSBMode::Mode)), this, SLOT(applyUSBMode(MeeGo::QmUSBMode::Mode))); ++ connect(usbMode, SIGNAL(error(const QString &)), this, SLOT(showError(const QString &))); ++ ++ // Lazy initialize to improve startup time ++ QTimer::singleShot(500, this, SLOT(applyCurrentUSBMode())); ++#endif ++} ++ ++UsbUi::~UsbUi() ++{ + MWidget *centralWidget = new MWidget; + centralWidget->setLayout(layout); + setCentralWidget(centralWidget); +@@ -122,12 +160,14 @@ UsbUi::UsbUi(QObject *parent) : MDialog(), + #endif + } + ++#ifdef NOKIA + UsbUi::~UsbUi() + { + if (sdkItem->parentLayoutItem() == NULL) { + delete sdkItem; + } + } ++#endif /* NOKIA */ + + #ifdef HAVE_QMSYSTEM + void UsbUi::applyCurrentUSBMode() +@@ -157,6 +197,7 @@ void UsbUi::hideDialog(bool acceptDialog) + } + } + ++#ifdef NOKIA + void UsbUi::setOviSuiteMode() + { + hideDialog(true); +@@ -168,28 +209,50 @@ void UsbUi::setOviSuiteMode() + #endif + } + +-void UsbUi::setMassStorageMode() ++void UsbUi::setSDKMode() + { + hideDialog(true); + + #ifdef HAVE_QMSYSTEM + // Set the USB mode after a small delay to allow the dialog to close smoothly +- requestedUSBMode = MeeGo::QmUSBMode::MassStorage; ++ requestedUSBMode = MeeGo::QmUSBMode::SDK; + QTimer::singleShot(100, this, SLOT(setRequestedUSBMode())); + #endif + } ++#endif /* NOKIA */ + +-void UsbUi::setSDKMode() ++void UsbUi::setMassStorageMode() + { + hideDialog(true); + + #ifdef HAVE_QMSYSTEM + // Set the USB mode after a small delay to allow the dialog to close smoothly +- requestedUSBMode = MeeGo::QmUSBMode::SDK; ++ requestedUSBMode = MeeGo::QmUSBMode::MassStorage; + QTimer::singleShot(100, this, SLOT(setRequestedUSBMode())); + #endif + } + ++void UsbUi::setMTPMode() ++{ ++ hideDialog(true); ++ ++#ifdef HAVE_QMSYSTEM ++ // Set the USB mode after a small delay to allow the dialog to close smoothly ++ requestedUSBMode = MeeGo::QmUSBMode::MTP; ++ QTimer::singleShot(100, this, SLOT(setRequestedUSBMode())); ++#endif ++} ++ ++void UsbUi::setDeveloperMode() ++{ ++ hideDialog(true); ++ ++#ifdef HAVE_QMSYSTEM ++ // Set the USB mode after a small delay to allow the dialog to close smoothly ++ requestedUSBMode = MeeGo::QmUSBMode::Developer; ++ QTimer::singleShot(100, this, SLOT(setRequestedUSBMode())); ++#endif ++} + #ifdef HAVE_QMSYSTEM + void UsbUi::setRequestedUSBMode() + { +@@ -216,6 +279,8 @@ void UsbUi::applyUSBMode(MeeGo::QmUSBMode::Mode mode) + case MeeGo::QmUSBMode::OviSuite: + case MeeGo::QmUSBMode::MassStorage: + case MeeGo::QmUSBMode::SDK: ++ case MeeGo::QmUSBMode::MTP: ++ case MeeGo::QmUSBMode::Developer: + // Hide the mode selection dialog and show a mode notification + hideDialog(false); + showNotification(mode); +@@ -244,6 +309,7 @@ void UsbUi::showNotification(MeeGo::QmUSBMode::Mode mode) + body = qtTrId("qtn_usb_storage_active"); + break; + case MeeGo::QmUSBMode::SDK: ++ case MeeGo::QmUSBMode::Developer: + //% "SDK mode in use" + body = qtTrId("qtn_usb_sdk_active"); + break; +@@ -279,12 +345,19 @@ void UsbUi::retranslateUi() + chargingLabel->setText(qtTrId("qtn_usb_charging")); + //% "Mass Storage mode" + massStorageItem->setTitle(qtTrId("qtn_usb_mass_storage")); ++#ifdef NOKIA + //% "Ovi Suite mode" + oviSuiteItem->setTitle(qtTrId("qtn_usb_ovi_suite")); + //% "SDK mode" + sdkItem->setTitle(qtTrId("qtn_usb_sdk_mode")); ++#endif /* NOKIA */ ++ //% "Developer mode" ++ DeveloperItem->setTitle(qtTrId("qtn_usb_developer_mode")); ++ //% "MTP mode" ++ MTPItem->setTitle(qtTrId("qtn_usb_mtp_mode")); + } + ++#ifdef NOKIA + void UsbUi::updateSDKItemVisibility() + { + if (developerMode->value().toBool()) { +@@ -300,3 +373,4 @@ void UsbUi::updateSDKItemVisibility() + } + } + } (265 more lines skipped) submit: Project:MTF:UX / usb-moded -> CE:UX:MTF / usb-moded changes files: -------------- --- usb-moded.changes +++ usb-moded.changes @@ -0,0 +1,11 @@ +* Tue Aug 21 2012 Philippe De Swert <[email protected]> - 0.53 +- Update to the latest and greatest 0.53 +- MTP support for buteo +- More generic network set-up and configuration +- Fix bug with charging mode clean-up +- Compile for all versions of glib +- Support g_mass_storage and g_file_storage so we do not need to depend on certain kernels + +* Tue Aug 21 2012 Marko Saukko <[email protected]> - 0.47 +- Fix build with new glib: usb-moded-0.47-Fix-build-with-newer-glib.patch + old: ---- usb-moded-0.36-ifup-to-ifconfig.patch usb-moded-0.38-default-ovi-suite-schemas.patch usb-moded-0.47.tar.bz2 new: ---- usb-moded-0.53.tar.bz2 spec files: ----------- --- usb-moded.spec +++ usb-moded.spec @@ -1,5 +1,5 @@ Name: usb-moded -Version: 0.47 +Version: 0.53 Release: 0 Summary: USB mode controller Group: System/System Control @@ -9,8 +9,6 @@ Source1: %{name}.service Source2: usb_moded.conf Patch0: %{name}-0.38-dbus-policy.patch -Patch1: %{name}-0.36-ifup-to-ifconfig.patch -Patch2: %{name}-0.38-default-ovi-suite-schemas.patch BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) @@ -62,8 +60,6 @@ %prep %setup -q %patch0 -p0 -%patch1 -p1 -%patch2 -p0 %build %autogen other changes: -------------- ++++++ usb-moded-0.47.tar.bz2 -> usb-moded-0.53.tar.bz2 (71460 lines skipped) ++++++ deleted files: --- usb-moded-0.36-ifup-to-ifconfig.patch --- usb-moded-0.38-default-ovi-suite-schemas.patch submit: Project:MTF:UX / usb-moded-config-n900 -> CE:UX:MTF / usb-moded-config-n900 changes files: -------------- --- usb-moded-config-n900.changes +++ usb-moded-config-n900.changes @@ -0,0 +1,3 @@ +* Mon Aug 20 2012 Philippe De Swert <[email protected]> - 0.3 +- Ovi-suite mode is removed in favour of developer mode + old: ---- boss.conf spec files: ----------- --- usb-moded-config-n900.spec +++ usb-moded-config-n900.spec @@ -1,5 +1,5 @@ Name: usb-moded-config-n900 -Version: 0.2 +Version: 0.3 Release: 1 Summary: USB mode controller config Group: System/System Control @@ -8,7 +8,7 @@ URL: http://meego.gitorious.org/meego-middleware/usb_moded Source0: usb-moded.ini -Requires: usb-moded +Requires: usb-moded >= 0.53 Provides: usb-moded-config %description other changes: -------------- ++++++ usb-moded.ini --- usb-moded.ini +++ usb-moded.ini @@ -13,4 +13,4 @@ path = /sys/class/power_supply/isp1704 [usbmode] -mode = ovi_suite +mode = developer_mode ++++++ deleted files: --- boss.conf submit: Project:MTF:UX / usb-moded-config-n950-n9 -> CE:UX:MTF / usb-moded-config-n950-n9 changes files: -------------- --- usb-moded-config-n950-n9.changes +++ usb-moded-config-n950-n9.changes @@ -0,0 +1,3 @@ +* Mon Aug 20 2012 Philippe De Swert <[email protected]> - 0.3 +- Remove ovi-suite mode as it is developer mode now + old: ---- boss.conf spec files: ----------- --- usb-moded-config-n950-n9.spec +++ usb-moded-config-n950-n9.spec @@ -1,5 +1,5 @@ Name: usb-moded-config-n950-n9 -Version: 0.2 +Version: 0.3 Release: 1 Summary: USB mode controller config Group: System/System Control @@ -8,7 +8,7 @@ URL: http://meego.gitorious.org/meego-middleware/usb_moded Source0: usb-moded.ini -Requires: usb-moded +Requires: usb-moded >= 0.53 Provides: usb-moded-config %description other changes: -------------- ++++++ usb-moded.ini --- usb-moded.ini +++ usb-moded.ini @@ -10,4 +10,4 @@ mount = /home/user/MyDocs [usbmode] -mode = ovi_suite +mode = developer_mode ++++++ deleted files: --- boss.conf
