I have made the following changes intended for : CE:UX:MTF / meegotouch-controlpanelapplets
Please review and accept ASAP - BOSS has already processed this request and suggests ??? See the "Messages from BOSS" section below https://build.pub.meego.com/request/show/2720 Thank You, bossbot ([email protected]) [This message was auto-generated] --- Request # 2720: Messages from BOSS: None State: new 2011-10-24T20:44:37 bossbot Reviews: from bossbot :BOSS suggests accepting this review. See email for more details. BOSS accepted this review because: Target repo CE_UX_MTF_armv7hl found. accepted on No date Changes: submit: Project:MTF / meegotouch-controlpanelapplets -> CE:UX:MTF / meegotouch-controlpanelapplets Index: wallpaper02016_backport.diff =================================================================== --- wallpaper02016_backport.diff (revision 0) +++ wallpaper02016_backport.diff (revision 17) @@ -0,0 +1,1917 @@ +--- a/src/wallpaperapplet/gridimagewidget.cpp ++++ b/src/wallpaperapplet/gridimagewidget.cpp +@@ -4,7 +4,7 @@ + #include <MImageWidget> + #include <MProgressIndicator> + +-#define DEBUG ++//#define DEBUG + #include "../debug.h" + + //static const QString progressType = MProgressIndicator::barType; +@@ -26,7 +26,7 @@ GridImageLayout::~GridImageLayout() + while ((item = takeAt(0))) + delete item; + #endif +- } ++} + + + int +@@ -86,14 +86,17 @@ GridImageLayout::addItem ( + { + switch (role) { + case Image: ++ SYS_DEBUG ("Adding image"); + m_Image = layoutItem; + break; + + case ProgressIndicator: ++ SYS_DEBUG ("Adding progress indicator"); + m_ProgressBar = layoutItem; + break; + + case CheckMark: ++ SYS_DEBUG ("Adding checkmark"); + m_TopRightImageWidget = layoutItem; + } + +@@ -176,6 +179,8 @@ GridImageLayout::sizeHint ( + Qt::SizeHint which, + const QSizeF &constraint) const + { ++ Q_UNUSED (which); ++ Q_UNUSED (constraint); + QSizeF retval (100.0, 100.0); + + if (m_Image) +@@ -291,12 +296,19 @@ GridImageWidget::progressIndicator ( + createLayout (); + + if (!m_ProgressIndicator && create) { ++ SYS_DEBUG ("Creating a progress indicator."); + m_ProgressIndicator = new MProgressIndicator (this, progressType); +- m_ProgressIndicator->setObjectName ("CommonProgressBar"); ++ m_ProgressIndicator->setObjectName ("WallpaperLoadingSpinner"); ++ m_ProgressIndicator->setStyleName ("CommonProgressBarInverted"); + m_ProgressIndicator->setUnknownDuration (true); + m_Layout->addItem ( + m_ProgressIndicator, + GridImageLayout::ProgressIndicator); ++ // This seems to solve the issue in NB#208329. FIXME: We should at least ++ // use some stored/calculated values instead of these litarals. ++ m_Layout->setGeometry (QRectF(0.0, 0.0, 172.0, 172.0)); ++ } else { ++ SYS_DEBUG ("Already have a progress indicator."); + } + + return m_ProgressIndicator; +@@ -324,7 +336,6 @@ GridImageWidget::createLayout() + setLayout (m_Layout); + } + +-#if 1 + void GridImageWidget::mousePressEvent(QGraphicsSceneMouseEvent *event) + { + MListItem::mousePressEvent(event); +@@ -342,4 +353,3 @@ void GridImageWidget::contextMenuEvent(Q + MListItem::contextMenuEvent(event); + emit longPressed(); + } +-#endif +--- a/src/wallpaperapplet/wallpaper-rfs.sh ++++ /dev/null +@@ -1,5 +0,0 @@ +-#! /bin/sh +-# Un-set the keys... +-gconftool-2 --recursive-unset /desktop/meego/background +-rm -rf $HOME/.wallpapers +- +--- a/src/wallpaperapplet/wallpaper.css ++++ /dev/null +@@ -1,11 +0,0 @@ +-#WallpaperInfoHeader { +- width: 100%; +- background-color: black; +- background-opacity: 0.8; +-} +- +-#WallpaperInfoHeaderLabel { +- color: white; +- font: "Nokia Sans" 18; +-} +- +--- a/src/wallpaperapplet/wallpaper.desktop ++++ b/src/wallpaperapplet/wallpaper.desktop +@@ -2,7 +2,7 @@ + Type=ControlPanelApplet + Name=Wallpaper + X-logical-id=qtn_wall_wallpaper +-X-translation-catalog=wallpaper ++X-translation-catalog=meegotouchcp-applets,wallpaper + Icon= + Exec= + X-Maemo-Service=com.nokia.DuiControlPanel +--- a/src/wallpaperapplet/wallpaperapplet.cpp ++++ b/src/wallpaperapplet/wallpaperapplet.cpp +@@ -22,17 +22,18 @@ + #include "wallpapereditorwidget.h" + #include "wallpaperbrief.h" + +-#include <MTheme> + #include <MAction> +-#include <QDBusInterface> ++ ++#ifndef UNIT_TEST ++#include <MLibrary> ++M_LIBRARY ++#endif + + //#define DEBUG + #include "../debug.h" + + Q_EXPORT_PLUGIN2(wallpaperapplet, WallpaperApplet) + +-const QString cssDir = "/usr/share/themes/base/meegotouch/duicontrolpanel/style/"; +- + WallpaperApplet::WallpaperApplet() : + m_WallpaperBusinessLogic (new WallpaperBusinessLogic) + { +@@ -45,12 +46,6 @@ WallpaperApplet::~WallpaperApplet() + void + WallpaperApplet::init() + { +- QString themeFile = cssDir + "wallpaper.css"; +- +- SYS_DEBUG ("Adding pixmap dir %s", SYS_STR(cssDir)); +- MTheme::addPixmapDirectory (cssDir, M::Recursive); +- SYS_DEBUG ("Loading theme %s", SYS_STR(themeFile)); +- MTheme::loadCSS (themeFile); + } + + DcpWidget * +@@ -94,21 +89,8 @@ WallpaperApplet::title() const + QVector<MAction*> + WallpaperApplet::viewMenuItems() + { +- //MAction *helpAction; + QVector<MAction*> vector; +-#if 0 +- SYS_DEBUG (""); +- helpAction = new MAction ( +- //% "User guide" +- qtTrId ("qtn_comm_userguide"), +- pageMain (0)); +- helpAction->setLocation (MAction::ApplicationMenuLocation); +- +- vector.append(helpAction); + +- connect (helpAction, SIGNAL (triggered (bool)), +- this, SLOT (userGuide ())); +-#endif + return vector; + } + +@@ -121,14 +103,3 @@ WallpaperApplet::constructBrief ( + return new WallpaperBrief (m_WallpaperBusinessLogic); + } + +-#if 0 +-void +-WallpaperApplet::userGuide () +-{ +- SYS_DEBUG (""); +- +- QDBusInterface userguide ("com.nokia.userguide", "/", +- "com.nokia.UserGuideIf"); +- userguide.call ("pageByPath", "fullguide-1-2-list-1.cfg"); +-} +-#endif +--- a/src/wallpaperapplet/wallpaperapplet.pro ++++ b/src/wallpaperapplet/wallpaperapplet.pro +@@ -9,9 +9,8 @@ QT += dbus + + CONFIG += plugin \ + gui \ +- meegotouch \ ++ meegotouchcore \ + duicontrolpanel \ +- silent + (1717 more lines skipped) Index: fix_desktop_path.diff =================================================================== --- fix_desktop_path.diff (revision 0) +++ fix_desktop_path.diff (revision 17) @@ -0,0 +1,121 @@ +--- a/src/aboutapplet/aboutapplet.pro ++++ b/src/aboutapplet/aboutapplet.pro +@@ -32,7 +32,7 @@ SOURCES = \ + + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + message("The plugin will be installed to: " $$target.path) +--- a/src/batteryapplet/batteryapplet.pro ++++ b/src/batteryapplet/batteryapplet.pro +@@ -55,7 +55,7 @@ css.files = batteryapplet.css + css.path += $$(DEBIAN_DESTDIR)/usr/share/themes/base/meegotouch/duicontrolpanel/style + + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + + rfs.files = battery-rfs.sh + rfs.path += $$(DEBIAN_DESTDIR)/$$RFS_DIR +--- a/src/displayapplet/displayapplet.pro ++++ b/src/displayapplet/displayapplet.pro +@@ -35,7 +35,7 @@ DESTDIR = lib + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + + rfs.files = display-rfs.sh + rfs.path += $$(DEBIAN_DESTDIR)/$$RFS_DIR +--- a/src/offlineapplet/offlineapplet.pro ++++ b/src/offlineapplet/offlineapplet.pro +@@ -27,7 +27,7 @@ SOURCES = \ + + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + message("The plugin will be installed to: " $$target.path) +--- a/src/profileapplet/profileapplet.pro ++++ b/src/profileapplet/profileapplet.pro +@@ -32,7 +32,7 @@ SOURCES = \ + css.files = profileapplet.css + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + css.path += $$(DEBIAN_DESTDIR)/usr/share/themes/base/meegotouch/duicontrolpanel/style + +--- a/src/resetapplet/resetapplet.pro ++++ b/src/resetapplet/resetapplet.pro +@@ -29,7 +29,7 @@ SOURCES = \ + + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + message("The plugin will be installed to: " $$target.path) +--- a/src/testapplet/testapplet.pro ++++ b/src/testapplet/testapplet.pro +@@ -25,7 +25,7 @@ SOURCES = \ + + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + message("The plugin will be installed to: " $$target.path) +--- a/src/themeapplet/themeapplet.pro ++++ b/src/themeapplet/themeapplet.pro +@@ -45,7 +45,7 @@ DESTDIR = lib + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + + css.files = themeapplet.css + css.path += $$(DEBIAN_DESTDIR)/usr/share/themes/base/meegotouch/duicontrolpanel/style +--- a/src/usbapplet/usbapplet.pro ++++ b/src/usbapplet/usbapplet.pro +@@ -34,7 +34,7 @@ DESTDIR = lib + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + desktop.files += usbapplet.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + + rfs.files = usb-rfs.sh + rfs.path += $$(DEBIAN_DESTDIR)/$$RFS_DIR +--- a/src/wallpaperapplet/wallpaperapplet.pro ++++ b/src/wallpaperapplet/wallpaperapplet.pro +@@ -66,7 +66,7 @@ backupscripts.files = wallpaper-backup w + backupscripts.path = $$(DEBIAN_DESTDIR)/usr/share/wallpaper/ + + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + + css.files = wallpaper.css + css.path = \ +--- a/src/warrantyapplet/warrantyapplet.pro ++++ b/src/warrantyapplet/warrantyapplet.pro +@@ -33,7 +33,7 @@ SOURCES = \ + + DESTDIR = lib + desktop.files += *.desktop +-desktop.path = $$(DEBIAN_DESTDIR)/usr/lib/duicontrolpanel ++desktop.path = $$(DEBIAN_DESTDIR)/usr/share/duicontrolpanel/desktops + target.path += $$(DEBIAN_DESTDIR)$$[QT_INSTALL_LIBS]/duicontrolpanel/applets + + message("The plugin will be installed to: " $$target.path) Index: no_mce.patch =================================================================== --- no_mce.patch (revision 0) +++ no_mce.patch (revision 17) @@ -0,0 +1,84 @@ +diff --git a/src/displayapplet/displaybusinesslogic.cpp b/src/displayapplet/displaybusinesslogic.cpp +index 4add929..ddd3c18 100644 +--- a/src/displayapplet/displaybusinesslogic.cpp ++++ b/src/displayapplet/displaybusinesslogic.cpp +@@ -27,7 +27,7 @@ + #include <QDBusInterface> + #include <QDBusObjectPath> + +-#include <mce/dbus-names.h> ++//#include <mce/dbus-names.h> + + #define DEBUG + #define WARNING +@@ -334,11 +334,11 @@ DisplayBusinessLogic::setColorProfile ( + QList<QVariant> params; + params.append(QVariant(QString(m_AvailColorProfiles.at(index)))); + +- m_MceDBusIf->callWithCallback ( +- QString (MCE_COLOR_PROFILE_CHANGE_REQ), +- params, this, +- SLOT (colorProfileIsSet(QDBusMessage)), +- SLOT (DBusMessagingFailure (QDBusError))); ++// m_MceDBusIf->callWithCallback ( ++// QString (MCE_COLOR_PROFILE_CHANGE_REQ), ++// params, this, ++// SLOT (colorProfileIsSet(QDBusMessage)), ++// SLOT (DBusMessagingFailure (QDBusError))); + } + + /*! +@@ -476,13 +476,13 @@ DisplayBusinessLogic::getCloseFromTopValue () + void + DisplayBusinessLogic::setupMceDBusIf () + { +- if (!m_MceDBusIf){ +- m_MceDBusIf = new QDBusInterface ( +- MCE_SERVICE, +- MCE_REQUEST_PATH, +- MCE_REQUEST_IF, +- QDBusConnection::systemBus ()); +- } ++// if (!m_MceDBusIf){ ++// m_MceDBusIf = new QDBusInterface ( ++// MCE_SERVICE, ++// MCE_REQUEST_PATH, ++// MCE_REQUEST_IF, ++// QDBusConnection::systemBus ()); ++// } + } + + /*! +@@ -491,19 +491,19 @@ DisplayBusinessLogic::setupMceDBusIf () + void + DisplayBusinessLogic::initiateMceQueries () + { +- setupMceDBusIf (); +- +- m_MceDBusIf->callWithCallback ( +- QString (MCE_COLOR_PROFILE_IDS_GET), +- QList<QVariant> (), this, +- SLOT (availableColorProfilesReceivedSlot(QStringList)), +- SLOT (DBusMessagingFailure (QDBusError))); +- +- m_MceDBusIf->callWithCallback ( +- QString (MCE_COLOR_PROFILE_GET), +- QList<QVariant> (), this, +- SLOT (currentColorProfileReceived(QString)), +- SLOT (DBusMessagingFailure (QDBusError))); ++// setupMceDBusIf (); ++ ++// m_MceDBusIf->callWithCallback ( ++// QString (MCE_COLOR_PROFILE_IDS_GET), ++// QList<QVariant> (), this, ++// SLOT (availableColorProfilesReceivedSlot(QStringList)), ++// SLOT (DBusMessagingFailure (QDBusError))); ++ ++// m_MceDBusIf->callWithCallback ( ++// QString (MCE_COLOR_PROFILE_GET), ++// QList<QVariant> (), this, ++// SLOT (currentColorProfileReceived(QString)), ++// SLOT (DBusMessagingFailure (QDBusError))); + } + + /*! Index: fix_about_category.diff =================================================================== --- fix_about_category.diff (revision 0) +++ fix_about_category.diff (revision 17) @@ -0,0 +1,25 @@ +Description: category of About and Waranty applets changed from + qtn_sett_main_about to qtn_sett_main_aboutmy. +Bug: BMC#11205 + +--- a/src/aboutapplet/about.desktop ++++ b/src/aboutapplet/about.desktop +@@ -12,6 +12,6 @@ + X-DUIApplet-Applet=libaboutapplet.so + + [DCP] +-Category=qtn_sett_main_about ++Category=qtn_sett_main_aboutmy + Order=2 + WidgetType=Label +--- a/src/warrantyapplet/warranty.desktop ++++ b/src/warrantyapplet/warranty.desktop +@@ -16,7 +16,7 @@ + X-DUIApplet-ImagePortrait=Widget_portrait_weather.png + + [DCP] +-Category=qtn_sett_main_about ++Category=qtn_sett_main_aboutmy + Order=1 + WidgetType=Label + Index: fix_translate_catalogs.diff =================================================================== --- fix_translate_catalogs.diff (revision 0) +++ fix_translate_catalogs.diff (revision 17) @@ -0,0 +1,37 @@ +Only in meegotouch-controlpanelapplets-0.17.4_current_patches//src/aboutapplet: aboutapplet.cpp.rej +diff -ru meegotouch-controlpanelapplets-0.17.4_current_patches//src/aboutapplet/about.desktop meegotouch-controlpanelapplets-0.17.4/src/aboutapplet/about.desktop +--- meegotouch-controlpanelapplets-0.17.4_current_patches//src/aboutapplet/about.desktop 2011-05-03 16:31:44.000000000 +0300 ++++ meegotouch-controlpanelapplets-0.17.4/src/aboutapplet/about.desktop 2011-05-14 13:58:00.240978208 +0300 +@@ -2,7 +2,7 @@ + Type=ControlPanelApplet + Name=About product + X-logical-id=qtn_prod_about_product +-X-translation-catalog=about-product ++X-translation-catalog=systemui-applets,about-product + X-Maemo-Service=com.nokia.DuiControlPanel + X-Maemo-Method=com.nokia.DuiControlPanelIf.appletPage + X-Maemo-Object-Path=/ +diff -ru meegotouch-controlpanelapplets-0.17.4_current_patches//src/themeapplet/theme.desktop meegotouch-controlpanelapplets-0.17.4/src/themeapplet/theme.desktop +--- meegotouch-controlpanelapplets-0.17.4_current_patches//src/themeapplet/theme.desktop 2010-11-09 15:35:15.000000000 +0200 ++++ meegotouch-controlpanelapplets-0.17.4/src/themeapplet/theme.desktop 2011-05-14 13:58:30.668450803 +0300 +@@ -2,7 +2,7 @@ + Type=ControlPanelApplet + Name=Theme + X-logical-id=qtn_teme_theme +-X-translation-catalog=theme ++X-translation-catalog=systemui-applets,theme + Icon= + Exec= + X-Maemo-Service=com.nokia.DuiControlPanel +diff -ru meegotouch-controlpanelapplets-0.17.4_current_patches//src/wallpaperapplet/wallpaper.desktop meegotouch-controlpanelapplets-0.17.4/src/wallpaperapplet/wallpaper.desktop +--- meegotouch-controlpanelapplets-0.17.4_current_patches//src/wallpaperapplet/wallpaper.desktop 2011-05-03 16:31:55.000000000 +0300 ++++ meegotouch-controlpanelapplets-0.17.4/src/wallpaperapplet/wallpaper.desktop 2011-05-14 14:05:50.837677842 +0300 +@@ -2,7 +2,7 @@ + Type=ControlPanelApplet + Name=Wallpaper + X-logical-id=qtn_wall_wallpaper +-X-translation-catalog=meegotouchcp-applets,wallpaper ++X-translation-catalog=systemui-applets,wallpaper + Icon= + Exec= + X-Maemo-Service=com.nokia.DuiControlPanel Index: meegotouch-controlpanelapplets.yaml =================================================================== --- meegotouch-controlpanelapplets.yaml (revision 0) +++ meegotouch-controlpanelapplets.yaml (revision 17) @@ -0,0 +1,267 @@ +Name: meegotouch-controlpanelapplets +Summary: Various MeeGo Touch Controlpanel Applets +Version: 0.21.1 +Release: 1 +Group: System/GUI/Other +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch + - meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch + - no_mce.patch +# - fix_tests_path.diff +# - about_nokia_text_removal.diff +# - fix_desktop_path.diff +# - fix_about_category.diff +# - wallpaper02016_backport.diff +# - aboutapplet_buildversion_fix.diff +# - fix_aboutapplet_stylename.diff +# - fix_themeapplet_stylename.diff +# - fix_about_licensetext.diff +# - fix_translate_catalogs.diff +# - fix_usbapplet_translation.diff +# - fix_usbapplet_notification.diff +# - fix_aboutapplet_wordwrap.diff +# - add_gprsapplet.patch +# - fix_build.patch +# - gprsapplet_layout_cleanup.patch +Description: | + Various Controlpanel applets for MeeGo Touch environment: + - Offline switcher + - USB settings + - Battery info/settings + - Display settings + - Profiles settings + - Theme-switcher + - Wallpaper editor/setter + - About product + - Warranty applet + - Profiles switcher +PkgBR: +# - doxygen + - libthumbnailer-devel + - meegotouch-systemui-devel + - profiled-devel +PkgConfigBR: + - quill + - gstreamer-0.10 + - dbus-1 + - QtGui >= 4.7.0 + - QtSystemInfo + - clean-device >= 0.0.3 + - meegotouch-controlpanel + - meegotouch >= 0.20.37 +# - qttracker + - ofono-qt + - qmsystem2 +Configure: none +Builder: qmake +QMakeOptions: + - BUILD_APPLET="about theme libmeegocontrol battery display gprs offline reset sound testapplet usb wallpaper2 warranty" +#NoFiles: True +SetupOptions: -q -n %{name}-%{version} +Files: + - "%{_sysconfdir}/meego-rfs-scripts/mcpapplets-rfs.sh" + - "%{_libdir}/libmeegocontrol.so.0" + - "%{_libdir}/libmeegocontrol.so.0.1" + - "%{_libdir}/libmeegocontrol.so.0.1.1" + +SubPackages: + - Name: devel + Summary: Development files for MeeGo Touch Controlpanel Applets + Group: Development/Libraries + Description: | + This package contains the development files for MeeGo Touch Controlpanel + Applets. + Files: +# - "%{_includedir}/libmeegocontrol/WallpaperBusinessLogic" +# - "%{_includedir}/libmeegocontrol/WallpaperCurrentDescriptor" +# - "%{_includedir}/libmeegocontrol/WallpaperDescriptor" +# - "%{_includedir}/libmeegocontrol/WallpaperEditorWidget" +# - "%{_includedir}/libmeegocontrol/WallpaperITrans" + - "%{_includedir}/libmeegocontrol/*.h" + - "%{_libdir}/libmeegocontrol.so" + - "%{_datadir}/qt4/mkspecs/features/meegocontrol.prf" + +# - Name: doc +# Summary: Documentation for MeeGo Touch Controlpanel Applets +# Group: Documentation +# Description: | +# This package contains the documentation for MeeGo Touch Controlpanel +# Applets. +# Files: +# - "%doc %{_datadir}/libmeegocontrol-doc/" + +# - Name: tests +# Summary: Unit and functional test cases for %{name} +# Group: Development/Libraries +# Description: This package contains unit and functional test cases for %{name} +# Files: +# - "%{_bindir}/cylontest.sh" +# - "%{_libdir}/%{name}-tests/ft_*" +# - "%{_libdir}/%{name}-tests/ut_*" +# - "%{_datadir}/%{name}-tests/tests.xml" + + - Name: meegotouchcp-wallpaper + AsWholeName: True + Summary: MeegoTouch Controlpanel wallpaper editor & setter + Group: System/GUI/Other + Description: This package contains MeegoTouch Controlpanel wallpaper editor & setter + Requires: +# - tumbler + - meegotouch-controlpanel + Files: + - "%{_libdir}/duicontrolpanel/applets/libwallpaperapplet2.so" + - "%{_datadir}/backup-framework/applications/wallpaper.conf" + - "%{_datadir}/themes/base/meegotouch/libwallpaperapplet2/style/libwallpaperapplet2.css" + - "%{_libdir}/duicontrolpanel/wallpaper2.desktop" + - "%{_datadir}/l10n/meegotouch/wallpaperapplet2.qm" + + - Name: meegotouchcp-about + AsWholeName: True + Summary: MeegoTouch Controlpanel about product applet + Group: System/GUI/Other + Requires: + - qt-mobility + - meegotouch-controlpanel + Description: This package contains MeegoTouch Controlpanel about product applet + Files: + - "%{_libdir}/duicontrolpanel/applets/libaboutapplet.so" + - "%{_libdir}/duicontrolpanel/about.desktop" + - "%{_datadir}/themes/base/meegotouch/libaboutapplet/style/libaboutapplet.css" + - "%{_datadir}/l10n/meegotouch/aboutapplet.qm" + + - Name: meegotouchcp-gprs + AsWholeName: True + Summary: MeegoTouch Controlpanel gprs product applet + Group: System/GUI/Other + Requires: + - qt-mobility + - meegotouch-controlpanel + - libofono-qt + Description: MeegoTouch Controlpanel gprs product applet. + Files: + - "%{_libdir}/duicontrolpanel/applets/libgprsapplet.so" + - "%{_libdir}/duicontrolpanel/gprs.desktop" + - "%{_datadir}/themes/base/meegotouch/libgprsapplet/style/libgprsapplet.css" + - "%{_sysconfdir}/meegotouch/connections/gprs/operators" + - "%{_datadir}/l10n/meegotouch/gprsapplet.qm" + + - Name: meegotouchcp-usb + AsWholeName: True + Summary: MeegoTouch Controlpanel USB settings + Group: System/GUI/Other + Requires: + - meegotouch-controlpanel + Description: This package contains MeegoTouch Controlpanel USB settings + Files: + - "%{_libdir}/duicontrolpanel/applets/libusbapplet.so" + - "%{_libdir}/duicontrolpanel/usbapplet.desktop" + - "%{_datadir}/l10n/meegotouch/usbapplet.qm" + + - Name: meegotouchcp-battery + AsWholeName: True + Summary: MeegoTouch Controlpanel battery info/settings + Group: System/GUI/Other + Requires: + - meegotouch-controlpanel + Description: This package contains MeegoTouch Controlpanel battery info/settings + Files: + - "%{_libdir}/duicontrolpanel/applets/libbatteryapplet.so" + - "%{_libdir}/duicontrolpanel/battery.desktop" + - "%{_datadir}/themes/base/meegotouch/libbatteryapplet/style/libbatteryapplet.css" + - "%{_datadir}/l10n/meegotouch/batteryapplet.qm" + + - Name: meegotouchcp-warranty + AsWholeName: True + Summary: MeegoTouch Controlpanel warranty applet + Group: System/GUI/Other + Requires: + - meegotouch-controlpanel + Description: This package contains MeegoTouch Controlpanel warranty applet + Files: + - "%{_libdir}/duicontrolpanel/applets/libwarrantyapplet.so" + - "%{_libdir}/duicontrolpanel/warranty.desktop" + - "%{_datadir}/l10n/meegotouch/warrantyapplet.qm" + + - Name: meegotouchcp-offline + AsWholeName: True + Summary: MeegoTouch Controlpanel Offline switcher + Group: System/GUI/Other + Requires: + - meegotouch-controlpanel + Description: This package contains MeegoTouch Controlpanel Offline switcher + Files: + - "%{_libdir}/duicontrolpanel/applets/libofflineapplet.so" + - "%{_libdir}/duicontrolpanel/offline.desktop" + - "%{_datadir}/l10n/meegotouch/offlineapplet.qm" + (67 more lines skipped) Index: meegotouch-controlpanelapplets-0.21.1.tar.bz2 =================================================================== Binary file meegotouch-controlpanelapplets-0.21.1.tar.bz2 added Index: meegotouch-controlpanelapplets.spec =================================================================== --- meegotouch-controlpanelapplets.spec (revision 0) +++ meegotouch-controlpanelapplets.spec (revision 17) @@ -0,0 +1,380 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.23 +# +# >> macros +%define upstreamtag 1 +# << macros + +Name: meegotouch-controlpanelapplets +Summary: Various MeeGo Touch Controlpanel Applets +Version: 0.21.1 +Release: 1 +Group: System/GUI/Other +License: LGPLv2.1 +URL: http://meego.gitorious.org/meegotouch/meegotouch-controlpanelapplets +Source0: %{name}-%{version}.tar.bz2 +Source100: meegotouch-controlpanelapplets.yaml +Patch0: meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch +Patch1: meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch +Patch2: no_mce.patch +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig +BuildRequires: pkgconfig(quill) +BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(QtGui) >= 4.7.0 +BuildRequires: pkgconfig(QtSystemInfo) +BuildRequires: pkgconfig(clean-device) >= 0.0.3 +BuildRequires: pkgconfig(meegotouch-controlpanel) +BuildRequires: pkgconfig(meegotouch) >= 0.20.37 +BuildRequires: pkgconfig(ofono-qt) +BuildRequires: pkgconfig(qmsystem2) +BuildRequires: libthumbnailer-devel +BuildRequires: meegotouch-systemui-devel +BuildRequires: profiled-devel + + +%description +Various Controlpanel applets for MeeGo Touch environment: + - Offline switcher + - USB settings + - Battery info/settings + - Display settings + - Profiles settings + - Theme-switcher + - Wallpaper editor/setter + - About product + - Warranty applet + - Profiles switcher + + + +%package devel +Summary: Development files for MeeGo Touch Controlpanel Applets +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains the development files for MeeGo Touch Controlpanel +Applets. + + +%package -n meegotouchcp-wallpaper +Summary: MeegoTouch Controlpanel wallpaper editor & setter +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-wallpaper +This package contains MeegoTouch Controlpanel wallpaper editor & setter + +%package -n meegotouchcp-about +Summary: MeegoTouch Controlpanel about product applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: qt-mobility +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-about +This package contains MeegoTouch Controlpanel about product applet + +%package -n meegotouchcp-gprs +Summary: MeegoTouch Controlpanel gprs product applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: qt-mobility +Requires: meegotouch-controlpanel +Requires: libofono-qt + +%description -n meegotouchcp-gprs +MeegoTouch Controlpanel gprs product applet. + +%package -n meegotouchcp-usb +Summary: MeegoTouch Controlpanel USB settings +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-usb +This package contains MeegoTouch Controlpanel USB settings + +%package -n meegotouchcp-battery +Summary: MeegoTouch Controlpanel battery info/settings +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-battery +This package contains MeegoTouch Controlpanel battery info/settings + +%package -n meegotouchcp-warranty +Summary: MeegoTouch Controlpanel warranty applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-warranty +This package contains MeegoTouch Controlpanel warranty applet + +%package -n meegotouchcp-offline +Summary: MeegoTouch Controlpanel Offline switcher +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-offline +This package contains MeegoTouch Controlpanel Offline switcher + +%package -n meegotouchcp-display +Summary: MeegoTouch Controlpanel display settings +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-display +This package contains MeegoTouch Controlpanel display settings + +%package -n meegotouchcp-reset +Summary: MeegoTouch Controlpanel reset applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel +Requires: clean-device + +%description -n meegotouchcp-reset +This package contains MeegoTouch Controlpanel deevice clearing and restore settings applet. + +%package -n meegotouchcp-sound +Summary: MeegoTouch Controlpanel sound applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel +Requires: clean-device + +%description -n meegotouchcp-sound +This package contains MeegoTouch Controlpanel sound applet. + +%package -n meegotouchcp-test +Summary: MeegoTouch Controlpanel test applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-test +MeegoTouch Controlpanel test applet to manually test the Controlpanel. + +%package -n meegotouchcp-theme +Summary: MeegoTouch Controlpanel Theme applet +Group: System/GUI/Other +Requires: %{name} = %{version}-%{release} +Requires: meegotouch-controlpanel + +%description -n meegotouchcp-theme +MeegoTouch Controlpanel Theme applet for changing the theme from the Controlpanel. + + +%prep +%setup -q -n %{name}-%{version} + +# meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch +%patch0 -p1 +# meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch +%patch1 -p1 +# no_mce.patch +%patch2 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qmake \ + BUILD_APPLET="about theme libmeegocontrol battery display gprs offline reset sound testapplet usb wallpaper2 warranty" + +make %{?jobs:-j%jobs} + +# >> build post +# << build post +%install (180 more lines skipped) Index: meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch =================================================================== --- meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch (revision 0) +++ meegotouch-controlpanelapplets-0.20.74-5-fix-without-qtsparql.patch (revision 17) @@ -0,0 +1,18 @@ +diff --exclude='*~' -ruN meegotouch-controlpanelapplets-0.20.74-5.orig/src/soundsettingsapplet/trackerconnection.cpp meegotouch-controlpanelapplets-0.20.74-5/src/soundsettingsapplet/trackerconnection.cpp +--- meegotouch-controlpanelapplets-0.20.74-5.orig/src/soundsettingsapplet/trackerconnection.cpp 2011-10-03 09:32:26.640351526 +0300 ++++ meegotouch-controlpanelapplets-0.20.74-5/src/soundsettingsapplet/trackerconnection.cpp 2011-10-04 10:27:02.535527034 +0300 +@@ -273,12 +273,13 @@ + #endif + + fallback: ++#ifdef HAVE_QTSPARQL + if (result) + { + delete result; + result = 0; + } +- ++#endif + /* + * This part is handling the case when the tracker information is not + * available. In this case we are creating a nice name from the filename. We Index: fix_tests_path.diff =================================================================== --- fix_tests_path.diff (revision 0) +++ fix_tests_path.diff (revision 17) @@ -0,0 +1,36 @@ +--- a/tests/common_top.pri ++++ b/tests/common_top.pri +@@ -1,7 +1,7 @@ + QMAKE_LFLAGS_RPATH = -Wl + +-#TEST_PKG_NAME = meegotouch-controlpanelapplets-tests +-TEST_PKG_NAME = systemui-applets-tests ++TEST_PKG_NAME = meegotouch-controlpanelapplets-tests ++#TEST_PKG_NAME = systemui-applets-tests + + include(check.pri) + include(coverage.pri) +--- a/tests/gen-tests-xml.sh ++++ b/tests/gen-tests-xml.sh +@@ -7,8 +7,8 @@ DOMAIN="Application framework" + FEATURE="DuiControlPanel SystemUIApplets" + TYPE="Functional" + LEVEL="Component" +-#BINARY_DIR="/usr/lib/meegotouch-controlpanelapplets-tests" +-BINARY_DIR="/usr/lib/systemui-applets-tests" ++BINARY_DIR="/usr/lib/meegotouch-controlpanelapplets-tests" ++#BINARY_DIR="/usr/lib/systemui-applets-tests" + + # + # The code. These lines should not contain configuration values. +--- a/tests/tests.pro ++++ b/tests/tests.pro +@@ -50,7 +50,7 @@ dummy_file.files += $$OUT_PWD/keep_this_ + dummy_file.path = /usr/lib/$$TEST_PKG_NAME + + testscript.files = cylontest.sh +-testscript.path = /bin ++testscript.path = /usr/bin + + INSTALLS += \ + support_files \ Index: meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch =================================================================== --- meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch (revision 0) +++ meegotouch-controlpanelapplets-0.20.74-5-disable-tests.patch (revision 17) @@ -0,0 +1,12 @@ +diff --exclude='*~' -ruN meegotouch-controlpanelapplets-0.20.74-5.orig/meegotouch-controlpanelapplets.pro meegotouch-controlpanelapplets-0.20.74-5/meegotouch-controlpanelapplets.pro +--- meegotouch-controlpanelapplets-0.20.74-5.orig/meegotouch-controlpanelapplets.pro 2011-10-03 09:32:26.663351951 +0300 ++++ meegotouch-controlpanelapplets-0.20.74-5/meegotouch-controlpanelapplets.pro 2011-10-04 10:44:50.382912181 +0300 +@@ -11,7 +11,7 @@ + } + + addSubDirs(src) +-addSubDirs(tests) ++#addSubDirs(tests) + + QMAKE_CLEAN += \ + configure-stamp \ Index: meegotouch-controlpanelapplets.changes =================================================================== --- meegotouch-controlpanelapplets.changes (revision 0) +++ meegotouch-controlpanelapplets.changes (revision 17) @@ -0,0 +1,97 @@ +* Fri Oct 14 2011 Miroslav Safr <[email protected]> - 0.21.1-6 +- upgrade 0.21.1-6 + +* Mon Oct 03 2011 Marko Saukko <[email protected]> - 0.20.75-1 +- Updated to latest upstream tar ball. +- Removed dep to qttracker. +- Included files to actual packages +- Removed duplicated stuff +- NOTE: Patches needs to be reviewed and rebased/removed if needed. + +* Tue Sep 27 2011 Mika Laitio <[email protected]> - 0.17.4 +- added patch gprsapplet_layout_cleanup.patch to fix issues + BMC#20497, BMC#20790 and BMC#20793 + +* Tue Jun 28 2011 Mika Laitio <[email protected]> - 0.17.4 +- add support for /etc/duicontrolpanel/connections/gprs/operators config + file file containing apn/operator info. Add combobox to allow user to + select operator specific connection. +- request the registered operator name from ofono and select that's info + by default in the combobox. (if data for that operator is in the + config file) + +* Wed Jun 22 2011 Miroslav Safr <[email protected]> - 0.17.4 +- added dependency to meegotouchcp-applets-l10n-eng-en at least some human readable strings are visible in applets + +* Mon Jun 13 2011 Gabor Juhasz <[email protected]> - 0.17.4 +- Removing profile applet temporary from yaml file + +* Mon Jun 06 2011 jsjarvi <[email protected]> - 0.17.4 +- Add add_gprsapplet.patch: Missing GPRS AP UI added under + Settings/Connections/APN Settings. (BMC#8408) + +* Tue May 24 2011 Zoltan Gyarmati <[email protected]> - 0.17.4 +- Fix BMC#18072 - Empty banner shown by usbapplet +- Fix BMC#17872 - [DE] Build version is clipped in 'About product' settings. + +* Wed May 18 2011 Zoltan Gyarmati <[email protected]> - 0.17.4 +- Enable usbapplet +- Fix usbapplet traslation catalog name + +* Sun May 15 2011 Zoltan Gyarmati <[email protected]> - 0.17.4 +- Add patch to fix BMC#16948 - Theme applet contains unreadable text due to inappropriate colour usage +- Add patch to fix BMC#16953 - AboutMyDevice applet contains unredable text due to inappropriate colour usage +- Add patch to fix BMC#15880 - themeapplet.css : bad path +- Add patch to fix BMC#14246 - About Product Dialogue has placeholder license.txt +- Add patch to fix translation-related problems + +* Wed Apr 7 2011 Zoltan Gyarmat <[email protected]> - 0.17.4 +- Add aboutapplet_buildversion_fix.diff: About Product Dialogue shows rootfs + (Maemo) product string. Now it gathers the infos from the /etc/meego-release + file. (BMC#14234) + +* Wed Apr 5 2011 Zoltan Gyarmat <[email protected]> - 0.17.4 +- Add wallpaper02016_backport.diff: allow to change wallpaper (BMC#14755) +- Remove wallpaper-rfs.sh and wallpaper.css +- Update fix_desktop_path.diff: modify desktop files path from + /usr/share/duicontrolpanel to /usr/share/duicontrolpanel/desktops + +* Wed Mar 30 2011 Janne Siren <[email protected]> - 0.17.4 +- Add fix_about_category.diff: category of About and Waranty applets changed + from qtn_sett_main_about to qtn_sett_main_aboutmy. (BMC#11205) +- Minor changes to few package Descriptions in yaml file due newer specify +- Fix specify warnings: use PkgConfigBR when possible + +* Tue Jan 04 2011 Fathi Boudra <[email protected]> - 0.17.4 +- Add devel package (BMC#11608) +- Use macros in Files section +- Use PkgConfigBR when possible +- Add fix_desktop_path.diff: desktop file are arch independent and should be + under /usr/share directory + +* Tue Dec 07 2010 David Kedves <[email protected]> - 0.17.4 +- Import latest upstream tag as applets can't be recompiled (BMC#10964) +- Disable the reset-applet building (will be built from a separate src.tree) +- Enable about-applet (as it now uses the qtmobility for fetch the sysinfo) + +* Fri Oct 15 2010 David Kedves <[email protected]> - 0.16.1 +- make tests package (added a one patch for this...) +- use Builder: qmake in yaml file + +* Wed Oct 13 2010 David Kedves <[email protected]> - 0.16.1 +- Import latest upstream tag +- drop wallpaper-brief patch (as it works correctly now...) + +* Mon Oct 11 2010 David Kedves <[email protected]> - 0.15.4 +- Fix build errors... (caused by controlpanel devel package name change...) + +* Thu Sep 30 2010 David Kedves <[email protected]> - 0.15.4 +- Update to release tag 0.15.4-1 +- Disable wallpaper-applet brief (image doesn't get scaled to icon size) + +* Mon Sep 13 2010 Kaitlin Rupert <[email protected]> - 0.15.2 +- Update to release tag 0.15.2-1 +- Provides applets for FEA#5772 and FEA#5768 + +* Mon Jul 12 2010 Kaitlin Rupert <[email protected]> - 0.14.11 +- Initial import using release tag 0.14.12-2 Index: Makefile =================================================================== --- Makefile (revision 0) +++ Makefile (revision 17) @@ -0,0 +1,6 @@ +PKG_NAME := meegotouch-controlpanelapplets +SPECFILE = $(addsuffix .spec, $(PKG_NAME)) +YAMLFILE = $(addsuffix .yaml, $(PKG_NAME)) + +include /usr/share/packaging-tools/Makefile.common + Index: fix_themeapplet_stylename.diff =================================================================== --- fix_themeapplet_stylename.diff (revision 0) +++ fix_themeapplet_stylename.diff (revision 17) @@ -0,0 +1,135 @@ +Only in meegotouch-controlpanelapplets-0.17.4/src/aboutapplet: .aboutwidget.cpp.swo +diff -ru meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themeapplet.cpp meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themeapplet.cpp +--- meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themeapplet.cpp 2010-11-09 15:35:15.000000000 +0200 ++++ meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themeapplet.cpp 2011-05-13 14:42:57.000000000 +0300 +@@ -28,9 +28,20 @@ + #define WARNING + #include "../debug.h" + ++ ++#ifndef UNIT_TEST ++#include <MLibrary> ++ M_LIBRARY ++ ++#endif ++ ++ + Q_EXPORT_PLUGIN2(themeapplet, ThemeApplet) + +-const QString cssDir = "/usr/share/themes/base/meegotouch/duicontrolpanel/style/"; ++//const QString cssDir = "/usr/share/themes/base/meegotouch/duicontrolpanel/style/"; ++ ++ ++ + + #ifdef DEBUG + static int nApplets = 0; +@@ -56,10 +67,11 @@ + void + ThemeApplet::init() + { +- QString themeFile = cssDir + "themeapplet.css"; +- +- SYS_DEBUG ("Loading theme file: %s", SYS_STR(themeFile)); +- MTheme::loadCSS (themeFile); ++//get out themeapplet.css loading as it is deprecated ++// QString themeFile = cssDir + "themeapplet.css"; ++// ++// SYS_DEBUG ("Loading theme file: %s", SYS_STR(themeFile)); ++// MTheme::loadCSS (themeFile); + } + + DcpWidget * +diff -ru meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themecellcreator.cpp meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themecellcreator.cpp +--- meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themecellcreator.cpp 2010-11-09 15:47:03.000000000 +0200 ++++ meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themecellcreator.cpp 2011-05-14 11:46:49.000000000 +0300 +@@ -1,5 +1,5 @@ + /**************************************************************************** +-** ++**i + ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). + ** All rights reserved. + ** Contact: Nokia Corporation ([email protected]) +@@ -27,6 +27,7 @@ + #include <MImageWidget> + #include <MProgressIndicator> + #include <QGraphicsLayout> ++#include <MLabel> + + #include "themecellcreator.h" + #include "themelistmodel.h" +@@ -37,19 +38,32 @@ + static const char *SelectionStartTag = "<font color='blue'>"; + static const char *SelectionEndTag = "</font>"; + ++ ++ ++ThemeListItem::ThemeListItem ( ItemStyle itemStyle, ++ QGraphicsItem *parent): ++ MAdvancedListItem (itemStyle, parent) ++{ ++setStyleName ("CommonPanelInverted"); ++titleLabelWidget ()->setStyleName ("CommonTitleInverted"); ++} ++ ++ ++ ++ + MWidget * + ThemeCellCreator::createCell( + const QModelIndex &index, + MWidgetRecycler &recycler) const + { +- MAdvancedListItem *cell; ++ MAdvancedListItem *cell; + + cell = qobject_cast <MAdvancedListItem *> ( + recycler.take(MAdvancedListItem::staticMetaObject.className())); + + if (!cell) { +- cell = new MAdvancedListItem ( +- MAdvancedListItem::IconWithTitleProgressIndicatorAndTwoSideIcons); ++ cell = new ThemeListItem( ++ ThemeListItem::IconWithTitleProgressIndicatorAndTwoSideIcons); + cell->progressIndicator()->setUnknownDuration (true); + cell->sideTopImageWidget()->hide(); + cell->sideBottomImageWidget()->hide(); +@@ -107,6 +121,7 @@ + listItem->setTitle (title); + } + ++ + // The icon + if (listItem->imageWidget()->image() != iconName) + listItem->imageWidget()->setImage (iconName); +diff -ru meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themecellcreator.h meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themecellcreator.h +--- meegotouch-controlpanelapplets-0.17.4_with_aboutappletpatch//src/themeapplet/themecellcreator.h 2010-09-30 17:16:11.000000000 +0300 ++++ meegotouch-controlpanelapplets-0.17.4/src/themeapplet/themecellcreator.h 2011-05-14 11:55:13.000000000 +0300 +@@ -23,13 +23,25 @@ + #include <MAdvancedListItem> + #include <MAbstractCellCreator> + +-class ThemeCellCreator : public MAbstractCellCreator<MAdvancedListItem> ++class ThemeListItem : public MAdvancedListItem ++{ ++ Q_OBJECT ++ ++ public: ++ ThemeListItem ( ItemStyle itemStyle = IconWithTitleProgressIndicatorAndTwoSideIcons, ++ QGraphicsItem *parent = 0); ++ ++}; ++ ++ ++ ++class ThemeCellCreator : public MAbstractCellCreator<ThemeListItem> + { + public: + virtual MWidget *createCell ( + const QModelIndex &index, + MWidgetRecycler &recycler) const; +- ++ + virtual void updateCell ( + const QModelIndex &index, + MWidget *cell) const; Index: fix_usbapplet_translation.diff =================================================================== --- fix_usbapplet_translation.diff (revision 0) +++ fix_usbapplet_translation.diff (revision 17) @@ -0,0 +1,13 @@ +Only in meegotouch-controlpanelapplets-0.17.4_current_patches//src/aboutapplet: aboutapplet.cpp.rej +diff -ru meegotouch-controlpanelapplets-0.17.4_current_patches//src/usbapplet/usbapplet.desktop meegotouch-controlpanelapplets-0.17.4/src/usbapplet/usbapplet.desktop +--- meegotouch-controlpanelapplets-0.17.4_current_patches//src/usbapplet/usbapplet.desktop 2011-05-18 15:32:21.822113254 +0300 ++++ meegotouch-controlpanelapplets-0.17.4/src/usbapplet/usbapplet.desktop 2011-05-18 15:33:12.701168739 +0300 +@@ -2,7 +2,7 @@ + Type=ControlPanelApplet + Name=USB + X-logical-id=qtn_usb_title +-X-translation-catalog=usb ++X-translation-catalog=systemui-applets,usb + X-Maemo-Service=com.nokia.DuiControlPanel + X-Maemo-Method=com.nokia.DuiControlPanelIf.appletPage + X-Maemo-Object-Path=/
